tidy headers

41 files changed, 54 insertions, 52 deletions

diff --git a/config.mk.in b/config.mk.in
index 5caa2599bb..5df28ae83b 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -109,15 +109,17 @@ libfirewall.CPPFLAGS                 = -I$(topsrcdir)/src/libfirewall
 libfirewall.DEPENDS                  =   $(topoutdir)/src/libfirewall/libfirewall.la
 libshared.CPPFLAGS                   = -I$(topsrcdir)/src/libshared/include $(libsystemd-internal.CPPFLAGS) -I$(topsrcdir)/src/libudev/src
 libshared.DEPENDS                    =   $(topoutdir)/src/libshared/src/libshared.la
+
 libsystemd-internal.CPPFLAGS         = -I$(topsrcdir)/src/libsystemd/src -I$(topoutdir)/src/libsystemd/src $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS)
 libsystemd-internal.DEPENDS          = $(topoutdir)/src/libsystemd/src/libsystemd-internal.la
 libsystemd-network.CPPFLAGS          = -I$(topsrcdir)/src/libsystemd-network/include
 libsystemd-network.DEPENDS           =   $(topoutdir)/src/libsystemd-network/src/libsystemd-network.la
 libsystemd.CPPFLAGS                  = -I$(topsrcdir)/src/libsystemd/include
 libsystemd.DEPENDS                   =   $(topoutdir)/src/libsystemd/libsystemd.la
+
 libudev.CPPFLAGS                     = -I$(topsrcdir)/src/libudev/include
 libudev.DEPENDS                      =   $(topoutdir)/src/libudev/src/libudev.la
-libudev-internal.CPPFLAGS            = $(libudev.CPPFLAGS)
+libudev-internal.CPPFLAGS            = $(libudev.CPPFLAGS) $(libbasic.CPPFLAGS)
 libudev-internal.DEPENDS             =   $(topoutdir)/src/libudev/src/libudev-internal.la
 # -core libs
 #libbus-proxy-core.CPPFLAGS =
diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp6.c b/src/grp-network/libnetworkd-core/networkd-dhcp6.c
index 4b0f93a222..c3d8f1df08 100644
--- a/src/grp-network/libnetworkd-core/networkd-dhcp6.c
+++ b/src/grp-network/libnetworkd-core/networkd-dhcp6.c
@@ -20,8 +20,7 @@
 #include <netinet/ether.h>
 #include <linux/if.h>
 
-#include <systemd/sd-dhcp6-client.h>
-
+#include "systemd-network/sd-dhcp6-client.h"
 #include "systemd-network/network-internal.h"
 #include "networkd.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-link.h b/src/grp-network/libnetworkd-core/networkd-link.h
index ddb8b41f23..76cdd7e42d 100644
--- a/src/grp-network/libnetworkd-core/networkd-link.h
+++ b/src/grp-network/libnetworkd-core/networkd-link.h
@@ -22,12 +22,12 @@
 #include <endian.h>
 
 #include <systemd/sd-bus.h>
-#include <systemd/sd-dhcp-client.h>
-#include <systemd/sd-dhcp-server.h>
-#include <systemd/sd-dhcp6-client.h>
-#include <systemd/sd-ipv4ll.h>
-#include <systemd/sd-lldp.h>
-#include <systemd/sd-ndisc.h>
+#include "systemd-network/sd-dhcp-client.h"
+#include "systemd-network/sd-dhcp-server.h"
+#include "systemd-network/sd-dhcp6-client.h"
+#include "systemd-network/sd-ipv4ll.h"
+#include "systemd-network/sd-lldp.h"
+#include "systemd-network/sd-ndisc.h"
 #include <systemd/sd-netlink.h>
 
 #include "basic/list.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-ndisc.c b/src/grp-network/libnetworkd-core/networkd-ndisc.c
index f3a4fc0fa5..1033ccc342 100644
--- a/src/grp-network/libnetworkd-core/networkd-ndisc.c
+++ b/src/grp-network/libnetworkd-core/networkd-ndisc.c
@@ -22,7 +22,7 @@
 #include <netinet/in.h>
 #include <linux/if.h>
 
-#include <systemd/sd-ndisc.h>
+#include "systemd-network/sd-ndisc.h"
 
 #include "networkd.h"
 
diff --git a/src/grp-network/networkctl/networkctl.c b/src/grp-network/networkctl/networkctl.c
index efbef4afed..8d443aef3d 100644
--- a/src/grp-network/networkctl/networkctl.c
+++ b/src/grp-network/networkctl/networkctl.c
@@ -23,7 +23,7 @@
 
 #include <systemd/sd-device.h>
 #include <systemd/sd-hwdb.h>
