diff --git a/src/AIModel/submodel.cxx b/src/AIModel/submodel.cxx
index 32ee5bf94..a4959e27b 100644
--- a/src/AIModel/submodel.cxx
+++ b/src/AIModel/submodel.cxx
@@ -3,6 +3,10 @@
 //
 // This file is in the Public Domain and comes with no warranty.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "submodel.hxx"
 
 #include <simgear/structure/exception.hxx>
diff --git a/src/ATC/ATCDialog.cxx b/src/ATC/ATCDialog.cxx
index b2b6964cd..b44e69c1a 100644
--- a/src/ATC/ATCDialog.cxx
+++ b/src/ATC/ATCDialog.cxx
@@ -18,6 +18,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <simgear/compiler.h>
 
 #include <simgear/structure/commands.hxx>
diff --git a/src/Aircraft/aircraft.cxx b/src/Aircraft/aircraft.cxx
index 47292bc32..724f659e1 100644
--- a/src/Aircraft/aircraft.cxx
+++ b/src/Aircraft/aircraft.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <stdio.h>
 #include <string.h>		// strdup
diff --git a/src/Aircraft/replay.cxx b/src/Aircraft/replay.cxx
index e650a8b31..a58703b73 100644
--- a/src/Aircraft/replay.cxx
+++ b/src/Aircraft/replay.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/constants.h>
 
diff --git a/src/Cockpit/built_in/FGMagRibbon.cxx b/src/Cockpit/built_in/FGMagRibbon.cxx
index 9aa7632a3..3f0f34779 100644
--- a/src/Cockpit/built_in/FGMagRibbon.cxx
+++ b/src/Cockpit/built_in/FGMagRibbon.cxx
@@ -18,6 +18,9 @@
 //
 //  $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include "FGMagRibbon.hxx"
 
diff --git a/src/Cockpit/hud_card.cxx b/src/Cockpit/hud_card.cxx
index ee5fad245..f678a94ce 100644
--- a/src/Cockpit/hud_card.cxx
+++ b/src/Cockpit/hud_card.cxx
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <plib/sg.h>
 #include "hud.hxx"
 
diff --git a/src/Cockpit/hud_ladr.cxx b/src/Cockpit/hud_ladr.cxx
index 6c070b605..dfc815a70 100644
--- a/src/Cockpit/hud_ladr.cxx
+++ b/src/Cockpit/hud_ladr.cxx
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <simgear/constants.h>
 
 #include "hud.hxx"
diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx
index e4f7ac964..0b901640b 100644
--- a/src/Environment/environment_ctrl.cxx
+++ b/src/Environment/environment_ctrl.cxx
@@ -20,6 +20,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <simgear/debug/logstream.hxx>
 
 #include <stdlib.h>
diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index 75a9b6417..970a4fa9d 100644
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -20,6 +20,10 @@
 //
 //
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <Main/fg_props.hxx>
 
 #include <simgear/constants.h>
