From: Elijah Newren <newren@xxxxxxxxx> The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren <newren@xxxxxxxxx> --- builtin/fsmonitor--daemon.c | 2 ++ compat/fsmonitor/fsm-health-win32.c | 1 + compat/fsmonitor/fsm-listen-darwin.c | 1 + compat/fsmonitor/fsm-listen-win32.c | 1 + fsmonitor--daemon.h | 4 +--- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c index 5d01db5c029..7260604534f 100644 --- a/builtin/fsmonitor--daemon.c +++ b/builtin/fsmonitor--daemon.c @@ -1,6 +1,7 @@ #include "builtin.h" #include "abspath.h" #include "config.h" +#include "dir.h" #include "environment.h" #include "gettext.h" #include "parse-options.h" @@ -14,6 +15,7 @@ #include "simple-ipc.h" #include "khash.h" #include "pkt-line.h" +#include "run-command.h" #include "trace.h" #include "trace2.h" diff --git a/compat/fsmonitor/fsm-health-win32.c b/compat/fsmonitor/fsm-health-win32.c index 2d4e245beb1..2aa8c219ace 100644 --- a/compat/fsmonitor/fsm-health-win32.c +++ b/compat/fsmonitor/fsm-health-win32.c @@ -4,6 +4,7 @@ #include "fsm-health.h" #include "fsmonitor--daemon.h" #include "gettext.h" +#include "simple-ipc.h" /* * Every minute wake up and test our health. diff --git a/compat/fsmonitor/fsm-listen-darwin.c b/compat/fsmonitor/fsm-listen-darwin.c index 11b56d3ef12..2fc67442eb5 100644 --- a/compat/fsmonitor/fsm-listen-darwin.c +++ b/compat/fsmonitor/fsm-listen-darwin.c @@ -29,6 +29,7 @@ #include "fsmonitor--daemon.h" #include "fsmonitor-path-utils.h" #include "gettext.h" +#include "simple-ipc.h" #include "string-list.h" #include "trace.h" diff --git a/compat/fsmonitor/fsm-listen-win32.c b/compat/fsmonitor/fsm-listen-win32.c index 90a24122844..5a21dade7b8 100644 --- a/compat/fsmonitor/fsm-listen-win32.c +++ b/compat/fsmonitor/fsm-listen-win32.c @@ -4,6 +4,7 @@ #include "fsm-listen.h" #include "fsmonitor--daemon.h" #include "gettext.h" +#include "simple-ipc.h" #include "trace2.h" /* diff --git a/fsmonitor--daemon.h b/fsmonitor--daemon.h index 673f80d2aad..5cbbec8d940 100644 --- a/fsmonitor--daemon.h +++ b/fsmonitor--daemon.h @@ -3,9 +3,7 @@ #ifdef HAVE_FSMONITOR_DAEMON_BACKEND -#include "dir.h" -#include "run-command.h" -#include "simple-ipc.h" +#include "hashmap.h" #include "thread-utils.h" #include "fsmonitor-path-utils.h" -- gitgitgadget