Merge pull request #7458 from keszybz/two-build-fixes

Two build fixes

man/meson.build

@@ -49,7 +49,7 @@ custom_entities_ent = configure_file(
 man_pages = []
 html_pages = []
 source_xml_files = []
-foreach tuple : want_man or want_html ? manpages : []
+foreach tuple : xsltproc.found() ? manpages : []
         stem = tuple[0]
         section = tuple[1]
         aliases = tuple[2]

src/core/kmod-setup.c

@@ -22,20 +22,18 @@
 #include <string.h>
 #include <unistd.h>
 
-#if HAVE_KMOD
-#include <libkmod.h>
-#endif
-
 #include "alloc-util.h"
 #include "bus-util.h"
 #include "capability-util.h"
 #include "fileio.h"
 #include "kmod-setup.h"
 #include "macro.h"
-#include "module-util.h"
 #include "string-util.h"
 
 #if HAVE_KMOD
+#include <libkmod.h>
+#include "module-util.h"
+
 static void systemd_kmod_log(
                 void *data,
                 int priority,