headerssss

59 files changed, 246 insertions, 120 deletions

diff --git a/src/grp-network/libnetworkd-core/networkd-link.h b/src/grp-network/libnetworkd-core/networkd-link.h
index 76cdd7e42d..ac10bd41b7 100644
--- a/src/grp-network/libnetworkd-core/networkd-link.h
+++ b/src/grp-network/libnetworkd-core/networkd-link.h
@@ -22,16 +22,16 @@
 #include <endian.h>
 
 #include <systemd/sd-bus.h>
+
+#include "basic/list.h"
+#include "basic/set.h"
+#include "sd-netlink/sd-netlink.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"
-#include "basic/set.h"
 
 typedef enum LinkState {
         LINK_STATE_PENDING,
diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c
index 6226c24b01..8f57e890ae 100644
--- a/src/grp-network/libnetworkd-core/networkd-manager.c
+++ b/src/grp-network/libnetworkd-core/networkd-manager.c
@@ -21,24 +21,25 @@
 #include <linux/if.h>
 
 #include <systemd/sd-daemon.h>
-#include <systemd/sd-netlink.h>
 
 #include "basic/alloc-util.h"
-#include "shared/bus-util.h"
-#include "shared/conf-parser.h"
 #include "basic/def.h"
-#include "shared/dns-domain.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
-#include "libudev-private.h"
-#include "local-addresses.h"
-#include "netlink-util.h"
-#include "networkd.h"
 #include "basic/ordered-set.h"
 #include "basic/path-util.h"
 #include "basic/set.h"
-#include "shared/udev-util.h"
 #include "basic/virt.h"
+#include "sd-netlink/sd-netlink.h"
+#include "shared/bus-util.h"
+#include "shared/conf-parser.h"
+#include "shared/dns-domain.h"
+#include "shared/udev-util.h"
+
+#include "libudev-private.h"
+#include "local-addresses.h"
+#include "netlink-util.h"
+#include "networkd.h"
 
 /* use 8 MB for receive socket kernel queue. */
 #define RCVBUF_SIZE    (8*1024*1024)
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
index fc1d4eb12f..6f55c3ee06 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c
@@ -21,15 +21,15 @@
 #include <netinet/ether.h>
 #include <linux/if_bonding.h>
 
-#include <systemd/sd-netlink.h>
-
 #include "basic/alloc-util.h"
-#include "shared/conf-parser.h"
 #include "basic/extract-word.h"
 #include "basic/missing.h"
-#include "networkd-netdev-bond.h"
 #include "basic/string-table.h"
 #include "basic/string-util.h"
+#include "sd-netlink/sd-netlink.h"
+#include "shared/conf-parser.h"
+
+#include "networkd-netdev-bond.h"
 
 /*
  * Number of seconds between instances where the bonding
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
index 16bb8a56e8..1ede86737f 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
@@ -23,16 +23,16 @@
 #include <linux/if_tunnel.h>
 #include <linux/ip6_tunnel.h>
 
-#include <systemd/sd-netlink.h>
-
-#include "shared/conf-parser.h"
 #include "basic/missing.h"
-#include "networkd-link.h"
-#include "networkd-netdev-tunnel.h"
 #include "basic/parse-util.h"
 #include "basic/string-table.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
+#include "sd-netlink/sd-netlink.h"
+#include "shared/conf-parser.h"
+
+#include "networkd-link.h"
+#include "networkd-netdev-tunnel.h"
 
 #define DEFAULT_TNL_HOP_LIMIT   64
 #define IP6_FLOWINFO_FLOWLABEL  htonl(0x000FFFFF)
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.h b/src/grp-network/libnetworkd-core/networkd-netdev.h
index fcfee9e234..43311852b2 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev.h
+++ b/src/grp-network/libnetworkd-core/networkd-netdev.h
@@ -19,10 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <systemd/sd-netlink.h>
-
 #include "basic/list.h"
 #include "basic/time-util.h"
+#include "sd-netlink/sd-netlink.h"
 
 typedef struct netdev_join_callback netdev_join_callback;
 typedef struct Link Link;
diff --git a/src/grp-network/networkctl/networkctl.c b/src/grp-network/networkctl/networkctl.c
index 8d443aef3d..205b051f9a 100644
--- a/src/grp-network/networkctl/networkctl.c
+++ b/src/grp-network/networkctl/networkctl.c
@@ -23,20 +23,14 @@
 
 #include <systemd/sd-device.h>
 #include <systemd/sd-hwdb.h>
-#include "systemd-network/sd-lldp.h"
 #include <systemd/sd-netlink.h>
 #include <systemd/sd-network.h>
 
 #include "basic/alloc-util.h"
 #include "basic/arphrd-list.h"
-#include "device-util.h"
 #include "basic/ether-addr-util.h"
 #include "basic/fd-util.h"
-#include "hwdb-util.h"
-#include "local-addresses.h"
 #include "basic/locale-util.h"
-#include "netlink-util.h"
-#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/socket-util.h"
 #include "basic/sparse-endian.h"
@@ -48,6 +42,13 @@
 #include "basic/terminal-util.h"
 #include "basic/util.h"
 #include "basic/verbs.h"
+#include "shared/pager.h"
+#include "systemd-network/sd-lldp.h"
+
+#include "device-util.h"
+#include "hwdb-util.h"
+#include "local-addresses.h"
+#include "netlink-util.h"
 
 static bool arg_no_pager = false;
 static bool arg_legend = true;
diff --git a/src/grp-resolve/systemd-resolved/resolved-link.c b/src/grp-resolve/systemd-resolved/resolved-link.c
index 6172a763dc..1d23e49172 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link.c
+++ b/src/grp-resolve/systemd-resolved/resolved-link.c
@@ -19,14 +19,14 @@
 
 #include <net/if.h>
 
-#include <systemd/sd-network.h>
-
 #include "basic/alloc-util.h"
 #include "basic/missing.h"
 #include "basic/parse-util.h"
-#include "resolved-link.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
+#include "sd-network/sd-network.h"
+
+#include "resolved-link.h"
 
 int link_new(Manager *m, Link **ret, int ifindex) {
         _cleanup_(link_freep) Link *l = NULL;
diff --git a/src/grp-resolve/systemd-resolved/resolved-manager.h b/src/grp-resolve/systemd-resolved/resolved-manager.h
index 1860994463..dd2a534213 100644
--- a/src/grp-resolve/systemd-resolved/resolved-manager.h
+++ b/src/grp-resolve/systemd-resolved/resolved-manager.h
@@ -20,12 +20,12 @@
 ***/
 
 #include <systemd/sd-event.h>
-#include <systemd/sd-netlink.h>
-#include <systemd/sd-network.h>
 
 #include "basic/hashmap.h"
 #include "basic/list.h"
 #include "basic/ordered-set.h"
+#include "sd-netlink/sd-netlink.h"
+#include "sd-network/sd-network.h"
 #include "shared/resolve-util.h"
 
 typedef struct Manager Manager;
diff --git a/src/grp-udev/libudev-core/net/link-config.c b/src/grp-udev/libudev-core/net/link-config.c
index 7c93c561b3..c2cd3dcc3c 100644
--- a/src/grp-udev/libudev-core/net/link-config.c
+++ b/src/grp-udev/libudev-core/net/link-config.c
@@ -19,19 +19,11 @@
 
 #include <netinet/ether.h>
 
-#include <systemd/sd-netlink.h>
-
 #include "basic/alloc-util.h"
 #include "basic/conf-files.h"
-#include "shared/conf-parser.h"
-#include "ethtool-util.h"
 #include "basic/fd-util.h"
-#include "libudev-private.h"
-#include "link-config.h"
 #include "basic/log.h"
 #include "basic/missing.h"
-#include "sd-netlink/netlink-util.h"
-#include "systemd-network/network-internal.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/proc-cmdline.h"
@@ -41,6 +33,14 @@
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/util.h"
+#include "sd-netlink/netlink-util.h"
+#include "sd-netlink/sd-netlink.h"
+#include "shared/conf-parser.h"
+#include "systemd-network/network-internal.h"
+#include "libudev-private.h"
+
+#include "ethtool-util.h"
+#include "link-config.h"
 
 struct link_config_ctx {
         LIST_HEAD(link_config, links);
diff --git a/src/grp-udev/libudev-core/udev-builtin-hwdb.c b/src/grp-udev/libudev-core/udev-builtin-hwdb.c
index 24f4ba0744..a5290ebf2b 100644
--- a/src/grp-udev/libudev-core/udev-builtin-hwdb.c
+++ b/src/grp-udev/libudev-core/udev-builtin-hwdb.c
@@ -22,13 +22,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <systemd/sd-hwdb.h>
+#include "udev.h"
 
 #include "basic/alloc-util.h"
-#include "sd-hwdb/hwdb-util.h"
 #include "basic/string-util.h"
+#include "sd-hwdb/hwdb-util.h"
+#include "sd-hwdb/sd-hwdb.h"
 #include "shared/udev-util.h"
-#include "udev.h"
 
 static sd_hwdb *hwdb;
 
diff --git a/src/libcore/loopback-setup.c b/src/libcore/loopback-setup.c
index 8affda895c..f92e346f8c 100644
--- a/src/libcore/loopback-setup.c
+++ b/src/libcore/loopback-setup.c
@@ -20,10 +20,10 @@
 #include <net/if.h>
 #include <stdlib.h>
 
-#include <systemd/sd-netlink.h>
+#include "basic/missing.h"
+#include "sd-netlink/sd-netlink.h"
 
 #include "loopback-setup.h"
-#include "basic/missing.h"
 
 static int start_loopback(sd_netlink *rtnl) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
diff --git a/src/libsystemd-network/test/test-acd.c b/src/libsystemd-network/test/test-acd.c
index 922185bc7a..bf3f401ade 100644
--- a/src/libsystemd-network/test/test-acd.c
+++ b/src/libsystemd-network/test/test-acd.c
@@ -25,12 +25,12 @@
 #include <net/if.h>
 
 #include <systemd/sd-event.h>
-#include "systemd-network/sd-ipv4acd.h"
-#include <systemd/sd-netlink.h>
 
 #include "basic/in-addr-util.h"
-#include "netlink-util.h"
 #include "basic/util.h"
+#include "sd-netlink/netlink-util.h"
+#include "sd-netlink/sd-netlink.h"
+#include "systemd-network/sd-ipv4acd.h"
 
 static void acd_handler(sd_ipv4acd *acd, int event, void *userdata) {
         assert_se(acd);
diff --git a/src/libsystemd-network/test/test-ipv4ll-manual.c b/src/libsystemd-network/test/test-ipv4ll-manual.c
index 7dd669131d..aba41f4af9 100644
--- a/src/libsystemd-network/test/test-ipv4ll-manual.c
+++ b/src/libsystemd-network/test/test-ipv4ll-manual.c
@@ -24,15 +24,15 @@
 #include <linux/veth.h>
 
 #include <systemd/sd-event.h>
-#include "systemd-network/sd-ipv4ll.h"
-#include <systemd/sd-netlink.h>
 
 #include "basic/alloc-util.h"
 #include "basic/in-addr-util.h"
-#include "netlink-util.h"
 #include "basic/parse-util.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
+#include "sd-netlink/netlink-util.h"
+#include "sd-netlink/sd-netlink.h"
+#include "systemd-network/sd-ipv4ll.h"
 
 static void ll_handler(sd_ipv4ll *ll, int event, void *userdata) {
         _cleanup_free_ char *address = NULL;
diff --git a/src/libsystemd/src/sd-device/Makefile b/src/libsystemd/src/sd-device/Makefile
index 71a1159ce0..821bb70dfc 120000..100644
--- a/src/libsystemd/src/sd-device/Makefile
+++ b/src/libsystemd/src/sd-device/Makefile
@@ -1 +1,31 @@
-../subdir.mk
\ No newline at end of file
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
+systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
+systemd.CPPFLAGS += $(libshared.CPPFLAGS)
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/sd-device/device-enumerator-private.h b/src/libsystemd/src/sd-device/device-enumerator-private.h
index d46e26b56e..eb06f9542d 100644
--- a/src/libsystemd/src/sd-device/device-enumerator-private.h
+++ b/src/libsystemd/src/sd-device/device-enumerator-private.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <systemd/sd-device.h>
+#include "sd-device.h"
 
 int device_enumerator_scan_devices(sd_device_enumerator *enumeartor);
 int device_enumerator_scan_subsystems(sd_device_enumerator *enumeartor);
diff --git a/src/libsystemd/src/sd-device/device-enumerator.c b/src/libsystemd/src/sd-device/device-enumerator.c
index db3228d707..97f3453898 100644
--- a/src/libsystemd/src/sd-device/device-enumerator.c
+++ b/src/libsystemd/src/sd-device/device-enumerator.c
@@ -18,7 +18,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <systemd/sd-device.h>
+#include "sd-device.h"
 
 #include "basic/alloc-util.h"
 #include "device-enumerator-private.h"
diff --git a/src/libsystemd/src/sd-device/device-private.c b/src/libsystemd/src/sd-device/device-private.c
index f1c2ada066..dce2ba091a 100644
--- a/src/libsystemd/src/sd-device/device-private.c
+++ b/src/libsystemd/src/sd-device/device-private.c
@@ -22,7 +22,7 @@
 #include <net/if.h>
 #include <sys/types.h>
 
-#include <systemd/sd-device.h>
+#include "sd-device.h"
 
 #include "basic/alloc-util.h"
 #include "device-internal.h"
diff --git a/src/libsystemd/src/sd-device/device-private.h b/src/libsystemd/src/sd-device/device-private.h
index d6add2f7b2..29b3e155fb 100644
--- a/src/libsystemd/src/sd-device/device-private.h
+++ b/src/libsystemd/src/sd-device/device-private.h
@@ -23,7 +23,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include <systemd/sd-device.h>
+#include "sd-device.h"
 
 int device_new_from_nulstr(sd_device **ret, uint8_t *nulstr, size_t len);
 int device_new_from_strv(sd_device **ret, char **strv);
diff --git a/src/libsystemd/src/sd-device/sd-device.c b/src/libsystemd/src/sd-device/sd-device.c
index 5a7e34a77b..20c7684b97 100644
--- a/src/libsystemd/src/sd-device/sd-device.c
+++ b/src/libsystemd/src/sd-device/sd-device.c
@@ -22,7 +22,7 @@
 #include <net/if.h>
 #include <sys/types.h>
 
-#include <systemd/sd-device.h>
+#include "sd-device.h"
 
 #include "basic/alloc-util.h"
 #include "device-internal.h"
diff --git a/src/libsystemd/include/systemd/sd-device.h b/src/libsystemd/src/sd-device/sd-device.h
index c1d07561d7..5e32fc6110 100644
--- a/src/libsystemd/include/systemd/sd-device.h
+++ b/src/libsystemd/src/sd-device/sd-device.h
@@ -25,7 +25,7 @@
 #include <sys/sysmacros.h>
 #include <sys/types.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/src/sd-hwdb/Makefile b/src/libsystemd/src/sd-hwdb/Makefile
index 71a1159ce0..821bb70dfc 120000..100644
--- a/src/libsystemd/src/sd-hwdb/Makefile
+++ b/src/libsystemd/src/sd-hwdb/Makefile
@@ -1 +1,31 @@
-../subdir.mk
\ No newline at end of file
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
+systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
+systemd.CPPFLAGS += $(libshared.CPPFLAGS)
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/sd-hwdb/hwdb-util.h b/src/libsystemd/src/sd-hwdb/hwdb-util.h
index c3cba2e9a0..63c154d34e 100644
--- a/src/libsystemd/src/sd-hwdb/hwdb-util.h
+++ b/src/libsystemd/src/sd-hwdb/hwdb-util.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <systemd/sd-hwdb.h>
+#include "sd-hwdb.h"
 
 #include "basic/util.h"
 
diff --git a/src/libsystemd/src/sd-hwdb/sd-hwdb.c b/src/libsystemd/src/sd-hwdb/sd-hwdb.c
index 8127b7c5c6..9964599c99 100644
--- a/src/libsystemd/src/sd-hwdb/sd-hwdb.c
+++ b/src/libsystemd/src/sd-hwdb/sd-hwdb.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <sys/mman.h>
 
-#include <systemd/sd-hwdb.h>
+#include "sd-hwdb.h"
 
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
diff --git a/src/libsystemd/include/systemd/sd-hwdb.h b/src/libsystemd/src/sd-hwdb/sd-hwdb.h
index 7105920492..f46d7ad561 100644
--- a/src/libsystemd/include/systemd/sd-hwdb.h
+++ b/src/libsystemd/src/sd-hwdb/sd-hwdb.h
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/src/sd-netlink/local-addresses.c b/src/libsystemd/src/sd-netlink/local-addresses.c
index 5ab5ba6ea6..f2382847dd 100644
--- a/src/libsystemd/src/sd-netlink/local-addresses.c
+++ b/src/libsystemd/src/sd-netlink/local-addresses.c
@@ -18,7 +18,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <systemd/sd-netlink.h>
+#include "sd-netlink.h"
 
 #include "basic/alloc-util.h"
 #include "local-addresses.h"
diff --git a/src/libsystemd/src/sd-netlink/local-addresses.h b/src/libsystemd/src/sd-netlink/local-addresses.h
index 7267940520..498797f515 100644
--- a/src/libsystemd/src/sd-netlink/local-addresses.h
+++ b/src/libsystemd/src/sd-netlink/local-addresses.h
@@ -20,7 +20,7 @@
 ***/
 
 
-#include <systemd/sd-netlink.h>
+#include "sd-netlink.h"
 
 #include "basic/in-addr-util.h"
 
diff --git a/src/libsystemd/src/sd-netlink/netlink-internal.h b/src/libsystemd/src/sd-netlink/netlink-internal.h
index ecb3a5eda7..d989789fe5 100644
--- a/src/libsystemd/src/sd-netlink/netlink-internal.h
+++ b/src/libsystemd/src/sd-netlink/netlink-internal.h
@@ -21,7 +21,7 @@
 
 #include <linux/netlink.h>
 
-#include <systemd/sd-netlink.h>
+#include "sd-netlink.h"
 
 #include "basic/list.h"
 #include "netlink-types.h"
diff --git a/src/libsystemd/src/sd-netlink/netlink-message.c b/src/libsystemd/src/sd-netlink/netlink-message.c
index 115c6416ab..c885b97117 100644
--- a/src/libsystemd/src/sd-netlink/netlink-message.c
+++ b/src/libsystemd/src/sd-netlink/netlink-message.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include <systemd/sd-netlink.h>
+#include "sd-netlink.h"
 
 #include "basic/alloc-util.h"
 #include "basic/formats-util.h"
diff --git a/src/libsystemd/src/sd-netlink/netlink-socket.c b/src/libsystemd/src/sd-netlink/netlink-socket.c
index 4b7037720d..8e0e5d2b04 100644
--- a/src/libsystemd/src/sd-netlink/netlink-socket.c
+++ b/src/libsystemd/src/sd-netlink/netlink-socket.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include <systemd/sd-netlink.h>
+#include "sd-netlink.h"
 
 #include "basic/alloc-util.h"
 #include "basic/formats-util.h"
diff --git a/src/libsystemd/src/sd-netlink/netlink-util.c b/src/libsystemd/src/sd-netlink/netlink-util.c
index 828ae7db7f..73b9ac0258 100644
--- a/src/libsystemd/src/sd-netlink/netlink-util.c
+++ b/src/libsystemd/src/sd-netlink/netlink-util.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <systemd/sd-netlink.h>
+#include "sd-netlink.h"
 
 #include "netlink-internal.h"
 #include "netlink-util.h"
diff --git a/src/libsystemd/src/sd-netlink/netlink-util.h b/src/libsystemd/src/sd-netlink/netlink-util.h
index ad723b0f67..ddd25e36be 100644
--- a/src/libsystemd/src/sd-netlink/netlink-util.h
+++ b/src/libsystemd/src/sd-netlink/netlink-util.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <systemd/sd-netlink.h>
+#include "sd-netlink.h"
 
 #include "basic/util.h"
 
diff --git a/src/libsystemd/src/sd-netlink/rtnl-message.c b/src/libsystemd/src/sd-netlink/rtnl-message.c
index 18c2ad4945..0c1b7b3218 100644
--- a/src/libsystemd/src/sd-netlink/rtnl-message.c
+++ b/src/libsystemd/src/sd-netlink/rtnl-message.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include <systemd/sd-netlink.h>
+#include "sd-netlink.h"
 
 #include "basic/formats-util.h"
 #include "basic/missing.h"
diff --git a/src/libsystemd/src/sd-netlink/sd-netlink.c b/src/libsystemd/src/sd-netlink/sd-netlink.c
index 90745ec0c9..2314dfabe8 100644
--- a/src/libsystemd/src/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/src/sd-netlink/sd-netlink.c
@@ -20,7 +20,7 @@
 #include <poll.h>
 #include <sys/socket.h>
 
-#include <systemd/sd-netlink.h>
+#include "sd-netlink.h"
 
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
diff --git a/src/libsystemd/include/systemd/sd-netlink.h b/src/libsystemd/src/sd-netlink/sd-netlink.h
index c4cefe4e30..1faca07ce8 100644
--- a/src/libsystemd/include/systemd/sd-netlink.h
+++ b/src/libsystemd/src/sd-netlink/sd-netlink.h
@@ -28,7 +28,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/src/sd-netlink/test-netlink.c b/src/libsystemd/src/sd-netlink/test-netlink.c
index 704b5a83b2..90513fa5a2 100644
--- a/src/libsystemd/src/sd-netlink/test-netlink.c
+++ b/src/libsystemd/src/sd-netlink/test-netlink.c
@@ -20,7 +20,7 @@
 #include <net/if.h>
 #include <netinet/ether.h>
 
-#include <systemd/sd-netlink.h>
+#include "sd-netlink.h"
 
 #include "basic/ether-addr-util.h"
 #include "basic/macro.h"
diff --git a/src/libsystemd/src/sd-network/Makefile b/src/libsystemd/src/sd-network/Makefile
index 71a1159ce0..821bb70dfc 120000..100644
--- a/src/libsystemd/src/sd-network/Makefile
+++ b/src/libsystemd/src/sd-network/Makefile
@@ -1 +1,31 @@
-../subdir.mk
\ No newline at end of file
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
+systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
+systemd.CPPFLAGS += $(libshared.CPPFLAGS)
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/sd-network/network-util.h b/src/libsystemd/src/sd-network/network-util.h
index 8c4dbc68b1..26780dce28 100644
--- a/src/libsystemd/src/sd-network/network-util.h
+++ b/src/libsystemd/src/sd-network/network-util.h
@@ -19,6 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <systemd/sd-network.h>
+#include "sd-network.h"
 
 bool network_is_online(void);
diff --git a/src/libsystemd/src/sd-network/sd-network.c b/src/libsystemd/src/sd-network/sd-network.c
index 5c0f9d05e3..e97a68f566 100644
--- a/src/libsystemd/src/sd-network/sd-network.c
+++ b/src/libsystemd/src/sd-network/sd-network.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <sys/inotify.h>
 
-#include <systemd/sd-network.h>
+#include "sd-network.h"
 
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
diff --git a/src/libsystemd/include/systemd/sd-network.h b/src/libsystemd/src/sd-network/sd-network.h
index 0f13e2bae7..ac2660de45 100644
--- a/src/libsystemd/include/systemd/sd-network.h
+++ b/src/libsystemd/src/sd-network/sd-network.h
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 #include <sys/types.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 /*
  * A few points:
diff --git a/src/libsystemd/src/sd-resolve/Makefile b/src/libsystemd/src/sd-resolve/Makefile
index 71a1159ce0..2b0ea2c84f 120000..100644
--- a/src/libsystemd/src/sd-resolve/Makefile
+++ b/src/libsystemd/src/sd-resolve/Makefile
@@ -1 +1,32 @@
-../subdir.mk
\ No newline at end of file
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
+systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
+systemd.CPPFLAGS += $(libshared.CPPFLAGS)
+systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/sd-resolve/sd-resolve.c b/src/libsystemd/src/sd-resolve/sd-resolve.c
index 6a1eae4d9f..001f527c68 100644
--- a/src/libsystemd/src/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/src/sd-resolve/sd-resolve.c
@@ -29,7 +29,7 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
-#include <systemd/sd-resolve.h>
+#include "sd-resolve.h"
 
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
diff --git a/src/libsystemd/include/systemd/sd-resolve.h b/src/libsystemd/src/sd-resolve/sd-resolve.h
index fe3b910671..2e718ec543 100644
--- a/src/libsystemd/include/systemd/sd-resolve.h
+++ b/src/libsystemd/src/sd-resolve/sd-resolve.h
@@ -27,7 +27,7 @@
 
 #include <systemd/sd-event.h>
 
-#include "_sd-common.h"
+#include <systemd/_sd-common.h>
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/src/sd-resolve/test-resolve.c b/src/libsystemd/src/sd-resolve/test-resolve.c
index ac5cc0c28d..59dd0d540f 100644
--- a/src/libsystemd/src/sd-resolve/test-resolve.c
+++ b/src/libsystemd/src/sd-resolve/test-resolve.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <sys/socket.h>
 
-#include <systemd/sd-resolve.h>
+#include "sd-resolve.h"
 
 #include "basic/alloc-util.h"
 #include "basic/macro.h"
diff --git a/src/libudev/src/libudev-device-internal.h b/src/libudev/src/libudev-device-internal.h
index f76da09407..fd3711626c 100644
--- a/src/libudev/src/libudev-device-internal.h
+++ b/src/libudev/src/libudev-device-internal.h
@@ -21,7 +21,8 @@
 ***/
 
 #include "libudev.h"
-#include <systemd/sd-device.h>
+
+#include "sd-device/sd-device.h"
 
 #include "libudev-private.h"
 
diff --git a/src/libudev/src/libudev-device-private.c b/src/libudev/src/libudev-device-private.c
index bd18d60c1e..654895e652 100644
--- a/src/libudev/src/libudev-device-private.c
+++ b/src/libudev/src/libudev-device-private.c
@@ -21,6 +21,7 @@
 #include "libudev.h"
 
 #include "sd-device/device-private.h"
+
 #include "libudev-device-internal.h"
 #include "libudev-private.h"
 
diff --git a/src/libudev/src/libudev-device.c b/src/libudev/src/libudev-device.c
index 3ad59176b3..dc4b0deb83 100644
--- a/src/libudev/src/libudev-device.c
+++ b/src/libudev/src/libudev-device.c
@@ -34,15 +34,16 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "libudev.h"
-#include <systemd/sd-device.h>
+#include <libudev.h>
 
 #include "basic/alloc-util.h"
+#include "basic/parse-util.h"
 #include "sd-device/device-private.h"
 #include "sd-device/device-util.h"
+#include "sd-device/sd-device.h"
+
 #include "libudev-device-internal.h"
 #include "libudev-private.h"
-#include "basic/parse-util.h"
 
 /**
  * SECTION:libudev-device
diff --git a/src/libudev/src/libudev-enumerate.c b/src/libudev/src/libudev-enumerate.c
index a58779866e..4b24c437e0 100644
--- a/src/libudev/src/libudev-enumerate.c
+++ b/src/libudev/src/libudev-enumerate.c
@@ -29,11 +29,12 @@
 #include <sys/stat.h>
 
 #include "libudev.h"
-#include <systemd/sd-device.h>
 
 #include "basic/alloc-util.h"
 #include "sd-device/device-enumerator-private.h"
 #include "sd-device/device-util.h"
+#include "sd-device/sd-device.h"
+
 #include "libudev-device-internal.h"
 
 /**
diff --git a/src/libudev/src/libudev-hwdb.c b/src/libudev/src/libudev-hwdb.c
index 436e2ccb67..1d47cfaa4e 100644
--- a/src/libudev/src/libudev-hwdb.c
+++ b/src/libudev/src/libudev-hwdb.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <systemd/sd-hwdb.h>
-
 #include "basic/alloc-util.h"
 #include "sd-hwdb/hwdb-util.h"
+#include "sd-hwdb/sd-hwdb.h"
+
 #include "libudev-private.h"
 
 /**
diff --git a/src/libudev/src/udev.h b/src/libudev/src/udev.h
index d50ad1c828..26afe63b55 100644
--- a/src/libudev/src/udev.h
+++ b/src/libudev/src/udev.h
@@ -23,12 +23,12 @@
 #include <sys/types.h>
 
 #include <libudev.h>
-#include <systemd/sd-netlink.h>
 
 #include "basic/label.h"
 #include "basic/macro.h"
 #include "basic/strv.h"
 #include "basic/util.h"
+#include "sd-netlink/sd-netlink.h"
 
 #include "libudev-private.h"
 
diff --git a/src/systemd-cryptsetup/cryptsetup.c b/src/systemd-cryptsetup/cryptsetup.c
index fc0d7e0e9a..eef2b1954c 100644
--- a/src/systemd-cryptsetup/cryptsetup.c
+++ b/src/systemd-cryptsetup/cryptsetup.c
@@ -23,11 +23,7 @@
 #include <string.h>
 #include <sys/mman.h>
 
-#include <systemd/sd-device.h>
-
 #include "basic/alloc-util.h"
-#include "shared/ask-password-api.h"
-#include "sd-device/device-util.h"
 #include "basic/escape.h"
 #include "basic/fileio.h"
 #include "basic/log.h"
@@ -37,6 +33,9 @@
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/util.h"
+#include "sd-device/device-util.h"
+#include "sd-device/sd-device.h"
+#include "shared/ask-password-api.h"
 
 static const char *arg_type = NULL; /* CRYPT_LUKS1, CRYPT_TCRYPT or CRYPT_PLAIN */
 static char *arg_cipher = NULL;
diff --git a/src/systemd-fsck/fsck.c b/src/systemd-fsck/fsck.c
index f6e5309cd5..4ca018763f 100644
--- a/src/systemd-fsck/fsck.c
+++ b/src/systemd-fsck/fsck.c
@@ -28,13 +28,8 @@
 #include <unistd.h>
 
 #include <systemd/sd-bus.h>
-#include <systemd/sd-device.h>
 
 #include "basic/alloc-util.h"
-#include "sd-bus/bus-common-errors.h"
-#include "sd-bus/bus-error.h"
-#include "shared/bus-util.h"
-#include "sd-device/device-util.h"
 #include "basic/fd-util.h"
 #include "basic/fs-util.h"
 #include "basic/parse-util.h"
@@ -46,6 +41,11 @@
 #include "basic/special.h"
 #include "basic/stdio-util.h"
 #include "basic/util.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-error.h"
+#include "sd-device/device-util.h"
+#include "sd-device/sd-device.h"
+#include "shared/bus-util.h"
 
 /* exit codes as defined in fsck(8) */
 enum {
diff --git a/src/systemd-hwdb/hwdb.c b/src/systemd-hwdb/hwdb.c
index 5ec2ba6169..0e96716b0f 100644
--- a/src/systemd-hwdb/hwdb.c
+++ b/src/systemd-hwdb/hwdb.c
@@ -27,14 +27,14 @@
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/fs-util.h"
-#include "sd-hwdb/hwdb-internal.h"
-#include "sd-hwdb/hwdb-util.h"
 #include "basic/mkdir.h"
 #include "basic/strbuf.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/util.h"
 #include "basic/verbs.h"
+#include "sd-hwdb/hwdb-internal.h"
+#include "sd-hwdb/hwdb-util.h"
 
 /*
  * Generic udev properties, key/value database based on modalias strings.
diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c
index 4da7ef744f..a00e7600aa 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.c
+++ b/src/systemd-nspawn/nspawn-expose-ports.c
@@ -17,18 +17,18 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <systemd/sd-netlink.h>
-
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
-#include "firewall-util.h"
 #include "basic/in-addr-util.h"
-#include "sd-netlink/local-addresses.h"
-#include "nspawn-expose-ports.h"
 #include "basic/parse-util.h"
 #include "basic/socket-util.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
+#include "firewall-util.h"
+#include "sd-netlink/local-addresses.h"
+#include "sd-netlink/sd-netlink.h"
+
+#include "nspawn-expose-ports.h"
 
 int expose_port_parse(ExposePort **l, const char *s) {
 
diff --git a/src/systemd-nspawn/nspawn-expose-ports.h b/src/systemd-nspawn/nspawn-expose-ports.h
index 0003b74e62..2c0a5ecc88 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.h
+++ b/src/systemd-nspawn/nspawn-expose-ports.h
@@ -22,10 +22,10 @@
 #include <inttypes.h>
 
 #include <systemd/sd-event.h>
-#include <systemd/sd-netlink.h>
 
 #include "basic/in-addr-util.h"
 #include "basic/list.h"
+#include "sd-netlink/sd-netlink.h"
 
 typedef struct ExposePort {
         int protocol;
diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c
index 98bb3e386f..4929615b74 100644
--- a/src/systemd-nspawn/nspawn-network.c
+++ b/src/systemd-nspawn/nspawn-network.c
@@ -22,18 +22,19 @@
 
 #include "libudev.h"
 #include <systemd/sd-id128.h>
-#include <systemd/sd-netlink.h>
 
 #include "basic/alloc-util.h"
 #include "basic/ether-addr-util.h"
 #include "basic/lockfile-util.h"
-#include "nspawn-network.h"
 #include "basic/siphash24.h"
 #include "basic/socket-util.h"
 #include "basic/stat-util.h"
 #include "basic/string-util.h"
-#include "shared/udev-util.h"
 #include "basic/util.h"
+#include "sd-netlink/sd-netlink.h"
+#include "shared/udev-util.h"
+
+#include "nspawn-network.h"
 
 #define HOST_HASH_KEY SD_ID128_MAKE(1a,37,6f,c7,46,ec,45,0b,ad,a3,d5,31,06,60,5d,b1)
 #define CONTAINER_HASH_KEY SD_ID128_MAKE(c3,c4,f9,19,b5,57,b2,1c,e6,cf,14,27,03,9c,ee,a2)
diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c
index 29e60ca48a..3f174b6f24 100644
--- a/src/systemd-nspawn/nspawn-register.c
+++ b/src/systemd-nspawn/nspawn-register.c
@@ -19,13 +19,14 @@
 
 #include <systemd/sd-bus.h>
 
+#include "basic/stat-util.h"
+#include "basic/strv.h"
+#include "basic/util.h"
 #include "sd-bus/bus-error.h" /* for bus_error_message */
 #include "shared/bus-unit-util.h"
 #include "shared/bus-util.h"
+
 #include "nspawn-register.h"
-#include "basic/stat-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
 
 int register_machine(
                 const char *machine_name,
diff --git a/src/systemd-socket-proxyd/socket-proxyd.c b/src/systemd-socket-proxyd/socket-proxyd.c
index 59141d20aa..888850595b 100644
--- a/src/systemd-socket-proxyd/socket-proxyd.c
+++ b/src/systemd-socket-proxyd/socket-proxyd.c
@@ -30,7 +30,6 @@
 
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
-#include <systemd/sd-resolve.h>
 
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
@@ -40,6 +39,7 @@
 #include "basic/socket-util.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
+#include "sd-resolve/sd-resolve.h"
 
 #define BUFFER_SIZE (256 * 1024)
 #define CONNECTIONS_MAX 256
diff --git a/src/systemd-timesyncd/timesyncd-manager.h b/src/systemd-timesyncd/timesyncd-manager.h
index de6836087d..a70b187089 100644
--- a/src/systemd-timesyncd/timesyncd-manager.h
+++ b/src/systemd-timesyncd/timesyncd-manager.h
@@ -20,11 +20,11 @@
 ***/
 
 #include <systemd/sd-event.h>
-#include <systemd/sd-network.h>
-#include <systemd/sd-resolve.h>
 
 #include "basic/list.h"
 #include "basic/ratelimit.h"
+#include "sd-network/sd-network.h"
+#include "sd-resolve/sd-resolve.h"
 
 typedef struct Manager Manager;
 
diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c
index 6540a35020..d7cb3b2c87 100644
--- a/src/test/test-netlink-manual.c
+++ b/src/test/test-netlink-manual.c
@@ -23,10 +23,9 @@
 #include <net/if.h>
 #include <linux/if_tunnel.h>
 
-#include <systemd/sd-netlink.h>
-
 #include "basic/macro.h"
 #include "basic/util.h"
+#include "sd-netlink/sd-netlink.h"
 
 static int load_module(const char *mod_name) {
         struct kmod_ctx *ctx;