git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 05/12] fsmonitor--daemon.h: remove unnecessary includes

From
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
Date
Dec 23, 2023, 17:14 UTC
Message-ID
<8ae3696197b9cb1d27b17ac9f7c06350eefd96d1.1703351701.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.1617.v2.git.1703351700.gitgitgadget@gmail.com>
From: Elijah Newren <newren@gmail.com>

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@gmail.com>
---
 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
Previous: Elijah Newren via GitGitGadgetNext: Elijah Newren via GitGitGadget
Message 22 of 29 in “Additional header cleanups (removing unnecessary includes)”
  1. 00/12 Additional header cleanups (removing unnecessary includes)Elijah Newren via GitGitGadget, Dec 3, 2023
  2. 01/12 treewide: remove unnecessary includes from header filesElijah Newren via GitGitGadget, Dec 3, 2023
  3. 03/12 archive.h: remove unnecessary includeElijah Newren via GitGitGadget, Dec 3, 2023
  4. 04/12 blame.h: remove unnecessary includesElijah Newren via GitGitGadget, Dec 3, 2023
  5. 02/12 treewide: remove unnecessary includes in source filesElijah Newren via GitGitGadget, Dec 3, 2023
  6. Junio C HamanoDec 3, 2023
  7. Junio C HamanoDec 20, 2023
  8. Elijah NewrenDec 20, 2023
  9. 05/12 fsmonitor--daemon.h: remove unnecessary includesElijah Newren via GitGitGadget, Dec 3, 2023
  10. 06/12 http.h: remove unnecessary includeElijah Newren via GitGitGadget, Dec 3, 2023
  11. 07/12 line-log.h: remove unnecessary includeElijah Newren via GitGitGadget, Dec 3, 2023
  12. 08/12 pkt-line.h: remove unnecessary includeElijah Newren via GitGitGadget, Dec 3, 2023
  13. 09/12 submodule-config.h: remove unnecessary includeElijah Newren via GitGitGadget, Dec 3, 2023
  14. 10/12 trace2/tr2_tls.h: remove unnecessary includeElijah Newren via GitGitGadget, Dec 3, 2023
  15. 11/12 treewide: add direct includes currently only pulled in transitivelyElijah Newren via GitGitGadget, Dec 3, 2023
  16. 12/12 treewide: remove unnecessary includes in source filesElijah Newren via GitGitGadget, Dec 3, 2023
  17. 00/12 Additional header cleanups (removing unnecessary includes)Elijah Newren via GitGitGadget, Dec 23, 2023
  18. 01/12 treewide: remove unnecessary includes from header filesElijah Newren via GitGitGadget, Dec 23, 2023
  19. 03/12 archive.h: remove unnecessary includeElijah Newren via GitGitGadget, Dec 23, 2023
  20. 02/12 treewide: remove unnecessary includes in source filesElijah Newren via GitGitGadget, Dec 23, 2023
  21. 04/12 blame.h: remove unnecessary includesElijah Newren via GitGitGadget, Dec 23, 2023
  22. 05/12 fsmonitor--daemon.h: remove unnecessary includesElijah Newren via GitGitGadget, Dec 23, 2023
  23. 06/12 http.h: remove unnecessary includeElijah Newren via GitGitGadget, Dec 23, 2023
  24. 07/12 line-log.h: remove unnecessary includeElijah Newren via GitGitGadget, Dec 23, 2023
  25. 08/12 pkt-line.h: remove unnecessary includeElijah Newren via GitGitGadget, Dec 23, 2023
  26. 09/12 submodule-config.h: remove unnecessary includeElijah Newren via GitGitGadget, Dec 23, 2023
  27. 10/12 trace2/tr2_tls.h: remove unnecessary includeElijah Newren via GitGitGadget, Dec 23, 2023
  28. 11/12 treewide: add direct includes currently only pulled in transitivelyElijah Newren via GitGitGadget, Dec 23, 2023
  29. 12/12 treewide: remove unnecessary includes in source filesElijah Newren via GitGitGadget, Dec 23, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.