[Guile-commits] 14/86: Simplify file names

[Andy Wingo]

wingo pushed a commit to branch lightening
in repository guile.

commit 9c1b01fba502833d3294b4d870240581f551a567
Author: Andy Wingo <address@hidden>
Date:   Tue Oct 30 12:29:18 2018 +0100

    Simplify file names
---
 jit.h                                    | 20 ++++++++++----------
 jit/{jit_aarch64-cpu.c => aarch64-cpu.c} |  0
 jit/{jit_aarch64-fpu.c => aarch64-fpu.c} |  0
 jit/{jit_aarch64.c => aarch64.c}         |  8 ++++----
 jit/{jit_aarch64.h => aarch64.h}         |  0
 jit/{jit_alpha-cpu.c => alpha-cpu.c}     |  0
 jit/{jit_alpha-fpu.c => alpha-fpu.c}     |  0
 jit/{jit_alpha.c => alpha.c}             |  8 ++++----
 jit/{jit_alpha.h => alpha.h}             |  0
 jit/{jit_arm-cpu.c => arm-cpu.c}         |  0
 jit/{jit_arm-swf.c => arm-swf.c}         |  0
 jit/{jit_arm-vfp.c => arm-vfp.c}         |  0
 jit/{jit_arm.c => arm.c}                 | 16 ++++++++--------
 jit/{jit_arm.h => arm.h}                 |  0
 jit/{jit_disasm.c => disasm.c}           |  0
 jit/{jit_hppa-cpu.c => hppa-cpu.c}       |  0
 jit/{jit_hppa-fpu.c => hppa-fpu.c}       |  0
 jit/{jit_hppa.c => hppa.c}               |  8 ++++----
 jit/{jit_hppa.h => hppa.h}               |  0
 jit/{jit_ia64-cpu.c => ia64-cpu.c}       |  0
 jit/{jit_ia64-fpu.c => ia64-fpu.c}       |  0
 jit/{jit_ia64.c => ia64.c}               |  8 ++++----
 jit/{jit_ia64.h => ia64.h}               |  0
 jit/jit.c                                | 20 ++++++++++----------
 jit/{jit_memory.c => memory.c}           |  0
 jit/{jit_mips-cpu.c => mips-cpu.c}       |  0
 jit/{jit_mips-fpu.c => mips-fpu.c}       |  0
 jit/{jit_mips.c => mips.c}               | 12 ++++++------
 jit/{jit_mips.h => mips.h}               |  0
 jit/{jit_names.c => names.c}             |  0
 jit/{jit_note.c => note.c}               |  0
 jit/{jit_ppc-cpu.c => ppc-cpu.c}         |  0
 jit/{jit_ppc-fpu.c => ppc-fpu.c}         |  0
 jit/{jit_ppc.c => ppc.c}                 |  8 ++++----
 jit/{jit_ppc.h => ppc.h}                 |  0
 jit/{jit_print.c => print.c}             |  2 +-
 jit/{jit_private.h => private.h}         |  0
 jit/{jit_rewind.c => rewind.c}           |  0
 jit/{jit_s390-cpu.c => s390-cpu.c}       |  0
 jit/{jit_s390-fpu.c => s390-fpu.c}       |  0
 jit/{jit_s390.c => s390.c}               |  8 ++++----
 jit/{jit_s390.h => s390.h}               |  0
 jit/{jit_size.c => size.c}               | 20 ++++++++++----------
 jit/{jit_sparc-cpu.c => sparc-cpu.c}     |  0
 jit/{jit_sparc-fpu.c => sparc-fpu.c}     |  0
 jit/{jit_sparc.c => sparc.c}             |  8 ++++----
 jit/{jit_sparc.h => sparc.h}             |  0
 jit/{jit_x86-cpu.c => x86-cpu.c}         |  0
 jit/{jit_x86-sse.c => x86-sse.c}         |  0
 jit/{jit_x86-x87.c => x86-x87.c}         |  0
 jit/{jit_x86.c => x86.c}                 | 12 ++++++------
 jit/{jit_x86.h => x86.h}                 |  0
 52 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/jit.h b/jit.h
index 0b5c6ce..f46ebbe 100644
--- a/jit.h
+++ b/jit.h
@@ -133,25 +133,25 @@ typedef jit_int32_t               jit_gpr_t;
 typedef jit_int32_t            jit_fpr_t;
 
 #if defined(__i386__) || defined(__x86_64__)
