diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx
index afffdc817..315920ab5 100644
--- a/src/AIModel/AIManager.cxx
+++ b/src/AIModel/AIManager.cxx
@@ -18,6 +18,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#include <cstring>
+
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/props/props_io.hxx>
 #include <simgear/structure/exception.hxx>
diff --git a/src/ATCDCL/transmission.cxx b/src/ATCDCL/transmission.cxx
index 9f77af939..5c1d01572 100644
--- a/src/ATCDCL/transmission.cxx
+++ b/src/ATCDCL/transmission.cxx
@@ -25,6 +25,8 @@
 
 #include "transmission.hxx"
 
+#include <cstring>
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 
diff --git a/src/Airports/runwayprefs.cxx b/src/Airports/runwayprefs.cxx
index 8337d31f9..b47c6bc77 100644
--- a/src/Airports/runwayprefs.cxx
+++ b/src/Airports/runwayprefs.cxx
@@ -26,6 +26,7 @@
 #endif
 
 #include <math.h>
+#include <cstring>
 
 #include <simgear/compiler.h>
 
diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx
index ac870e5e2..74f1d82ea 100644
--- a/src/Environment/environment_ctrl.cxx
+++ b/src/Environment/environment_ctrl.cxx
@@ -25,6 +25,7 @@
 #endif
 
 #include <algorithm>
+#include <cstring>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/commands.hxx>
diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index fa23149ec..944948f7d 100644
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -24,6 +24,8 @@
 #  include <config.h>
 #endif
 
+#include <cstring>
+
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/scene/sky/sky.hxx>
diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index f58d324f4..208fa402b 100644
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -24,6 +24,7 @@
 #  include "config.h"
 #endif
 
+#include <cstring>
 #include <Main/fg_props.hxx>
 
 #include <simgear/constants.h>
diff --git a/src/FDM/ExternalPipe/ExternalPipe.cxx b/src/FDM/ExternalPipe/ExternalPipe.cxx
index f3c7f2912..abe656960 100644
--- a/src/FDM/ExternalPipe/ExternalPipe.cxx
+++ b/src/FDM/ExternalPipe/ExternalPipe.cxx
@@ -31,6 +31,7 @@
 #  include <unistd.h>           // unlink()
 #endif
 
+#include <cstring>
 #include <stdio.h>              // FILE*, fopen(), fread(), fwrite(), et. al.
 #include <iostream>             // for cout, endl
 
diff --git a/src/FDM/SP/ADA.cxx b/src/FDM/SP/ADA.cxx
index 123856be0..7585b428a 100644
--- a/src/FDM/SP/ADA.cxx
+++ b/src/FDM/SP/ADA.cxx
@@ -22,6 +22,8 @@
 #  include <config.h>
 #endif
 
+#include <cstring>
+
 #include <simgear/io/iochannel.hxx>
 #include <simgear/io/sg_socket.hxx>
 #include <simgear/constants.h>
diff --git a/src/FDM/UIUCModel/uiuc_wrapper.cpp b/src/FDM/UIUCModel/uiuc_wrapper.cpp
index 79bbe74c3..47897560e 100644
--- a/src/FDM/UIUCModel/uiuc_wrapper.cpp
+++ b/src/FDM/UIUCModel/uiuc_wrapper.cpp
@@ -83,6 +83,7 @@
 #endif
 
 #include <iostream>
+#include <cstring>
 
 #include <simgear/compiler.h>
 #include <simgear/misc/sg_path.hxx>
diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx
index 4b522dfce..afee154f3 100644
--- a/src/Instrumentation/gps.cxx
+++ b/src/Instrumentation/gps.cxx
@@ -11,6 +11,7 @@
 
 #include <memory>
 #include <set>
+#include <cstring>
 
 #include "Main/fg_props.hxx"
 #include "Main/globals.hxx" // for get_subsystem
diff --git a/src/Instrumentation/gps.hxx b/src/Instrumentation/gps.hxx
index f1a1b4396..cbdca3bc4 100644
--- a/src/Instrumentation/gps.hxx
+++ b/src/Instrumentation/gps.hxx
@@ -7,6 +7,8 @@
 #ifndef __INSTRUMENTS_GPS_HXX
 #define __INSTRUMENTS_GPS_HXX 1
 
+#include <cassert>
+
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/math/SGMath.hxx>
diff --git a/src/Instrumentation/navradio.cxx b/src/Instrumentation/navradio.cxx
index f8cc3bebb..d10076278 100644
--- a/src/Instrumentation/navradio.cxx
+++ b/src/Instrumentation/navradio.cxx
@@ -28,6 +28,7 @@
 #include "navradio.hxx"
 
 #include <sstream>
+#include <cstring>
 
 #include <simgear/sg_inlines.h>
 #include <simgear/timing/sg_time.hxx>
diff --git a/src/Main/metar_main.cxx b/src/Main/metar_main.cxx
index d150b6526..04edbcab1 100644
--- a/src/Main/metar_main.cxx
+++ b/src/Main/metar_main.cxx
@@ -25,6 +25,7 @@
 #include <iostream>
 #include <string.h>
 #include <time.h>
