8 files changed, 3 insertions, 29 deletions
diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c
index 93aa6c4..fd6b1e7 100644
--- a/gdb/solib-aix.c
+++ b/gdb/solib-aix.c
@@ -21,13 +21,10 @@
 #include "solist.h"
 #include "inferior.h"
 #include "gdb_bfd.h"
-#include "gdbcore.h"
 #include "objfiles.h"
 #include "symtab.h"
 #include "xcoffread.h"
 #include "observable.h"
-#include "gdbcmd.h"
-#include "gdbsupport/scope-exit.h"
 
 /* Our private data in struct so_list.  */
 
diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
index 1f52dd4..1dacc7b 100644
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -19,26 +19,17 @@
 
 #include "defs.h"
 
-#include "symtab.h"
 #include "bfd.h"
-#include "symfile.h"
 #include "objfiles.h"
 #include "gdbcore.h"
 #include "target.h"
 #include "inferior.h"
 #include "regcache.h"
-#include "gdbthread.h"
 #include "gdb_bfd.h"
 
 #include "solist.h"
-#include "solib.h"
-#include "solib-svr4.h"
 #include "solib-darwin.h"
 
-#include "bfd-target.h"
-#include "elf-bfd.h"
-#include "exec.h"
-#include "auxv.h"
 #include "mach-o.h"
 #include "mach-o/external.h"
 
diff --git a/gdb/solib-darwin.h b/gdb/solib-darwin.h
index 6cb05e2..fb3e8ab 100644
--- a/gdb/solib-darwin.h
+++ b/gdb/solib-darwin.h
@@ -20,7 +20,6 @@
 #ifndef SOLIB_DARWIN_H
 #define SOLIB_DARWIN_H
 
-struct objfile;
 struct target_so_ops;
 
 extern const struct target_so_ops darwin_so_ops;
diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c
index b18c4a3..e0aa7f1 100644
--- a/gdb/solib-dsbt.c
+++ b/gdb/solib-dsbt.c
@@ -24,12 +24,11 @@
 #include "solist.h"
 #include "objfiles.h"
 #include "symtab.h"
-#include "language.h"
 #include "command.h"
-#include "gdbcmd.h"
-#include "elf-bfd.h"
 #include "gdb_bfd.h"
 #include "solib-dsbt.h"
+#include "elf/common.h"
+#include "cli/cli-cmds.h"
 
 #define GOT_MODULE_OFFSET 4
 
diff --git a/gdb/solib-dsbt.h b/gdb/solib-dsbt.h
index 59964a6..2b8161e 100644
--- a/gdb/solib-dsbt.h
+++ b/gdb/solib-dsbt.h
@@ -20,7 +20,6 @@
 #ifndef SOLIB_DSBT_H
 #define SOLIB_DSBT_H
 
-struct objfile;
 struct target_so_ops;
 
 extern const struct target_so_ops dsbt_so_ops;
diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c
index 8b0e3a6..152168c 100644
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -18,16 +18,12 @@
 
 
 #include "defs.h"
-#include "inferior.h"
 #include "gdbcore.h"
 #include "solib.h"
 #include "solist.h"
 #include "frv-tdep.h"
 #include "objfiles.h"
 #include "symtab.h"
-#include "language.h"
-#include "command.h"
-#include "gdbcmd.h"
 #include "elf/frv.h"
 #include "gdb_bfd.h"
 
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index f5fdbc7..521e08c 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -32,7 +32,6 @@
 #include "inferior.h"
 #include "infrun.h"
 #include "regcache.h"
-#include "gdbthread.h"
 #include "observable.h"
 
 #include "solist.h"
diff --git a/gdb/solib.c b/gdb/solib.c
index 771954e..e2636f0 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 
-#include <sys/types.h>
 #include <fcntl.h>
 #include "symtab.h"
 #include "bfd.h"
@@ -30,12 +29,9 @@
 #include "command.h"
 #include "target.h"
 #include "frame.h"
-#include "gdbsupport/gdb_regex.h"
 #include "inferior.h"
 #include "gdbsupport/environ.h"
-#include "language.h"
-#include "gdbcmd.h"
-#include "completer.h"
+#include "cli/cli-cmds.h"
 #include "elf/external.h"
 #include "elf/common.h"
 #include "filenames.h"
@@ -43,7 +39,6 @@
 #include "solist.h"
 #include "observable.h"
 #include "readline/tilde.h"
-#include "remote.h"
 #include "solib.h"
 #include "interps.h"
 #include "filesystem.h"
@@ -53,7 +48,6 @@
 #include "debuginfod-support.h"
 #include "source.h"
 #include "cli/cli-style.h"
-#include "solib-target.h"
 
 /* See solib.h.  */