libudev: Clean up includes

Split out of #37344.

diff --git a/src/libudev/libudev-device-internal.h b/src/libudev/libudev-device-internal.h
index b0c4b188bcef17e413db803bddf867dd354ac576..c8729730917e14faea4d076caeb3de6a86f69424 100644 (file)
--- a/src/libudev/libudev-device-internal.h
+++ b/src/libudev/libudev-device-internal.h
@@ -2,7 +2,8 @@
 #pragma once
 
 #include "libudev.h"
-#include "sd-device.h"
+
+#include "forward.h"
 
 struct udev_device;
 

diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index 4ad1489307d0fa9511d351b2e7b4d48341ea6e66..d7ccadae66ab6903e6b3f76d45dc83717ad42df3 100644 (file)
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -1,21 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <linux/sockios.h>
-#include <net/if.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
 #include "libudev.h"
 #include "sd-device.h"
 
@@ -25,8 +9,6 @@
 #include "errno-util.h"
 #include "libudev-device-internal.h"
 #include "libudev-list-internal.h"
-#include "parse-util.h"
-#include "time-util.h"
 
 /**
  * SECTION:libudev-device

diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
index 6afcc68256b8abc3cdd67d4b57cd24fb2def99ba..d4d670106b2a2e7eccddc8c69ccdf12e2d571813 100644 (file)
--- a/src/libudev/libudev-enumerate.c
+++ b/src/libudev/libudev-enumerate.c
@@ -1,21 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <dirent.h>
-#include <errno.h>
-#include <fnmatch.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#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 "errno-util.h"
 #include "libudev-device-internal.h"
 #include "libudev-list-internal.h"

diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c
index edc1c664a85db677df22c5ece5aed04f0d4b6c9a..5087e04ee8b941999ee86411a637b1ac1a7164c9 100644 (file)
--- a/src/libudev/libudev-hwdb.c
+++ b/src/libudev/libudev-hwdb.c
@@ -1,15 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-
 #include "sd-hwdb.h"
 
 #include "alloc-util.h"
-#include "assert-util.h"
 #include "errno-util.h"
-#include "hwdb-util.h"
 #include "libudev-list-internal.h"
-#include "log.h"
 
 /**
  * SECTION:libudev-hwdb

diff --git a/src/libudev/libudev-list-internal.h b/src/libudev/libudev-list-internal.h
index dd4fcbc7718271b87811af3de6fb405a043f6d78..efe394d1fd55c99beaa7a62699afd046011390bf 100644 (file)
--- a/src/libudev/libudev-list-internal.h
+++ b/src/libudev/libudev-list-internal.h
@@ -3,7 +3,7 @@
 
 #include "libudev.h"
 
-#include "memory-util.h"
+#include "forward.h"
 
 struct udev_list;
 

diff --git a/src/libudev/libudev-list.c b/src/libudev/libudev-list.c
index 4f9e58fe1bed55c9a127ce8867a80dc465df3bbd..4c4de297b95f10e6a5c1c734db6f849b86a7c06c 100644 (file)
--- a/src/libudev/libudev-list.c
+++ b/src/libudev/libudev-list.c
@@ -4,6 +4,7 @@
 #include "hashmap.h"
 #include "libudev-list-internal.h"
 #include "list.h"
+#include "string-util.h"
 
 /**
  * SECTION:libudev-list

diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index 0682ab9cd6590b665b97487ab6c99fb5cd34b076..c82f9c01519d8dd1eb98bbab0260c489563e352e 100644 (file)
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -1,14 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <poll.h>
 
 #include "libudev.h"
+#include "sd-device.h"
 
 #include "alloc-util.h"
 #include "device-monitor-private.h"
-#include "device-private.h"
-#include "device-util.h"
+#include "errno-util.h"
 #include "io-util.h"
 #include "libudev-device-internal.h"
 #include "string-util.h"

diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c
index 852bd370eddd77d43d1625d758ecaa25686a2b50..a6064e5b666655d2146e0d96df591c6277842bab 100644 (file)
--- a/src/libudev/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
@@ -3,7 +3,6 @@
   Copyright © 2009 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
 ***/
 
-#include <errno.h>
 #include <sys/inotify.h>
 #include <unistd.h>
 

diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index 8c518776626d1022e97cdc27f897d2f2d9af0721..5ee9ebd03e463b02f65538cb5219d0370d5762b7 100644 (file)
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "libudev.h"
+
+#include "forward.h"
 #include "device-nodes.h"
-#include "libudev-util.h"
 
 /**
  * SECTION:libudev-util

diff --git a/src/libudev/libudev-util.h b/src/libudev/libudev-util.h
index a02021845d3ee1353d09b7f33292fb561dda5c8f..eb899f9f1dd3d47ca1216e672e201cd88ef038ee 100644 (file)
--- a/src/libudev/libudev-util.h
+++ b/src/libudev/libudev-util.h
@@ -3,8 +3,7 @@
 
 #include "libudev.h"
 
-#include "macro.h"
-#include "memory-util.h"
+#include "forward.h"
 
 /* Cleanup functions */
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev*, udev_unref);

diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index ae3260633aeb5e97a691ef4b0b72064943954cb5..659aa2b743d8aa72b70b6a822fd5987491dd2a39 100644 (file)
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -1,18 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <ctype.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "libudev.h"
 
 #include "alloc-util.h"
 #include "errno-util.h"
-#include "fd-util.h"
 #include "log.h"
-#include "string-util.h"
 
 /**
  * SECTION:libudev

diff --git a/src/libudev/test-libudev.c b/src/libudev/test-libudev.c
index 99934c6f036049993c4c18f2c8922fc9f18ed320..63c24031240e69f4312c54268dafe24857565446 100644 (file)
--- a/src/libudev/test-libudev.c
+++ b/src/libudev/test-libudev.c
@@ -1,18 +1,15 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
 #include <sys/epoll.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
 #include "devnum-util.h"
 #include "fd-util.h"
 #include "libudev-list-internal.h"
-#include "libudev-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "stdio-util.h"
+#include "libudev-util.h"
 #include "string-util.h"
 #include "tests.h"
 #include "version.h"

diff --git a/src/libudev/test-udev-device-thread.c b/src/libudev/test-udev-device-thread.c
index c12480f89cd1f9a0cf7671ad789cf4d9f2ff2315..78fd3b24bf5973069c2ca06169b6b96a00ed3ba6 100644 (file)
--- a/src/libudev/test-udev-device-thread.c
+++ b/src/libudev/test-udev-device-thread.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <pthread.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "libudev.h"
 
@@ -11,7 +9,7 @@
 
 #define handle_error_errno(error, msg)                          \
         ({                                                      \
-                errno = abs(error);                             \
+                errno = ABS(error);                             \
                 perror(msg);                                    \
                 EXIT_FAILURE;                                   \
         })