diff --git a/Makefile.am b/Makefile.am
index 1e9bdf981..9bd2412e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,8 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I tools/m4
 
-SUBDIRS = include/ircd
+SUBDIRS =#
+SUBDIRS += include/ircd
 SUBDIRS += ircd
 SUBDIRS += matrix
 SUBDIRS += modules
diff --git a/include/ircd/Makefile.am b/include/ircd/Makefile.am
index 06aff91b1..ac0fadfb8 100644
--- a/include/ircd/Makefile.am
+++ b/include/ircd/Makefile.am
@@ -16,8 +16,8 @@ LOWMEM_FLAGS= --param ggc-min-expand=1
 endif
 endif
 
-AM_CPPFLAGS += $(EXTRA_CPPFLAGS)
-AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
+CPPFLAGS += $(EXTRA_CPPFLAGS)
+CXXFLAGS += $(EXTRA_CXXFLAGS)
 
 # includedir = @includedir@/$(PACKAGE_TARNAME)
 includedir = @includedir@/ircd
diff --git a/ircd/Makefile.am b/ircd/Makefile.am
index c90d13659..868e7c16d 100644
--- a/ircd/Makefile.am
+++ b/ircd/Makefile.am
@@ -68,9 +68,13 @@ AM_LDFLAGS += -Wl,--enable-runtime-pseudo-reloc
 AM_LDFLAGS += -export-symbols-regex '*'
 endif
 
-AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
-AM_CPPFLAGS += $(EXTRA_CPPFLAGS)
-AM_LDFLAGS += $(EXTRA_LDFLAGS)
+CXXFLAGS += $(EXTRA_CXXFLAGS)
+CPPFLAGS += $(EXTRA_CPPFLAGS)
+LDFLAGS += $(EXTRA_LDFLAGS)
+
+#
+# libircd
+#
 
 libircddir = @libdir@
 libircd_LTLIBRARIES =#
diff --git a/matrix/Makefile.am b/matrix/Makefile.am
index b50375677..b6fcb942e 100644
--- a/matrix/Makefile.am
+++ b/matrix/Makefile.am
@@ -58,18 +58,18 @@ if MINGW
 AM_LDFLAGS += -Wl,--enable-runtime-pseudo-reloc
 endif
 
-AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
-AM_CPPFLAGS += $(EXTRA_CPPFLAGS)
-AM_LDFLAGS += $(EXTRA_LDFLAGS)
+CXXFLAGS += $(EXTRA_CXXFLAGS)
+CPPFLAGS += $(EXTRA_CPPFLAGS)
+LDFLAGS += $(EXTRA_LDFLAGS)
+
+#
+# libircd_matrix
+#
 
 libircd_matrixdir = @libdir@
 libircd_matrix_LTLIBRARIES =#
 libircd_matrix_LTLIBRARIES += libircd_matrix.la
 
-#
-# Unit list
-#
-
 libircd_matrix_la_SOURCES =#
 libircd_matrix_la_SOURCES += name.cc
 libircd_matrix_la_SOURCES += id.cc
diff --git a/modules/Makefile.am b/modules/Makefile.am
index f92a277b5..99c354c56 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -32,9 +32,9 @@ AM_LDFLAGS += -Wl,--no-gnu-unique
 AM_LDFLAGS += -Wl,--sort-common=descending
 endif
 
-AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
-AM_CPPFLAGS += $(EXTRA_CPPFLAGS)
-AM_LDFLAGS += $(EXTRA_LDFLAGS)
+CPPFLAGS += $(EXTRA_CPPFLAGS)
+CXXFLAGS += $(EXTRA_CXXFLAGS)
+LDFLAGS += $(EXTRA_LDFLAGS)
 
 ###############################################################################
 #