Reorder and reorganize header files

Let the includes in the following order:

< system headers >
< libkmod >
< tool >
< local headers >

diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
index 3bbc866825ea897f34c0ff61893b98e3f1c6f217..e248d3c3a8e9b42ecb94897eef19f170a3c4acbf 100644 (file)
--- a/libkmod/libkmod-config.c
+++ b/libkmod/libkmod-config.c
@@ -19,17 +19,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <errno.h>
 #include <string.h>
-#include <ctype.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include <shared/util.h>
 

diff --git a/libkmod/libkmod-elf.c b/libkmod/libkmod-elf.c
index 5144099d7481056442187b91537526a0f444d2a7..9a7b12c3fa89f94d60e289b5a95d0fa75b29d5df 100644 (file)
--- a/libkmod/libkmod-elf.c
+++ b/libkmod/libkmod-elf.c
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <assert.h>
 #include <elf.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
-#include <errno.h>
 
 #include <shared/util.h>
 

diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c
index f32ce2aa79da2569ba7c136683c9ffda2680fb38..45ae4a346bd00d7180a196f155187a0bb683b2e2 100644 (file)
--- a/libkmod/libkmod-file.c
+++ b/libkmod/libkmod-file.c
@@ -18,21 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
-
-#include <shared/util.h>
-
-#include "libkmod.h"
-#include "libkmod-internal.h"
-
 #ifdef ENABLE_XZ
 #include <lzma.h>
 #endif
@@ -40,6 +34,11 @@
 #include <zlib.h>
 #endif
 