-#include <systemd/sd-lldp.h>
+#include "systemd-network/sd-lldp.h"
 #include <systemd/sd-netlink.h>
 #include <systemd/sd-network.h>
 
diff --git a/src/libsystemd-network/include/systemd-network/dhcp-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-internal.h
index dbfa4c93e6..ac9f9705eb 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp-internal.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp-internal.h
@@ -25,7 +25,7 @@
 #include <net/if_arp.h>
 #include <stdint.h>
 
-#include <systemd/sd-dhcp-client.h>
+#include "systemd-network/sd-dhcp-client.h"
 
 #include "systemd-network/dhcp-protocol.h"
 #include "basic/socket-util.h"
diff --git a/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h
index 0fb58c763e..048e89dc9a 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <linux/if_packet.h>
 
-#include <systemd/sd-dhcp-client.h>
+#include "systemd-network/sd-dhcp-client.h"
 
 #include "systemd-network/dhcp-protocol.h"
 #include "basic/list.h"
diff --git a/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h
index ecb8d35dde..97543b992a 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h
@@ -20,7 +20,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <systemd/sd-dhcp-server.h>
+#include "systemd-network/sd-dhcp-server.h"
 #include <systemd/sd-event.h>
 
 #include "systemd-network/dhcp-internal.h"
diff --git a/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h
index a3e442e6ee..c7c7a08769 100644
--- a/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h
+++ b/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 
-#include <systemd/sd-dhcp6-lease.h>
+#include "systemd-network/sd-dhcp6-lease.h"
 
 #include "systemd-network/dhcp6-internal.h"
 
diff --git a/src/libsystemd-network/include/systemd-network/lldp-internal.h b/src/libsystemd-network/include/systemd-network/lldp-internal.h
index 44857d6f63..9001237fe2 100644
--- a/src/libsystemd-network/include/systemd-network/lldp-internal.h
+++ b/src/libsystemd-network/include/systemd-network/lldp-internal.h
@@ -21,7 +21,7 @@
 ***/
 
 #include <systemd/sd-event.h>
-#include <systemd/sd-lldp.h>
+#include "systemd-network/sd-lldp.h"
 
 #include "basic/hashmap.h"
 #include "basic/log.h"
diff --git a/src/libsystemd-network/include/systemd-network/lldp-neighbor.h b/src/libsystemd-network/include/systemd-network/lldp-neighbor.h
index 600431e775..f2730bb608 100644
--- a/src/libsystemd-network/include/systemd-network/lldp-neighbor.h
+++ b/src/libsystemd-network/include/systemd-network/lldp-neighbor.h
@@ -23,7 +23,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include <systemd/sd-lldp.h>
+#include "systemd-network/sd-lldp.h"
 
 #include "basic/hash-funcs.h"
 #include "systemd-network/lldp-internal.h"
diff --git a/src/libsystemd-network/include/systemd-network/network-internal.h b/src/libsystemd-network/include/systemd-network/network-internal.h
index aa2d6c191c..a5606cb2a8 100644
--- a/src/libsystemd-network/include/systemd-network/network-internal.h
+++ b/src/libsystemd-network/include/systemd-network/network-internal.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include <systemd/sd-dhcp-lease.h>
+#include "systemd-network/sd-dhcp-lease.h"
 
 #include "shared/condition.h"
 #include "udev.h"
diff --git a/src/libsystemd/include/systemd/sd-dhcp-client.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h
index f7bd5c4b7a..ca254e5f9c 100644
--- a/src/libsystemd/include/systemd/sd-dhcp-client.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h
@@ -25,10 +25,10 @@
 #include <netinet/in.h>
 #include <sys/types.h>
 
-#include <systemd/sd-dhcp-lease.h>
+#include "systemd-network/sd-dhcp-lease.h"
 #include <systemd/sd-event.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/include/systemd/sd-dhcp-lease.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-lease.h
index 2f565ca825..014288b8c1 100644
--- a/src/libsystemd/include/systemd/sd-dhcp-lease.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-lease.h
@@ -26,7 +26,7 @@
 #include <netinet/in.h>
 #include <sys/types.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/include/systemd/sd-dhcp-server.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-server.h
index bbb2bb203c..e433d8562e 100644
--- a/src/libsystemd/include/systemd/sd-dhcp-server.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-server.h
@@ -26,7 +26,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/include/systemd/sd-dhcp6-client.h b/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h
index 6bcd9862c9..37243ef707 100644
--- a/src/libsystemd/include/systemd/sd-dhcp6-client.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h
@@ -24,10 +24,10 @@
 #include <net/ethernet.h>
 #include <sys/types.h>
 
