From d37d2416477be6b069f526d41e39c9f39f1fc949 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Sun, 6 Jul 2025 02:58:17 +0200
Subject: [PATCH] Drop log.h include from helpers.h

With the relocation of several functions, including inline functions,
from helpers to util, we no longer need to include log.h.  Which is a
good thing, since any subsystem that needs logging should explicitly
include log.h

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 plugins/netlink.c    | 1 +
 plugins/procps.c     | 1 +
 plugins/rtc.c        | 1 +
 plugins/tty.c        | 1 +
 plugins/urandom.c    | 1 +
 plugins/x11-common.c | 1 +
 src/helpers.h        | 1 -
 src/mount.c          | 1 +
 src/sm.c             | 1 +
 src/tty.c            | 1 +
 10 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/netlink.c b/plugins/netlink.c
index f452ebd5..ce49127d 100644
--- a/plugins/netlink.c
+++ b/plugins/netlink.c
@@ -29,6 +29,7 @@
 
 #include "finit.h"
 #include "cond.h"
+#include "log.h"
 #include "helpers.h"
 #include "plugin.h"
 #include "service.h"
diff --git a/plugins/procps.c b/plugins/procps.c
index 47524766..2cbcc4a4 100644
--- a/plugins/procps.c
+++ b/plugins/procps.c
@@ -31,6 +31,7 @@
 #include "finit.h"
 #include "helpers.h"
 #include "plugin.h"
+#include "log.h"
 
 #ifndef SYSCTL_PATH
 #define SYSCTL_PATH "/sbin/sysctl"
diff --git a/plugins/rtc.c b/plugins/rtc.c
index de96348d..993fcf92 100644
--- a/plugins/rtc.c
+++ b/plugins/rtc.c
@@ -35,6 +35,7 @@
 #include "finit.h"
 #include "helpers.h"
 #include "plugin.h"
+#include "log.h"
 
 /*
  * Kernel RTC driver validates against this date for sanity check.  The
diff --git a/plugins/tty.c b/plugins/tty.c
index 7ff982ea..a83c93c0 100644
--- a/plugins/tty.c
+++ b/plugins/tty.c
@@ -38,6 +38,7 @@
 #include "plugin.h"
 #include "service.h"
 #include "tty.h"
+#include "log.h"
 
 static void tty_watcher(void *arg, int fd, int events);
 
diff --git a/plugins/urandom.c b/plugins/urandom.c
index 10b0da59..a64bbb02 100644
--- a/plugins/urandom.c
+++ b/plugins/urandom.c
@@ -38,6 +38,7 @@
 #include "finit.h"
 #include "helpers.h"
 #include "plugin.h"
+#include "log.h"
 
 #ifndef RANDOM_BYTES
 #define RANDOM_BYTES (32*1024)
diff --git a/plugins/x11-common.c b/plugins/x11-common.c
index 01142f8d..cd222074 100644
--- a/plugins/x11-common.c
+++ b/plugins/x11-common.c
@@ -33,6 +33,7 @@
 #include "finit.h"
 #include "helpers.h"
 #include "plugin.h"
+#include "log.h"
 
 static void setup(void *arg)
 {
diff --git a/src/helpers.h b/src/helpers.h
index 9bfef7a9..bbae458b 100644
--- a/src/helpers.h
+++ b/src/helpers.h
@@ -39,7 +39,6 @@
 #else
 # include <lite/lite.h>
 #endif
-#include "log.h"
 
 #define PROGRESS_DEFAULT PROGRESS_MODERN
 
diff --git a/src/mount.c b/src/mount.c
index 43239efa..30e83b9e 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -31,6 +31,7 @@
 #include <sys/mount.h>
 
 #include "helpers.h"
+#include "log.h"
 
 /*
  * SysV init on Debian/Ubuntu skips these protected mount points
diff --git a/src/sm.c b/src/sm.c
index 43facdfb..a6231c9e 100644
--- a/src/sm.c
+++ b/src/sm.c
@@ -29,6 +29,7 @@
 #include "finit.h"
 #include "cond.h"
 #include "conf.h"
+#include "log.h"
 #include "helpers.h"
 #include "private.h"
 #include "schedule.h"
diff --git a/src/tty.c b/src/tty.c
index e0500832..1b638d17 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -38,6 +38,7 @@
 #endif
 
 #include "config.h"		/* Generated by configure script */
+#include "log.h"
 #include "finit.h"
 #include "conf.h"
 #include "helpers.h"