Merge pull request #1926 from phomes/include-order-libudev

tree-wide: group include of libudev.h with sd-*

6 files changed, 10 insertions, 6 deletions

diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
index fa4e3a2b1e..2d3e62410c 100644
--- a/src/libudev/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
@@ -18,10 +18,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "libudev.h"
+
 #include "device-private.h"
 #include "libudev-device-internal.h"
 #include "libudev-private.h"
-#include "libudev.h"
 
 int udev_device_tag_index(struct udev_device *udev_device, struct udev_device *udev_device_old, bool add) {
         sd_device *device_old = NULL;
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index b17ecd870d..814e016800 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -34,6 +34,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "libudev.h"
 #include "sd-device.h"
 
 #include "alloc-util.h"
@@ -41,7 +42,6 @@
 #include "device-util.h"
 #include "libudev-device-internal.h"
 #include "libudev-private.h"
-#include "libudev.h"
 #include "parse-util.h"
 
 /**
diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
index f15b099ad1..442f9615f2 100644
--- a/src/libudev/libudev-enumerate.c
+++ b/src/libudev/libudev-enumerate.c
@@ -28,13 +28,13 @@
 #include <string.h>
 #include <sys/stat.h>
 
+#include "libudev.h"
 #include "sd-device.h"
 
 #include "alloc-util.h"
 #include "device-enumerator-private.h"
 #include "device-util.h"
 #include "libudev-device-internal.h"
-#include "libudev.h"
 
 /**
  * SECTION:libudev-enumerate
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index f1ef4ac96f..f870eba9eb 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -28,12 +28,13 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
+#include "libudev.h"
+
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "libudev-private.h"
-#include "libudev.h"
 #include "missing.h"
 #include "mount-util.h"
 #include "socket-util.h"
diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index 4a75980b1f..574cfeac85 100644
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -24,10 +24,11 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "libudev.h"
+
 #include "MurmurHash2.h"
 #include "device-nodes.h"
 #include "libudev-private.h"
-#include "libudev.h"
 #include "syslog-util.h"
 #include "utf8.h"
 
diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index 3f76dd8171..63fb05547d 100644
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -24,10 +24,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "libudev.h"
+
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "libudev-private.h"
-#include "libudev.h"
 #include "missing.h"
 #include "string-util.h"