-#include <systemd/sd-dhcp6-lease.h>
+#include "systemd-network/sd-dhcp6-lease.h"
 #include <systemd/sd-event.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/include/systemd/sd-dhcp6-lease.h b/src/libsystemd-network/include/systemd-network/sd-dhcp6-lease.h
index 184fbb8e0d..3e633548d0 100644
--- a/src/libsystemd/include/systemd/sd-dhcp6-lease.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp6-lease.h
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 #include <netinet/in.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/include/systemd/sd-ipv4acd.h b/src/libsystemd-network/include/systemd-network/sd-ipv4acd.h
index 93db7a4a6c..8246b5b267 100644
--- a/src/libsystemd/include/systemd/sd-ipv4acd.h
+++ b/src/libsystemd-network/include/systemd-network/sd-ipv4acd.h
@@ -26,7 +26,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/include/systemd/sd-ipv4ll.h b/src/libsystemd-network/include/systemd-network/sd-ipv4ll.h
index 9167623167..ab7233a856 100644
--- a/src/libsystemd/include/systemd/sd-ipv4ll.h
+++ b/src/libsystemd-network/include/systemd-network/sd-ipv4ll.h
@@ -25,7 +25,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/include/systemd/sd-lldp.h b/src/libsystemd-network/include/systemd-network/sd-lldp.h
index 391e7c2a2e..b611fdd37c 100644
--- a/src/libsystemd/include/systemd/sd-lldp.h
+++ b/src/libsystemd-network/include/systemd-network/sd-lldp.h
@@ -26,7 +26,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/include/systemd/sd-ndisc.h b/src/libsystemd-network/include/systemd-network/sd-ndisc.h
index c77a435d17..42ef961dac 100644
--- a/src/libsystemd/include/systemd/sd-ndisc.h
+++ b/src/libsystemd-network/include/systemd-network/sd-ndisc.h
@@ -25,7 +25,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd-network/src/dhcp6-option.c b/src/libsystemd-network/src/dhcp6-option.c
index aba31afd97..8c7c179587 100644
--- a/src/libsystemd-network/src/dhcp6-option.c
+++ b/src/libsystemd-network/src/dhcp6-option.c
@@ -21,7 +21,7 @@
 #include <netinet/in.h>
 #include <string.h>
 
-#include <systemd/sd-dhcp6-client.h>
+#include "systemd-network/sd-dhcp6-client.h"
 
 #include "basic/alloc-util.h"
 #include "systemd-network/dhcp6-internal.h"
diff --git a/src/libsystemd-network/src/network-internal.c b/src/libsystemd-network/src/network-internal.c
index ffc449d24b..e3973c11a9 100644
--- a/src/libsystemd-network/src/network-internal.c
+++ b/src/libsystemd-network/src/network-internal.c
@@ -21,7 +21,7 @@
 #include <linux/if.h>
 #include <netinet/ether.h>
 
-#include <systemd/sd-ndisc.h>
+#include "systemd-network/sd-ndisc.h"
 
 #include "basic/alloc-util.h"
 #include "shared/condition.h"
diff --git a/src/libsystemd-network/src/sd-dhcp-client.c b/src/libsystemd-network/src/sd-dhcp-client.c
index b1f2364689..7f734a7b37 100644
--- a/src/libsystemd-network/src/sd-dhcp-client.c
+++ b/src/libsystemd-network/src/sd-dhcp-client.c
@@ -26,7 +26,7 @@
 #include <sys/ioctl.h>
 #include <linux/if_infiniband.h>
 
-#include <systemd/sd-dhcp-client.h>
+#include "systemd-network/sd-dhcp-client.h"
 
 #include "basic/alloc-util.h"
 #include "basic/async.h"
diff --git a/src/libsystemd-network/src/sd-dhcp-lease.c b/src/libsystemd-network/src/sd-dhcp-lease.c
index 034924c529..d0e54ae376 100644
--- a/src/libsystemd-network/src/sd-dhcp-lease.c
+++ b/src/libsystemd-network/src/sd-dhcp-lease.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <systemd/sd-dhcp-lease.h>
+#include "systemd-network/sd-dhcp-lease.h"
 
 #include "basic/alloc-util.h"
 #include "systemd-network/dhcp-lease-internal.h"
