diff --git a/Makefile.am b/Makefile.am
index de0b643..626aaf4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 ## remove line below when OE toolchain is updated to version which include those
 ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = \
-	$(all_includes) \
 	-I$(top_srcdir)/include \
 	$(NULL)
 
diff --git a/src/libosmo-gtlv/Makefile.am b/src/libosmo-gtlv/Makefile.am
index ae77948..9b7b1ad 100644
--- a/src/libosmo-gtlv/Makefile.am
+++ b/src/libosmo-gtlv/Makefile.am
@@ -1,5 +1,4 @@
 AM_CPPFLAGS = \
-	$(all_includes) \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir) \
 	-I$(builddir) \
diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am
index fdc30e0..5af9bdb 100644
--- a/src/libosmo-pfcp/Makefile.am
+++ b/src/libosmo-pfcp/Makefile.am
@@ -1,5 +1,4 @@
 AM_CPPFLAGS = \
-	$(all_includes) \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_builddir) \
diff --git a/tests/libosmo-gtlv/Makefile.am b/tests/libosmo-gtlv/Makefile.am
index d73f940..65e85d6 100644
--- a/tests/libosmo-gtlv/Makefile.am
+++ b/tests/libosmo-gtlv/Makefile.am
@@ -4,7 +4,6 @@ SUBDIRS = \
 	$(NULL)
 
 AM_CPPFLAGS = \
-	$(all_includes) \
 	-I$(top_srcdir)/include \
 	$(NULL)
 
diff --git a/tests/libosmo-gtlv/test_gtlv_gen/Makefile.am b/tests/libosmo-gtlv/test_gtlv_gen/Makefile.am
index 9f791fe..c08b1f1 100644
--- a/tests/libosmo-gtlv/test_gtlv_gen/Makefile.am
+++ b/tests/libosmo-gtlv/test_gtlv_gen/Makefile.am
@@ -1,5 +1,4 @@
 AM_CPPFLAGS = \
-	$(all_includes) \
 	-I$(top_srcdir)/include \
 	-I$(bulddir) \
 	$(NULL)
diff --git a/tests/libosmo-gtlv/test_tliv/Makefile.am b/tests/libosmo-gtlv/test_tliv/Makefile.am
index 5b7dd7c..65e2aaa 100644
--- a/tests/libosmo-gtlv/test_tliv/Makefile.am
+++ b/tests/libosmo-gtlv/test_tliv/Makefile.am
@@ -1,5 +1,4 @@
 AM_CPPFLAGS = \
-	$(all_includes) \
 	-I$(top_srcdir)/include \
 	-I$(bulddir) \
 	$(NULL)
diff --git a/tests/libosmo-pfcp/Makefile.am b/tests/libosmo-pfcp/Makefile.am
index f4314f2..106def5 100644
--- a/tests/libosmo-pfcp/Makefile.am
+++ b/tests/libosmo-pfcp/Makefile.am
@@ -1,5 +1,4 @@
 AM_CPPFLAGS = \
-	$(all_includes) \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	$(NULL)