diff --git a/src/ATC/ATC.hxx b/src/ATC/ATC.hxx
index 1f3028018..d0cd38daf 100644
--- a/src/ATC/ATC.hxx
+++ b/src/ATC/ATC.hxx
@@ -24,7 +24,7 @@
 
 // Possible types of ATC type that the radios may be tuned to.
 // INVALID implies not tuned in to anything.
-typedef enum atc_type {
+enum atc_type {
     INVALID,
     ATIS,
     GROUND,
diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index bde2930a6..c8a58fedf 100644
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -473,7 +473,7 @@ private:
 class FGTextLayer : public FGInstrumentLayer
 {
 public:
-  typedef enum ChunkType {
+  enum ChunkType {
     TEXT,
     TEXT_VALUE,
     DOUBLE_VALUE
diff --git a/src/Main/logger.cxx b/src/Main/logger.cxx
index 3e42f23cb..2c63da8a7 100644
--- a/src/Main/logger.cxx
+++ b/src/Main/logger.cxx
@@ -5,9 +5,11 @@
 
 #include "logger.hxx"
 
-#include <fstream>
+#include STL_FSTREAM
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_STD(ofstream);
 SG_USING_STD(endl);
+#endif
 
 #include <string>
 SG_USING_STD(string);
diff --git a/src/Main/logger.hxx b/src/Main/logger.hxx
index cdadc2530..fe2bc7948 100644
--- a/src/Main/logger.hxx
+++ b/src/Main/logger.hxx
@@ -19,8 +19,10 @@
 #include <simgear/misc/exception.hxx>
 #include <simgear/misc/props.hxx>
 
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 #include <iostream>
 SG_USING_STD(ostream);
+#endif
 
 #include <vector>
 SG_USING_STD(vector);
diff --git a/src/WeatherCM/FGSnowRain.h b/src/WeatherCM/FGSnowRain.h
index bf82101af..ba940cdbf 100644
--- a/src/WeatherCM/FGSnowRain.h
+++ b/src/WeatherCM/FGSnowRain.h
@@ -52,7 +52,7 @@ HISTORY
 /****************************************************************************/
 /* DEFINES								    */
 /****************************************************************************/
-typedef enum SnowRainType
+enum SnowRainType
 {
     Rain,
     Snow,