make headers include headers they depend on, don't rely on the c(xx)

[simgear.git] / simgear / screen / screen-dump.cxx

diff --git a/simgear/screen/screen-dump.cxx b/simgear/screen/screen-dump.cxx
index 8a9da20fd88fb80559e478609c4eb206d7b705cd..8251ab8c61e168eb9397d78c5c31c56ca69f572e 100644 (file)
--- a/simgear/screen/screen-dump.cxx
+++ b/simgear/screen/screen-dump.cxx
@@ -12,28 +12,32 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <simgear_config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>                     
+#if defined(__CYGWIN__)  /* && !defined(USING_X) */
+#define WIN32
+#endif
+
+#if defined(WIN32)  /* MINGW and MSC predefine WIN32 */
+# include <windows.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
 
-#include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #include "screen-dump.hxx"