Merge branch 'ehofman/atc-sound'

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

diff --git a/src/Cockpit/panel_io.hxx b/src/Cockpit/panel_io.hxx
index 4db99ea18ffe5107b89d6d4eb61e0ac8345d5a4f..5d5fd09fbc550a7b7e6572b293aaf79147450942 100644 (file)
--- a/src/Cockpit/panel_io.hxx
+++ b/src/Cockpit/panel_io.hxx
@@ -25,21 +25,14 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
-#include STL_STRING
-
-SG_USING_STD(istream);
-SG_USING_STD(string);
+#include <iosfwd>
+#include <string>
 
 class FGPanel;
 
-extern FGPanel * fgReadPanel (istream &input);
-extern FGPanel * fgReadPanel (const string &relative_path);
+extern FGPanel * fgReadPanel (std::istream &input);
+extern FGPanel * fgReadPanel (const std::string &relative_path);
 
 #endif // __PANEL_IO_HXX