diff --git a/builtin/am.c b/builtin/am.c
index 8677ea2348ab5b..c35713ac4f826a 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -34,6 +34,7 @@
 #include "string-list.h"
 #include "packfile.h"
 #include "repository.h"
+#include "pager.h"
 
 /**
  * Returns the length of the first line of msg.
diff --git a/builtin/blame.c b/builtin/blame.c
index f9ee3f8c688d47..8f0f2f42b66118 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -28,6 +28,7 @@
 #include "blame.h"
 #include "refs.h"
 #include "tag.h"
+#include "pager.h"
 
 static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
 
diff --git a/builtin/fetch.c b/builtin/fetch.c
index f7abbc31ff1414..64f9f7329fb0c9 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -28,6 +28,7 @@
 #include "promisor-remote.h"
 #include "commit-graph.h"
 #include "shallow.h"
+#include "pager.h"
 
 #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
 
diff --git a/builtin/grep.c b/builtin/grep.c
index 9e34a820ad4d83..a95cdcc69e8938 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -25,6 +25,7 @@
 #include "submodule-config.h"
 #include "object-store.h"
 #include "packfile.h"
+#include "pager.h"
 
 static char const * const grep_usage[] = {
 	N_("git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"),
diff --git a/builtin/help.c b/builtin/help.c
index 75cd2fb407f6eb..2419b9b800917c 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -10,6 +10,7 @@
 #include "config-list.h"
 #include "help.h"
 #include "alias.h"
+#include "pager.h"
 
 #ifndef DEFAULT_HELP_FORMAT
 #define DEFAULT_HELP_FORMAT "man"
diff --git a/builtin/log.c b/builtin/log.c
index f75d87e8d7fea4..3cd94f1525abf0 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -35,6 +35,7 @@
 #include "repository.h"
 #include "commit-reach.h"
 #include "range-diff.h"
+#include "pager.h"
 
 #define MAIL_DEFAULT_WRAP 72
 #define COVER_FROM_AUTO_MAX_SUBJECT_LEN 100
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index b221d300147fcd..98483c233c929b 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -9,6 +9,7 @@
 #include "prio-queue.h"
 #include "hash-lookup.h"
 #include "commit-slab.h"
+#include "pager.h"
 
 /*
  * One day.  See the 'name a rev shortly after epoch' test in t6120 when
diff --git a/cache.h b/cache.h
index e676d4b25614cd..339df71b6fb892 100644
--- a/cache.h
+++ b/cache.h
@@ -1765,16 +1765,6 @@ void write_file_buf(const char *path, const char *buf, size_t len);
 __attribute__((format (printf, 2, 3)))
 void write_file(const char *path, const char *fmt, ...);
 
-/* pager.c */
-void setup_pager(void);
-int pager_in_use(void);
-extern int pager_use_color;
-int term_columns(void);
-void term_clear_line(void);
-int decimal_width(uintmax_t);
-int check_pager_config(const char *cmd);
-void prepare_pager_args(struct child_process *, const char *pager);
-
 extern const char *editor_program;
 extern const char *askpass_program;
 extern const char *excludes_file;
diff --git a/color.c b/color.c
index 64f52a4f93a21c..f16cb2079287b6 100644
--- a/color.c
+++ b/color.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "config.h"
 #include "color.h"
+#include "pager.h"
 
 static int git_use_color_default = GIT_COLOR_AUTO;
 int color_stdout_is_tty = -1;
diff --git a/column.c b/column.c
index 1261e18a72e972..4c1fe39c1508b0 100644
--- a/column.c
+++ b/column.c
@@ -5,6 +5,7 @@
 #include "parse-options.h"
 #include "run-command.h"
 #include "utf8.h"
+#include "pager.h"
 
 #define XY2LINEAR(d, x, y) (COL_LAYOUT((d)->colopts) == COL_COLUMN ? \
 			    (x) * (d)->rows + (y) : \