+#include <cstdlib>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/environment/metar.hxx>
diff --git a/src/Main/viewer.cxx b/src/Main/viewer.cxx
index d7b51d859..ab5f6aa44 100644
--- a/src/Main/viewer.cxx
+++ b/src/Main/viewer.cxx
@@ -28,6 +28,7 @@
 #endif
 
 #include <simgear/compiler.h>
+#include <cassert>
 
 #include "fg_props.hxx"
 
diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index 600086d29..3478a68c5 100644
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -16,6 +16,7 @@
 #include <algorithm>
 #include <functional>
 #include <vector>
+#include <cstring>
 
 #include <osg/Math>
 
diff --git a/src/Network/AV400.cxx b/src/Network/AV400.cxx
index 4b3f368aa..bed03b48b 100644
--- a/src/Network/AV400.cxx
+++ b/src/Network/AV400.cxx
@@ -25,6 +25,8 @@
 #  include "config.h"
 #endif
 
+#include <cstring>
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/io/iochannel.hxx>
diff --git a/src/Network/AV400Sim.cxx b/src/Network/AV400Sim.cxx
index 3a9fcdf28..894dcbef8 100644
--- a/src/Network/AV400Sim.cxx
+++ b/src/Network/AV400Sim.cxx
@@ -29,6 +29,8 @@
 #  include "config.h"
 #endif
 
+#include <cstring>
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/io/iochannel.hxx>
diff --git a/src/Network/atlas.cxx b/src/Network/atlas.cxx
index f1c940c96..4a2cd9d64 100644
--- a/src/Network/atlas.cxx
+++ b/src/Network/atlas.cxx
@@ -24,6 +24,8 @@
 #  include "config.h"
 #endif
 
+#include <cstring>
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/io/iochannel.hxx>
diff --git a/src/Network/garmin.cxx b/src/Network/garmin.cxx
index 0bf751bcd..e6bc2dcd7 100644
--- a/src/Network/garmin.cxx
+++ b/src/Network/garmin.cxx
@@ -25,6 +25,7 @@
 #endif
 
 #include <iostream>
+#include <cstring>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
diff --git a/src/Network/nmea.cxx b/src/Network/nmea.cxx
index b9d4eb1a4..bbfd3fc0d 100644
--- a/src/Network/nmea.cxx
+++ b/src/Network/nmea.cxx
@@ -24,6 +24,8 @@
 #  include "config.h"
 #endif
 
+#include <cstring>
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/io/iochannel.hxx>
diff --git a/src/Sound/beacon.cxx b/src/Sound/beacon.cxx
index 4505017c9..f72289189 100644
--- a/src/Sound/beacon.cxx
+++ b/src/Sound/beacon.cxx
@@ -22,6 +22,7 @@
 
 
 #include <stdlib.h>
+#include <cstring>
 
 #include "beacon.hxx"
 
diff --git a/src/Sound/morse.cxx b/src/Sound/morse.cxx
index df6c969fa..31949144c 100644
--- a/src/Sound/morse.cxx
+++ b/src/Sound/morse.cxx
@@ -25,6 +25,7 @@
 
 #include "morse.hxx"
 
+#include <cstring>
 
 static const char alphabet[26][4] = {
     { DI, DAH, end, end },	/* A */ 
diff --git a/src/Systems/electrical.cxx b/src/Systems/electrical.cxx
index 103456a48..18e80222f 100644
--- a/src/Systems/electrical.cxx
+++ b/src/Systems/electrical.cxx
@@ -24,6 +24,8 @@
 #  include <config.h>
 #endif
 
+#include <cstring>
+
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/debug/logstream.hxx>
diff --git a/src/Systems/vacuum.cxx b/src/Systems/vacuum.cxx
index 9303073b2..a776d9a49 100644
--- a/src/Systems/vacuum.cxx
+++ b/src/Systems/vacuum.cxx
@@ -8,6 +8,9 @@
 #endif
 
 #include "vacuum.hxx"
+
+#include <cstring>
+
 #include <Main/fg_props.hxx>
 
 
diff --git a/src/Time/sunsolver.cxx b/src/Time/sunsolver.cxx
index cdb53a6bf..2275f9902 100644
--- a/src/Time/sunsolver.cxx
+++ b/src/Time/sunsolver.cxx
@@ -29,6 +29,7 @@
 
 #include <cmath>
 #include <ctime>
+#include <cassert>
 
 #include <simgear/math/SGMath.hxx>
 #include <simgear/timing/sg_time.hxx>
diff --git a/utils/GPSsmooth/UGear.cxx b/utils/GPSsmooth/UGear.cxx
index 95781f876..2a570e1e9 100644
--- a/utils/GPSsmooth/UGear.cxx
+++ b/utils/GPSsmooth/UGear.cxx
@@ -3,6 +3,7 @@
 #endif 
 
 #include <iostream>
+#include <cstdio>
 
 #include <simgear/constants.h>
 #include <simgear/io/sg_file.hxx>