summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scripts/generator-internals.c2
-rw-r--r--scripts/lvm2_activation_generator_systemd_red_hat.c20
-rw-r--r--test/unit/activation-generator_t.c2
3 files changed, 2 insertions, 22 deletions
diff --git a/scripts/generator-internals.c b/scripts/generator-internals.c
index 9619e8c9c..9919247a4 100644
--- a/scripts/generator-internals.c
+++ b/scripts/generator-internals.c
@@ -1,6 +1,8 @@
// This file contains the unit testable parts of
// lvm2_activation_generator_systemd_red_hat
+#include "device_mapper/all.h"
+
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c
index b44c8f0e9..a3a3e88ae 100644
--- a/scripts/lvm2_activation_generator_systemd_red_hat.c
+++ b/scripts/lvm2_activation_generator_systemd_red_hat.c
@@ -12,29 +12,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h> /* For PATH_MAX for musl libc */
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include "configure.h"
-#include "device_mapper/all.h"
-
-//----------------------------------------------------------------
-
// Code in this file gets included in the unit tests.
#include "generator-internals.c"
-//----------------------------------------------------------------
// Logging
#define KMSG_DEV_PATH "/dev/kmsg"
diff --git a/test/unit/activation-generator_t.c b/test/unit/activation-generator_t.c
index ef4946d92..6aa115c1c 100644
--- a/test/unit/activation-generator_t.c
+++ b/test/unit/activation-generator_t.c
@@ -15,8 +15,6 @@
#include "units.h"
#include "scripts/generator-internals.c"
-#include "device_mapper/all.h"
-
//----------------------------------------------------------------
static void _error(const char *format, ...)