-#  include <jit/jit_x86.h>
+#  include "jit/x86.h"
 #elif defined(__mips__)
-#  include <jit/jit_mips.h>
+#  include "jit/mips.h"
 #elif defined(__arm__)
-#  include <jit/jit_arm.h>
+#  include "jit/arm.h"
 #elif defined(__ppc__) || defined(__powerpc__)
-#  include <jit/jit_ppc.h>
+#  include "jit/ppc.h"
 #elif defined(__sparc__)
-#  include <jit/jit_sparc.h>
+#  include "jit/sparc.h"
 #elif defined(__ia64__)
-#  include <jit/jit_ia64.h>
+#  include "jit/ia64.h"
 #elif defined(__hppa__)
-#  include <jit/jit_hppa.h>
+#  include "jit/hppa.h"
 #elif defined(__aarch64__)
-#  include <jit/jit_aarch64.h>
+#  include "jit/aarch64.h"
 #elif defined(__s390__) || defined(__s390x__)
-#  include <jit/jit_s390.h>
+#  include "jit/s390.h"
 #elif defined(__alpha__)
-#  include <jit/jit_alpha.h>
+#  include "jit/alpha.h"
 #endif
 
 #define jit_flag_node          0x0001  /* patch node not absolute */
diff --git a/jit/jit_aarch64-cpu.c b/jit/aarch64-cpu.c
similarity index 100%
rename from jit/jit_aarch64-cpu.c
rename to jit/aarch64-cpu.c
diff --git a/jit/jit_aarch64-fpu.c b/jit/aarch64-fpu.c
similarity index 100%
rename from jit/jit_aarch64-fpu.c
rename to jit/aarch64-fpu.c
diff --git a/jit/jit_aarch64.c b/jit/aarch64.c
similarity index 99%
rename from jit/jit_aarch64.c
rename to jit/aarch64.c
index 2d0f2b4..dea4c20 100644
--- a/jit/jit_aarch64.c
+++ b/jit/aarch64.c
@@ -63,8 +63,8 @@ static void _patch(jit_state_t*,jit_word_t,jit_node_t*);
 extern void __clear_cache(void *, void *);
 
 #define PROTO                          1
