Merge branch 'tbm/graphics-bug' into next

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

diff --git a/src/ATCDCL/ATCVoice.hxx b/src/ATCDCL/ATCVoice.hxx
index 0bc501c2065498f901dcfa8122bf6d65fe8520fb..bdd2b0a491002a6dd5b46893f57818cc2ef3a42f 100644 (file)
--- a/src/ATCDCL/ATCVoice.hxx
+++ b/src/ATCDCL/ATCVoice.hxx
@@ -23,21 +23,16 @@
 
 #include <simgear/compiler.h>
 
-#if defined( SG_HAVE_STD_INCLUDES ) || defined( __BORLANDC__ ) || (__APPLE__)
 #  include <fstream>
-#else
-#  include <fstream.h>
-#endif
-
 #include <map>
 #include <list>
 #include <string>
 
 #include <simgear/sound/sample_openal.hxx>
 
-SG_USING_STD(map);
-SG_USING_STD(list);
-SG_USING_STD(string);
+using std::map;
+using std::list;
+using std::string;
 
 
 struct WordData {