diff --git a/client/Makefile.am b/client/Makefile.am
index 0031c04a5..91fa71235 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -4,14 +4,6 @@ AUTOMAKE_OPTIONS = 1.7 subdir-objects
 
 NULL =
 
-AM_CFLAGS = $(NULL)
-if HAVE_GCC
-    AM_CFLAGS += -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith \
-		-Wcast-align -Werror-implicit-function-declaration \
-		$(NULL)
-endif
-export AM_CFLAGS
-
 IPA_CONF_FILE=$(sysconfdir)/ipa/default.conf
 
 AM_CPPFLAGS =							\
diff --git a/configure.ac b/configure.ac
index 9bfd93fdd..160dd586a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -469,6 +469,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
         -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
         -Wnested-externs -Wpointer-arith \
         -Wcast-align -Wsign-compare \
+        -Wshadow -Wstrict-prototypes \
         $CFLAGS"
 
         for option in -Wno-strict-aliasing -Wno-sign-compare; do
diff --git a/daemons/Makefile.am b/daemons/Makefile.am
index 296791785..f8f3ed5b2 100644
--- a/daemons/Makefile.am
+++ b/daemons/Makefile.am
@@ -4,14 +4,6 @@ AUTOMAKE_OPTIONS = 1.7 subdir-objects
 
 NULL =
 
-AM_CFLAGS = $(NULL)
-if HAVE_GCC
-    AM_CFLAGS += -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith \
-		-Wcast-align -Werror-implicit-function-declaration \
-		$(NULL)
-endif
-export AM_CFLAGS
-
 nodist_noinst_HEADERS = ipa-version.h
 noinst_HEADERS = ipa-version.h.in