diff --git a/src/libsystemd-network/src/sd-dhcp-server.c b/src/libsystemd-network/src/sd-dhcp-server.c
index 91866ca541..2209855067 100644
--- a/src/libsystemd-network/src/sd-dhcp-server.c
+++ b/src/libsystemd-network/src/sd-dhcp-server.c
@@ -20,7 +20,7 @@
 
 #include <sys/ioctl.h>
 
-#include <systemd/sd-dhcp-server.h>
+#include "systemd-network/sd-dhcp-server.h"
 
 #include "basic/alloc-util.h"
 #include "systemd-network/dhcp-internal.h"
diff --git a/src/libsystemd-network/src/sd-dhcp6-client.c b/src/libsystemd-network/src/sd-dhcp6-client.c
index 1bd351d479..c2aa36aa9d 100644
--- a/src/libsystemd-network/src/sd-dhcp6-client.c
+++ b/src/libsystemd-network/src/sd-dhcp6-client.c
@@ -22,7 +22,7 @@
 #include <sys/ioctl.h>
 #include <linux/if_infiniband.h>
 
-#include <systemd/sd-dhcp6-client.h>
+#include "systemd-network/sd-dhcp6-client.h"
 
 #include "basic/alloc-util.h"
 #include "systemd-network/dhcp-identifier.h"
diff --git a/src/libsystemd-network/src/sd-ipv4acd.c b/src/libsystemd-network/src/sd-ipv4acd.c
index 08f95fda93..8c603d8a7d 100644
--- a/src/libsystemd-network/src/sd-ipv4acd.c
+++ b/src/libsystemd-network/src/sd-ipv4acd.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <systemd/sd-ipv4acd.h>
+#include "systemd-network/sd-ipv4acd.h"
 
 #include "basic/alloc-util.h"
 #include "systemd-network/arp-util.h"
diff --git a/src/libsystemd-network/src/sd-ipv4ll.c b/src/libsystemd-network/src/sd-ipv4ll.c
index 2547821cef..fc3c0dd090 100644
--- a/src/libsystemd-network/src/sd-ipv4ll.c
+++ b/src/libsystemd-network/src/sd-ipv4ll.c
@@ -24,8 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <systemd/sd-ipv4acd.h>
-#include <systemd/sd-ipv4ll.h>
+#include "systemd-network/sd-ipv4acd.h"
+#include "systemd-network/sd-ipv4ll.h"
 
 #include "basic/alloc-util.h"
 #include "basic/in-addr-util.h"
diff --git a/src/libsystemd-network/src/sd-lldp.c b/src/libsystemd-network/src/sd-lldp.c
index 6586279161..09c5ba5a5b 100644
--- a/src/libsystemd-network/src/sd-lldp.c
+++ b/src/libsystemd-network/src/sd-lldp.c
@@ -20,7 +20,7 @@
 
 #include <arpa/inet.h>
 
-#include <systemd/sd-lldp.h>
+#include "systemd-network/sd-lldp.h"
 
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
diff --git a/src/libsystemd-network/src/sd-ndisc.c b/src/libsystemd-network/src/sd-ndisc.c
index 514946c511..0e19febff1 100644
--- a/src/libsystemd-network/src/sd-ndisc.c
+++ b/src/libsystemd-network/src/sd-ndisc.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <sys/ioctl.h>
 
-#include <systemd/sd-ndisc.h>
+#include "systemd-network/sd-ndisc.h"
 
 #include "basic/alloc-util.h"
 #include "basic/async.h"
diff --git a/src/libsystemd-network/test/test-acd.c b/src/libsystemd-network/test/test-acd.c
index edbf27beb3..922185bc7a 100644
--- a/src/libsystemd-network/test/test-acd.c
+++ b/src/libsystemd-network/test/test-acd.c
@@ -25,7 +25,7 @@
 #include <net/if.h>
 
 #include <systemd/sd-event.h>
-#include <systemd/sd-ipv4acd.h>
+#include "systemd-network/sd-ipv4acd.h"
 #include <systemd/sd-netlink.h>
 
 #include "basic/in-addr-util.h"
diff --git a/src/libsystemd-network/test/test-dhcp-client.c b/src/libsystemd-network/test/test-dhcp-client.c
index f8eb7e9999..bee542ac42 100644
--- a/src/libsystemd-network/test/test-dhcp-client.c
+++ b/src/libsystemd-network/test/test-dhcp-client.c
@@ -22,7 +22,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include <systemd/sd-dhcp-client.h>
+#include "systemd-network/sd-dhcp-client.h"
 #include <systemd/sd-event.h>
 
 #include "basic/alloc-util.h"
