diff --git a/src/ClockTool.cc b/src/ClockTool.cc
index b6d343f4..0812092f 100644
--- a/src/ClockTool.cc
+++ b/src/ClockTool.cc
@@ -37,10 +37,6 @@
 #include "FbTk/I18n.hh"
 #include "FbTk/FbTime.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CTIME
   #include <ctime>
 #else
diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index 6138e643..0d2e12fa 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -39,10 +39,6 @@
 #include "FbTk/Util.hh"
 #include "FbTk/RelCalcHelper.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTDLIB
 #include <cstdlib>
 #else
diff --git a/src/Debug.hh b/src/Debug.hh
index 3688b521..59072e83 100644
--- a/src/Debug.hh
+++ b/src/Debug.hh
@@ -1,7 +1,6 @@
 #ifndef DEBUG_HH
 #define DEBUG_HH
 
-#include "config.h"
 #include <iostream>
 
 #ifdef DEBUG
diff --git a/src/FbCommands.cc b/src/FbCommands.cc
index eb7fbfd3..c8cf4aed 100644
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@@ -54,11 +54,6 @@
   #include <string.h>
 #endif
 
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #if defined(__EMX__) && defined(HAVE_PROCESS_H)
 #include <process.h> // for P_NOWAIT
 #endif // __EMX__
diff --git a/src/FbTk/FbString.hh b/src/FbTk/FbString.hh
index 4f3e792b..750014dc 100644
--- a/src/FbTk/FbString.hh
+++ b/src/FbTk/FbString.hh
@@ -25,7 +25,6 @@
 
 #include <string>
 
-#include "config.h"
 #ifdef HAVE_ICONV
 #include <iconv.h>
 #endif // HAVE_ICONV
diff --git a/src/FbTk/FbTime.hh b/src/FbTk/FbTime.hh
index 3d80b122..42ee9127 100644
--- a/src/FbTk/FbTime.hh
+++ b/src/FbTk/FbTime.hh
@@ -22,12 +22,6 @@
 #ifndef FBTK_FBTIME_HH
 #define FBTK_FBTIME_HH
 
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
 #endif // HAVE_INTTYPES_H
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 257447fd..45825745 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -28,10 +28,6 @@
 #include "App.hh"
 #include "Transparent.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 
diff --git a/src/FbTk/FileUtil.hh b/src/FbTk/FileUtil.hh
index d031a6e5..fbc8ceba 100644
--- a/src/FbTk/FileUtil.hh
+++ b/src/FbTk/FileUtil.hh
@@ -22,9 +22,6 @@
 #ifndef FBTK_FILEUTIL_HH
 #define FBTK_FILEUTIL_HH
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
 #ifdef HAVE_CTIME
   #include <ctime>
 #else
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index 544ddc23..5987134f 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -25,10 +25,6 @@
 #include "FontImp.hh"
 #include "App.hh"
 
-#ifdef    HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 // for antialias
 #ifdef USE_XFT
 #include "XftFontImp.hh"
diff --git a/src/FbTk/Font.hh b/src/FbTk/Font.hh
index 6ea2571c..8a0f05d8 100644
--- a/src/FbTk/Font.hh
+++ b/src/FbTk/Font.hh
@@ -24,10 +24,6 @@
 
 #include <X11/Xlib.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "FbString.hh"
 #include "Color.hh"
 #include "Orientation.hh"
diff --git a/src/FbTk/I18n.hh b/src/FbTk/I18n.hh
index 0413f743..4ff4b77b 100644
--- a/src/FbTk/I18n.hh
+++ b/src/FbTk/I18n.hh
@@ -30,11 +30,6 @@
 
 #include "FbString.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif // HAVE_LOCALE_H
diff --git a/src/FbTk/Image.cc b/src/FbTk/Image.cc
index 1cf94fa7..f1bca2c8 100644
--- a/src/FbTk/Image.cc
+++ b/src/FbTk/Image.cc
@@ -23,10 +23,6 @@
 #include "StringUtil.hh"
 #include "FileUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XPM
 #include "ImageXPM.hh"
 #endif // HAVE_XPM
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc
index c99ef9a9..8b5f23da 100644
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@@ -35,11 +35,6 @@
 #define _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif // HAVE_SYS_TYPES_H
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index d54eaaed..3c34b22c 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LIBRARIES = libFbTk.a
 
-AM_CPPFLAGS=@CPPFLAGS@
+AM_CPPFLAGS=-include $(top_builddir)/config.h
 
 if XFT
 xft_SOURCE= XftFontImp.hh XftFontImp.cc
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 3632fc9d..3e3481fe 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -29,10 +29,6 @@
 
 #include "Menu.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #include "MenuItem.hh"
 #include "MenuSeparator.hh"
 #include "ImageControl.hh"
