Moved random ground cover object management code (userdata.[ch]xx) over

[flightgear.git] / src / ATC / ATCVoice.hxx

diff --git a/src/ATC/ATCVoice.hxx b/src/ATC/ATCVoice.hxx
index 5b61f75c0725a9952d43c42365ce5c38867c0bac..657e5ecb20301ec4cd761d933a0d1f3b606057af 100644 (file)
--- a/src/ATC/ATCVoice.hxx
+++ b/src/ATC/ATCVoice.hxx
@@ -21,15 +21,11 @@
 #ifndef _FG_ATC_VOICE
 #define _FG_ATC_VOICE
 
+#include <plib/sl.h>
+
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <fstream>
-#  include <iostream>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <fstream.h>
-#  include <iostream.h>
-#elif defined( __BORLANDC__ ) || (__APPLE__)
+#if defined( SG_HAVE_STD_INCLUDES ) || defined( __BORLANDC__ ) || (__APPLE__)
 #  include <fstream>
 #  include <iostream>
 #else
@@ -45,12 +41,10 @@ SG_USING_STD(map);
 SG_USING_STD(list);
 SG_USING_STD(string);
 
-#if !defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(cout);
 SG_USING_STD(ios);
 SG_USING_STD(ofstream);
 SG_USING_STD(ifstream);
-#endif
 
 
 struct WordData {