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 6aea75e23d83dbf947858a2010618aa64ac70704..5d5fd09fbc550a7b7e6572b293aaf79147450942 100644 (file)
--- a/src/Cockpit/panel_io.hxx
+++ b/src/Cockpit/panel_io.hxx
@@ -11,10 +11,10 @@
 //  WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 //  General Public License for more details.
-// 
+//
 //  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 //  $Id$
 
@@ -25,19 +25,14 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H          
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
+#include <iosfwd>
+#include <string>
 
-#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
-SG_USING_STD(istream);
-#endif
+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