diff --git a/configure.ac b/configure.ac
index 9e13410..6d73189 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,7 @@ m4_ifndef([XORG_MACROS_VERSION],
     [m4_fatal([must install xorg-macros before running autoconf/autogen.sh])])
 XORG_MACROS_VERSION([1.2.0])
 XORG_RELEASE_VERSION
+XORG_CWARNFLAGS
 XORG_CHANGELOG
 
 AC_OUTPUT([
diff --git a/src/Makefile.am b/src/Makefile.am
index e0dde83..fd3dca8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = makekeys
 
 INCLUDES = -I$(top_srcdir)/include
+AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS)
 
 BUILT_SOURCES = ks_tables.h
 ks_tables.h: $(builddir)/makekeys/makekeys$(EXEEXT)
@@ -12,7 +13,6 @@ $(builddir)/makekeys/makekeys$(EXEEXT):
 	@cd makekeys && $(MAKE) $(AM_MAKEFLAGS)
 
 lib_LTLIBRARIES = libxkbcommon.la
-libxkbcommon_la_CFLAGS = $(X11_CFLAGS)
 libxkbcommon_la_SOURCES = \
 	ks_tables.h \
 	keysym.c
diff --git a/src/makekeys/Makefile.am b/src/makekeys/Makefile.am
index 95f9262..bd05903 100644
--- a/src/makekeys/Makefile.am
+++ b/src/makekeys/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/include
+AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS)
 
 # need to use build-native compiler
 CC = $(CC_FOR_BUILD)
 noinst_PROGRAMS = makekeys
-makekeys_CFLAGS = $(X11_CFLAGS)
diff --git a/test/Makefile.am b/test/Makefile.am
index 49362d1..18ac375 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = -I$(top_srcdir)/include
-AM_CFLAGS = $(X11_CFLAGS)
+AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS)
 
 check_PROGRAMS = xkey
 xkey_SOURCES = xkey.c