diff --git a/config.c b/config.c
index 67cd66e33ca78c..4dae18c16fd839 100644
--- a/config.c
+++ b/config.c
@@ -22,6 +22,7 @@
 #include "color.h"
 #include "refs.h"
 #include "ws.h"
+#include "pager.h"
 
 struct config_source {
 	struct config_source *prev;
diff --git a/date.c b/date.c
index c55ea47e96ade2..d507430e365a7d 100644
--- a/date.c
+++ b/date.c
@@ -5,6 +5,7 @@
  */
 
 #include "cache.h"
+#include "pager.h"
 
 /*
  * This is like mktime, but without normalization of tm_wday and tm_yday.
diff --git a/diff.c b/diff.c
index 0263e2ad745ce6..254a08ba2e07c5 100644
--- a/diff.c
+++ b/diff.c
@@ -29,6 +29,7 @@
 #include "dir.h"
 #include "ws.h"
 #include "base85.h"
+#include "pager.h"
 
 #ifdef NO_FAST_WORKING_DIRECTORY
 #define FAST_WORKING_DIRECTORY 0
diff --git a/editor.c b/editor.c
index fdd3eeafa94791..41785857d0e0ab 100644
--- a/editor.c
+++ b/editor.c
@@ -3,6 +3,7 @@
 #include "strbuf.h"
 #include "run-command.h"
 #include "sigchain.h"
+#include "pager.h"
 
 #ifndef DEFAULT_EDITOR
 #define DEFAULT_EDITOR "vi"
diff --git a/git.c b/git.c
index 5ff21be21f323c..2aa5f6dcdb32c6 100644
--- a/git.c
+++ b/git.c
@@ -5,6 +5,7 @@
 #include "run-command.h"
 #include "alias.h"
 #include "shallow.h"
+#include "pager.h"
 
 #define RUN_SETUP		(1<<0)
 #define RUN_SETUP_GENTLY	(1<<1)
diff --git a/pager.c b/pager.c
index 52f27a6765c8de..5d711a80ca98bc 100644
--- a/pager.c
+++ b/pager.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "pager.h"
 #include "config.h"
 #include "run-command.h"
 #include "sigchain.h"
diff --git a/pager.h b/pager.h
new file mode 100644
index 00000000000000..e3530d22b62165
--- /dev/null
+++ b/pager.h
@@ -0,0 +1,11 @@
+#ifndef PAGER_H
+#define PAGER_H
+void setup_pager(void);
+int pager_in_use(void);
+extern int pager_use_color;
+int term_columns(void);
+void term_clear_line(void);
+int decimal_width(uintmax_t);
+int check_pager_config(const char *cmd);
+void prepare_pager_args(struct child_process *, const char *pager);
+#endif
diff --git a/pretty.c b/pretty.c
index 1af5b093ae8a91..895623f911173e 100644
--- a/pretty.c
+++ b/pretty.c
@@ -13,6 +13,7 @@
 #include "gpg-interface.h"
 #include "trailer.h"
 #include "run-command.h"
+#include "pager.h"
 
 static char *user_format;
 static struct cmt_fmt_map {
diff --git a/progress.c b/progress.c
index 680c6a8bf93b51..0faf7d655fb652 100644
--- a/progress.c
+++ b/progress.c
@@ -16,6 +16,7 @@
 #include "trace.h"
 #include "utf8.h"
 #include "config.h"
+#include "pager.h"
 
 #define TP_IDX_MAX      8
 
diff --git a/range-diff.c b/range-diff.c
index cac89a2f4f2c8d..caecfc4dfa94e5 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -12,6 +12,7 @@
 #include "userdiff.h"
 #include "apply.h"
 #include "revision.h"
+#include "pager.h"
 
 struct patch_util {
 	/* For the search for an exact match */
diff --git a/sequencer.c b/sequencer.c
index b4135a78c9133d..1870b9bb00482c 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -35,6 +35,7 @@
 #include "commit-reach.h"
 #include "rebase-interactive.h"
 #include "reset.h"
+#include "pager.h"
 
 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"