diff --git a/src/FDM/Balloon/BalloonSim.cpp b/src/FDM/Balloon/BalloonSim.cpp
index 6047c41a9..5ca8c0b1b 100644
--- a/src/FDM/Balloon/BalloonSim.cpp
+++ b/src/FDM/Balloon/BalloonSim.cpp
@@ -38,6 +38,11 @@ HISTORY
 /****************************************************************************/
 /* INCLUDES								    */
 /****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <stdio.h>
 // #include <conio.h>
 #include <math.h>
diff --git a/src/FDM/flight.cxx b/src/FDM/flight.cxx
index 695497190..1f40e1493 100644
--- a/src/FDM/flight.cxx
+++ b/src/FDM/flight.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <stdio.h>
 
diff --git a/src/FDM/groundcache.cxx b/src/FDM/groundcache.cxx
index 04b5af06e..3680ef366 100644
--- a/src/FDM/groundcache.cxx
+++ b/src/FDM/groundcache.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <float.h>
 
diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index 8d19187d2..451cee38d 100644
--- a/src/GUI/dialog.cxx
+++ b/src/GUI/dialog.cxx
@@ -1,5 +1,9 @@
 // dialog.cxx: implementation of an XML-configurable dialog box.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <stdlib.h>		// atof()
 
 #include <Input/input.hxx>
diff --git a/src/Instrumentation/KLN89/kln89_page_act.cxx b/src/Instrumentation/KLN89/kln89_page_act.cxx
index d121820a6..9b1772278 100644
--- a/src/Instrumentation/KLN89/kln89_page_act.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_act.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_act.hxx"
 #include "kln89_page_apt.hxx"
 #include "kln89_page_vor.hxx"
diff --git a/src/Instrumentation/KLN89/kln89_page_apt.cxx b/src/Instrumentation/KLN89/kln89_page_apt.cxx
index 1ea7022b0..eb44449ce 100644
--- a/src/Instrumentation/KLN89/kln89_page_apt.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_apt.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_apt.hxx"
 #include <ATC/commlist.hxx>
 #include <Main/globals.hxx>
diff --git a/src/Instrumentation/KLN89/kln89_page_cal.cxx b/src/Instrumentation/KLN89/kln89_page_cal.cxx
index 42b9f3ea3..cbf2ca63e 100644
--- a/src/Instrumentation/KLN89/kln89_page_cal.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_cal.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_cal.hxx"
 
 KLN89CalPage::KLN89CalPage(KLN89* parent)
diff --git a/src/Instrumentation/KLN89/kln89_page_dir.cxx b/src/Instrumentation/KLN89/kln89_page_dir.cxx
index 8ac43e5ac..eff8230d2 100644
--- a/src/Instrumentation/KLN89/kln89_page_dir.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_dir.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_dir.hxx"
 
 KLN89DirPage::KLN89DirPage(KLN89* parent)
diff --git a/src/Instrumentation/KLN89/kln89_page_fpl.cxx b/src/Instrumentation/KLN89/kln89_page_fpl.cxx
index 99dfe982a..0195b3fa6 100644
--- a/src/Instrumentation/KLN89/kln89_page_fpl.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_fpl.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_fpl.hxx"
 #include <algorithm>
 
diff --git a/src/Instrumentation/KLN89/kln89_page_int.cxx b/src/Instrumentation/KLN89/kln89_page_int.cxx
index cf46bf142..16da2bd74 100644
--- a/src/Instrumentation/KLN89/kln89_page_int.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_int.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_int.hxx"
 
 KLN89IntPage::KLN89IntPage(KLN89* parent) 
diff --git a/src/Instrumentation/KLN89/kln89_page_nav.cxx b/src/Instrumentation/KLN89/kln89_page_nav.cxx
index fdddb3901..6c98a1536 100644
--- a/src/Instrumentation/KLN89/kln89_page_nav.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_nav.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_nav.hxx"
 #include <Main/fg_props.hxx>
 
diff --git a/src/Instrumentation/KLN89/kln89_page_ndb.cxx b/src/Instrumentation/KLN89/kln89_page_ndb.cxx
index 9d460bf0e..fa0f00860 100644
--- a/src/Instrumentation/KLN89/kln89_page_ndb.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_ndb.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_ndb.hxx"
 
 KLN89NDBPage::KLN89NDBPage(KLN89* parent) 
diff --git a/src/Instrumentation/KLN89/kln89_page_nrst.cxx b/src/Instrumentation/KLN89/kln89_page_nrst.cxx
index fad2170ab..c16b68c23 100644
--- a/src/Instrumentation/KLN89/kln89_page_nrst.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_nrst.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_nrst.hxx"
 
 KLN89NrstPage::KLN89NrstPage(KLN89* parent) 
diff --git a/src/Instrumentation/KLN89/kln89_page_oth.cxx b/src/Instrumentation/KLN89/kln89_page_oth.cxx
index ae7ce92d2..0b77bcbc1 100644
--- a/src/Instrumentation/KLN89/kln89_page_oth.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_oth.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_oth.hxx"
 
 KLN89OthPage::KLN89OthPage(KLN89* parent)
diff --git a/src/Instrumentation/KLN89/kln89_page_set.cxx b/src/Instrumentation/KLN89/kln89_page_set.cxx
index fc09e81ad..1dff40dc7 100644
--- a/src/Instrumentation/KLN89/kln89_page_set.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_set.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_set.hxx"
 
 #include <iostream>
diff --git a/src/Instrumentation/KLN89/kln89_page_usr.cxx b/src/Instrumentation/KLN89/kln89_page_usr.cxx
index bf2cdcefe..31622f89f 100644
--- a/src/Instrumentation/KLN89/kln89_page_usr.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_usr.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_usr.hxx"
 
 KLN89UsrPage::KLN89UsrPage(KLN89* parent) 
diff --git a/src/Instrumentation/KLN89/kln89_page_vor.cxx b/src/Instrumentation/KLN89/kln89_page_vor.cxx
index 3a1c5938a..88628c135 100644
--- a/src/Instrumentation/KLN89/kln89_page_vor.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_vor.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "kln89_page_vor.hxx"
 
 KLN89VorPage::KLN89VorPage(KLN89* parent) 
diff --git a/src/Instrumentation/od_gauge.cxx b/src/Instrumentation/od_gauge.cxx
index f2ec9d4cd..647f93cfc 100644
--- a/src/Instrumentation/od_gauge.cxx
+++ b/src/Instrumentation/od_gauge.cxx
@@ -20,6 +20,10 @@
 //
 //
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <plib/ssg.h>
 #include <simgear/screen/extensions.hxx>
 #include <simgear/screen/RenderTexture.h>
diff --git a/src/Instrumentation/wxradar.cxx b/src/Instrumentation/wxradar.cxx
index 629f9abe1..829af7b25 100644
--- a/src/Instrumentation/wxradar.cxx
+++ b/src/Instrumentation/wxradar.cxx
@@ -20,6 +20,10 @@
 //
 //
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <plib/sg.h>
 #include <plib/ssg.h>
 #include <Main/fg_props.hxx>
diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 644bda6a4..2a1863411 100644
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -1,5 +1,9 @@
 // fg_commands.cxx - internal FGFS commands.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <string.h>		// strcmp()
 
 #include <simgear/compiler.h>
diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 2cdd3f7e9..6ac044ff9 100644
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/compiler.h>
 
diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 9c32d1d11..3980a4f82 100644
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -21,9 +21,11 @@
 // $Id$
 
 #ifdef HAVE_CONFIG_H
-#  include <simgear/compiler.h>
+#  include "config.h"
 #endif
 
+#include <simgear/compiler.h>
+
 #include <simgear/structure/exception.hxx>
 #include <simgear/magvar/magvar.hxx>
 #include <simgear/timing/sg_time.hxx>
diff --git a/src/Main/viewer.cxx b/src/Main/viewer.cxx
index 5c62846c4..c0fc51534 100644
--- a/src/Main/viewer.cxx
+++ b/src/Main/viewer.cxx
@@ -23,6 +23,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/compiler.h>
 
diff --git a/src/Main/viewmgr.cxx b/src/Main/viewmgr.cxx
index 33fe8f7cb..9d30d046e 100644
--- a/src/Main/viewmgr.cxx
+++ b/src/Main/viewmgr.cxx
@@ -21,6 +21,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <string.h>		// strcmp
 
 #include <plib/sg.h>
diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index 1c2d40a65..2e8d12c0f 100644
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/compiler.h>
 
diff --git a/src/Network/atlas.cxx b/src/Network/atlas.cxx
index f4007595d..997ce1c5c 100644
--- a/src/Network/atlas.cxx
+++ b/src/Network/atlas.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
diff --git a/src/Network/garmin.cxx b/src/Network/garmin.cxx
index 80690a22e..88fc8112b 100644
--- a/src/Network/garmin.cxx
+++ b/src/Network/garmin.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
diff --git a/src/Network/generic.cxx b/src/Network/generic.cxx
index 38481b08b..eae2d4492 100644
--- a/src/Network/generic.cxx
+++ b/src/Network/generic.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <string.h>		// strstr()
 #include <stdlib.h>		// strtod(), atoi()
diff --git a/src/Network/joyclient.cxx b/src/Network/joyclient.cxx
index 2f5e802aa..2fd0970d7 100644
--- a/src/Network/joyclient.cxx
+++ b/src/Network/joyclient.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
diff --git a/src/Network/jsclient.cxx b/src/Network/jsclient.cxx
index 3df3b486e..8221b4d58 100644
--- a/src/Network/jsclient.cxx
+++ b/src/Network/jsclient.cxx
@@ -21,6 +21,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
diff --git a/src/Network/nmea.cxx b/src/Network/nmea.cxx
index 72fbbdbdf..0f485f67b 100644
--- a/src/Network/nmea.cxx
+++ b/src/Network/nmea.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index 2222bcf17..9acfedca6 100644
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/src/Scripting/nasal-props.cxx b/src/Scripting/nasal-props.cxx
index 3d0788bea..bd3f9411c 100644
--- a/src/Scripting/nasal-props.cxx
+++ b/src/Scripting/nasal-props.cxx
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <simgear/nasal/nasal.h>
 #include <simgear/props/props.hxx>
 
diff --git a/src/Sound/voice.cxx b/src/Sound/voice.cxx
index 77b40821c..075373305 100644
--- a/src/Sound/voice.cxx
+++ b/src/Sound/voice.cxx
@@ -20,6 +20,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <sstream>
 #include <simgear/compiler.h>
 #include <Main/fg_props.hxx>
diff --git a/src/Traffic/SchedFlight.cxx b/src/Traffic/SchedFlight.cxx
index a65adad8c..8f56cbaad 100644
--- a/src/Traffic/SchedFlight.cxx
+++ b/src/Traffic/SchedFlight.cxx
@@ -36,6 +36,11 @@
  * - Find an alternative for the depricated Point3D class
  *
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <time.h>
 #include <iostream>
diff --git a/src/Traffic/Schedule.cxx b/src/Traffic/Schedule.cxx
index 678bcd5d7..8bb04a3c9 100644
--- a/src/Traffic/Schedule.cxx
+++ b/src/Traffic/Schedule.cxx
@@ -20,6 +20,11 @@
  ****************************************************************************
  *
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <time.h>
 #include <iostream>
diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx
index 3d7fe4d79..a38646bc0 100644
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -33,6 +33,11 @@
  *
  *
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <time.h>
 #include <iostream>