diff --git a/Makefile.am b/Makefile.am
index f2050249..dae701eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1139,7 +1139,7 @@ EXTRA_DIST += \
 	printf "#include <$$(echo "$<" | sed 's|.*\<include/netlink/|netlink/|')>\nint main(void) { return 0; }" > $@
 
 %.build-headers-test.o: %.build-headers-test.c
-	$(COMPILE) -Wall -Werror -Wno-error=cpp -I$(srcdir)/include -I$(builddir)/include -c -o $@ $<
+	$(COMPILE) -Wall -Werror -I$(srcdir)/include -I$(builddir)/include -c -o $@ $<
 
 BUILD_HEADERS_OBJS = $(patsubst %,%.build-headers-test.o,$(public_headers))
 
diff --git a/include/netlink/cache-api.h b/include/netlink/cache-api.h
index 851eca0b..e8a41706 100644
--- a/include/netlink/cache-api.h
+++ b/include/netlink/cache-api.h
@@ -9,6 +9,8 @@
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 
+#ifndef _NL_NO_WARN_DEPRECATED_HEADER
 #warning "You are including a deprecated header file, include <netlink/cache.h>."
+#endif
 
 #endif
diff --git a/include/netlink/route/link/api.h b/include/netlink/route/link/api.h
index abdd8b29..ef11d2f5 100644
--- a/include/netlink/route/link/api.h
+++ b/include/netlink/route/link/api.h
@@ -9,6 +9,8 @@
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 
+#ifndef _NL_NO_WARN_DEPRECATED_HEADER
 #warning "You are including a deprecated header file, include <netlink/route/link.h>."
+#endif
 
 #endif
diff --git a/include/netlink/route/link/info-api.h b/include/netlink/route/link/info-api.h
index 11cffcfa..88461bbe 100644
--- a/include/netlink/route/link/info-api.h
+++ b/include/netlink/route/link/info-api.h
@@ -9,6 +9,8 @@
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 
+#ifndef _NL_NO_WARN_DEPRECATED_HEADER
 #warning "You are including a deprecated header file, include <netlink/route/link.h>."
+#endif
 
 #endif
diff --git a/include/netlink/route/tc-api.h b/include/netlink/route/tc-api.h
index 3f400baa..36b1b0fc 100644
--- a/include/netlink/route/tc-api.h
+++ b/include/netlink/route/tc-api.h
@@ -10,6 +10,8 @@
 #include <netlink/msg.h>
 #include <netlink/route/tc.h>
 
+#ifndef _NL_NO_WARN_DEPRECATED_HEADER
 #warning "You are including a deprecated header file, include <netlink/route/tc.h>."
+#endif
 
 #endif