diff --git a/src/libsystemd-network/test/test-dhcp-server.c b/src/libsystemd-network/test/test-dhcp-server.c
index 34a67fcc73..d7029d1cc5 100644
--- a/src/libsystemd-network/test/test-dhcp-server.c
+++ b/src/libsystemd-network/test/test-dhcp-server.c
@@ -20,7 +20,7 @@
 
 #include <errno.h>
 
-#include <systemd/sd-dhcp-server.h>
+#include "systemd-network/sd-dhcp-server.h"
 #include <systemd/sd-event.h>
 
 #include "systemd-network/dhcp-server-internal.h"
diff --git a/src/libsystemd-network/test/test-dhcp6-client.c b/src/libsystemd-network/test/test-dhcp6-client.c
index 710f1fe0d4..9709fabf74 100644
--- a/src/libsystemd-network/test/test-dhcp6-client.c
+++ b/src/libsystemd-network/test/test-dhcp6-client.c
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <systemd/sd-dhcp6-client.h>
+#include "systemd-network/sd-dhcp6-client.h"
 #include <systemd/sd-event.h>
 
 #include "systemd-network/dhcp6-internal.h"
diff --git a/src/libsystemd-network/test/test-ipv4ll-manual.c b/src/libsystemd-network/test/test-ipv4ll-manual.c
index f7188595df..7dd669131d 100644
--- a/src/libsystemd-network/test/test-ipv4ll-manual.c
+++ b/src/libsystemd-network/test/test-ipv4ll-manual.c
@@ -24,7 +24,7 @@
 #include <linux/veth.h>
 
 #include <systemd/sd-event.h>
-#include <systemd/sd-ipv4ll.h>
+#include "systemd-network/sd-ipv4ll.h"
 #include <systemd/sd-netlink.h>
 
 #include "basic/alloc-util.h"
diff --git a/src/libsystemd-network/test/test-ipv4ll.c b/src/libsystemd-network/test/test-ipv4ll.c
index ff594c1038..afb69a22fc 100644
--- a/src/libsystemd-network/test/test-ipv4ll.c
+++ b/src/libsystemd-network/test/test-ipv4ll.c
@@ -25,9 +25,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <systemd/sd-ipv4ll.h>
-
+#include "systemd-network/sd-ipv4ll.h"
 #include "systemd-network/arp-util.h"
+
 #include "basic/fd-util.h"
 #include "basic/socket-util.h"
 #include "basic/util.h"
diff --git a/src/libsystemd-network/test/test-lldp.c b/src/libsystemd-network/test/test-lldp.c
index f3480c28d6..ea625ea28b 100644
--- a/src/libsystemd-network/test/test-lldp.c
+++ b/src/libsystemd-network/test/test-lldp.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 
 #include <systemd/sd-event.h>
-#include <systemd/sd-lldp.h>
+#include "systemd-network/sd-lldp.h"
 
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
diff --git a/src/libsystemd-network/test/test-ndisc-rs.c b/src/libsystemd-network/test/test-ndisc-rs.c
index 4878ad2429..200983b4ab 100644
--- a/src/libsystemd-network/test/test-ndisc-rs.c
+++ b/src/libsystemd-network/test/test-ndisc-rs.c
@@ -19,7 +19,7 @@
 
 #include <netinet/icmp6.h>
 
-#include <systemd/sd-ndisc.h>
+#include "systemd-network/sd-ndisc.h"
 
 #include "systemd-network/icmp6-util.h"
 #include "basic/socket-util.h"
diff --git a/src/libudev/src/libudev-private.h b/src/libudev/src/libudev-private.h
index 717601766c..8dfc8d6fe7 100644
--- a/src/libudev/src/libudev-private.h
+++ b/src/libudev/src/libudev-private.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "libudev.h"
+#include <libudev.h>
 
 #include "basic/macro.h"
 #include "basic/mkdir.h"
diff --git a/src/libudev/src/udev.h b/src/libudev/src/udev.h
index 7b5a308e58..d50ad1c828 100644
--- a/src/libudev/src/udev.h
+++ b/src/libudev/src/udev.h
@@ -22,15 +22,16 @@
 #include <sys/sysmacros.h>
 #include <sys/types.h>
 
-#include "libudev.h"
+#include <libudev.h>
 #include <systemd/sd-netlink.h>
 
 #include "basic/label.h"
-#include "libudev-private.h"
 #include "basic/macro.h"
 #include "basic/strv.h"
 #include "basic/util.h"
 
+#include "libudev-private.h"
+
 struct udev_event {
         struct udev *udev;
         struct udev_device *dev;