+#include <shared/util.h>
+
+#include "libkmod.h"
+#include "libkmod-internal.h"
+
 struct kmod_file;
 struct file_ops {
        int (*load)(struct kmod_file *file);

diff --git a/libkmod/libkmod-index.c b/libkmod/libkmod-index.c
index db431d281580c52e71c32109b88352f8414b8375..e8e8032300bfb8e565e663033278bc43931bd870 100644 (file)
--- a/libkmod/libkmod-index.c
+++ b/libkmod/libkmod-index.c
@@ -18,14 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <arpa/inet.h> /* htonl */
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <arpa/inet.h>
+#include <assert.h>
 #include <errno.h>
 #include <fnmatch.h>
-#include <assert.h>
 #include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <shared/macro.h>
 #include <shared/util.h>

diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index b22f40038ee1ed283e5fb661afb74becc79afc6b..ac6b71a543eaf02205b9a8cb4cdb55b7c3eb29f4 100644 (file)
--- a/libkmod/libkmod-module.c
+++ b/libkmod/libkmod-module.c
@@ -19,24 +19,23 @@
  */
 
 #include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
 #include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fnmatch.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
 #include <sys/syscall.h>
+#include <sys/types.h>
 #include <sys/wait.h>
-#include <fnmatch.h>
-
 #ifdef HAVE_LINUX_MODULE_H
 #include <linux/module.h>
 #endif

diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
index 96712e4152ae62f5f7681e7412a7eb9a05840239..b7ef5f497dd279ad4c5102a1f98229625fa91011 100644 (file)
--- a/libkmod/libkmod-signature.c
+++ b/libkmod/libkmod-signature.c
@@ -20,9 +20,9 @@
 
 #include <endian.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 #include <shared/missing.h>
 #include <shared/util.h>

diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
index ea90bbb05621bcfe05a8d0a34cb00dfe8322d3fb..fd4383807ffbce28d760bf8002641e07f4d87295 100644 (file)
--- a/libkmod/libkmod-util.c
+++ b/libkmod/libkmod-util.c
@@ -20,13 +20,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <ctype.h>
+#include <stdarg.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <unistd.h>
 #include <string.h>
-#include <ctype.h>
+#include <unistd.h>
 
 #include <shared/util.h>
 

diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 3dc5a2b4b73e2fd59e8eff46c351a96ac51b6471..040a8105e7d2ad4900a31f4a8be28c1cc54ef092 100644 (file)
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -19,18 +19,18 @@
  */
 
 #include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <limits.h>
-#include <unistd.h>
+#include <ctype.h>
 #include <errno.h>
 #include <fnmatch.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <sys/utsname.h>
+#include <unistd.h>
 #include <sys/stat.h>
+#include <sys/utsname.h>
 
 #include <shared/hash.h>
 #include <shared/util.h>

diff --git a/shared/array.c b/shared/array.c
index b37e54e0fecc02ba65c0715f68d0a2679f224a85..865b3e8258e33f0969a867aa3087e59558fa2360 100644 (file)
--- a/shared/array.c
+++ b/shared/array.c
@@ -18,14 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <shared/array.h>
-
-#include "libkmod.h"
-
 #include <assert.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
+
+#include <shared/array.h>
+
+#include <libkmod.h>
 
 /* basic pointer array growing in steps */
 

diff --git a/shared/hash.c b/shared/hash.c
index d2f5a7892356c3eeb11911c23e42562ca8a76f37..99057efa84a6b02f19dd8c60317d2496261aef97 100644 (file)
--- a/shared/hash.c
+++ b/shared/hash.c
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <errno.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 
 #include <shared/hash.h>
 #include <shared/util.h>

diff --git a/shared/util.c b/shared/util.c
index 2d44107afaef83906fb4a65597a8d4a9b62fccdc..0113967cbb1628afc85b72e070ca412f820c07ea 100644 (file)
--- a/shared/util.c
+++ b/shared/util.c
@@ -21,14 +21,14 @@
  */
 
 #include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <errno.h>
 #include <string.h>
-#include <ctype.h>
+#include <unistd.h>
 
 #include <shared/util.h>
 

diff --git a/testsuite/delete_module.c b/testsuite/delete_module.c
index 9718894516835a7dd0d17873fe19fe0ad9ec404d..8cb9d73882193d9911eed480eb4b73034f50e03c 100644 (file)
--- a/testsuite/delete_module.c
+++ b/testsuite/delete_module.c
@@ -17,18 +17,18 @@
  */
 
 #include <assert.h>
-#include <errno.h>
 #include <dirent.h>
-#include <fcntl.h>
 #include <dlfcn.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <limits.h>
-#include <stdlib.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <string.h>
 #include <stdio.h>
-#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include "testsuite.h"

diff --git a/testsuite/init_module.c b/testsuite/init_module.c
index edbba0795a9c21c5d1f14a412c057143302c1274..2af18286020def8fae99a4aa579be0db1a452bd3 100644 (file)
--- a/testsuite/init_module.c
+++ b/testsuite/init_module.c
@@ -22,23 +22,23 @@
 #endif
 
 #include <assert.h>
+#include <dirent.h>
+#include <dlfcn.h>
 #include <elf.h>
 #include <errno.h>
-#include <dirent.h>
 #include <fcntl.h>
-#include <dlfcn.h>
 #include <limits.h>
-#include <stdlib.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/mman.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
+#include <sys/types.h>
 #include <sys/utsname.h>
-#include <unistd.h>
 
 #include <shared/util.h>
 

diff --git a/testsuite/path.c b/testsuite/path.c
index f87f5c52d8faf9391d3ac78d4a8225f71732a58c..c27fabe4e267759029247f69f1390c9cd039352c 100644 (file)
--- a/testsuite/path.c
+++ b/testsuite/path.c
@@ -17,18 +17,18 @@
  */
 
 #include <assert.h>
-#include <errno.h>
 #include <dirent.h>
-#include <fcntl.h>
 #include <dlfcn.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <limits.h>
-#include <stdlib.h>
 #include <stdarg.h>
-#include <string.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "testsuite.h"
 

diff --git a/testsuite/test-blacklist.c b/testsuite/test-blacklist.c
index 5b88caf7a01acc9d87be0782879a5aacceaf1684..0937391ea1b9fbcf0adfe9356b136e6a2df13148 100644 (file)
--- a/testsuite/test-blacklist.c
+++ b/testsuite/test-blacklist.c
@@ -16,13 +16,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include <errno.h>
-#include <unistd.h>
 #include <inttypes.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+
 #include <libkmod.h>
 
 /* good luck bulding a kmod_list outside of the library... makes this blacklist

diff --git a/testsuite/test-dependencies.c b/testsuite/test-dependencies.c
index cdd80662c8861eb909567697224e93666dd88542..98e8f76c3cdfad739ac1b1b3e7371324ddf321f4 100644 (file)
--- a/testsuite/test-dependencies.c
+++ b/testsuite/test-dependencies.c
@@ -16,16 +16,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include <errno.h>
-#include <unistd.h>
 #include <inttypes.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+
 #include <libkmod.h>
 
 #include "testsuite.h"
+
 #define TEST_UNAME "4.0.20-kmod"
 
 static int test_dependencies(const struct test *t)

diff --git a/testsuite/test-depmod.c b/testsuite/test-depmod.c
index ae53753e75846b1428266759a14d564adb4e85c7..ca9633cfd598d7db5b8f8aee605e81fe15b4c47e 100644 (file)
--- a/testsuite/test-depmod.c
+++ b/testsuite/test-depmod.c
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include <errno.h>
-#include <unistd.h>
 #include <inttypes.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "testsuite.h"
 

diff --git a/testsuite/test-hash.c b/testsuite/test-hash.c
index 61260d9c624aee1a5aee86602b5f30841b440c85..236dd72d2ea066925cb937d9536565e786a7a902 100644 (file)
--- a/testsuite/test-hash.c
+++ b/testsuite/test-hash.c
@@ -16,11 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <errno.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
-#include <errno.h>
 #include <unistd.h>
 
 #include <shared/hash.h>

diff --git a/testsuite/test-init.c b/testsuite/test-init.c
index d2aa4bd393ffd6d3fe6d1eafdfd1eebb2a54b04b..06c67d04ba009d49a87b4d7d813bbd7bc23c1ba9 100644 (file)
--- a/testsuite/test-init.c
+++ b/testsuite/test-init.c
@@ -16,12 +16,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <errno.h>
+#include <inttypes.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
-#include <errno.h>
 #include <unistd.h>
+
 #include <libkmod.h>
 
 #include "testsuite.h"

diff --git a/testsuite/test-loaded.c b/testsuite/test-loaded.c
index 4b50813668b3deed490aea791213b77f9f4c5259..8f7b449b82f682d53c0e28ccabc3a24a1c10a176 100644 (file)
--- a/testsuite/test-loaded.c
+++ b/testsuite/test-loaded.c
@@ -16,13 +16,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include <errno.h>
-#include <unistd.h>
 #include <inttypes.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+
 #include <libkmod.h>
 
 #include "testsuite.h"

diff --git a/testsuite/test-modinfo.c b/testsuite/test-modinfo.c
index 918ed3a9eccc60c93b8ce48b23989c8f3d51ef50..5427cdc041d9044ef56e697aa1025c4d7cac0773 100644 (file)
--- a/testsuite/test-modinfo.c
+++ b/testsuite/test-modinfo.c
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include <errno.h>
-#include <unistd.h>
 #include <inttypes.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "testsuite.h"
 

diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index d7663e6e40fa096bf3c79dbd3f2e6773d7a0a439..5bc18f8705dfb112d820388b5d1be850028aa803 100644 (file)
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include <errno.h>
-#include <unistd.h>
 #include <inttypes.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "testsuite.h"
 

diff --git a/testsuite/test-new-module.c b/testsuite/test-new-module.c
index 0892507f4679ea50e69e8253fd7d0f9228fde8fe..1658422abcbb59c85d3d571d32f8c111ec6ca17e 100644 (file)
--- a/testsuite/test-new-module.c
+++ b/testsuite/test-new-module.c
@@ -16,13 +16,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include <errno.h>
-#include <unistd.h>
 #include <inttypes.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+
 #include <libkmod.h>
 
 #include "testsuite.h"

diff --git a/testsuite/test-testsuite.c b/testsuite/test-testsuite.c
index a22911d4d0349c431e65a488951ac317e38b466d..44495c2cbb40b824097ad7383e493491ce3a0702 100644 (file)
--- a/testsuite/test-testsuite.c
+++ b/testsuite/test-testsuite.c
@@ -16,16 +16,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <dirent.h>
+#include <errno.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
-#include <dirent.h>
-#include <errno.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
+
 #include <libkmod.h>
 
 #include "testsuite.h"

diff --git a/testsuite/test-util.c b/testsuite/test-util.c
index 8b6474bc7feb69fa283c8275722418e0d0dbdce2..17f242234ab2dea52e5de2e3e3dc2c78e861fccd 100644 (file)
--- a/testsuite/test-util.c
+++ b/testsuite/test-util.c
@@ -20,11 +20,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libkmod.h>
 
 #include <shared/util.h>
 
-#include "libkmod-util.h"
+#include <libkmod.h>
+#include <libkmod-util.h>
+
 #include "testsuite.h"
 
 static int alias_1(const struct test *t)

diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index 54b662b45a4643cae23d876c2e26f38891c83abb..d8acf6802d8a5d5da422aec9e68468d10a83dfc5 100644 (file)
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <limits.h>
-#include <dirent.h>
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -34,7 +34,8 @@
 
 #include <shared/util.h>
 
-#include "libkmod-util.h"
+#include <libkmod-util.h>
+
 #include "testsuite.h"
 
 static const char *ANSI_HIGHLIGHT_GREEN_ON = "\x1B[1;32m";

diff --git a/testsuite/uname.c b/testsuite/uname.c
index f55c435a166bb4900580f3a02b60a20ca5129d68..750abf57dfc662d97026e7edfd1693299384317c 100644 (file)
--- a/testsuite/uname.c
+++ b/testsuite/uname.c
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <errno.h>
 #include <dlfcn.h>
-#include <sys/utsname.h>
+#include <errno.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <unistd.h>
+#include <sys/utsname.h>
 
 #include "testsuite.h"
 

diff --git a/tools/depmod.c b/tools/depmod.c
index 69c3f3f07a46a9caa534e4e6e2fa1d527f7dceb2..cb46e0ce42d079ed8b135672802df7d50548ca6b 100644 (file)
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -16,27 +16,28 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "libkmod.h"
-#include "libkmod-util.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <getopt.h>
+#include <limits.h>
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/utsname.h>
 
 #include <shared/array.h>
 #include <shared/hash.h>
 #include <shared/macro.h>
 #include <shared/util.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <errno.h>
-#include <string.h>
-#include <limits.h>
-#include <dirent.h>
-#include <sys/utsname.h>
-#include <sys/stat.h>
-#include <regex.h>
-#include <assert.h>
-#include <unistd.h>
-#include <ctype.h>
+#include <libkmod.h>
+#include <libkmod-util.h>
 
 #include "kmod.h"
 

diff --git a/tools/insmod.c b/tools/insmod.c
index a795d893e57f53357312a8419d47ac64aa600af9..c3be4e44efaf3cbb30bcffc514ffaa50b1410a07 100644 (file)
--- a/tools/insmod.c
+++ b/tools/insmod.c
@@ -17,12 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <errno.h>
+#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <getopt.h>
-#include <errno.h>
 #include <string.h>
-#include "libkmod.h"
+
+#include <libkmod.h>
 
 #include "kmod.h"
 

diff --git a/tools/kmod.c b/tools/kmod.c
index 347bb7dd336f58348b150d1335944c117b72aa33..42390275304ff4dfaf3c0cedffb68d0c99fe9e84 100644 (file)
--- a/tools/kmod.c
+++ b/tools/kmod.c
@@ -17,12 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <getopt.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+
 #include <libkmod.h>
+
 #include "kmod.h"
 
 static const char options_s[] = "+hV";

diff --git a/tools/log.c b/tools/log.c
index 05f6b7741059b7accdc40aba3efb1c5d1e4c7fdd..05ff96fc84d2cff24ddceb0e0f598b6e3752d3fb 100644 (file)
--- a/tools/log.c
+++ b/tools/log.c
@@ -22,7 +22,8 @@
 #include <stdlib.h>
 #include <syslog.h>
 
-#include "libkmod.h"
+#include <libkmod.h>
+
 #include "kmod.h"
 
 static bool log_use_syslog;

diff --git a/tools/lsmod.c b/tools/lsmod.c
index b00a9cd32cfddd495dea8bca9ec9b29d5a2dc73c..282163969dfe6d6ce0cc10d9a68257911ab9d9b2 100644 (file)
--- a/tools/lsmod.c
+++ b/tools/lsmod.c
@@ -17,13 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <errno.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
-#include <errno.h>
-#include <unistd.h>
 #include <string.h>
-#include "libkmod.h"
+#include <unistd.h>
+
+#include <libkmod.h>
 
 #include "kmod.h"
 

diff --git a/tools/modinfo.c b/tools/modinfo.c
index 9a60d71d67c8b752bd20d26b2dc0aad2a42c39d0..72ac03cbca6779eb6c8492cb9fcbcdb2c2930176 100644 (file)
--- a/tools/modinfo.c
+++ b/tools/modinfo.c
@@ -17,17 +17,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <errno.h>
+#include <getopt.h>
+#include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
-#include <getopt.h>
-#include <errno.h>
 #include <string.h>
-#include <limits.h>
-#include <sys/utsname.h>
 #include <sys/stat.h>
-#include "libkmod.h"
-#include "libkmod-util.h"
+#include <sys/utsname.h>
+
+#include <libkmod.h>
+#include <libkmod-util.h>
 
 #include "kmod.h"
 

diff --git a/tools/modprobe.c b/tools/modprobe.c
index 57992714e2a8ccd0c36d75deb9e8632bf0dfc5e7..b82625593334b0b5efd2db8359bc5ed163496448 100644 (file)
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -18,24 +18,24 @@
  */
 
 #include <assert.h>
+#include <errno.h>
+#include <getopt.h>
+#include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
-#include <getopt.h>
-#include <errno.h>
 #include <string.h>
-#include <sys/types.h>
+#include <unistd.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/wait.h>
-#include <unistd.h>
-#include <limits.h>
-
-#include "libkmod.h"
 
 #include <shared/array.h>
 #include <shared/macro.h>
 
+#include <libkmod.h>
+
 #include "kmod.h"
 
 static int log_priority = LOG_CRIT;

diff --git a/tools/rmmod.c b/tools/rmmod.c
index 8a3c22e69dc3e4397b454206b44ff9240a54fa62..c6f1aeec98556e4d86fb322a36032937c79420f9 100644 (file)
--- a/tools/rmmod.c
+++ b/tools/rmmod.c
@@ -17,17 +17,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <errno.h>
+#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <getopt.h>
-#include <errno.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
-#include "libkmod.h"
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #include <shared/macro.h>
 
+#include <libkmod.h>
+
 #include "kmod.h"
 
 #define DEFAULT_VERBOSE LOG_ERR

diff --git a/tools/static-nodes.c b/tools/static-nodes.c
index b7ea23274c0f2d23c280c1c184acab1cb0bc16f5..d1e3b6e6c942a8eb52a7201c91ab8a664d1eb64f 100644 (file)
--- a/tools/static-nodes.c
+++ b/tools/static-nodes.c
@@ -19,17 +19,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <errno.h>
+#include <getopt.h>
+#include <limits.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
-#include <getopt.h>
-#include <errno.h>
-#include <unistd.h>
 #include <string.h>
-#include <limits.h>
-#include <sys/utsname.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/utsname.h>
 
 #include <shared/util.h>