diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 6f02f04b5cb..78a2fe2ade5 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -51,7 +51,7 @@
 #include "arch/arm.h"
 #include "arch/arm-get-next-pcs.h"
 #include "arm-tdep.h"
-#include "gdb/sim-arm.h"
+#include "sim/sim-arm.h"
 
 #include "elf-bfd.h"
 #include "coff/internal.h"
diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
index f751e278211..44d644975ad 100644
--- a/gdb/bfin-tdep.c
+++ b/gdb/bfin-tdep.c
@@ -30,7 +30,7 @@
 #include "trad-frame.h"
 #include "dis-asm.h"
 #include "sim-regno.h"
-#include "gdb/sim-bfin.h"
+#include "sim/sim-bfin.h"
 #include "dwarf2/frame.h"
 #include "symtab.h"
 #include "elf-bfd.h"
diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index 056aad3f17e..1cfb1a6a8b8 100644
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -28,7 +28,7 @@
 #include "trad-frame.h"
 #include "dis-asm.h"
 #include "sim-regno.h"
-#include "gdb/sim-frv.h"
+#include "sim/sim-frv.h"
 #include "opcodes/frv-desc.h"	/* for the H_SPR_... enums */
 #include "symtab.h"
 #include "elf-bfd.h"
diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c
index 8da3dbae592..45169db80e1 100644
--- a/gdb/ft32-tdep.c
+++ b/gdb/ft32-tdep.c
@@ -40,7 +40,7 @@
 #include "opcode/ft32.h"
 
 #include "ft32-tdep.h"
-#include "gdb/sim-ft32.h"
+#include "sim/sim-ft32.h"
 #include <algorithm>
 
 #define RAM_BIAS  0x800000  /* Bias added to RAM addresses.  */
diff --git a/gdb/lm32-tdep.c b/gdb/lm32-tdep.c
index dd601320c3a..5640b9edd9a 100644
--- a/gdb/lm32-tdep.c
+++ b/gdb/lm32-tdep.c
@@ -27,7 +27,7 @@
 #include "symfile.h"
 #include "remote.h"
 #include "gdbcore.h"
-#include "gdb/sim-lm32.h"
+#include "sim/sim-lm32.h"
 #include "arch-utils.h"
 #include "regcache.h"
 #include "trad-frame.h"
diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c
index f5101635aed..0a2f5d79cbf 100644
--- a/gdb/m32c-tdep.c
+++ b/gdb/m32c-tdep.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb/sim-m32c.h"
+#include "sim/sim-m32c.h"
 #include "gdbtypes.h"
 #include "regcache.h"
 #include "arch-utils.h"
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index cbd84514795..7a470746444 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -35,7 +35,7 @@
 #include "osabi.h"
 #include "infcall.h"
 #include "sim-regno.h"
-#include "gdb/sim-ppc.h"
+#include "sim/sim-ppc.h"
 #include "reggroups.h"
 #include "dwarf2/frame.h"
 #include "target-descriptions.h"
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index a2e91483229..1adbb3ced4c 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -49,7 +49,7 @@
 #include "elf/sh.h"
 #include "dwarf2.h"
 /* registers numbers shared with the simulator.  */
-#include "gdb/sim-sh.h"
+#include "sim/sim-sh.h"
 #include <algorithm>
 
 /* List of "set sh ..." and "show sh ..." commands.  */
