Fix Carriers without catapults and wires.

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

diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx
index 9461544de506df156fed11e715e0c240b19035c4..dd1f1036155c0df275f02c9f1e1ed391a0ebe5e4 100644 (file)
--- a/src/Cockpit/panel_io.cxx
+++ b/src/Cockpit/panel_io.cxx
@@ -22,10 +22,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <string.h>            // for strcmp()
 
 #include <simgear/compiler.h>
@@ -35,8 +31,8 @@
 #include <simgear/props/props.hxx>
 
 #include <istream>
-#include STL_FSTREAM
-#include STL_STRING
+#include <fstream>
+#include <string>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
@@ -50,9 +46,9 @@
 //built-in layers
 #include "built_in/FGMagRibbon.hxx"
 
-SG_USING_STD(istream);
-SG_USING_STD(ifstream);
-SG_USING_STD(string);
+using std::istream;
+using std::ifstream;
+using std::string;
 
 
 \f