diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am
index f098e823be22b5a4e11ff468a687bb08e21e5bcf..601f74073cb0a360611e514774a7c2110181e2b0 100644
--- a/gnulib/lib/Makefile.am
+++ b/gnulib/lib/Makefile.am
@@ -26,5 +26,3 @@ SUFFIXES =
 noinst_LTLIBRARIES =
 
 include gnulib.mk
-
-INCLUDES = -I$(top_srcdir) $(GETTEXT_CPPFLAGS)
diff --git a/gnulib/tests/Makefile.am b/gnulib/tests/Makefile.am
index df4af59a8292b7f03809301c1ac5040db735c4d5..7062cbaf87896d8df2699e23a4083ea74b9022fb 100644
--- a/gnulib/tests/Makefile.am
+++ b/gnulib/tests/Makefile.am
@@ -18,8 +18,6 @@
 
 include gnulib.mk
 
-INCLUDES = $(GETTEXT_CPPFLAGS)
-
 GNULIB_TESTS0 =
 GNULIB_TESTS1 = $(GNULIB_TESTS)
 if WITH_EXPENSIVE_TESTS
diff --git a/src/Makefile.am b/src/Makefile.am
index e2b89e27e8b1717b23332a4ec24e9836865314d0..3ac6dcad16411c99d74a1b5b3b21b0bff3ea1431 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ abs_topsrcdir = $(shell cd $(top_srcdir) && pwd)
 
 # No libraries with the exception of LIBXML should be listed
 # here. List them against the individual XXX_la_CFLAGS targets
-# that actually use them. Also keep GETTEXT_CPPFLAGS at the end.
+# that actually use them.
 INCLUDES =	-I../gnulib/lib \
 		-I$(top_srcdir)/gnulib/lib \
 		-I$(top_srcdir) \
@@ -35,7 +35,7 @@ INCLUDES =	-I../gnulib/lib \
 		-DIN_LIBVIRT \
 		-Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \
 		-Dabs_topsrcdir="\"$(abs_topsrcdir)\"" \
-		$(GETTEXT_CPPFLAGS)
+		$(NULL)
 
 WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3b413dca439e37a7375fe7f2373592be2676628b..69dd45728d77c0b12e09dc4c81294476630233e5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,7 +31,7 @@ INCLUDES = \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/util \
 	-I$(top_srcdir)/src/conf \
-	$(GETTEXT_CPPFLAGS)
+	$(NULL)
 
 WARN_CFLAGS += $(RELAXED_FRAME_LIMIT_CFLAGS)
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1dc009c4fbb2dec7e71ae5d113c7554176969b0b..fadd09977e132e089b783bbd5ec8a933ab15e601 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES = \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/util \
 	-I$(top_srcdir) \
-	$(GETTEXT_CPPFLAGS)
+	$(NULL)
 
 WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)