-#  include "jit_aarch64-cpu.c"
-#  include "jit_aarch64-fpu.c"
+#  include "aarch64-cpu.c"
+#  include "aarch64-fpu.c"
 #undef PROTO
 
 /*
@@ -1518,8 +1518,8 @@ _emit_code(jit_state_t *_jit)
 }
 
 #define CODE                           1
-#  include "jit_aarch64-cpu.c"
-#  include "jit_aarch64-fpu.c"
+#  include "aarch64-cpu.c"
+#  include ", 2018aarch64-fpu.c"
 #undef CODE
 
 void
diff --git a/jit/jit_aarch64.h b/jit/aarch64.h
similarity index 100%
rename from jit/jit_aarch64.h
rename to jit/aarch64.h
diff --git a/jit/jit_alpha-cpu.c b/jit/alpha-cpu.c
similarity index 100%
rename from jit/jit_alpha-cpu.c
rename to jit/alpha-cpu.c
diff --git a/jit/jit_alpha-fpu.c b/jit/alpha-fpu.c
similarity index 100%
rename from jit/jit_alpha-fpu.c
rename to jit/alpha-fpu.c
diff --git a/jit/jit_alpha.c b/jit/alpha.c
similarity index 99%
rename from jit/jit_alpha.c
rename to jit/alpha.c
index a950a33..4d49fb9 100644
--- a/jit/jit_alpha.c
+++ b/jit/alpha.c
@@ -62,8 +62,8 @@ typedef struct jit_va_list {
 static void _patch(jit_state_t*,jit_word_t,jit_node_t*);
 
 #define PROTO                          1
-#  include "jit_alpha-cpu.c"
-#  include "jit_alpha-fpu.c"
+#  include "alpha-cpu.c"
+#  include "alpha-fpu.c"
 #undef PROTO
 
 /*
@@ -1495,8 +1495,8 @@ _emit_code(jit_state_t *_jit)
 }
 
 #define CODE                           1
-#  include "jit_alpha-cpu.c"
-#  include "jit_alpha-fpu.c"
+#  include "alpha-cpu.c"
+#  include ", 2018alpha-fpu.c"
 #undef CODE
 
 void
diff --git a/jit/jit_alpha.h b/jit/alpha.h
similarity index 100%
rename from jit/jit_alpha.h
rename to jit/alpha.h
diff --git a/jit/jit_arm-cpu.c b/jit/arm-cpu.c
similarity index 100%
rename from jit/jit_arm-cpu.c
rename to jit/arm-cpu.c
diff --git a/jit/jit_arm-swf.c b/jit/arm-swf.c
similarity index 100%
rename from jit/jit_arm-swf.c
rename to jit/arm-swf.c
diff --git a/jit/jit_arm-vfp.c b/jit/arm-vfp.c
similarity index 100%
rename from jit/jit_arm-vfp.c
rename to jit/arm-vfp.c
diff --git a/jit/jit_arm.c b/jit/arm.c
similarity index 99%
rename from jit/jit_arm.c
rename to jit/arm.c
index 7578865..ee98c47 100644
--- a/jit/jit_arm.c
+++ b/jit/arm.c
@@ -86,10 +86,10 @@ extern void __clear_cache(void *, void *);
 #endif
 
 #define PROTO                          1
-#  include "jit_rewind.c"
-#  include "jit_arm-cpu.c"
-#  include "jit_arm-swf.c"
-#  include "jit_arm-vfp.c"
+#  include "rewind.c"
+#  include "arm-cpu.c"
+#  include "arm-swf.c"
+#  include "arm-vfp.c"
 #undef PROTO
 
 /*
@@ -1995,10 +1995,10 @@ _emit_code(jit_state_t *_jit)
 }
 
 #define CODE                           1
-#  include "jit_rewind.c"
-#  include "jit_arm-cpu.c"
-#  include "jit_arm-swf.c"
-#  include "jit_arm-vfp.c"
+#  include "rewind.c"
+#  include "arm-cpu.c"
+#  include "arm-swf.c"
+#  include ", 2018arm-vfp.c"
 #undef CODE
 
 void
diff --git a/jit/jit_arm.h b/jit/arm.h
similarity index 100%
rename from jit/jit_arm.h
rename to jit/arm.h
diff --git a/jit/jit_disasm.c b/jit/disasm.c
similarity index 100%
rename from jit/jit_disasm.c
rename to jit/disasm.c
diff --git a/jit/jit_hppa-cpu.c b/jit/hppa-cpu.c
similarity index 100%
rename from jit/jit_hppa-cpu.c
rename to jit/hppa-cpu.c
diff --git a/jit/jit_hppa-fpu.c b/jit/hppa-fpu.c
similarity index 100%
rename from jit/jit_hppa-fpu.c
rename to jit/hppa-fpu.c
diff --git a/jit/jit_hppa.c b/jit/hppa.c
similarity index 99%
rename from jit/jit_hppa.c
rename to jit/hppa.c
index 38bd22e..6b9ef3f 100644
--- a/jit/jit_hppa.c
+++ b/jit/hppa.c
@@ -23,8 +23,8 @@
 #define jit_arg_reg_p(i)               (i >= 0 && i < 4)
 
 #define PROTO                          1
-#  include "jit_hppa-cpu.c"
-#  include "jit_hppa-fpu.c"
+#  include "hppa-cpu.c"
+#  include "hppa-fpu.c"
 #undef PROTO
 
 /*
@@ -1453,8 +1453,8 @@ _emit_code(jit_state_t *_jit)
 }
 
 #define CODE                           1
-#  include "jit_hppa-cpu.c"
-#  include "jit_hppa-fpu.c"
+#  include "hppa-cpu.c"
+#  include "hppa-fpu.c"
 #undef CODE
 
 void
diff --git a/jit/jit_hppa.h b/jit/hppa.h
similarity index 100%
rename from jit/jit_hppa.h
rename to jit/hppa.h
diff --git a/jit/jit_ia64-cpu.c b/jit/ia64-cpu.c
similarity index 100%
rename from jit/jit_ia64-cpu.c
rename to jit/ia64-cpu.c
diff --git a/jit/jit_ia64-fpu.c b/jit/ia64-fpu.c
similarity index 100%
rename from jit/jit_ia64-fpu.c
rename to jit/ia64-fpu.c
diff --git a/jit/jit_ia64.c b/jit/ia64.c
similarity index 99%
rename from jit/jit_ia64.c
rename to jit/ia64.c
index 99e2b71..96f1b59 100644
--- a/jit/jit_ia64.c
+++ b/jit/ia64.c
@@ -50,8 +50,8 @@ extern void __clear_cache(void *, void *);
 #endif
 
 #define PROTO                          1
-#  include "jit_ia64-cpu.c"
-#  include "jit_ia64-fpu.c"
+#  include "ia64-cpu.c"
+#  include "ia64-fpu.c"
 #undef PROTO
 
 /*
@@ -1688,8 +1688,8 @@ _emit_code(jit_state_t *_jit)
 }
 
 #define CODE                           1
-#  include "jit_ia64-cpu.c"
-#  include "jit_ia64-fpu.c"
+#  include "ia64-cpu.c"
+#  include "ia64-fpu.c"
 #undef CODE
 
 void
diff --git a/jit/jit_ia64.h b/jit/ia64.h
similarity index 100%
rename from jit/jit_ia64.h
rename to jit/ia64.h
diff --git a/jit/jit.c b/jit/jit.c
index c2cb75f..f906899 100644
--- a/jit/jit.c
+++ b/jit/jit.c
@@ -3402,23 +3402,23 @@ _patch_register(jit_state_t *_jit, jit_node_t *node, 
jit_node_t *link,
 }
 
 #if defined(__i386__) || defined(__x86_64__)
-#  include "jit_x86.c"
+#  include "x86.c"
 #elif defined(__mips__)
-#  include "jit_mips.c"
+#  include "mips.c"
 #elif defined(__arm__)
-#  include "jit_arm.c"
+#  include "arm.c"
 #elif defined(__ppc__) || defined(__powerpc__)
-#  include "jit_ppc.c"
+#  include "ppc.c"
 #elif defined(__sparc__)
-#  include "jit_sparc.c"
+#  include "sparc.c"
 #elif defined(__ia64__)
-#  include "jit_ia64.c"
+#  include "ia64.c"
 #elif defined(__hppa__)
-#  include "jit_hppa.c"
+#  include "hppa.c"
 #elif defined(__aarch64__)
-#  include "jit_aarch64.c"
+#  include "aarch64.c"
 #elif defined(__s390__) || defined(__s390x__)
-#  include "jit_s390.c"
+#  include "s390.c"
 #elif defined(__alpha__)
-#  include "jit_alpha.c"
+#  include "alpha.c"
 #endif
diff --git a/jit/jit_memory.c b/jit/memory.c
similarity index 100%
rename from jit/jit_memory.c
rename to jit/memory.c
diff --git a/jit/jit_mips-cpu.c b/jit/mips-cpu.c
similarity index 100%
rename from jit/jit_mips-cpu.c
rename to jit/mips-cpu.c
diff --git a/jit/jit_mips-fpu.c b/jit/mips-fpu.c
similarity index 100%
rename from jit/jit_mips-fpu.c
rename to jit/mips-fpu.c
diff --git a/jit/jit_mips.c b/jit/mips.c
similarity index 99%
rename from jit/jit_mips.c
rename to jit/mips.c
index cca3d76..be878f5 100644
--- a/jit/jit_mips.c
+++ b/jit/mips.c
@@ -64,9 +64,9 @@ static jit_node_t *_jit_make_arg_d(jit_state_t*,jit_node_t*);
 static void _patch(jit_state_t*,jit_word_t,jit_node_t*);
 
 #define PROTO                          1
-#  include "jit_rewind.c"
-#  include "jit_mips-cpu.c"
-#  include "jit_mips-fpu.c"
+#  include "rewind.c"
+#  include "mips-cpu.c"
+#  include "mips-fpu.c"
 #undef PROTO
 
 /*
@@ -1864,9 +1864,9 @@ _emit_code(jit_state_t *_jit)
 }
 
 #define CODE                           1
-#  include "jit_rewind.c"
-#  include "jit_mips-cpu.c"
-#  include "jit_mips-fpu.c"
+#  include "rewind.c"
+#  include "mips-cpu.c"
+#  include ", 2018mips-fpu.c"
 #undef CODE
 
 void
diff --git a/jit/jit_mips.h b/jit/mips.h
similarity index 100%
rename from jit/jit_mips.h
rename to jit/mips.h
diff --git a/jit/jit_names.c b/jit/names.c
similarity index 100%
rename from jit/jit_names.c
rename to jit/names.c
diff --git a/jit/jit_note.c b/jit/note.c
similarity index 100%
rename from jit/jit_note.c
rename to jit/note.c
diff --git a/jit/jit_ppc-cpu.c b/jit/ppc-cpu.c
similarity index 100%
rename from jit/jit_ppc-cpu.c
rename to jit/ppc-cpu.c
diff --git a/jit/jit_ppc-fpu.c b/jit/ppc-fpu.c
similarity index 100%
rename from jit/jit_ppc-fpu.c
rename to jit/ppc-fpu.c
diff --git a/jit/jit_ppc.c b/jit/ppc.c
similarity index 99%
rename from jit/jit_ppc.c
rename to jit/ppc.c
index 68db716..c43b074 100644
--- a/jit/jit_ppc.c
+++ b/jit/ppc.c
@@ -46,8 +46,8 @@ static void _patch(jit_state_t*,jit_word_t,jit_node_t*);
 extern void __clear_cache(void *, void *);
 
 #define PROTO                          1
-#  include "jit_ppc-cpu.c"
-#  include "jit_ppc-fpu.c"
+#  include "ppc-cpu.c"
+#  include "ppc-fpu.c"
 #undef PROTO
 
 /*
@@ -1673,8 +1673,8 @@ _emit_code(jit_state_t *_jit)
 }
 
 #define CODE                           1
-#  include "jit_ppc-cpu.c"
-#  include "jit_ppc-fpu.c"
+#  include "ppc-cpu.c"
+#  include ", 2018ppc-fpu.c"
 #undef CODE
 
 void
diff --git a/jit/jit_ppc.h b/jit/ppc.h
similarity index 100%
rename from jit/jit_ppc.h
rename to jit/ppc.h
diff --git a/jit/jit_print.c b/jit/print.c
similarity index 99%
rename from jit/jit_print.c
rename to jit/print.c
index 57eb4d1..d1800ba 100644
--- a/jit/jit_print.c
+++ b/jit/print.c
@@ -44,7 +44,7 @@
 /*
  * Initialization
  */
