Merge branch 'topic/atis' into merge/master-atis

[flightgear.git] / src / Cockpit / cockpit.cxx

diff --git a/src/Cockpit/cockpit.cxx b/src/Cockpit/cockpit.cxx
index b9e97281eec961215903ed5ba78903572657a554..0414a0f6a0ae4fb0a15f3cde660c52bde07fbed4 100644 (file)
--- a/src/Cockpit/cockpit.cxx
+++ b/src/Cockpit/cockpit.cxx
@@ -25,21 +25,14 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 
-#include SG_GLU_H
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/polar3d.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/timing/sg_time.hxx>
 
@@ -51,8 +44,8 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
+#include <Main/viewer.hxx>
 #include <Scenery/scenery.hxx>
-#include <Time/fg_timer.hxx>
 #include <GUI/gui.h>
 
 #include "cockpit.hxx"