diff --git a/src/listview_curses.cc b/src/listview_curses.cc
index ac5dc707..d9a74cc0 100644
--- a/src/listview_curses.cc
+++ b/src/listview_curses.cc
@@ -36,6 +36,7 @@
 #include <sys/time.h>
 #include <time.h>
 
+#include "base/func_util.hh"
 #include "base/lnav_log.hh"
 #include "config.h"
 
diff --git a/src/listview_curses.hh b/src/listview_curses.hh
index 3a92631f..ef2d5ea9 100644
--- a/src/listview_curses.hh
+++ b/src/listview_curses.hh
@@ -39,7 +39,6 @@
 
 #include <sys/types.h>
 
-#include "base/func_util.hh"
 #include "view_curses.hh"
 #include "vis_line.hh"
 
diff --git a/src/log.watch.cc b/src/log.watch.cc
index 84b0a2bb..6c4a8213 100644
--- a/src/log.watch.cc
+++ b/src/log.watch.cc
@@ -39,6 +39,7 @@
 #include "logfile_sub_source.cfg.hh"
 #include "readline_highlighters.hh"
 #include "sql_util.hh"
+#include "sqlitepp.hh"
 
 namespace lnav {
 namespace log {
diff --git a/src/log_format.cc b/src/log_format.cc
index 3aec0af0..2fb42294 100644
--- a/src/log_format.cc
+++ b/src/log_format.cc
@@ -50,6 +50,7 @@
 #include "scn/scn.h"
 #include "sql_util.hh"
 #include "sqlite-extension-func.hh"
+#include "sqlitepp.hh"
 #include "yajlpp/yajlpp.hh"
 #include "yajlpp/yajlpp_def.hh"
 
diff --git a/src/regexp_vtab.cc b/src/regexp_vtab.cc
index c5bb7a6f..e3120b72 100644
--- a/src/regexp_vtab.cc
+++ b/src/regexp_vtab.cc
@@ -40,6 +40,7 @@
 #include "scn/scn.h"
 #include "sql_help.hh"
 #include "sql_util.hh"
+#include "sqlitepp.hh"
 #include "vtab_module.hh"
 #include "yajlpp/yajlpp.hh"
 #include "yajlpp/yajlpp_def.hh"
diff --git a/src/sql_util.cc b/src/sql_util.cc
index 70f38bb5..ff9bd5d9 100644
--- a/src/sql_util.cc
+++ b/src/sql_util.cc
@@ -29,7 +29,6 @@
  * @file sql_util.cc
  */
 
-#include <algorithm>
 #include <regex>
 #include <vector>
 
@@ -42,7 +41,6 @@
 #include "base/injector.hh"
 #include "base/lnav_log.hh"
 #include "base/string_util.hh"
-#include "base/time_util.hh"
 #include "bound_tags.hh"
 #include "config.h"
 #include "lnav_util.hh"
@@ -51,7 +49,7 @@
 #include "readline_highlighters.hh"
 #include "sql_execute.hh"
 #include "sql_help.hh"
-#include "sqlite-extension-func.hh"
+#include "sqlitepp.hh"
 
 using namespace lnav::roles::literals;
 
diff --git a/src/sql_util.hh b/src/sql_util.hh
index c6f67b7b..0a81ccf0 100644
--- a/src/sql_util.hh
+++ b/src/sql_util.hh
@@ -41,10 +41,9 @@
 #include <sys/time.h>
 #include <time.h>
 
+#include "base/attr_line.hh"
 #include "base/intern_string.hh"
-#include "base/lnav.console.hh"
 #include "base/time_util.hh"
-#include "sqlitepp.hh"
 
 extern const char* sql_keywords[145];
 extern const char* sql_function_names[];
diff --git a/src/top_status_source.cc b/src/top_status_source.cc
index 85b68b86..4be57908 100644
--- a/src/top_status_source.cc
+++ b/src/top_status_source.cc
@@ -29,13 +29,11 @@
 
 #include "top_status_source.hh"
 
-#include "base/injector.hh"
 #include "config.h"
 #include "lnav.hh"
 #include "md2attr_line.hh"
 #include "md4cpp.hh"
 #include "shlex.hh"
-#include "sql_util.hh"
 #include "sqlitepp.client.hh"
 #include "top_status_source.cfg.hh"
 
diff --git a/src/top_status_source.hh b/src/top_status_source.hh
index 5c76796b..160aab03 100644
--- a/src/top_status_source.hh
+++ b/src/top_status_source.hh
@@ -30,15 +30,8 @@
 #ifndef lnav_top_status_source_hh
 #define lnav_top_status_source_hh
 
-#include <string>
-
-#include <sqlite3.h>
-
-#include "base/injector.hh"
-#include "bound_tags.hh"
-#include "listview_curses.hh"
-#include "sql_util.hh"
 #include "sqlitepp.client.hh"
+#include "sqlitepp.hh"
 #include "statusview_curses.hh"
 #include "top_status_source.cfg.hh"
 
diff --git a/src/vtab_module.hh b/src/vtab_module.hh
index 17f29093..ff08bfd2 100644
--- a/src/vtab_module.hh
+++ b/src/vtab_module.hh
@@ -31,7 +31,6 @@
 #define vtab_module_hh
 
 #include <string>
-#include <utility>
 #include <vector>
 
 #include <sqlite3.h>