-#include "jit_names.c"
+#include "names.c"
 
 /*
  * Implementation
diff --git a/jit/jit_private.h b/jit/private.h
similarity index 100%
rename from jit/jit_private.h
rename to jit/private.h
diff --git a/jit/jit_rewind.c b/jit/rewind.c
similarity index 100%
rename from jit/jit_rewind.c
rename to jit/rewind.c
diff --git a/jit/jit_s390-cpu.c b/jit/s390-cpu.c
similarity index 100%
rename from jit/jit_s390-cpu.c
rename to jit/s390-cpu.c
diff --git a/jit/jit_s390-fpu.c b/jit/s390-fpu.c
similarity index 100%
rename from jit/jit_s390-fpu.c
rename to jit/s390-fpu.c
diff --git a/jit/jit_s390.c b/jit/s390.c
similarity index 99%
rename from jit/jit_s390.c
rename to jit/s390.c
index b7e9bce..56aa1b9 100644
--- a/jit/jit_s390.c
+++ b/jit/s390.c
@@ -86,8 +86,8 @@ static void _patch(jit_state_t*,jit_word_t,jit_node_t*);
 extern void __clear_cache(void *, void *);
 
 #define PROTO                          1
-#  include "jit_s390-cpu.c"
-#  include "jit_s390-fpu.c"
+#  include "s390-cpu.c"
+#  include "s390-fpu.c"
 #undef PROTO
 
 /*
@@ -1549,8 +1549,8 @@ _emit_code(jit_state_t *_jit)
 }
 
 #define CODE                           1
-#  include "jit_s390-cpu.c"
-#  include "jit_s390-fpu.c"
+#  include "s390-cpu.c"
+#  include "s390-fpu.c"
 #undef CODE
 
 void
diff --git a/jit/jit_s390.h b/jit/s390.h
similarity index 100%
rename from jit/jit_s390.h
rename to jit/s390.h
diff --git a/jit/jit_size.c b/jit/size.c
similarity index 89%
rename from jit/jit_size.c
rename to jit/size.c
index 47b41df..5a7f291 100644
--- a/jit/jit_size.c
+++ b/jit/size.c
@@ -31,25 +31,25 @@ static jit_int16_t  _szs[jit_code_last_code] = {
 #  define JIT_INSTR_MAX                256
 #else
 #  if defined(__i386__) || defined(__x86_64__)
-#    include "jit_x86-sz.c"
+#    include "x86-sz.c"
 #  elif defined(__mips__)
-#    include "jit_mips-sz.c"
+#    include "mips-sz.c"
 #  elif defined(__arm__)
-#    include "jit_arm-sz.c"
+#    include "arm-sz.c"
 #  elif defined(__ppc__) || defined(__powerpc__)
-#    include "jit_ppc-sz.c"
+#    include "ppc-sz.c"
 #  elif defined(__sparc__)
-#    include "jit_sparc-sz.c"
+#    include "sparc-sz.c"
 #  elif defined(__ia64__)
-#    include "jit_ia64-sz.c"
+#    include "ia64-sz.c"
 #  elif defined(__hppa__)
-#    include "jit_hppa-sz.c"
+#    include "hppa-sz.c"
 #  elif defined(__aarch64__)
-#    include "jit_aarch64-sz.c"
+#    include "aarch64-sz.c"
 #  elif defined(__s390__) || defined(__s390x__)
-#    include "jit_s390-sz.c"
+#    include "s390-sz.c"
 #  elif defined(__alpha__)
-#    include "jit_alpha-sz.c"
+#    include "alpha-sz.c"
 #  endif
 #endif
 };
diff --git a/jit/jit_sparc-cpu.c b/jit/sparc-cpu.c
similarity index 100%
rename from jit/jit_sparc-cpu.c
rename to jit/sparc-cpu.c
diff --git a/jit/jit_sparc-fpu.c b/jit/sparc-fpu.c
similarity index 100%
rename from jit/jit_sparc-fpu.c
rename to jit/sparc-fpu.c
diff --git a/jit/jit_sparc.c b/jit/sparc.c
similarity index 99%
rename from jit/jit_sparc.c
rename to jit/sparc.c
index 3ac80d4..a318bff 100644
--- a/jit/jit_sparc.c
+++ b/jit/sparc.c
@@ -38,8 +38,8 @@ typedef jit_pointer_t jit_va_list_t;
 static void _patch(jit_state_t*,jit_word_t,jit_node_t*);
 
 #define PROTO                          1
-#  include "jit_sparc-cpu.c"
-#  include "jit_sparc-fpu.c"
+#  include "sparc-cpu.c"
+#  include "sparc-fpu.c"
 #undef PROTO
 
 /*
@@ -1868,8 +1868,8 @@ _emit_code(jit_state_t *_jit)
 }
 
 #define CODE                           1
-#  include "jit_sparc-cpu.c"
-#  include "jit_sparc-fpu.c"
+#  include "sparc-cpu.c"
+#  include ", 2018sparc-fpu.c"
 #undef CODE
 
 void
diff --git a/jit/jit_sparc.h b/jit/sparc.h
similarity index 100%
rename from jit/jit_sparc.h
rename to jit/sparc.h
diff --git a/jit/jit_x86-cpu.c b/jit/x86-cpu.c
similarity index 100%
rename from jit/jit_x86-cpu.c
rename to jit/x86-cpu.c
diff --git a/jit/jit_x86-sse.c b/jit/x86-sse.c
similarity index 100%
rename from jit/jit_x86-sse.c
rename to jit/x86-sse.c
diff --git a/jit/jit_x86-x87.c b/jit/x86-x87.c
similarity index 100%
rename from jit/jit_x86-x87.c
rename to jit/x86-x87.c
diff --git a/jit/jit_x86.c b/jit/x86.c
similarity index 99%
rename from jit/jit_x86.c
rename to jit/x86.c
index 40f6674..7905c5b 100644
--- a/jit/jit_x86.c
+++ b/jit/x86.c
@@ -111,9 +111,9 @@ static void 
_x87_from_sse_f(jit_state_t*,jit_int32_t,jit_int32_t);
 static void _x87_from_sse_d(jit_state_t*,jit_int32_t,jit_int32_t);
 
 #define PROTO                          1
-#  include "jit_x86-cpu.c"
-#  include "jit_x86-sse.c"
-#  include "jit_x86-x87.c"
+#  include "x86-cpu.c"
+#  include "x86-sse.c"
+#  include "x86-x87.c"
 #undef PROTO
 
 /*
@@ -2173,9 +2173,9 @@ _emit_code(jit_state_t *_jit)
 }
 
 #define CODE                           1
-#  include "jit_x86-cpu.c"
-#  include "jit_x86-sse.c"
-#  include "jit_x86-x87.c"
+#  include "x86-cpu.c"
+#  include "x86-sse.c"
+#  include "x86-x87.c"
 #undef CODE
 
 void
diff --git a/jit/jit_x86.h b/jit/x86.h
similarity index 100%
rename from jit/jit_x86.h
rename to jit/x86.h