diff --git a/src/FbTk/RegExp.hh b/src/FbTk/RegExp.hh
index 47d2cd58..b3106c0c 100644
--- a/src/FbTk/RegExp.hh
+++ b/src/FbTk/RegExp.hh
@@ -26,10 +26,6 @@
 
 #include "NotCopyable.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <string>
 
 /*
diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc
index 32745af4..806828fc 100644
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@@ -26,10 +26,6 @@
 #include "GContext.hh"
 #include "FbPixmap.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTRING
   #include <cstring>
 #else
diff --git a/src/FbTk/ThemeItems.cc b/src/FbTk/ThemeItems.cc
index 774a14d4..b1f9a60d 100644
--- a/src/FbTk/ThemeItems.cc
+++ b/src/FbTk/ThemeItems.cc
@@ -24,10 +24,6 @@
 #ifndef THEMEITEMS_HH
 #define THEMEITEMS_HH
 
-#ifdef    HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "Theme.hh"
 #include "Color.hh"
 #include "Texture.hh"
diff --git a/src/FbTk/Timer.hh b/src/FbTk/Timer.hh
index b4ce55ee..4bdd13ab 100644
--- a/src/FbTk/Timer.hh
+++ b/src/FbTk/Timer.hh
@@ -29,10 +29,6 @@
 #include "Command.hh"
 #include "FbTime.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #include <string>
 
 namespace FbTk {
diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc
index 04fee67c..7db207a8 100644
--- a/src/FbTk/Transparent.cc
+++ b/src/FbTk/Transparent.cc
@@ -23,10 +23,6 @@
 #include "App.hh"
 #include "I18n.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XRENDER
 #include <X11/extensions/Xrender.h>
 #endif // HAVE_XRENDER
diff --git a/src/FbTk/XftFontImp.cc b/src/FbTk/XftFontImp.cc
index 15c82120..65684573 100644
--- a/src/FbTk/XftFontImp.cc
+++ b/src/FbTk/XftFontImp.cc
@@ -25,10 +25,6 @@
 
 #include <math.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 namespace FbTk {
 
 XftFontImp::XftFontImp(const char *name, bool utf8):
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc
index 34abee99..6370d860 100644
--- a/src/FbTk/XmbFontImp.cc
+++ b/src/FbTk/XmbFontImp.cc
@@ -27,10 +27,6 @@
 #include "FbPixmap.hh"
 #include "GContext.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #ifdef HAVE_SETLOCALE
 #include <locale.h>
 #endif // HAVE_SETLOCALE
diff --git a/src/FbTk/stringstream.hh b/src/FbTk/stringstream.hh
index 54bd6f0e..31560c94 100644
--- a/src/FbTk/stringstream.hh
+++ b/src/FbTk/stringstream.hh
@@ -22,10 +22,6 @@
 #ifndef FBTK_STRINGSTREAM_HH
 #define FBTK_STRINGSTREAM_HH
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_SSTREAM
 #include <sstream>
 #define FbTk_istringstream std::istringstream
diff --git a/src/IconButton.cc b/src/IconButton.cc
index 7c70a632..f7b4f5fc 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -32,10 +32,6 @@
 #include "FbTk/ImageControl.hh"
 #include "FbTk/TextUtils.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #ifdef SHAPE
 #include <X11/extensions/shape.h>
diff --git a/src/Keys.cc b/src/Keys.cc
index 388ec521..79b04036 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -40,11 +40,6 @@
 #include "FbTk/AutoReloadHelper.hh"
 #include "FbTk/STLUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_CCTYPE
   #include <cctype>
 #else
diff --git a/src/Makefile.am b/src/Makefile.am
index 257bdbbb..966546c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,7 +38,7 @@ DEFAULT_WINDOWMENU=@DEFAULT_WINDOWMENU@
 PROGRAM_PREFIX=@program_prefix@
 PROGRAM_SUFFIX=@program_suffix@
 
-AM_CPPFLAGS=
+AM_CPPFLAGS=-include $(top_builddir)/config.h
 
 bin_PROGRAMS= fluxbox
 BUILT_SOURCES = defaults.hh defaults.cc
diff --git a/src/Screen.cc b/src/Screen.cc
index 366b8df5..9bf8e402 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -82,10 +82,6 @@
 #define _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef USE_SLIT
 #include "Slit.hh"
 #include "SlitClient.hh"
diff --git a/src/Slit.cc b/src/Slit.cc
index 7d6b1efd..47cd11f2 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -29,10 +29,6 @@
 #define	 _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "Screen.hh"
 #include "ScreenPlacement.hh"
 #include "FbTk/ImageControl.hh"
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 43007901..775bf399 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -60,10 +60,6 @@
 #define	 _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
diff --git a/src/Window.cc b/src/Window.cc
index c09cc24c..4c811243 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -55,9 +55,6 @@
 #include "FbTk/Select2nd.hh"
 #include "FbTk/MemFun.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
 #ifdef SHAPE
 #include <X11/extensions/shape.h>
 #endif // SHAPE
diff --git a/src/WindowState.cc b/src/WindowState.cc
index b2c76b0b..2f1ee0e6 100644
--- a/src/WindowState.cc
+++ b/src/WindowState.cc
@@ -23,10 +23,6 @@
 
 #include "FbTk/StringUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTDLIB
   #include <cstdlib>
 #else
diff --git a/src/Workspace.cc b/src/Workspace.cc
index a162b4c2..6a721cb6 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -41,10 +41,6 @@
 #define  _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 4ef6a67a..cec46eba 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -62,10 +62,6 @@
 #define	 _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef USE_EWMH
 #include "Ewmh.hh"
 #endif // USE_EWMH
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index f83934a1..58cf664f 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -41,10 +41,6 @@
   #include <stdio.h>
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
diff --git a/src/main.cc b/src/main.cc
index 0639e304..bcd31db8 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -20,10 +20,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "fluxbox.hh"
 #include "version.h"
 #include "defaults.hh"
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 6b3809d3..62d76048 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS= -I$(top_srcdir)/src
+AM_CPPFLAGS= -I$(top_srcdir)/src -include $(top_builddir)/config.h
 
 noinst_PROGRAMS= \
 	 testTexture \
diff --git a/util/Makefile.am b/util/Makefile.am
index f47924f6..1123f689 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,6 +1,6 @@
 # util/Makefile.am for Fluxbox
 SUBDIRS=		fbrun
-AM_CPPFLAGS= 		-I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
+AM_CPPFLAGS= 		-I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk -include $(top_builddir)/config.h
 bin_SCRIPTS= 		fbsetbg fluxbox-generate_menu startfluxbox
 bin_PROGRAMS=		fbsetroot fluxbox-update_configs fluxbox-remote
 fbsetroot_SOURCES=	fbsetroot.cc fbsetroot.hh
@@ -23,10 +23,10 @@ all-local:	startfluxbox
 clean-local:
 		rm -f startfluxbox fluxbox-generate_menu
 
-fbsetroot.o: 	fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \
+fbsetroot.o: 	fbsetroot.cc $(srcdir)/fbsetroot.hh \
 			$(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
 
-fluxbox-update_configs.o:	fluxbox-update_configs.cc ../config.h \
+fluxbox-update_configs.o:	fluxbox-update_configs.cc \
 			$(top_builddir)/src/defaults.hh
 
 fluxbox-remote.o:	fluxbox-remote.cc
diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc
index fac09b91..66a5fec0 100644
--- a/util/fbrun/FbRun.cc
+++ b/util/fbrun/FbRun.cc
@@ -27,10 +27,6 @@
 #include "FbTk/KeyUtil.hh"
 #include "FbTk/FileUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XPM
 #include <X11/xpm.h>
 #include "fbrun.xpm"
diff --git a/util/fbrun/Makefile.am b/util/fbrun/Makefile.am
index 35317df4..57fa1f66 100644
--- a/util/fbrun/Makefile.am
+++ b/util/fbrun/Makefile.am
@@ -1,5 +1,5 @@
 FLUXBOX_SRC_DIR=	../../src/
-AM_CPPFLAGS= 		-I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
+AM_CPPFLAGS= 		-I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk -include $(top_builddir)/config.h
 bin_PROGRAMS= 		fbrun
 fbrun_SOURCES= 		FbRun.hh FbRun.cc main.cc fbrun.xpm
 fbrun_LDADD=		${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
diff --git a/util/fbsetroot.cc b/util/fbsetroot.cc
index 4e7981fd..6dd478bc 100644
--- a/util/fbsetroot.cc
+++ b/util/fbsetroot.cc
@@ -26,10 +26,6 @@
 #include "../src/FbTk/GContext.hh"
 #include "../src/FbRootWindow.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xatom.h>
 
 #ifdef HAVE_CSTRING
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index a8052a2d..a4fe6f24 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -26,10 +26,6 @@
 
 #include "../src/defaults.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif // HAVE_SIGNAL_H