diff --git a/.gitignore b/.gitignore
index c1e465a1..9a25bea9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 
 # Exact filename in any subdir.
 .deps
+.dirstamp
 Makefile
 Makefile.in
 
@@ -27,23 +28,23 @@ Makefile.in
 /data/apps
 /data/init
 /data/menu
-/src/FbTk/libFbTk.a
+/fbrun
+/fbsetroot
+/fluxbox
+/fluxbox-remote
+/fluxbox-update_configs
+/libFbTk.a
 /src/defaults.cc
 /src/defaults.hh
-/src/fluxbox
-/src/tests/testDemandAttention
-/src/tests/testFont
-/src/tests/testFullscreen
-/src/tests/testKeys
-/src/tests/testRectangleUtil
-/src/tests/testSignals
-/src/tests/testStringUtil
-/src/tests/testTexture
 /stamp-h1
-/util/fbrun/fbrun
-/util/fbsetroot
+/testDemandAttention
+/testFont
+/testFullscreen
+/testKeys
+/testRectangleUtil
+/testSignals
+/testStringUtil
+/testTexture
 /util/fluxbox-generate_menu
-/util/fluxbox-remote
-/util/fluxbox-update_configs
 /util/startfluxbox
 /version.h
diff --git a/Makefile.am b/Makefile.am
index 3d9b5bfa..1b09b39e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,82 @@
-
 # Makefile.am for Fluxbox - http://fluxbox.org
 
