3 files changed, 7 insertions, 5 deletions
diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile
index ced0f7e476..ebc567cc55 100644
--- a/src/libfirewall/Makefile
+++ b/src/libfirewall/Makefile
@@ -39,4 +39,6 @@ libfirewall_la_LIBADD = \
 	$(LIBIPTC_LIBS)
 endif # HAVE_LIBIPTC
 
+systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libfirewall/firewall-util.c b/src/libfirewall/firewall-util.c
index f73108eaa3..5423b8cc3a 100644
--- a/src/libfirewall/firewall-util.c
+++ b/src/libfirewall/firewall-util.c
@@ -38,11 +38,11 @@
 #include <linux/netfilter/xt_addrtype.h>
 #include <libiptc/libiptc.h>
 
-#include "alloc-util.h"
+#include "basic/alloc-util.h"
 #include "firewall-util.h"
-#include "in-addr-util.h"
-#include "macro.h"
-#include "socket-util.h"
+#include "basic/in-addr-util.h"
+#include "basic/macro.h"
+#include "basic/socket-util.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct xtc_handle*, iptc_free);
 
diff --git a/src/libfirewall/firewall-util.h b/src/libfirewall/firewall-util.h
index c39b34cf8f..1e54dc0ceb 100644
--- a/src/libfirewall/firewall-util.h
+++ b/src/libfirewall/firewall-util.h
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "in-addr-util.h"
+#include "basic/in-addr-util.h"
 
 #ifdef HAVE_LIBIPTC