diff --git a/include/gdb/sim-aarch64.h b/include/sim/sim-aarch64.h
similarity index 100%
rename from include/gdb/sim-aarch64.h
rename to include/sim/sim-aarch64.h
diff --git a/include/gdb/sim-arm.h b/include/sim/sim-arm.h
similarity index 100%
rename from include/gdb/sim-arm.h
rename to include/sim/sim-arm.h
diff --git a/include/gdb/sim-bfin.h b/include/sim/sim-bfin.h
similarity index 100%
rename from include/gdb/sim-bfin.h
rename to include/sim/sim-bfin.h
diff --git a/include/gdb/sim-cr16.h b/include/sim/sim-cr16.h
similarity index 100%
rename from include/gdb/sim-cr16.h
rename to include/sim/sim-cr16.h
diff --git a/include/gdb/sim-d10v.h b/include/sim/sim-d10v.h
similarity index 100%
rename from include/gdb/sim-d10v.h
rename to include/sim/sim-d10v.h
diff --git a/include/gdb/sim-frv.h b/include/sim/sim-frv.h
similarity index 100%
rename from include/gdb/sim-frv.h
rename to include/sim/sim-frv.h
diff --git a/include/gdb/sim-ft32.h b/include/sim/sim-ft32.h
similarity index 100%
rename from include/gdb/sim-ft32.h
rename to include/sim/sim-ft32.h
diff --git a/include/gdb/sim-h8300.h b/include/sim/sim-h8300.h
similarity index 100%
rename from include/gdb/sim-h8300.h
rename to include/sim/sim-h8300.h
diff --git a/include/gdb/sim-lm32.h b/include/sim/sim-lm32.h
similarity index 100%
rename from include/gdb/sim-lm32.h
rename to include/sim/sim-lm32.h
diff --git a/include/gdb/sim-m32c.h b/include/sim/sim-m32c.h
similarity index 100%
rename from include/gdb/sim-m32c.h
rename to include/sim/sim-m32c.h
diff --git a/include/gdb/sim-ppc.h b/include/sim/sim-ppc.h
similarity index 100%
rename from include/gdb/sim-ppc.h
rename to include/sim/sim-ppc.h
diff --git a/include/gdb/sim-riscv.h b/include/sim/sim-riscv.h
similarity index 100%
rename from include/gdb/sim-riscv.h
rename to include/sim/sim-riscv.h
diff --git a/include/gdb/sim-rl78.h b/include/sim/sim-rl78.h
similarity index 100%
rename from include/gdb/sim-rl78.h
rename to include/sim/sim-rl78.h
diff --git a/include/gdb/sim-rx.h b/include/sim/sim-rx.h
similarity index 100%
rename from include/gdb/sim-rx.h
rename to include/sim/sim-rx.h
diff --git a/include/gdb/sim-sh.h b/include/sim/sim-sh.h
similarity index 100%
rename from include/gdb/sim-sh.h
rename to include/sim/sim-sh.h
diff --git a/sim/aarch64/interp.c b/sim/aarch64/interp.c
index eb8d055461a..9848d5f5f0e 100644
--- a/sim/aarch64/interp.c
+++ b/sim/aarch64/interp.c
@@ -34,7 +34,7 @@
 #include "sim/callback.h"
 #include "sim/sim.h"
 #include "gdb/signals.h"
-#include "gdb/sim-aarch64.h"
+#include "sim/sim-aarch64.h"
 
 #include "sim-main.h"
 #include "sim-options.h"
diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index 831a0ff557b..2c5253fc746 100644
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -36,7 +36,7 @@
 #include "armemu.h"
 #include "dbg_rdi.h"
 #include "ansidecl.h"
-#include "gdb/sim-arm.h"
+#include "sim/sim-arm.h"
 #include "gdb/signals.h"
 #include "libiberty.h"
 #include "iwmmxt.h"
diff --git a/sim/bfin/machs.c b/sim/bfin/machs.c
index bbc3b516631..adc0eb35531 100644
--- a/sim/bfin/machs.c
+++ b/sim/bfin/machs.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 
 #include "sim-main.h"
-#include "gdb/sim-bfin.h"
+#include "sim/sim-bfin.h"
 #include "bfd.h"
 
 #include "sim-hw.h"
diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c
index cfe157cdd5e..1522ca4fa58 100644
--- a/sim/cr16/interp.c
+++ b/sim/cr16/interp.c
@@ -32,7 +32,7 @@
 #include "sim-options.h"
 #include "sim-signal.h"
 
-#include "gdb/sim-cr16.h"
+#include "sim/sim-cr16.h"
 #include "gdb/signals.h"
 #include "opcode/cr16.h"
 
diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index 496ccff9676..f83fa6678ad 100644
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -11,7 +11,7 @@
 #include "sim-options.h"
 #include "sim-signal.h"
 
-#include "gdb/sim-d10v.h"
+#include "sim/sim-d10v.h"
 #include "gdb/signals.h"
 
 #include <string.h>
diff --git a/sim/frv/frv.c b/sim/frv/frv.c
index 19bf4b9236f..69ff9fafa08 100644
--- a/sim/frv/frv.c
+++ b/sim/frv/frv.c
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "cgen-engine.h"
 #include "cgen-par.h"
 #include "bfd.h"
-#include "gdb/sim-frv.h"
+#include "sim/sim-frv.h"
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/sim/ft32/ft32-sim.h b/sim/ft32/ft32-sim.h
index 255aa48624e..27cb81c81e0 100644
--- a/sim/ft32/ft32-sim.h
+++ b/sim/ft32/ft32-sim.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 
-#include "gdb/sim-ft32.h"
+#include "sim/sim-ft32.h"
 
 #define FT32_HARD_FP 29
 #define FT32_HARD_CC 30