-# data dir after util so that utils are built for path searching
-# when generating menu
-
-SUBDIRS = doc nls src util data
-MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = $(top_srcdir)/3rd/vim/* $(top_srcdir)/3rd/vim/syntax/* build-aux/config.rpath
+AM_CPPFLAGS = \
+	-include $(top_builddir)/config.h
+
+# the defaults.hh is wrote to builddir
+src_incdir = $(top_srcdir)/src -I$(top_builddir)/src
+fbtk_incdir = $(top_srcdir)/src/FbTk
+nls_incdir = $(top_srcdir)/nls
+
+EXTRA_DIST = \
+	3rd/vim/ \
+	build-aux/config.rpath \
+	nls/fluxbox-nls.hh \
+	nls/nlsinfo
+
+CLEANFILES =
+bin_PROGRAMS =
+
+MAINTAINERCLEANFILES = \
+	aclocal.m4 \
+	config.h.in \
+	configure \
+	Makefile.in \
+	stamp-h.in
+
+DEFAULT_MENU=@DEFAULT_MENU@
+DEFAULT_STYLE=@DEFAULT_STYLE@
+DEFAULT_KEYSFILE=@DEFAULT_KEYS@
+DEFAULT_APPSFILE=@DEFAULT_APPS@
+DEFAULT_OVERLAY=@DEFAULT_OVERLAY@
+DEFAULT_INITFILE=@DEFAULT_INIT@
+DEFAULT_WINDOWMENU=@DEFAULT_WINDOWMENU@
+PROGRAM_PREFIX=@program_prefix@
+PROGRAM_SUFFIX=@program_suffix@
+
+# Do not rely on configure.ac AC_CONFIG_FILES for install paths.  The
+# paths should be expanded at make time rather than configure.
+edit_cmd = sed \
+	 -e 's|@bindir[@]|$(bindir)|g' \
+	 -e 's|@datadir[@]|$(datadir)|g' \
+	 -e 's|@exec_prefix[@]|$(exec_prefix)|g' \
+	 -e 's|@includedir[@]|$(includedir)|g' \
+	 -e 's|@localstatedir[@]|$(localstatedir)|g' \
+	 -e 's|@pkgbindir[@]|$(pkgbindir)|g' \
+	 -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
+	 -e 's|@pkgprefix[@]|$(pkgprefix:NONE=)|g' \
+	 -e 's|@pkgsuffix[@]|$(pkgsuffix:NONE=)|g' \
+	 -e 's|@prefix[@]|$(prefix)|g' \
+	 -e 's|@sbindir[@]|$(sbindir)|g' \
+	 -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	 -e 's|@usrbin_execdir[@]|$(usrbin_execdir)|g' \
+	 -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \
+	 -e 's|@usrsbin_execdir[@]|$(usrsbin_execdir)|g' \
+	 -e 's|@VERSION[@]|$(VERSION)|g'
+
+PATHFILES =
+CLEANFILES += $(PATHFILES)
+EXTRA_DIST += $(PATHFILES:=.in)
+
+$(PATHFILES): Makefile
+	@ rm -f $@ $@.tmp
+	$(AM_V_GEN) srcdir=''; \
+		test -f ./$@.in || srcdir=$(srcdir)/; \
+		$(edit_cmd) $${srcdir}$@.in >$@.tmp
+	@ mv $@.tmp $@
+
+include data/Makemodule.am
+include doc/Makemodule.am
+include nls/Makemodule.am
+include src/FbTk/Makemodule.am
+include src/Makemodule.am
+include src/tests/Makemodule.am
+include util/Makemodule.am
+include util/fbrun/Makemodule.am
 
 uninstall-hook:
 	rmdir $(DESTDIR)$(pkgdatadir)
-distclean-local:
-	rm -f *\~
 
 source-doc:
 	doxygen Doxyfile
diff --git a/configure.ac b/configure.ac
index ca7fe195..bead773a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -549,32 +549,6 @@ AC_CONFIG_HEADER([config.h])
 AC_OUTPUT([
 Makefile
 version.h
-src/Makefile
-src/FbTk/Makefile
-src/tests/Makefile
-util/Makefile
-util/fbrun/Makefile
-data/Makefile
-data/styles/Makefile
-data/styles/BlueFlux/Makefile
-data/styles/BlueFlux/pixmaps/Makefile
-data/styles/Emerge/Makefile
-data/styles/Emerge/pixmaps/Makefile
-data/styles/arch/Makefile
-data/styles/arch/pixmaps/Makefile
-data/styles/zimek_bisque/Makefile
-data/styles/zimek_darkblue/Makefile
-data/styles/zimek_green/Makefile
-data/styles/ostrich/Makefile
-data/styles/green_tea/Makefile
-data/styles/bora_black/Makefile
-data/styles/bora_blue/Makefile
-data/styles/bora_green/Makefile
-data/styles/carp/Makefile
-data/styles/bloe/Makefile
-data/styles/bloe/pixmaps/Makefile
-doc/Makefile
-nls/Makefile
 nls/C/Makefile
 nls/be_BY/Makefile
 nls/bg_BG/Makefile
diff --git a/data/Makefile.am b/data/Makemodule.am
similarity index 52%
rename from data/Makefile.am
rename to data/Makemodule.am
index c71f8202..437c54d6 100644
--- a/data/Makefile.am
+++ b/data/Makemodule.am
@@ -1,22 +1,33 @@
 # data/Makefile.am for Fluxbox - an X11 Window manager
 
-PROGRAM_PREFIX=@program_prefix@
-PROGRAM_SUFFIX=@program_suffix@
+EXTRA_DIST += \
+	data/keys \
+	data/overlay \
+	data/windowmenu
 
-DEFAULT_MENU = @DEFAULT_MENU@
-DEFAULT_STYLE = @DEFAULT_STYLE@
-DEFAULT_KEYS = @DEFAULT_KEYS@
-DEFAULT_APPS = @DEFAULT_APPS@
-DEFAULT_OVERLAY = @DEFAULT_OVERLAY@
-DEFAULT_INIT = @DEFAULT_INIT@
-DEFAULT_WINDOWMENU = @DEFAULT_WINDOWMENU@
+PATHFILES += \
+	data/apps \
+	data/init
+
+include data/styles/carp/Makemodule.am
+include data/styles/bora_blue/Makemodule.am
+include data/styles/green_tea/Makemodule.am
+include data/styles/bora_green/Makemodule.am
+include data/styles/Makemodule.am
+include data/styles/zimek_bisque/Makemodule.am
+include data/styles/bloe/pixmaps/Makemodule.am
+include data/styles/bloe/Makemodule.am
+include data/styles/Emerge/pixmaps/Makemodule.am
+include data/styles/Emerge/Makemodule.am
+include data/styles/ostrich/Makemodule.am
+include data/styles/zimek_green/Makemodule.am
+include data/styles/zimek_darkblue/Makemodule.am
+include data/styles/BlueFlux/pixmaps/Makemodule.am
+include data/styles/BlueFlux/Makemodule.am
+include data/styles/bora_black/Makemodule.am
+include data/styles/arch/pixmaps/Makemodule.am
+include data/styles/arch/Makemodule.am
 
-SUBDIRS= 		styles
-CLEANFILES= 		menu menu.in menu.pre menu.bak init apps
-MAINTAINERCLEANFILES= 	Makefile.in
-pkgdata_DATA= 		keys menu init apps overlay windowmenu
-EXTRA_DIST= 		keys init.in apps.in overlay windowmenu
-all-local: 		menu init apps
 install-pkgdataDATA:
 	@echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
 	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU))
@@ -37,26 +48,10 @@ install-pkgdataDATA:
 	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU))
 	$(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU)
 
-distclean-local:
-		rm -f *\~
-init: 			init.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
-			-e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-			-e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-			-e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
-
-apps: 			apps.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
-			-e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-			-e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" $(srcdir)/apps.in > apps
-
-menu: 			../util/fluxbox-generate_menu
+menu:
 	env	MENUFILENAME=menu \
 		PREFIX="${prefix}" \
 		MENUTITLE="Fluxbox-${VERSION}" \
 		INSTALL=Yes \
 		PATH="${PATH}:../util:../util/fbrun" \
-		../util/fluxbox-generate_menu
-
-../util/fluxbox-generate_menu:
-	cd ../util && ${MAKE} fluxbox-generate_menu
+		util/fluxbox-generate_menu
diff --git a/data/styles/BlueFlux/Makefile.am b/data/styles/BlueFlux/Makefile.am
deleted file mode 100644
index 86965dc0..00000000
--- a/data/styles/BlueFlux/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/BlueFlux
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/BlueFlux/Makemodule.am b/data/styles/BlueFlux/Makemodule.am
new file mode 100644
index 00000000..0357a9da
--- /dev/null
+++ b/data/styles/BlueFlux/Makemodule.am
@@ -0,0 +1,3 @@
+blueflux_styledir = $(pkgdatadir)/styles/BlueFlux
+
+dist_blueflux_style_DATA = data/styles/BlueFlux/theme.cfg
diff --git a/data/styles/BlueFlux/pixmaps/Makefile.am b/data/styles/BlueFlux/pixmaps/Makefile.am
deleted file mode 100644
index a247c5a3..00000000
--- a/data/styles/BlueFlux/pixmaps/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-styledir = $(pkgdatadir)/styles/BlueFlux/pixmaps
-
-style_DATA = button_close_active.xpm button_close_pressed.xpm \
-	button_close_unfocus.xpm button_max_active.xpm button_max_pressed.xpm \
-	button_max_unfocus.xpm button_min_active.xpm button_min_pressed.xpm \
-	button_min_unfocus.xpm button_stick_active.xpm button_stick_pressed.xpm \
-	button_stick_unfocus.xpm button_stuck.xpm button_stuck_unfocus.xpm \
-	button_toolbar.xpm button_toolbar_pressed.xpm menu_frame.xpm title_bar.xpm \
-	title_bar_unfocus.xpm toolbar.xpm toolbar_label.xpm
-
-include ../../Makefile.include
diff --git a/data/styles/BlueFlux/pixmaps/Makemodule.am b/data/styles/BlueFlux/pixmaps/Makemodule.am
new file mode 100644
index 00000000..9cfe8c46
--- /dev/null
+++ b/data/styles/BlueFlux/pixmaps/Makemodule.am
@@ -0,0 +1,24 @@
+blueflux_pixmaps_styledir = $(pkgdatadir)/styles/BlueFlux/pixmaps
+
+dist_blueflux_pixmaps_style_DATA = \
+	data/styles/BlueFlux/pixmaps/button_close_active.xpm \
+	data/styles/BlueFlux/pixmaps/button_close_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/button_close_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_max_active.xpm \
+	data/styles/BlueFlux/pixmaps/button_max_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/button_max_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_min_active.xpm \
+	data/styles/BlueFlux/pixmaps/button_min_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/button_min_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_stick_active.xpm \
+	data/styles/BlueFlux/pixmaps/button_stick_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/button_stick_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_stuck.xpm \
+	data/styles/BlueFlux/pixmaps/button_stuck_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_toolbar.xpm \
+	data/styles/BlueFlux/pixmaps/button_toolbar_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/menu_frame.xpm \
+	data/styles/BlueFlux/pixmaps/title_bar.xpm \
+	data/styles/BlueFlux/pixmaps/title_bar_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/toolbar.xpm \
+	data/styles/BlueFlux/pixmaps/toolbar_label.xpm
diff --git a/data/styles/Emerge/Makefile.am b/data/styles/Emerge/Makefile.am
deleted file mode 100644
index 4054bd77..00000000
--- a/data/styles/Emerge/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/Emerge
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/Emerge/Makemodule.am b/data/styles/Emerge/Makemodule.am
new file mode 100644
index 00000000..150b600c
--- /dev/null
+++ b/data/styles/Emerge/Makemodule.am
@@ -0,0 +1,3 @@
+emerge_styledir = $(pkgdatadir)/styles/Emerge
+
+dist_emerge_style_DATA = data/styles/Emerge/theme.cfg
diff --git a/data/styles/Emerge/pixmaps/Makefile.am b/data/styles/Emerge/pixmaps/Makefile.am
deleted file mode 100644
index 4165e1ca..00000000
--- a/data/styles/Emerge/pixmaps/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-styledir = $(pkgdatadir)/styles/Emerge/pixmaps
-
-style_DATA = bullet.xpm close.xpm icon.xpm max.xpm stick-unfocus.xpm \
-	stuck-unfocus.xpm close-pressed.xpm icon-pressed.xpm max-pressed.xpm \
-	selected.xpm stick.xpm stuck.xpm close-unfocus.xpm icon-unfocus.xpm \
-    max-unfocus.xpm stick-pressed.xpm stuck-pressed.xpm unselected.xpm
-
-include ../../Makefile.include
diff --git a/data/styles/Emerge/pixmaps/Makemodule.am b/data/styles/Emerge/pixmaps/Makemodule.am
new file mode 100644
index 00000000..42b0a4a8
--- /dev/null
+++ b/data/styles/Emerge/pixmaps/Makemodule.am
@@ -0,0 +1,21 @@
+emerge_pixmaps_styledir = $(pkgdatadir)/styles/Emerge/pixmaps
+
+dist_emerge_pixmaps_style_DATA = \
+	data/styles/Emerge/pixmaps/bullet.xpm \
+	data/styles/Emerge/pixmaps/close-pressed.xpm \
+	data/styles/Emerge/pixmaps/close-unfocus.xpm \
+	data/styles/Emerge/pixmaps/close.xpm \
+	data/styles/Emerge/pixmaps/icon-pressed.xpm \
+	data/styles/Emerge/pixmaps/icon-unfocus.xpm \
+	data/styles/Emerge/pixmaps/icon.xpm \
+	data/styles/Emerge/pixmaps/max-pressed.xpm \
+	data/styles/Emerge/pixmaps/max-unfocus.xpm \
+	data/styles/Emerge/pixmaps/max.xpm \
+	data/styles/Emerge/pixmaps/selected.xpm \
+	data/styles/Emerge/pixmaps/stick-pressed.xpm \
+	data/styles/Emerge/pixmaps/stick-unfocus.xpm \
+	data/styles/Emerge/pixmaps/stick.xpm \
+	data/styles/Emerge/pixmaps/stuck-pressed.xpm \
+	data/styles/Emerge/pixmaps/stuck-unfocus.xpm \
+	data/styles/Emerge/pixmaps/stuck.xpm \
+	data/styles/Emerge/pixmaps/unselected.xpm
diff --git a/data/styles/Makefile.am b/data/styles/Makefile.am
deleted file mode 100644
index 997aac51..00000000
--- a/data/styles/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-SUBDIRS=Emerge BlueFlux bora_black bora_blue bora_green \
-	zimek_bisque zimek_darkblue zimek_green \
-	arch carp ostrich green_tea bloe
-
-styledir = $(pkgdatadir)/styles
-
-style_DATA = Makro MerleyKay Artwiz Flux \
-	Nyz Operation Outcomes Results Shade LemonSpace \
-	Twice qnx-photon BlueNight Meta
-
-include Makefile.include
diff --git a/data/styles/Makefile.include b/data/styles/Makefile.include
deleted file mode 100644
index 2a99c2b3..00000000
--- a/data/styles/Makefile.include
+++ /dev/null
@@ -1,10 +0,0 @@
-## included by all Makefile.am files under the data/styles directory
-
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST=$(style_DATA)
-
-uninstall-hook:
-	rmdir $(DESTDIR)$(styledir)
-distclean-local:
-	rm -f *\~
diff --git a/data/styles/Makemodule.am b/data/styles/Makemodule.am
new file mode 100644
index 00000000..7239f1c0
--- /dev/null
+++ b/data/styles/Makemodule.am
@@ -0,0 +1,19 @@
+styledir = $(pkgdatadir)/styles
+
+style_DATA = \
+	data/styles/Artwiz \
+	data/styles/BlueNight \
+	data/styles/Flux \
+	data/styles/LemonSpace \
+	data/styles/Makro \
+	data/styles/MerleyKay \
+	data/styles/Meta \
+	data/styles/Nyz \
+	data/styles/Operation \
+	data/styles/Outcomes \
+	data/styles/Results \
+	data/styles/Shade \
+	data/styles/Twice \
+	data/styles/qnx-photon
+
+EXTRA_DIST += $(style_DATA)
diff --git a/data/styles/arch/Makefile.am b/data/styles/arch/Makefile.am
deleted file mode 100644
index bc1aafa1..00000000
--- a/data/styles/arch/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/arch
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/arch/Makemodule.am b/data/styles/arch/Makemodule.am
new file mode 100644
index 00000000..4ad28b9d
--- /dev/null
+++ b/data/styles/arch/Makemodule.am
@@ -0,0 +1,3 @@
+arch_styledir = $(pkgdatadir)/styles/arch
+
+dist_arch_style_DATA = data/styles/arch/theme.cfg
diff --git a/data/styles/arch/pixmaps/Makefile.am b/data/styles/arch/pixmaps/Makefile.am
deleted file mode 100644
index fb94c36d..00000000
--- a/data/styles/arch/pixmaps/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-styledir = $(pkgdatadir)/styles/arch/pixmaps
-
-style_DATA = closepr.xpm gripfcs.xpm maxufcs.xpm menuiconufcs.xpm \
-	 minufcs.xpm shadepr.xpm stickpr.xpm stuckufcs.xpm unselected.xpm \
-	 unshadeufcs.xpm bullet.xpm closeufcs.xpm maxfcs.xpm \
-	 menuiconfcs.xpm minfcs.xpm selected.xpm shadeufcs.xpm \
-	 stickufcs.xpm tbarfcs.xpm unshadefcs.xpm closefcs.xpm \
-	frame.xpm maxpr.xpm menuiconpr.xpm minpr.xpm shadefcs.xpm \
-	 stickfcs.xpm stuckfcs.xpm tbarufcs.xpm unshadepr.xpm
-
-
-include ../../Makefile.include
diff --git a/data/styles/arch/pixmaps/Makemodule.am b/data/styles/arch/pixmaps/Makemodule.am
new file mode 100644
index 00000000..fa470145
--- /dev/null
+++ b/data/styles/arch/pixmaps/Makemodule.am
@@ -0,0 +1,33 @@
+arch_pixmaps_styledir = $(pkgdatadir)/styles/arch/pixmaps
+
+dist_arch_pixmaps_style_DATA = \
+	data/styles/arch/pixmaps/bullet.xpm \
+	data/styles/arch/pixmaps/closefcs.xpm \
+	data/styles/arch/pixmaps/closepr.xpm \
+	data/styles/arch/pixmaps/closeufcs.xpm \
+	data/styles/arch/pixmaps/frame.xpm \
+	data/styles/arch/pixmaps/gripfcs.xpm \
+	data/styles/arch/pixmaps/maxfcs.xpm \
+	data/styles/arch/pixmaps/maxpr.xpm \
+	data/styles/arch/pixmaps/maxufcs.xpm \
+	data/styles/arch/pixmaps/menuiconfcs.xpm \
+	data/styles/arch/pixmaps/menuiconpr.xpm \
+	data/styles/arch/pixmaps/menuiconufcs.xpm \
+	data/styles/arch/pixmaps/minfcs.xpm \
+	data/styles/arch/pixmaps/minpr.xpm \
+	data/styles/arch/pixmaps/minufcs.xpm \
+	data/styles/arch/pixmaps/selected.xpm \
+	data/styles/arch/pixmaps/shadefcs.xpm \
+	data/styles/arch/pixmaps/shadepr.xpm \
+	data/styles/arch/pixmaps/shadeufcs.xpm \
+	data/styles/arch/pixmaps/stickfcs.xpm \
+	data/styles/arch/pixmaps/stickpr.xpm \
+	data/styles/arch/pixmaps/stickufcs.xpm \
+	data/styles/arch/pixmaps/stuckfcs.xpm \
+	data/styles/arch/pixmaps/stuckufcs.xpm \
+	data/styles/arch/pixmaps/tbarfcs.xpm \
+	data/styles/arch/pixmaps/tbarufcs.xpm \
+	data/styles/arch/pixmaps/unselected.xpm \
+	data/styles/arch/pixmaps/unshadefcs.xpm \
+	data/styles/arch/pixmaps/unshadepr.xpm \
+	data/styles/arch/pixmaps/unshadeufcs.xpm
diff --git a/data/styles/bloe/Makefile.am b/data/styles/bloe/Makefile.am
deleted file mode 100644
index ad574ba1..00000000
--- a/data/styles/bloe/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/bloe
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/bloe/Makemodule.am b/data/styles/bloe/Makemodule.am
new file mode 100644
index 00000000..909f6477
--- /dev/null
+++ b/data/styles/bloe/Makemodule.am
@@ -0,0 +1,3 @@
+bloe_styledir = $(pkgdatadir)/styles/bloe
+
+dist_bloe_style_DATA = data/styles/bloe/theme.cfg
diff --git a/data/styles/bloe/pixmaps/Makefile.am b/data/styles/bloe/pixmaps/Makefile.am
deleted file mode 100644
index 42226a0e..00000000
--- a/data/styles/bloe/pixmaps/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-styledir = $(pkgdatadir)/styles/bloe/pixmaps
-
-style_DATA = bullet.xpm closepr.xpm frame.xpm maxfcs.xpm \
-	maxufcs.xpm menuiconpr.xpm minfcs.xpm minufcs.xpm \
-	shadefcs.xpm shadeufcs.xpm stickpr.xpm stuckfcs.xpm \
-	tbarfcs.xpm unselected.xpm unshadepr.xpm \
-	windowlabelfcs.xpm closefcs.xpm closeufcs.xpm \
-	maxpr.xpm menuiconfcs.xpm menuiconufcs.xpm \
-	minpr.xpm selected.xpm shadepr.xpm stickfcs.xpm \
-	stickufcs.xpm stuckufcs.xpm tbarufcs.xpm \
-	unshadefcs.xpm unshadeufcs.xpm windowlabelufcs.xpm
-
-include ../../Makefile.include
diff --git a/data/styles/bloe/pixmaps/Makemodule.am b/data/styles/bloe/pixmaps/Makemodule.am
new file mode 100644
index 00000000..2d08d3bc
--- /dev/null
+++ b/data/styles/bloe/pixmaps/Makemodule.am
@@ -0,0 +1,34 @@
+pixmaps_styledir = $(pkgdatadir)/styles/bloe/pixmaps
+
+dist_pixmaps_style_DATA = \
+	data/styles/bloe/pixmaps/bullet.xpm \
+	data/styles/bloe/pixmaps/closefcs.xpm \
+	data/styles/bloe/pixmaps/closepr.xpm \
+	data/styles/bloe/pixmaps/closeufcs.xpm \
+	data/styles/bloe/pixmaps/frame.xpm \
+	data/styles/bloe/pixmaps/maxfcs.xpm \
+	data/styles/bloe/pixmaps/maxpr.xpm \
+	data/styles/bloe/pixmaps/maxufcs.xpm \
+	data/styles/bloe/pixmaps/menuiconfcs.xpm \
+	data/styles/bloe/pixmaps/menuiconpr.xpm \
+	data/styles/bloe/pixmaps/menuiconufcs.xpm \
+	data/styles/bloe/pixmaps/minfcs.xpm \
+	data/styles/bloe/pixmaps/minpr.xpm \
+	data/styles/bloe/pixmaps/minufcs.xpm \
+	data/styles/bloe/pixmaps/selected.xpm \
+	data/styles/bloe/pixmaps/shadefcs.xpm \
+	data/styles/bloe/pixmaps/shadepr.xpm \
+	data/styles/bloe/pixmaps/shadeufcs.xpm \
+	data/styles/bloe/pixmaps/stickfcs.xpm \
+	data/styles/bloe/pixmaps/stickpr.xpm \
+	data/styles/bloe/pixmaps/stickufcs.xpm \
+	data/styles/bloe/pixmaps/stuckfcs.xpm \
+	data/styles/bloe/pixmaps/stuckufcs.xpm \
+	data/styles/bloe/pixmaps/tbarfcs.xpm \
+	data/styles/bloe/pixmaps/tbarufcs.xpm \
+	data/styles/bloe/pixmaps/unselected.xpm \
+	data/styles/bloe/pixmaps/unshadefcs.xpm \
+	data/styles/bloe/pixmaps/unshadepr.xpm \
+	data/styles/bloe/pixmaps/unshadeufcs.xpm \
+	data/styles/bloe/pixmaps/windowlabelfcs.xpm \
+	data/styles/bloe/pixmaps/windowlabelufcs.xpm
diff --git a/data/styles/bora_black/Makefile.am b/data/styles/bora_black/Makefile.am
deleted file mode 100644
index 4cb9ffbe..00000000
--- a/data/styles/bora_black/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/bora_black
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/bora_black/Makemodule.am b/data/styles/bora_black/Makemodule.am
new file mode 100644
index 00000000..27f72216
--- /dev/null
+++ b/data/styles/bora_black/Makemodule.am
@@ -0,0 +1,3 @@
+bora_black_styledir = $(pkgdatadir)/styles/bora_black
+
+dist_bora_black_style_DATA = data/styles/bora_black/theme.cfg
diff --git a/data/styles/bora_blue/Makefile.am b/data/styles/bora_blue/Makefile.am
deleted file mode 100644
index c7260641..00000000
--- a/data/styles/bora_blue/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/bora_blue
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/bora_blue/Makemodule.am b/data/styles/bora_blue/Makemodule.am
new file mode 100644
index 00000000..547b2e3c
--- /dev/null
+++ b/data/styles/bora_blue/Makemodule.am
@@ -0,0 +1,3 @@
+bora_blue_styledir = $(pkgdatadir)/styles/bora_blue
+
+dist_bora_blue_style_DATA = data/styles/bora_blue/theme.cfg
diff --git a/data/styles/bora_green/Makefile.am b/data/styles/bora_green/Makefile.am
deleted file mode 100644
index 37d47e19..00000000
--- a/data/styles/bora_green/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/bora_green
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/bora_green/Makemodule.am b/data/styles/bora_green/Makemodule.am
new file mode 100644
index 00000000..ae52e158
--- /dev/null
+++ b/data/styles/bora_green/Makemodule.am
@@ -0,0 +1,3 @@
+bora_green_styledir = $(pkgdatadir)/styles/bora_green
+
+dist_bora_green_style_DATA = data/styles/bora_green/theme.cfg
diff --git a/data/styles/carp/Makefile.am b/data/styles/carp/Makefile.am
deleted file mode 100644
index 3e311787..00000000
--- a/data/styles/carp/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/carp
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/carp/Makemodule.am b/data/styles/carp/Makemodule.am
new file mode 100644
index 00000000..241901e9
--- /dev/null
+++ b/data/styles/carp/Makemodule.am
@@ -0,0 +1,3 @@
+carp_styledir = $(pkgdatadir)/styles/carp
+
+dist_carp_style_DATA = data/styles/carp/theme.cfg
diff --git a/data/styles/green_tea/Makefile.am b/data/styles/green_tea/Makefile.am
deleted file mode 100644
index 899e0286..00000000
--- a/data/styles/green_tea/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/green_tea
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/green_tea/Makemodule.am b/data/styles/green_tea/Makemodule.am
new file mode 100644
index 00000000..4ff80f2c
--- /dev/null
+++ b/data/styles/green_tea/Makemodule.am
@@ -0,0 +1,3 @@
+green_tea_styledir = $(pkgdatadir)/styles/green_tea
+
+dist_green_tea_style_DATA = data/styles/green_tea/theme.cfg
diff --git a/data/styles/ostrich/Makefile.am b/data/styles/ostrich/Makefile.am
deleted file mode 100644
index c9879c85..00000000
--- a/data/styles/ostrich/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/ostrich
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/ostrich/Makemodule.am b/data/styles/ostrich/Makemodule.am
new file mode 100644
index 00000000..61536e2c
--- /dev/null
+++ b/data/styles/ostrich/Makemodule.am
@@ -0,0 +1,3 @@
+ostrich_styledir = $(pkgdatadir)/styles/ostrich
+
+dist_ostrich_style_DATA = data/styles/ostrich/theme.cfg
diff --git a/data/styles/zimek_bisque/Makefile.am b/data/styles/zimek_bisque/Makefile.am
deleted file mode 100644
index 9869bdf9..00000000
--- a/data/styles/zimek_bisque/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/zimek_bisque
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/zimek_bisque/Makemodule.am b/data/styles/zimek_bisque/Makemodule.am
new file mode 100644
index 00000000..3c204304
--- /dev/null
+++ b/data/styles/zimek_bisque/Makemodule.am
@@ -0,0 +1,3 @@
+zimek_bisque_styledir = $(pkgdatadir)/styles/zimek_bisque
+
+dist_zimek_bisque_style_DATA = data/styles/zimek_bisque/theme.cfg
diff --git a/data/styles/zimek_darkblue/Makefile.am b/data/styles/zimek_darkblue/Makefile.am
deleted file mode 100644
index a84b7f4c..00000000
--- a/data/styles/zimek_darkblue/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/zimek_darkblue
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/zimek_darkblue/Makemodule.am b/data/styles/zimek_darkblue/Makemodule.am
new file mode 100644
index 00000000..88f06f12
--- /dev/null
+++ b/data/styles/zimek_darkblue/Makemodule.am
@@ -0,0 +1,3 @@
+zimek_darkblue_styledir = $(pkgdatadir)/styles/zimek_darkblue
+
+dist_zimek_darkblue_style_DATA = data/styles/zimek_darkblue/theme.cfg
diff --git a/data/styles/zimek_green/Makefile.am b/data/styles/zimek_green/Makefile.am
deleted file mode 100644
index 43dbb827..00000000
--- a/data/styles/zimek_green/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/zimek_green
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
diff --git a/data/styles/zimek_green/Makemodule.am b/data/styles/zimek_green/Makemodule.am
new file mode 100644
index 00000000..e42be6e0
--- /dev/null
+++ b/data/styles/zimek_green/Makemodule.am
@@ -0,0 +1,3 @@
+zimek_green_styledir = $(pkgdatadir)/styles/zimek_green
+
+dist_zimek_green_style_DATA = data/styles/zimek_green/theme.cfg
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 008e3185..00000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-# doc/Makefile.am for Fluxbox 0.9  - an X11 Window manager
-# Makefile.am for fluxbox/doc
-
-CLEANFILES = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 startfluxbox.1 fluxbox-apps.5 \
-	fluxbox-keys.5 fluxbox-menu.5 fluxbox-remote.1 fluxbox-style.5
-MAINTAINERCLEANFILES = Makefile.in
-man_MANS = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox-apps.5 \
-	fluxbox-keys.5 fluxbox-menu.5 fluxbox-remote.1 fluxbox-style.5 \
-	startfluxbox.1
-EXTRA_DIST=startfluxbox.1.in CODESTYLE \
-	fluxbox.1.in fbrun.1.in fbsetbg.1.in fbsetroot.1.in fluxbox-apps.5.in \
-	fluxbox-keys.5.in fluxbox-menu.5.in fluxbox-remote.1.in fluxbox-style.5.in
-distclean-local:
-	rm -f *\~
-
-%: %.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $^ > $@
diff --git a/doc/Makemodule.am b/doc/Makemodule.am
new file mode 100644
index 00000000..240f5c7b
--- /dev/null
+++ b/doc/Makemodule.am
@@ -0,0 +1,39 @@
+CLEANFILES += \
+	doc/fbrun.1 \
+	doc/fbsetbg.1 \
+	doc/fbsetroot.1 \
+	doc/fluxbox-apps.5 \
+	doc/fluxbox-keys.5 \
+	doc/fluxbox-menu.5 \
+	doc/fluxbox-remote.1 \
+	doc/fluxbox-style.5 \
+	doc/fluxbox.1 \
+	doc/startfluxbox.1
+
+dist_man_MANS = \
+	doc/fbrun.1 \
+	doc/fbsetbg.1 \
+	doc/fbsetroot.1 \
+	doc/fluxbox-apps.5 \
+	doc/fluxbox-keys.5 \
+	doc/fluxbox-menu.5 \
+	doc/fluxbox-remote.1 \
+	doc/fluxbox-style.5 \
+	doc/fluxbox.1 \
+	doc/startfluxbox.1
+
+EXTRA_DIST += \
+	doc/CODESTYLE \
+	doc/fbrun.1.in \
+	doc/fbsetbg.1.in \
+	doc/fbsetroot.1.in \
+	doc/fluxbox-apps.5.in \
+	doc/fluxbox-keys.5.in \
+	doc/fluxbox-menu.5.in \
+	doc/fluxbox-remote.1.in \
+	doc/fluxbox-style.5.in \
+	doc/fluxbox.1.in \
+	doc/startfluxbox.1.in
+
+%: %.in
+	@regex_cmd@ -e "s,@pkgdatadir[@],$(pkgdatadir)," $^ > $@
diff --git a/doc/asciidoc/Makefile b/doc/asciidoc/Makefile
index 666d4371..0e084e82 100644
--- a/doc/asciidoc/Makefile
+++ b/doc/asciidoc/Makefile
@@ -2,10 +2,24 @@
 # create manpages from the asciidoc files
 #
 
-SRC1 = fluxbox.txt fluxbox-remote.txt fbrun.txt fbsetbg.txt fbsetroot.txt startfluxbox.txt
-SRC5 = fluxbox-keys.txt fluxbox-apps.txt fluxbox-style.txt fluxbox-menu.txt
+SRC1 = \
+	fbrun.txt \
+	fbsetbg.txt \
+	fbsetroot.txt \
+	fluxbox-remote.txt \
+	fluxbox.txt \
+	startfluxbox.txt
+
+SRC5 = \
+	fluxbox-apps.txt \
+	fluxbox-keys.txt \
+	fluxbox-menu.txt \
+	fluxbox-style.txt
+
+MAN = \
+	$(SRC1:.txt=.1) \
+	$(SRC5:.txt=.5)
 
-MAN = $(SRC1:.txt=.1) $(SRC5:.txt=.5)
 MANdotIN = $(addsuffix .in,$(MAN))
 DISTFILES = $(addprefix ../,$(MANdotIN))
 
diff --git a/nls/Makefile.am b/nls/Makefile.am
deleted file mode 100644
index e3595dc0..00000000
--- a/nls/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-# nls/Makefile.am for fluxbox - http://fluxbox.org
-
-LOCALE_PATH = @LOCALE_PATH@
-NLSTEST = @NLS@
-SUBDIRS = C cs_CZ da_DK es_AR es_ES et_EE fr_FR pt_BR ru_RU \
-		  sv_SE tr_TR it_IT pt_PT bg_BG ja_JP ko_KR \
-		  lv_LV de_DE nl_NL no_NO sl_SI pl_PL vi_VN be_BY \
-		  uk_UA el_GR nb_NO zh_CN fi_FI en_US en_GB de_CH \
-		  de_AT fr_CH sk_SK zh_TW mk_MK he_IL
-
-MAINTAINERCLEANFILES = Makefile.in fluxbox-nls.hh
-EXTRA_DIST=fluxbox-nls.hh nlsinfo
-BUILT_SOURCES=fluxbox-nls.hh
-
-uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rmdir $(DESTDIR)$(LOCALE_PATH); \
-	fi
-distclean-local:
-	rm -f *\~
-
-fluxbox-nls.hh:
-	chmod +x $(srcdir)/nlsinfo
-	$(srcdir)/nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > fluxbox-nls.hh
diff --git a/nls/Makemodule.am b/nls/Makemodule.am
new file mode 100644
index 00000000..77962c71
--- /dev/null
+++ b/nls/Makemodule.am
@@ -0,0 +1,53 @@
+# nls/Makefile.am for fluxbox - http://fluxbox.org
+
+LOCALE_PATH = @LOCALE_PATH@
+NLSTEST = @NLS@
+
+SUBDIRS = \
+	nls/C \
+	nls/be_BY \
+	nls/bg_BG \
+	nls/cs_CZ \
+	nls/da_DK \
+	nls/de_AT \
+	nls/de_CH \
+	nls/de_DE \
+	nls/el_GR \
+	nls/en_GB \
+	nls/en_US \
+	nls/es_AR \
+	nls/es_ES \
+	nls/et_EE \
+	nls/fi_FI \
+	nls/fr_CH \
+	nls/fr_FR \
+	nls/he_IL \
+	nls/it_IT \
+	nls/ja_JP \
+	nls/ko_KR \
+	nls/lv_LV \
+	nls/mk_MK \
+	nls/nb_NO \
+	nls/nl_NL \
+	nls/no_NO \
+	nls/pl_PL \
+	nls/pt_BR \
+	nls/pt_PT \
+	nls/ru_RU \
+	nls/sk_SK \
+	nls/sl_SI \
+	nls/sv_SE \
+	nls/tr_TR \
+	nls/uk_UA \
+	nls/vi_VN \
+	nls/zh_CN \
+	nls/zh_TW
+
+uninstall-local:
+	@if test x$(NLSTEST) = "x-DNLS"; then \
+		rmdir $(DESTDIR)$(LOCALE_PATH); \
+	fi
+
+fluxbox-nls.hh:
+	chmod +x $(srcdir)/nlsinfo
+	$(srcdir)/nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > fluxbox-nls.hh
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
deleted file mode 100644
index 983f9236..00000000
--- a/src/FbTk/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-noinst_LIBRARIES = libFbTk.a
-
-AM_CPPFLAGS=-include $(top_builddir)/config.h
-
-if XFT
-xft_SOURCE = XftFontImp.hh XftFontImp.cc
-endif
-if MULTIBYTE
-xmb_SOURCE= XmbFontImp.hh XmbFontImp.cc
-endif
-if XPM
-xpm_SOURCE= ImageXPM.hh ImageXPM.cc
-endif
-if IMLIB2
-imlib2_SOURCE= ImageImlib2.hh ImageImlib2.cc
-endif
-
-libFbTk_a_CPPFLAGS = $(FREETYPE2_CFLAGS) $(FRIBIDI_CFLAGS) $(AM_CPPFLAGS)
-
-libFbTk_a_SOURCES = App.hh App.cc \
-	Color.cc Color.hh Command.hh \
-	ColorLUT.cc ColorLUT.hh \
-	Accessor.hh DefaultValue.hh \
-	FileUtil.hh FileUtil.cc \
-	EventHandler.hh EventManager.hh EventManager.cc \
-	FbWindow.hh FbWindow.cc Font.cc Font.hh FontImp.hh \
-	I18n.cc I18n.hh \
-	CommandParser.hh \
-	RadioMenuItem.hh \
-	ImageControl.hh ImageControl.cc \
-	LogicCommands.hh LogicCommands.cc \
-	MacroCommand.hh MacroCommand.cc \
-	Menu.hh Menu.cc MenuItem.hh MenuItem.cc \
-	BoolMenuItem.hh IntMenuItem.hh \
-	MultiButtonMenuItem.hh MultiButtonMenuItem.cc \
-	MenuTheme.hh MenuTheme.cc NotCopyable.hh \
-	BorderTheme.hh BorderTheme.cc TextTheme.hh TextTheme.cc \
-	RefCount.hh SimpleCommand.hh SignalHandler.cc SignalHandler.hh \
-	TextUtils.hh TextUtils.cc Orientation.hh \
-	Texture.cc Texture.hh TextureRender.hh TextureRender.cc \
-	Shape.hh Shape.cc \
-	Theme.hh Theme.cc ThemeItems.cc Timer.hh Timer.cc \
-	FbTime.cc FbTime.hh \
-	XFontImp.cc XFontImp.hh \
-	Button.hh Button.cc \
-	TextButton.hh TextButton.cc \
-	Container.hh Container.cc \
-	MultLayers.cc MultLayers.hh \
-	Layer.cc Layer.hh LayerItem.cc LayerItem.hh \
-	Resource.hh Resource.cc \
-	StringUtil.hh StringUtil.cc Parser.hh Parser.cc \
-	RegExp.hh RegExp.cc \
-	FbString.hh FbString.cc \
-	AutoReloadHelper.hh AutoReloadHelper.cc \
-	Transparent.hh Transparent.cc \
-	FbPixmap.hh FbPixmap.cc \
-	FbDrawable.hh FbDrawable.cc \
-	XrmDatabaseHelper.hh \
-	Image.hh Image.cc \
-	PixmapWithMask.hh \
-	Compose.hh CompareEqual.hh \
-	TextBox.hh TextBox.cc \
-	GContext.hh GContext.cc \
-	KeyUtil.hh KeyUtil.cc \
-	MenuSeparator.hh MenuSeparator.cc \
-	stringstream.hh \
-	TypeAhead.hh SearchResult.hh SearchResult.cc ITypeAheadable.hh \
-	Select2nd.hh STLUtil.hh \
-	CachedPixmap.hh CachedPixmap.cc \
-	Slot.hh Signal.hh MemFun.hh SelectArg.hh \
-	Util.hh \
-	RelCalcHelper.hh RelCalcHelper.cc \
-	${xpm_SOURCE} \
-	${xft_SOURCE} \
-	${xmb_SOURCE} \
-	$(imlib2_SOURCE)
diff --git a/src/FbTk/Makemodule.am b/src/FbTk/Makemodule.am
new file mode 100644
index 00000000..a5f118ff
--- /dev/null
+++ b/src/FbTk/Makemodule.am
@@ -0,0 +1,164 @@
+noinst_LIBRARIES = libFbTk.a
+
+if XFT
+xft_SOURCE = \
+	src/FbTk/XftFontImp.hh \
+	src/FbTk/XftFontImp.cc
+endif
+
+if MULTIBYTE
+xmb_SOURCE = \
+	src/FbTk/XmbFontImp.hh \
+	src/FbTk/XmbFontImp.cc
+endif
+
+if XPM
+xpm_SOURCE = \
+	src/FbTk/ImageXPM.hh \
+	src/FbTk/ImageXPM.cc
+endif
+
+if IMLIB2
+imlib2_SOURCE = \
+	src/FbTk/ImageImlib2.hh \
+	src/FbTk/ImageImlib2.cc
+endif
+
+libFbTk_a_CPPFLAGS = \
+	$(FREETYPE2_CFLAGS) \
+	$(FRIBIDI_CFLAGS) \
+	$(AM_CPPFLAGS) \
+	-I$(src_incdir) \
+	-I$(nls_incdir)
+
+libFbTk_a_SOURCES = \
+	$(imlib2_SOURCE) \
+	${xft_SOURCE} \
+	${xmb_SOURCE} \
+	${xpm_SOURCE} \
+	src/FbTk/Accessor.hh \
+	src/FbTk/App.cc \
+	src/FbTk/App.hh \
+	src/FbTk/AutoReloadHelper.cc \
+	src/FbTk/AutoReloadHelper.hh \
+	src/FbTk/BoolMenuItem.hh \
+	src/FbTk/BorderTheme.cc \
+	src/FbTk/BorderTheme.hh \
+	src/FbTk/Button.cc \
+	src/FbTk/Button.hh \
+	src/FbTk/CachedPixmap.cc \
+	src/FbTk/CachedPixmap.hh \
+	src/FbTk/Color.cc \
+	src/FbTk/Color.hh \
+	src/FbTk/ColorLUT.cc \
+	src/FbTk/ColorLUT.hh \
+	src/FbTk/Command.hh \
+	src/FbTk/CommandParser.hh \
+	src/FbTk/CompareEqual.hh \
+	src/FbTk/Compose.hh \
+	src/FbTk/Container.cc \
+	src/FbTk/Container.hh \
+	src/FbTk/DefaultValue.hh \
+	src/FbTk/EventHandler.hh \
+	src/FbTk/EventManager.cc \
+	src/FbTk/EventManager.hh \
+	src/FbTk/FbDrawable.cc \
+	src/FbTk/FbDrawable.hh \
+	src/FbTk/FbPixmap.cc \
+	src/FbTk/FbPixmap.hh \
+	src/FbTk/FbString.cc \
+	src/FbTk/FbString.hh \
+	src/FbTk/FbTime.cc \
+	src/FbTk/FbTime.hh \
+	src/FbTk/FbWindow.cc \
+	src/FbTk/FbWindow.hh \
+	src/FbTk/FileUtil.cc \
+	src/FbTk/FileUtil.hh \
+	src/FbTk/Font.cc \
+	src/FbTk/Font.hh \
+	src/FbTk/FontImp.hh \
+	src/FbTk/GContext.cc \
+	src/FbTk/GContext.hh \
+	src/FbTk/I18n.cc \
+	src/FbTk/I18n.hh \
+	src/FbTk/ITypeAheadable.hh \
+	src/FbTk/Image.cc \
+	src/FbTk/Image.hh \
+	src/FbTk/ImageControl.cc \
+	src/FbTk/ImageControl.hh \
+	src/FbTk/IntMenuItem.hh \
+	src/FbTk/KeyUtil.cc \
+	src/FbTk/KeyUtil.hh \
+	src/FbTk/Layer.cc \
+	src/FbTk/Layer.hh \
+	src/FbTk/LayerItem.cc \
+	src/FbTk/LayerItem.hh \
+	src/FbTk/LogicCommands.cc \
+	src/FbTk/LogicCommands.hh \
+	src/FbTk/MacroCommand.cc \
+	src/FbTk/MacroCommand.hh \
+	src/FbTk/MemFun.hh \
+	src/FbTk/Menu.cc \
+	src/FbTk/Menu.hh \
+	src/FbTk/MenuItem.cc \
+	src/FbTk/MenuItem.hh \
+	src/FbTk/MenuSeparator.cc \
+	src/FbTk/MenuSeparator.hh \
+	src/FbTk/MenuTheme.cc \
+	src/FbTk/MenuTheme.hh \
+	src/FbTk/MultLayers.cc \
+	src/FbTk/MultLayers.hh \
+	src/FbTk/MultiButtonMenuItem.cc \
+	src/FbTk/MultiButtonMenuItem.hh \
+	src/FbTk/NotCopyable.hh \
+	src/FbTk/Orientation.hh \
+	src/FbTk/Parser.cc \
+	src/FbTk/Parser.hh \
+	src/FbTk/PixmapWithMask.hh \
+	src/FbTk/RadioMenuItem.hh \
+	src/FbTk/RefCount.hh \
+	src/FbTk/RegExp.cc \
+	src/FbTk/RegExp.hh \
+	src/FbTk/RelCalcHelper.cc \
+	src/FbTk/RelCalcHelper.hh \
+	src/FbTk/Resource.cc \
+	src/FbTk/Resource.hh \
+	src/FbTk/STLUtil.hh \
+	src/FbTk/SearchResult.cc \
+	src/FbTk/SearchResult.hh \
+	src/FbTk/Select2nd.hh \
+	src/FbTk/SelectArg.hh \
+	src/FbTk/Shape.cc \
+	src/FbTk/Shape.hh \
+	src/FbTk/Signal.hh \
+	src/FbTk/SignalHandler.cc \
+	src/FbTk/SignalHandler.hh \
+	src/FbTk/SimpleCommand.hh \
+	src/FbTk/Slot.hh \
+	src/FbTk/StringUtil.cc \
+	src/FbTk/StringUtil.hh \
+	src/FbTk/TextBox.cc \
+	src/FbTk/TextBox.hh \
+	src/FbTk/TextButton.cc \
+	src/FbTk/TextButton.hh \
+	src/FbTk/TextTheme.cc \
+	src/FbTk/TextTheme.hh \
+	src/FbTk/TextUtils.cc \
+	src/FbTk/TextUtils.hh \
+	src/FbTk/Texture.cc \
+	src/FbTk/Texture.hh \
+	src/FbTk/TextureRender.cc \
+	src/FbTk/TextureRender.hh \
+	src/FbTk/Theme.cc \
+	src/FbTk/Theme.hh \
+	src/FbTk/ThemeItems.cc \
+	src/FbTk/Timer.cc \
+	src/FbTk/Timer.hh \
+	src/FbTk/Transparent.cc \
+	src/FbTk/Transparent.hh \
+	src/FbTk/TypeAhead.hh \
+	src/FbTk/Util.hh \
+	src/FbTk/XFontImp.cc \
+	src/FbTk/XFontImp.hh \
+	src/FbTk/XrmDatabaseHelper.hh \
+	src/FbTk/stringstream.hh
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 283e01de..00000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,201 +0,0 @@
-# Makefile.am for fluxbox
-# Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
-#
-# src/Makefile.am for Blackbox 0.61.x  - an X11 Window manager
-# Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the 
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in 
-# all copies or substantial portions of the Software. 
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
-# DEALINGS IN THE SOFTWARE.
-
-
-if TEST
-BUILD_TEST= tests
-endif
-SUBDIRS= FbTk $(BUILD_TEST)
-
-DEFAULT_MENU=@DEFAULT_MENU@
-DEFAULT_STYLE=@DEFAULT_STYLE@
-DEFAULT_KEYSFILE=@DEFAULT_KEYS@
-DEFAULT_APPSFILE=@DEFAULT_APPS@
-DEFAULT_OVERLAY=@DEFAULT_OVERLAY@
-DEFAULT_INITFILE=@DEFAULT_INIT@
-DEFAULT_WINDOWMENU=@DEFAULT_WINDOWMENU@
-PROGRAM_PREFIX=@program_prefix@
-PROGRAM_SUFFIX=@program_suffix@
-
-AM_CPPFLAGS=-include $(top_builddir)/config.h
-
-bin_PROGRAMS= fluxbox
-BUILT_SOURCES = defaults.hh defaults.cc
-CONFIG_CLEAN_FILES = defaults.hh defaults.cc
-defaults.hh: Makefile
-	@( \
-		echo '// This file is generated from Makefile. Do not edit!'; \
-		echo '#include <string>'; \
-		echo ''; \
-		echo '#ifdef _WIN32'; \
-		echo '#define DUMMYPREFIX "/DUMMYPREFIX"'; \
-		echo '#define PATHPREFIX DUMMYPREFIX'; \
-		echo '#else'; \
-		echo '#define PATHPREFIX'; \
-		echo '#endif'; \
-		echo '#define DEFAULTMENU PATHPREFIX "$(DEFAULT_MENU)"'; \
-		echo '#define DEFAULTSTYLE PATHPREFIX "$(DEFAULT_STYLE)"'; \
-		echo '#define DEFAULTKEYSFILE PATHPREFIX "$(DEFAULT_KEYSFILE)"'; \
-		echo '#define DEFAULT_APPSFILE PATHPREFIX "$(DEFAULT_APPSFILE)"'; \
-		echo '#define DEFAULT_OVERLAY PATHPREFIX "$(DEFAULT_OVERLAY)"'; \
-		echo '#define DEFAULT_INITFILE PATHPREFIX "$(DEFAULT_INITFILE)"'; \
-		echo '#define DEFAULT_WINDOWMENU PATHPREFIX "$(DEFAULT_WINDOWMENU)"'; \
-		echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \
-		echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \
-		echo 'std::string realProgramName(const std::string& name);'; \
-		echo 'const char* gitrevision();' ) > defaults.hh
-
-defaults.cc: force
-	@( \
-		GITDIR=$(top_srcdir)/.git; \
-		echo '// This file is generated from Makefile. Do not edit!'; \
-		echo '#include "defaults.hh"'; \
-		echo ''; \
-		echo 'std::string realProgramName(const std::string& name) {'; \
-		echo '  return PROGRAM_PREFIX + name + PROGRAM_SUFFIX;'; \
-		echo '}'; \
-		echo ''; \
-		echo 'const char* gitrevision() {'; \
-		if test -r $$GITDIR/HEAD; then \
-			echo '  return "'`cat $$GITDIR/$$(cat $$GITDIR/HEAD | cut -f 2 -d ' ')`'";'; \
-		else \
-			echo '  return "this_is_tar_ball_build";'; \
-		fi; \
-		echo '}' ) > defaults_tmp.cc
-	@if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi
-	@rm defaults_tmp.cc
-
-force: ;
-
-# an extra dep for fluxbox
-fluxbox.$(OBJEXT): defaults.hh
-
-
-
-if EWMH
-EWMH_SOURCE= Ewmh.hh Ewmh.cc
-endif
-if REMEMBER_SRC
-REMEMBER_SOURCE= Remember.hh Remember.cc
-endif
-if TOOLBAR_SRC
-TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \
-	ToolbarTheme.hh ToolbarTheme.cc ToolbarItem.hh ToolbarItem.cc \
-	ClockTool.hh ClockTool.cc \
-	WorkspaceNameTool.hh WorkspaceNameTool.cc WorkspaceNameTheme.hh \
-	IconbarTool.hh IconbarTool.cc \
-	ToolTheme.hh ToolTheme.cc \
-	GenericTool.hh GenericTool.cc \
-	ButtonTool.hh ButtonTool.cc ButtonTheme.hh ButtonTheme.cc \
-	ToolFactory.hh ToolFactory.cc
-if SYSTRAY_SRC
-TOOLBAR_SOURCE += SystemTray.hh SystemTray.cc
-endif
-endif
-
-
-if SLIT_SRC
-SLIT_SOURCE = Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc
-endif
-
-fluxbox_CPPFLAGS = \
-	$(XRANDR_CFLAGS) \
-	$(FRIBIDI_CFLAGS) \
-	$(AM_CPPFLAGS)
-
-fluxbox_LDFLAGS = \
-	$(FONTCONFIG_LIBS) \
-	$(FREETYPE2_LIBS) \
-	$(FRIBIDI_LIBS) \
-	$(IMLIB2_LIBS) \
-	$(RANDR_LIBS) \
-	$(X11_LIBS) \
-	$(XEXT_LIBS) \
-	$(XFT_LIBS) \
-	$(XINERAMA_LIBS) \
-	$(XPM_LIBS) \
-	$(XRENDER_LIBS) \
-	$(X_EXTRA_LIBS) \
-	$(X_LIBS) \
-	$(X_PRE_LIBS)
-
-fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
-	FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \
-	FbWinFrameTheme.hh FbWinFrameTheme.cc \
-	fluxbox.cc fluxbox.hh \
-	Keys.cc Keys.hh main.cc \
-	RootTheme.hh RootTheme.cc \
-	FbRootWindow.hh FbRootWindow.cc \
-	OSDWindow.hh OSDWindow.cc \
-	TooltipWindow.hh TooltipWindow.cc \
-	Screen.cc Screen.hh \
-	WinButton.hh WinButton.cc \
-	WinButtonTheme.hh WinButtonTheme.cc \
-	Window.cc Window.hh WindowState.cc WindowState.hh\
-	Workspace.cc Workspace.hh \
-	FbCommands.hh FbCommands.cc LayerMenu.hh LayerMenu.cc \
-	Layer.hh \
-	FbMenu.hh FbMenu.cc \
-	WinClient.hh WinClient.cc \
-	Strut.hh \
-	Xinerama.hh \
-	Xutil.hh Xutil.cc \
-	CurrentWindowCmd.hh CurrentWindowCmd.cc \
-	WorkspaceCmd.hh WorkspaceCmd.cc \
-	TextDialog.hh TextDialog.cc \
-	CommandDialog.hh CommandDialog.cc SendToMenu.hh SendToMenu.cc \
-	AlphaMenu.hh AlphaMenu.cc \
-	FbMenuParser.hh FbMenuParser.cc \
-	StyleMenuItem.hh StyleMenuItem.cc \
-	RootCmdMenuItem.hh RootCmdMenuItem.cc\
-	MenuCreator.hh MenuCreator.cc \
-	ClientMenu.hh ClientMenu.cc \
-	ClientPattern.hh ClientPattern.cc \
-	WorkspaceMenu.hh WorkspaceMenu.cc \
-	FocusModelMenuItem.hh \
-	ToggleMenu.hh \
-	HeadArea.hh HeadArea.cc \
-	Resources.cc \
-	WindowCmd.hh WindowCmd.cc \
-	FocusControl.hh FocusControl.cc \
-	PlacementStrategy.hh \
-	CascadePlacement.hh CascadePlacement.cc \
-	ColSmartPlacement.hh ColSmartPlacement.cc \
-	MinOverlapPlacement.hh MinOverlapPlacement.cc \
-	RowSmartPlacement.hh RowSmartPlacement.cc \
-	ScreenPlacement.hh ScreenPlacement.cc \
-	UnderMousePlacement.hh UnderMousePlacement.cc \
-	AttentionNoticeHandler.hh AttentionNoticeHandler.cc \
-	IconButton.hh IconButton.cc \
-	IconbarTheme.hh IconbarTheme.cc \
-	Focusable.hh FocusableList.hh FocusableList.cc FocusableTheme.hh \
-	WindowMenuAccessor.hh \
-	RectangleUtil.hh \
-	Debug.hh \
-	${EWMH_SOURCE} \
-	${REMEMBER_SOURCE} \
-	${SLIT_SOURCE} \
-	${TOOLBAR_SOURCE}
-
-LDADD=FbTk/libFbTk.a defaults.$(OBJEXT)
diff --git a/src/Makemodule.am b/src/Makemodule.am
new file mode 100644
index 00000000..dd9f2752
--- /dev/null
+++ b/src/Makemodule.am
@@ -0,0 +1,270 @@
+# Makefile.am for fluxbox
+# Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+#
+# src/Makefile.am for Blackbox 0.61.x  - an X11 Window manager
+# Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+BUILT_SOURCES = src/defaults.hh src/defaults.cc
+CONFIG_CLEAN_FILES = src/defaults.hh src/defaults.cc
+
+bin_PROGRAMS += fluxbox
+
+src/defaults.hh:
+	@( \
+		echo '// This file is generated from Makefile. Do not edit!'; \
+		echo '#include <string>'; \
+		echo ''; \
+		echo '#ifdef _WIN32'; \
+		echo '#define DUMMYPREFIX "/DUMMYPREFIX"'; \
+		echo '#define PATHPREFIX DUMMYPREFIX'; \
+		echo '#else'; \
+		echo '#define PATHPREFIX'; \
+		echo '#endif'; \
+		echo '#define DEFAULTMENU PATHPREFIX "$(DEFAULT_MENU)"'; \
+		echo '#define DEFAULTSTYLE PATHPREFIX "$(DEFAULT_STYLE)"'; \
+		echo '#define DEFAULTKEYSFILE PATHPREFIX "$(DEFAULT_KEYSFILE)"'; \
+		echo '#define DEFAULT_APPSFILE PATHPREFIX "$(DEFAULT_APPSFILE)"'; \
+		echo '#define DEFAULT_OVERLAY PATHPREFIX "$(DEFAULT_OVERLAY)"'; \
+		echo '#define DEFAULT_INITFILE PATHPREFIX "$(DEFAULT_INITFILE)"'; \
+		echo '#define DEFAULT_WINDOWMENU PATHPREFIX "$(DEFAULT_WINDOWMENU)"'; \
+		echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \
+		echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \
+		echo 'std::string realProgramName(const std::string& name);'; \
+		echo 'const char* gitrevision();' ) > $(top_builddir)/src/defaults.hh
+
+src/defaults.cc: force
+	@( \
+		GITDIR=$(top_srcdir)/.git; \
+		echo '// This file is generated from Makefile. Do not edit!'; \
+		echo '#include "defaults.hh"'; \
+		echo ''; \
+		echo 'std::string realProgramName(const std::string& name) {'; \
+		echo '  return PROGRAM_PREFIX + name + PROGRAM_SUFFIX;'; \
+		echo '}'; \
+		echo ''; \
+		echo 'const char* gitrevision() {'; \
+		if test -r $$GITDIR/HEAD; then \
+			echo '  return "'`cat $$GITDIR/$$(cat $$GITDIR/HEAD | cut -f 2 -d ' ')`'";'; \
+		else \
+			echo '  return "this_is_tar_ball_build";'; \
+		fi; \
+		echo '}' ) > $(top_builddir)/src/defaults_tmp.cc
+	@if ! cmp defaults_tmp.cc defaults.cc ; then cp $(top_builddir)/src/defaults_tmp.cc $(top_builddir)/src/defaults.cc; fi
+	@rm $(top_builddir)/src/defaults_tmp.cc
+
+force: ;
+
+# an extra dep for fluxbox
+fluxbox.$(OBJEXT): src/defaults.hh
+
+if EWMH
+EWMH_SOURCE = \
+	src/Ewmh.hh \
+	src/Ewmh.cc
+endif
+
+if REMEMBER_SRC
+REMEMBER_SOURCE = \
+	src/Remember.hh \
+	src/Remember.cc
+endif
+
+if TOOLBAR_SRC
+TOOLBAR_SOURCE = \
+	src/ButtonTheme.cc \
+	src/ButtonTheme.hh \
+	src/ButtonTool.cc \
+	src/ButtonTool.hh \
+	src/ClockTool.cc \
+	src/ClockTool.hh \
+	src/GenericTool.cc \
+	src/GenericTool.hh \
+	src/IconbarTool.cc \
+	src/IconbarTool.hh \
+	src/ToolFactory.cc \
+	src/ToolFactory.hh \
+	src/ToolTheme.cc \
+	src/ToolTheme.hh \
+	src/Toolbar.cc \
+	src/Toolbar.hh \
+	src/ToolbarItem.cc \
+	src/ToolbarItem.hh \
+	src/ToolbarTheme.cc \
+	src/ToolbarTheme.hh \
+	src/WorkspaceNameTheme.hh \
+	src/WorkspaceNameTool.cc \
+	src/WorkspaceNameTool.hh
+if SYSTRAY_SRC
+TOOLBAR_SOURCE += \
+	src/SystemTray.cc \
+	src/SystemTray.hh
+endif
+endif
+
+if SLIT_SRC
+SLIT_SOURCE = \
+	src/Slit.cc \
+	src/Slit.hh \
+	src/SlitClient.cc \
+	src/SlitClient.hh \
+	src/SlitTheme.cc \
+	src/SlitTheme.hh
+endif
+
+fluxbox_CPPFLAGS = \
+	$(FRIBIDI_CFLAGS) \
+	$(XRANDR_CFLAGS) \
+	$(AM_CPPFLAGS) \
+	-I$(src_incdir) \
+	-I$(fbtk_incdir) \
+	-I$(nls_incdir)
+
+fluxbox_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FREETYPE2_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(IMLIB2_LIBS) \
+	$(RANDR_LIBS) \
+	$(X11_LIBS) \
+	$(XEXT_LIBS) \
+	$(XFT_LIBS) \
+	$(XINERAMA_LIBS) \
+	$(XPM_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_EXTRA_LIBS) \
+	$(X_LIBS) \
+	$(X_PRE_LIBS)
+
+fluxbox_SOURCES = \
+	src/AlphaMenu.cc \
+	src/AlphaMenu.hh \
+	src/ArrowButton.cc \
+	src/ArrowButton.hh \
+	src/AtomHandler.hh \
+	src/AttentionNoticeHandler.cc \
+	src/AttentionNoticeHandler.hh \
+	src/CascadePlacement.cc \
+	src/CascadePlacement.hh \
+	src/ClientMenu.cc \
+	src/ClientMenu.hh \
+	src/ClientPattern.cc \
+	src/ClientPattern.hh \
+	src/ColSmartPlacement.cc \
+	src/ColSmartPlacement.hh \
+	src/CommandDialog.cc \
+	src/CommandDialog.hh \
+	src/CurrentWindowCmd.cc \
+	src/CurrentWindowCmd.hh \
+	src/Debug.hh \
+	src/FbAtoms.cc \
+	src/FbAtoms.hh \
+	src/FbCommands.cc \
+	src/FbCommands.hh \
+	src/FbMenu.cc \
+	src/FbMenu.hh \
+	src/FbMenuParser.cc \
+	src/FbMenuParser.hh \
+	src/FbRootWindow.cc \
+	src/FbRootWindow.hh \
+	src/FbWinFrame.cc \
+	src/FbWinFrame.hh \
+	src/FbWinFrameTheme.cc \
+	src/FbWinFrameTheme.hh \
+	src/FocusControl.cc \
+	src/FocusControl.hh \
+	src/FocusModelMenuItem.hh \
+	src/Focusable.hh \
+	src/FocusableList.cc \
+	src/FocusableList.hh \
+	src/FocusableTheme.hh \
+	src/HeadArea.cc \
+	src/HeadArea.hh \
+	src/IconButton.cc \
+	src/IconButton.hh \
+	src/IconbarTheme.cc \
+	src/IconbarTheme.hh \
+	src/Keys.cc \
+	src/Keys.hh \
+	src/Layer.hh \
+	src/LayerMenu.cc \
+	src/LayerMenu.hh \
+	src/MenuCreator.cc \
+	src/MenuCreator.hh \
+	src/MinOverlapPlacement.cc \
+	src/MinOverlapPlacement.hh \
+	src/OSDWindow.cc \
+	src/OSDWindow.hh \
+	src/PlacementStrategy.hh \
+	src/RectangleUtil.hh \
+	src/Resources.cc \
+	src/RootCmdMenuItem.cc\
+	src/RootCmdMenuItem.hh \
+	src/RootTheme.cc \
+	src/RootTheme.hh \
+	src/RowSmartPlacement.cc \
+	src/RowSmartPlacement.hh \
+	src/Screen.cc \
+	src/Screen.hh \
+	src/ScreenPlacement.cc \
+	src/ScreenPlacement.hh \
+	src/SendToMenu.cc \
+	src/SendToMenu.hh \
+	src/Strut.hh \
+	src/StyleMenuItem.cc \
+	src/StyleMenuItem.hh \
+	src/TextDialog.cc \
+	src/TextDialog.hh \
+	src/ToggleMenu.hh \
+	src/TooltipWindow.cc \
+	src/TooltipWindow.hh \
+	src/UnderMousePlacement.cc \
+	src/UnderMousePlacement.hh \
+	src/WinButton.cc \
+	src/WinButton.hh \
+	src/WinButtonTheme.cc \
+	src/WinButtonTheme.hh \
+	src/WinClient.cc \
+	src/WinClient.hh \
+	src/Window.cc \
+	src/Window.hh \
+	src/WindowCmd.cc \
+	src/WindowCmd.hh \
+	src/WindowMenuAccessor.hh \
+	src/WindowState.cc \
+	src/WindowState.hh\
+	src/Workspace.cc \
+	src/Workspace.hh \
+	src/WorkspaceCmd.cc \
+	src/WorkspaceCmd.hh \
+	src/WorkspaceMenu.cc \
+	src/WorkspaceMenu.hh \
+	src/Xinerama.hh \
+	src/Xutil.cc \
+	src/Xutil.hh \
+	src/fluxbox.cc \
+	src/fluxbox.hh \
+	src/main.cc \
+	${EWMH_SOURCE} \
+	${REMEMBER_SOURCE} \
+	${SLIT_SOURCE} \
+	${TOOLBAR_SOURCE}
+
+LDADD = libFbTk.a src/defaults.$(OBJEXT)
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
deleted file mode 100644
index 73f269f6..00000000
--- a/src/tests/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-AM_CPPFLAGS= -I$(top_srcdir)/src -include $(top_builddir)/config.h
-
-noinst_PROGRAMS= \
-	 testTexture \
-	 testFont \
-	 testSignals \
-	 testKeys \
-	 testDemandAttention \
-	 testFullscreen \
-	 testStringUtil \
-	 testRectangleUtil
-
-testTexture_SOURCES         = texturetest.cc
-testTexture_LDFLAGS	    = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(IMLIB2_LIBS) $(XPM_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
-testFont_SOURCES            = testFont.cc
-testFont_LDFLAGS	    = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
-testSignals_SOURCES         = testSignals.cc
-testSignals_LDFLAGS	    = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS)
-testKeys_SOURCES            = testKeys.cc
-testKeys_LDFLAGS	    = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
-testDemandAttention_SOURCES = testDemandAttention.cc
-testDemandAttention_LDFLAGS = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
-#testResource_SOURCES        = Resourcetest.cc
-testFullscreen_SOURCES      = fullscreentest.cc
-testFullscreen_LDFLAGS	    = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
-testStringUtil_SOURCES      = StringUtiltest.cc
-testRectangleUtil_SOURCES   = testRectangleUtil.cc
-
-LDADD=../FbTk/libFbTk.a
-
diff --git a/src/tests/Makemodule.am b/src/tests/Makemodule.am
new file mode 100644
index 00000000..4ef9a16b
--- /dev/null
+++ b/src/tests/Makemodule.am
@@ -0,0 +1,104 @@
+check_PROGRAMS= \
+	testDemandAttention \
+	testFont \
+	testFullscreen \
+	testKeys \
+	testRectangleUtil \
+	testSignals \
+	testStringUtil \
+	testTexture
+
+testDemandAttention_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testDemandAttention_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+testDemandAttention_SOURCES = \
+	src/tests/testDemandAttention.cc
+
+testFont_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testFont_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+testFont_SOURCES = \
+	src/tests/testFont.cc
+
+testFullscreen_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testFullscreen_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir) \
+	-I$(src_incdir)
+testFullscreen_SOURCES = \
+	src/tests/fullscreentest.cc
+
+testKeys_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testKeys_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+testKeys_SOURCES = \
+	src/tests/testKeys.cc
+
+testRectangleUtil_SOURCES = \
+	src/RectangleUtil.hh \
+	src/tests/testRectangleUtil.cc
+testRectangleUtil_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir)/src
+
+testSignals_LDFLAGS = \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+
+testSignals_SOURCES = \
+	src/tests/testSignals.cc
+testSignals_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+
+testStringUtil_SOURCES = \
+	src/tests/StringUtiltest.cc
+testStringUtil_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+
+testTexture_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(IMLIB2_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XPM_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testTexture_SOURCES = \
+	src/tests/texturetest.cc
+testTexture_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+
+#testResource_SOURCE = Resourcetest.cc
diff --git a/util/Makefile.am b/util/Makefile.am
deleted file mode 100644
index 63fe66ab..00000000
--- a/util/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-# util/Makefile.am for Fluxbox
-SUBDIRS=		fbrun
-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
-fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \
-			../src/FbTk/libFbTk.a
-fbsetroot_LDFLAGS = \
-	$(FONTCONFIG_LIBS) \
-	$(FRIBIDI_LIBS) \
-	$(X11_LIBS) \
-	$(XFT_LIBS) \
-	$(XRENDER_LIBS)
-
-fluxbox_update_configs_SOURCES=	fluxbox-update_configs.cc
-fluxbox_update_configs_LDADD=	../src/defaults.o ../src/Resources.o \
-			../src/FbTk/libFbTk.a
-fluxbox_update_configs_LDFLAGS = \
-	$(FRIBIDI_LIBS) \
-	$(X11_LIBS)
-fluxbox_remote_SOURCES=	fluxbox-remote.cc
-fluxbox_remote_LDFLAGS = $(X11_LIBS)
-
-MAINTAINERCLEANFILES=	Makefile.in
-EXTRA_DIST=		fbsetbg fluxbox-generate_menu.in \
-				startfluxbox.in
-
-PROGRAM_PREFIX=@program_prefix@
-PROGRAM_SUFFIX=@program_suffix@
-
-all-local:	startfluxbox
-
-clean-local:
-		rm -f startfluxbox fluxbox-generate_menu
-
-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 \
-			$(top_builddir)/src/defaults.hh
-
-fluxbox-remote.o:	fluxbox-remote.cc
-
-startfluxbox: 	startfluxbox.in
-		@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
-		            -e "s,@pkgbindir@,$(bindir),g" \
-		            -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-		            -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-		            -e "s,@EXEEXT@,$(EXEEXT),g" \
-				$(srcdir)/startfluxbox.in > startfluxbox
-		-chmod 755 startfluxbox
-
-fluxbox-generate_menu: fluxbox-generate_menu.in
-		@regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \
-		            -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-		            -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-		            -e "s,@EXEEXT@,$(EXEEXT),g" \
-				$(srcdir)/fluxbox-generate_menu.in \
-				> fluxbox-generate_menu
-		-chmod 755 fluxbox-generate_menu
-
-../src/FbRootWindow.o:
-	cd ../src && ${MAKE} FbRootWindow.o
-../src/FbAtoms.o:
-	cd ../src && ${MAKE} FbAtoms.o
-../src/defaults.o:
-	cd ../src && ${MAKE} defaults.o
-../src/Resources.o:
-	cd ../src && ${MAKE} Resources.o
diff --git a/util/Makemodule.am b/util/Makemodule.am
new file mode 100644
index 00000000..44f3002b
--- /dev/null
+++ b/util/Makemodule.am
@@ -0,0 +1,58 @@
+# util/Makefile.am for Fluxbox
+
+bin_SCRIPTS = \
+	util/fbsetbg \
+	util/fluxbox-generate_menu \
+	util/startfluxbox
+EXTRA_DIST += \
+	util/fbsetbg
+PATHFILES += \
+	util/startfluxbox \
+	util/fluxbox-generate_menu
+
+bin_PROGRAMS += \
+	fbsetroot \
+	fluxbox-remote \
+	fluxbox-update_configs
+
+fbsetroot_SOURCES = \
+	src/FbAtoms.cc \
+	src/FbRootWindow.cc \
+	util/fbsetroot.cc \
+	util/fbsetroot.hh
+fbsetroot_LDADD = \
+	libFbTk.a
+fbsetroot_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir) \
+	-I$(src_incdir) \
+	-I$(nls_incdir)
+fbsetroot_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS)
+
+fluxbox_update_configs_SOURCES = \
+	src/defaults.cc \
+	src/Resources.cc \
+	util/fluxbox-update_configs.cc
+fluxbox_update_configs_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir) \
+	-I$(src_incdir) \
+	-I$(nls_incdir)
+fluxbox_update_configs_LDADD = \
+	libFbTk.a
+fluxbox_update_configs_LDFLAGS = \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS)
+
+fluxbox_remote_SOURCES = \
+	util/fluxbox-remote.cc
+fluxbox_remote_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+fluxbox_remote_LDFLAGS = \
+	$(X11_LIBS)
diff --git a/util/fbrun/Makefile.am b/util/fbrun/Makefile.am
deleted file mode 100644
index 92f7c47f..00000000
--- a/util/fbrun/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-FLUXBOX_SRC_DIR=	../../src/
-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
-fbrun_LDFLAGS = \
-	$(FONTCONFIG_LIBS) \
-	$(FRIBIDI_LIBS) \
-	$(X11_LIBS) \
-	$(XINERAMA_LIBS) \
-	$(XFT_LIBS) \
-	$(XPM_LIBS) \
-	$(XRENDER_LIBS)
-
-${FLUXBOX_SRC_DIR}FbTk/libFbTk.a:
-	cd ${FLUXBOX_SRC_DIR}FbTk && make
diff --git a/util/fbrun/Makemodule.am b/util/fbrun/Makemodule.am
new file mode 100644
index 00000000..cb98e928
--- /dev/null
+++ b/util/fbrun/Makemodule.am
@@ -0,0 +1,22 @@
+bin_PROGRAMS += fbrun
+
+fbrun_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+
+fbrun_SOURCES = \
+	util/fbrun/FbRun.hh \
+	util/fbrun/FbRun.cc \
+	util/fbrun/main.cc \
+	util/fbrun/fbrun.xpm
+
+fbrun_LDADD = libFbTk.a
+
+fbrun_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XINERAMA_LIBS) \
+	$(XPM_LIBS) \
+	$(XRENDER_LIBS)