-THREADED_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/server @CFLAGSTHREADS@
-
-XMALLOC_FLAGS = -DTRACE_XMALLOC=2 -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/server
+THREADED_FLAGS = @CFLAGSTHREADS@
+XMALLOC_FLAGS = -DTRACE_XMALLOC=2