diff --git a/sim/h8300/compile.c b/sim/h8300/compile.c
index 25fb8b82225..1a9e6b22588 100644
--- a/sim/h8300/compile.c
+++ b/sim/h8300/compile.c
@@ -29,7 +29,7 @@
 
 #include "bfd.h"
 #include "sim-main.h"
-#include "gdb/sim-h8300.h"
+#include "sim/sim-h8300.h"
 #include "sys/stat.h"
 #include "sys/types.h"
 #include "sim-options.h"
diff --git a/sim/lm32/lm32-sim.h b/sim/lm32/lm32-sim.h
index eb58fb9443a..95a945df1f4 100644
--- a/sim/lm32/lm32-sim.h
+++ b/sim/lm32/lm32-sim.h
@@ -20,7 +20,7 @@
 #ifndef LM32_SIM_H
 #define LM32_SIM_H
 
-#include "gdb/sim-lm32.h"
+#include "sim/sim-lm32.h"
 
 /* CSRs.  */
 #define LM32_CSR_IE             0
diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c
index 2b33f40306b..b065bdca5b1 100644
--- a/sim/m32c/gdb-if.c
+++ b/sim/m32c/gdb-if.c
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim/callback.h"
 #include "sim/sim.h"
 #include "gdb/signals.h"
-#include "gdb/sim-m32c.h"
+#include "sim/sim-m32c.h"
 
 #include "cpu.h"
 #include "mem.h"
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index cc9635e6023..5f58ccf8b50 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -142,7 +142,7 @@ ANSIDECL_H = $(srcroot)/include/ansidecl.h
 BFD_H = ../../bfd/bfd.h
 GDB_CALLBACK_H = $(srcroot)/include/sim/callback.h
 GDB_REMOTE_SIM_H = $(srcroot)/include/sim/sim.h
-GDB_SIM_PPC_H = $(srcroot)/include/gdb/sim-ppc.h
+GDB_SIM_PPC_H = $(srcroot)/include/sim/sim-ppc.h
 COMMON_SIM_BASE_H = $(srcroot)/sim/common/sim-base.h
 COMMON_SIM_BASICS_H = $(srcroot)/sim/common/sim-basics.h
 COMMON_SIM_FPU_H = $(srcroot)/sim/common/sim-fpu.h
diff --git a/sim/ppc/gdb-sim.c b/sim/ppc/gdb-sim.c
index 5c4ad1112d8..fbe4c538de6 100644
--- a/sim/ppc/gdb-sim.c
+++ b/sim/ppc/gdb-sim.c
@@ -26,7 +26,7 @@
 #include "sim_callbacks.h"
 #include "sim/callback.h"
 #include "sim/sim.h"
-#include "gdb/sim-ppc.h"
+#include "sim/sim-ppc.h"
 
 /* Return the register name for the supplied SPR if any, or NULL if
    none.  */
diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c
index 6f253d58beb..b8771e66e67 100644
--- a/sim/riscv/sim-main.c
+++ b/sim/riscv/sim-main.c
@@ -33,7 +33,7 @@
 
 #include "opcode/riscv.h"
 
-#include "gdb/sim-riscv.h"
+#include "sim/sim-riscv.h"
 
 #define TRACE_REG(cpu, reg) \
   TRACE_REGISTER (cpu, "wrote %s = %#" PRIxTW, riscv_gpr_names_abi[reg], \
diff --git a/sim/rl78/gdb-if.c b/sim/rl78/gdb-if.c
index 15653cb7f84..cc76a7d9131 100644
--- a/sim/rl78/gdb-if.c
+++ b/sim/rl78/gdb-if.c
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim/callback.h"
 #include "sim/sim.h"
 #include "gdb/signals.h"
-#include "gdb/sim-rl78.h"
+#include "sim/sim-rl78.h"
 
 #include "cpu.h"
 #include "mem.h"
diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c
index d4cab50e282..70f84c184bc 100644
--- a/sim/rx/gdb-if.c
+++ b/sim/rx/gdb-if.c
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim/callback.h"
 #include "sim/sim.h"
 #include "gdb/signals.h"
-#include "gdb/sim-rx.h"
+#include "sim/sim-rx.h"
 
 #include "cpu.h"
 #include "mem.h"
diff --git a/sim/sh/interp.c b/sim/sh/interp.c
index bfac1ba4977..e0cbc7fc6d9 100644
--- a/sim/sh/interp.c
+++ b/sim/sh/interp.c
@@ -55,7 +55,7 @@
 #include "bfd.h"
 #include "sim/callback.h"
 #include "sim/sim.h"
-#include "gdb/sim-sh.h"
+#include "sim/sim-sh.h"
 
 #include "sim-main.h"
 #include "sim-base.h"