diff --git a/dox/Makefile.am b/dox/Makefile.am
index 6008616d..a0066e5f 100644
--- a/dox/Makefile.am
+++ b/dox/Makefile.am
@@ -4,12 +4,11 @@ EXTRA_DIST = README
 
 bin_PROGRAMS = edox
 
+AM_CPPFLAGS = -I$(top_builddir) $(IMLIB2_CFLAGS) $(X_CFLAGS) \
+	-D ENLIGHTENMENT_ROOT=\"$(pkgdatadir)\"
+
+AM_CFLAGS = $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY) $(CFLAGS_ASAN)
+
 edox_SOURCES = dox.c dox.h file.c format.c text.c ttfont.c
 
-edox_CPPFLAGS = -I$(top_builddir) $(IMLIB2_CFLAGS) $(X_CFLAGS) \
-	$(CFLAGS_WARNINGS) -D ENLIGHTENMENT_ROOT=\"$(pkgdatadir)\"
-
-edox_CFLAGS = $(CFLAGS_ASAN)
-
-LDADD = $(IMLIB2_LIBS) $(X_LIBS) $(XINERAMA_LIBS) -lX11 -lm
-
+edox_LDADD = $(IMLIB2_LIBS) $(X_LIBS) $(XINERAMA_LIBS) -lX11 -lm
diff --git a/eesh/Makefile.am b/eesh/Makefile.am
index 02b46058..f24f08d9 100644
--- a/eesh/Makefile.am
+++ b/eesh/Makefile.am
@@ -1,11 +1,10 @@
 
 bin_PROGRAMS = eesh
 
+AM_CPPFLAGS = -I$(top_builddir) $(X_CFLAGS)
+
+AM_CFLAGS = $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY) $(CFLAGS_ASAN)
+
 eesh_SOURCES = E.h comms.c main.c
 
-eesh_CPPFLAGS = -I$(top_builddir) $(X_CFLAGS) $(CFLAGS_WARNINGS)
-
-eesh_CFLAGS = $(CFLAGS_ASAN)
-
-LDADD = $(X_LIBS) -lX11
-
+eesh_LDADD = $(X_LIBS) -lX11
diff --git a/epp/Makefile.am b/epp/Makefile.am
index 942fde3c..0641aa81 100644
--- a/epp/Makefile.am
+++ b/epp/Makefile.am
@@ -19,6 +19,10 @@
 
 bin_PROGRAMS = epp
 
+AM_CPPFLAGS = -I$(top_builddir)
+
+AM_CFLAGS = $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY) $(CFLAGS_ASAN)
+
 epp_SOURCES = \
 	cpplib.h \
 	cpphash.h \
@@ -29,8 +33,6 @@ epp_SOURCES = \
 	cpplib.c \
 	cppmain.c 
 
-epp_CPPFLAGS = -I$(top_builddir) $(CFLAGS_WARNINGS)
-
 DEFS= \
 -DHAVE_STRERROR \
 -DFATAL_EXIT_CODE=1 \
@@ -49,4 +51,3 @@ DEFS= \
 -DTARGET_CR=13 \
 -DTARGET_TAB=9 \
 -DTARGET_VT=11
-
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a7ebd68e..6e2bc237 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,10 +2,9 @@ libe16dir = $(pkglibdir)
 
 libe16_LTLIBRARIES = $(LIB_HACK) $(LIB_TRIP)
 
-AM_CPPFLAGS = -I$(top_srcdir)/src $(X_CFLAGS) \
-	      $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY)
+AM_CPPFLAGS = -I$(top_srcdir)/src $(X_CFLAGS)
 
-AM_CFLAGS = $(CFLAGS_ASAN)
+AM_CFLAGS = $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY) $(CFLAGS_ASAN)
 
 if BUILD_LIBHACK
 
diff --git a/src/Makefile.am b/src/Makefile.am
index b0ff8e02..ee99a583 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,12 +115,9 @@ e16_SOURCES = \
 	$(SRCS_ECOMPMGR)	\
 	$(SRCS_DBUS)
 
-AM_CFLAGS = \
-	$(CFLAGS_ASAN)
+AM_CFLAGS = $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY) $(CFLAGS_ASAN)
 
 AM_CPPFLAGS = \
-	$(CFLAGS_WARNINGS) \
-	$(CFLAGS_VISIBILITY) \
 	-D LOCALEDIR=\"$(datadir)/locale\" \
 	-D ENLIGHTENMENT_BIN=\"$(bindir)\" \
 	-D ENLIGHTENMENT_LIB=\"$(pkglibdir)\" \
@@ -139,7 +136,7 @@ e16_CPPFLAGS = \
 	$(XPRESENT_CFLAGS) \
 	$(X_CFLAGS)
 
-LDADD = \
+e16_LDADD = \
 	$(LTLIBINTL)		\
 	$(LTLIBICONV)		\
 	$(IMLIB2_LIBS)		\