--- math/sg_memory.h.BAD	2006-10-18 14:55:31.000000000 -0500
+++ math/sg_memory.h	2006-10-18 14:55:52.000000000 -0500
@@ -24,10 +24,6 @@
 #ifndef _SG_MEMORY_H
 #define _SG_MEMORY_H
 
-#ifdef HAVE_CONFIG_H
-#  include <simgear_config.h>
-#endif
-
 #ifdef HAVE_MEMCPY
 
 #  ifdef HAVE_MEMORY_H
--- misc/stopwatch.hxx.BAD	2006-10-18 14:57:56.000000000 -0500
+++ misc/stopwatch.hxx	2006-10-18 14:58:06.000000000 -0500
@@ -42,10 +42,6 @@
 # error This library requires C++
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <simgear_config.h>
-#endif
-
 #if defined(__linux__) && ! defined(HAVE_GETRUSAGE)
 #  define HAVE_GETRUSAGE
 #endif
--- structure/SGSmplhist.hxx.BAD	2008-01-07 21:44:55.000000000 +0100
+++ structure/SGSmplhist.hxx	2008-01-07 21:46:29.000000000 +0100
@@ -16,9 +16,6 @@
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#include <simgear_config.h>
-#endif
 #ifndef SampleHistogram_h
 #ifdef __GNUG__
 #pragma interface
--- timing/timestamp.hxx.BAD	2008-01-07 11:03:49.000000000 +0100
+++ timing/timestamp.hxx	2008-01-07 21:47:15.000000000 +0100
@@ -32,9 +32,8 @@
 # error This library requires C++
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <simgear_config.h>
-#endif
+#define HAVE_GETTIMEOFDAY 1
+#define HAVE_SYS_TIME_H 1
 
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>