[Guile-commits] 11/86: Rename include to jit.h, move all files to jit/

[Andy Wingo]

wingo pushed a commit to branch lightening
in repository guile.

commit 796ec6c16d0eb0bdb17eb3ea30bc335e1a9622cd
Author: Andy Wingo <address@hidden>
Date:   Tue Oct 30 12:16:35 2018 +0100

    Rename include to jit.h, move all files to jit/
    
    This change is in anticipation of making this lightning fork into an
    include-only library.
---
 include/Makefile.am                      | 19 ----------
 include/lightning/Makefile.am            | 61 --------------------------------
 include/lightning.h => jit.h             | 28 +++++++--------
 {lib => jit}/Makefile.am                 |  0
 {lib => jit}/jit_aarch64-cpu.c           |  0
 {lib => jit}/jit_aarch64-fpu.c           |  0
 {lib => jit}/jit_aarch64-sz.c            |  0
 {lib => jit}/jit_aarch64.c               |  0
 {include/lightning => jit}/jit_aarch64.h |  0
 {lib => jit}/jit_alpha-cpu.c             |  0
 {lib => jit}/jit_alpha-fpu.c             |  0
 {lib => jit}/jit_alpha-sz.c              |  0
 {lib => jit}/jit_alpha.c                 |  0
 {include/lightning => jit}/jit_alpha.h   |  0
 {lib => jit}/jit_arm-cpu.c               |  0
 {lib => jit}/jit_arm-swf.c               |  0
 {lib => jit}/jit_arm-sz.c                |  0
 {lib => jit}/jit_arm-vfp.c               |  0
 {lib => jit}/jit_arm.c                   |  0
 {include/lightning => jit}/jit_arm.h     |  0
 {lib => jit}/jit_disasm.c                |  6 ++--
 {lib => jit}/jit_hppa-cpu.c              |  0
 {lib => jit}/jit_hppa-fpu.c              |  0
 {lib => jit}/jit_hppa-sz.c               |  0
 {lib => jit}/jit_hppa.c                  |  6 ++--
 {include/lightning => jit}/jit_hppa.h    |  0
 {lib => jit}/jit_ia64-cpu.c              |  0
 {lib => jit}/jit_ia64-fpu.c              |  0
 {lib => jit}/jit_ia64-sz.c               |  0
 {lib => jit}/jit_ia64.c                  |  6 ++--
 {include/lightning => jit}/jit_ia64.h    |  0
 {lib => jit}/jit_memory.c                |  7 ++--
 {lib => jit}/jit_mips-cpu.c              |  0
 {lib => jit}/jit_mips-fpu.c              |  0
 {lib => jit}/jit_mips-sz.c               |  0
 {lib => jit}/jit_mips.c                  |  0
 {include/lightning => jit}/jit_mips.h    |  0
 {lib => jit}/jit_names.c                 |  0
 {lib => jit}/jit_note.c                  |  6 ++--
 {lib => jit}/jit_ppc-cpu.c               |  0
 {lib => jit}/jit_ppc-fpu.c               |  0
 {lib => jit}/jit_ppc-sz.c                |  0
 {lib => jit}/jit_ppc.c                   |  0
 {include/lightning => jit}/jit_ppc.h     |  0
 {lib => jit}/jit_print.c                 |  6 ++--
 {include/lightning => jit}/jit_private.h |  0
 {lib => jit}/jit_rewind.c                |  6 ++--
 {lib => jit}/jit_s390-cpu.c              |  0
 {lib => jit}/jit_s390-fpu.c              |  0
 {lib => jit}/jit_s390-sz.c               |  0
 {lib => jit}/jit_s390.c                  |  6 ++--
 {include/lightning => jit}/jit_s390.h    |  0
 {lib => jit}/jit_size.c                  |  6 ++--
 {lib => jit}/jit_sparc-cpu.c             |  0
 {lib => jit}/jit_sparc-fpu.c             |  0
 {lib => jit}/jit_sparc-sz.c              |  0
 {lib => jit}/jit_sparc.c                 |  0
 {include/lightning => jit}/jit_sparc.h   |  0
 {lib => jit}/jit_x86-cpu.c               |  0
 {lib => jit}/jit_x86-sse.c               |  0
 {lib => jit}/jit_x86-sz.c                |  0
 {lib => jit}/jit_x86-x87.c               |  0
 {lib => jit}/jit_x86.c                   |  6 ++--
 {include/lightning => jit}/jit_x86.h     |  0
 {lib => jit}/lightning.c                 |  7 ++--
 65 files changed, 49 insertions(+), 127 deletions(-)

diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index 601ae7a..0000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2000, 2001, 2002, 2012-2017 Free Software Foundation, Inc.
-#
-# This file is part of GNU lightning.
-#
-# GNU lightning is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU lightning is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-# License for more details.
-#
-
-include_HEADERS = lightning.h
-SUBDIRS =              \
-       lightning
diff --git a/include/lightning/Makefile.am b/include/lightning/Makefile.am
deleted file mode 100644
index 885a0d5..0000000
--- a/include/lightning/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright 2000, 2001, 2002, 2012-2017 Free Software Foundation, Inc.
-#
-# This file is part of GNU lightning.
-#
-# GNU lightning is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU lightning is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-# License for more details.
-#
-
-lightning_includedir = $(includedir)/lightning
-
-EXTRA_DIST =           \
-       jit_private.h
-
-if cpu_arm
-lightning_include_HEADERS =    \
-       jit_arm.h
-endif
-if cpu_mips
-lightning_include_HEADERS =    \
-       jit_mips.h
-endif
-if cpu_ppc
-lightning_include_HEADERS =    \
-       jit_ppc.h
-endif
-if cpu_sparc
-lightning_include_HEADERS =    \
-       jit_sparc.h
-endif
-if cpu_x86
-lightning_include_HEADERS =    \
-       jit_x86.h
-endif
-if cpu_ia64
-lightning_include_HEADERS =    \
-       jit_ia64.h
-endif
-if cpu_hppa
-lightning_include_HEADERS =    \
-       jit_hppa.h
-endif
-if cpu_aarch64
-lightning_include_HEADERS =    \
-       jit_aarch64.h
-endif
-if cpu_s390
-lightning_include_HEADERS =    \
-       jit_s390.h
-endif
-if cpu_alpha
-lightning_include_HEADERS =    \
-       jit_alpha.h
-endif
diff --git a/include/lightning.h b/jit.h
similarity index 99%
rename from include/lightning.h
rename to jit.h
index 55657c8..0b5c6ce 100644
--- a/include/lightning.h
+++ b/jit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2012-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -17,8 +17,8 @@
  *     Paulo Cesar Pereira de Andrade
  */
 
-#ifndef _lightning_h
-#define _lightning_h
+#ifndef _jit_h
+#define _jit_h
 
 #if HAVE_CONFIG_H
 # include "config.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 <lightning/jit_x86.h>
+#  include <jit/jit_x86.h>
 #elif defined(__mips__)
-#  include <lightning/jit_mips.h>
+#  include <jit/jit_mips.h>
 #elif defined(__arm__)
-#  include <lightning/jit_arm.h>
+#  include <jit/jit_arm.h>
 #elif defined(__ppc__) || defined(__powerpc__)
-#  include <lightning/jit_ppc.h>
+#  include <jit/jit_ppc.h>
 #elif defined(__sparc__)
-#  include <lightning/jit_sparc.h>
+#  include <jit/jit_sparc.h>
 #elif defined(__ia64__)
-#  include <lightning/jit_ia64.h>
+#  include <jit/jit_ia64.h>
 #elif defined(__hppa__)
-#  include <lightning/jit_hppa.h>
+#  include <jit/jit_hppa.h>
 #elif defined(__aarch64__)
-#  include <lightning/jit_aarch64.h>
+#  include <jit/jit_aarch64.h>
 #elif defined(__s390__) || defined(__s390x__)
-#  include <lightning/jit_s390.h>
+#  include <jit/jit_s390.h>
 #elif defined(__alpha__)
-#  include <lightning/jit_alpha.h>
+#  include <jit/jit_alpha.h>
 #endif
 
 #define jit_flag_node          0x0001  /* patch node not absolute */
@@ -1095,4 +1095,4 @@ extern void jit_get_memory_functions(jit_alloc_func_ptr*,
                                     jit_realloc_func_ptr*,
                                     jit_free_func_ptr*);
 
-#endif /* _lightning_h */
+#endif /* _jit_h */
diff --git a/lib/Makefile.am b/jit/Makefile.am
similarity index 100%
rename from lib/Makefile.am
rename to jit/Makefile.am
diff --git a/lib/jit_aarch64-cpu.c b/jit/jit_aarch64-cpu.c
similarity index 100%
rename from lib/jit_aarch64-cpu.c
rename to jit/jit_aarch64-cpu.c
diff --git a/lib/jit_aarch64-fpu.c b/jit/jit_aarch64-fpu.c
similarity index 100%
rename from lib/jit_aarch64-fpu.c
rename to jit/jit_aarch64-fpu.c
diff --git a/lib/jit_aarch64-sz.c b/jit/jit_aarch64-sz.c
similarity index 100%
rename from lib/jit_aarch64-sz.c
rename to jit/jit_aarch64-sz.c
diff --git a/lib/jit_aarch64.c b/jit/jit_aarch64.c
similarity index 100%
rename from lib/jit_aarch64.c
rename to jit/jit_aarch64.c
diff --git a/include/lightning/jit_aarch64.h b/jit/jit_aarch64.h
similarity index 100%
rename from include/lightning/jit_aarch64.h
rename to jit/jit_aarch64.h
diff --git a/lib/jit_alpha-cpu.c b/jit/jit_alpha-cpu.c
similarity index 100%
rename from lib/jit_alpha-cpu.c
rename to jit/jit_alpha-cpu.c
diff --git a/lib/jit_alpha-fpu.c b/jit/jit_alpha-fpu.c
similarity index 100%
rename from lib/jit_alpha-fpu.c
rename to jit/jit_alpha-fpu.c
diff --git a/lib/jit_alpha-sz.c b/jit/jit_alpha-sz.c
similarity index 100%
rename from lib/jit_alpha-sz.c
rename to jit/jit_alpha-sz.c
diff --git a/lib/jit_alpha.c b/jit/jit_alpha.c
similarity index 100%
rename from lib/jit_alpha.c
rename to jit/jit_alpha.c
diff --git a/include/lightning/jit_alpha.h b/jit/jit_alpha.h
similarity index 100%
rename from include/lightning/jit_alpha.h
rename to jit/jit_alpha.h
diff --git a/lib/jit_arm-cpu.c b/jit/jit_arm-cpu.c
similarity index 100%
rename from lib/jit_arm-cpu.c
rename to jit/jit_arm-cpu.c
diff --git a/lib/jit_arm-swf.c b/jit/jit_arm-swf.c
similarity index 100%
rename from lib/jit_arm-swf.c
rename to jit/jit_arm-swf.c
diff --git a/lib/jit_arm-sz.c b/jit/jit_arm-sz.c
similarity index 100%
rename from lib/jit_arm-sz.c
rename to jit/jit_arm-sz.c
diff --git a/lib/jit_arm-vfp.c b/jit/jit_arm-vfp.c
similarity index 100%
rename from lib/jit_arm-vfp.c
rename to jit/jit_arm-vfp.c
diff --git a/lib/jit_arm.c b/jit/jit_arm.c
similarity index 100%
rename from lib/jit_arm.c
rename to jit/jit_arm.c
diff --git a/include/lightning/jit_arm.h b/jit/jit_arm.h
similarity index 100%
rename from include/lightning/jit_arm.h
rename to jit/jit_arm.h
diff --git a/lib/jit_disasm.c b/jit/jit_disasm.c
similarity index 98%
rename from lib/jit_disasm.c
rename to jit/jit_disasm.c
index 89cc289..fa33772 100644
--- a/lib/jit_disasm.c
+++ b/jit/jit_disasm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2012-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -17,8 +17,8 @@
  *     Paulo Cesar Pereira de Andrade
  */
 
-#include <lightning.h>
-#include <lightning/jit_private.h>
+#include "jit.h"
+#include "jit/jit_private.h"
 #if DISASSEMBLER
 #  include <dis-asm.h>
 #endif
diff --git a/lib/jit_hppa-cpu.c b/jit/jit_hppa-cpu.c
similarity index 100%
rename from lib/jit_hppa-cpu.c
rename to jit/jit_hppa-cpu.c
diff --git a/lib/jit_hppa-fpu.c b/jit/jit_hppa-fpu.c
similarity index 100%
rename from lib/jit_hppa-fpu.c
rename to jit/jit_hppa-fpu.c
diff --git a/lib/jit_hppa-sz.c b/jit/jit_hppa-sz.c
similarity index 100%
rename from lib/jit_hppa-sz.c
rename to jit/jit_hppa-sz.c
diff --git a/lib/jit_hppa.c b/jit/jit_hppa.c
similarity index 99%
rename from lib/jit_hppa.c
rename to jit/jit_hppa.c
index 558524b..38bd22e 100644
--- a/lib/jit_hppa.c
+++ b/jit/jit_hppa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2013-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -17,8 +17,8 @@
  *     Paulo Cesar Pereira de Andrade
  */
 
-#include <lightning.h>
-#include <lightning/jit_private.h>
+#include "jit.h"
+#include "jit/jit_private.h"
 
 #define jit_arg_reg_p(i)               (i >= 0 && i < 4)
 
diff --git a/include/lightning/jit_hppa.h b/jit/jit_hppa.h
similarity index 100%
rename from include/lightning/jit_hppa.h
rename to jit/jit_hppa.h
diff --git a/lib/jit_ia64-cpu.c b/jit/jit_ia64-cpu.c
similarity index 100%
rename from lib/jit_ia64-cpu.c
rename to jit/jit_ia64-cpu.c
diff --git a/lib/jit_ia64-fpu.c b/jit/jit_ia64-fpu.c
similarity index 100%
rename from lib/jit_ia64-fpu.c
rename to jit/jit_ia64-fpu.c
diff --git a/lib/jit_ia64-sz.c b/jit/jit_ia64-sz.c
similarity index 100%
rename from lib/jit_ia64-sz.c
rename to jit/jit_ia64-sz.c
diff --git a/lib/jit_ia64.c b/jit/jit_ia64.c
similarity index 99%
rename from lib/jit_ia64.c
rename to jit/jit_ia64.c
index 8f60b2e..99e2b71 100644
--- a/lib/jit_ia64.c
+++ b/jit/jit_ia64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2013-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -17,8 +17,8 @@
  *     Paulo Cesar Pereira de Andrade
  */
 
-#include <lightning.h>
-#include <lightning/jit_private.h>
+#include "jit.h"
+#include "jit/jit_private.h"
 
 #define jit_arg_reg_p(i)               ((i) >= 0 && (i) < 8)
 #if __BYTE_ORDER == __LITTLE_ENDIAN
diff --git a/include/lightning/jit_ia64.h b/jit/jit_ia64.h
similarity index 100%
rename from include/lightning/jit_ia64.h
rename to jit/jit_ia64.h
diff --git a/lib/jit_memory.c b/jit/jit_memory.c
similarity index 95%
rename from lib/jit_memory.c
rename to jit/jit_memory.c
index cbc2395..b2a90ef 100644
--- a/lib/jit_memory.c
+++ b/jit/jit_memory.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2013-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -17,10 +17,11 @@
  *     Paulo Cesar Pereira de Andrade
  */
 
-#include <lightning.h>
-#include <lightning/jit_private.h>
 #include <sys/mman.h>
 
+#include "jit.h"
+#include "jit/jit_private.h"
+
 /*
  * Prototypes
  */
diff --git a/lib/jit_mips-cpu.c b/jit/jit_mips-cpu.c
similarity index 100%
rename from lib/jit_mips-cpu.c
rename to jit/jit_mips-cpu.c
diff --git a/lib/jit_mips-fpu.c b/jit/jit_mips-fpu.c
similarity index 100%
rename from lib/jit_mips-fpu.c
rename to jit/jit_mips-fpu.c
diff --git a/lib/jit_mips-sz.c b/jit/jit_mips-sz.c
similarity index 100%
rename from lib/jit_mips-sz.c
rename to jit/jit_mips-sz.c
diff --git a/lib/jit_mips.c b/jit/jit_mips.c
similarity index 100%
rename from lib/jit_mips.c
rename to jit/jit_mips.c
diff --git a/include/lightning/jit_mips.h b/jit/jit_mips.h
similarity index 100%
rename from include/lightning/jit_mips.h
rename to jit/jit_mips.h
diff --git a/lib/jit_names.c b/jit/jit_names.c
similarity index 100%
rename from lib/jit_names.c
rename to jit/jit_names.c
diff --git a/lib/jit_note.c b/jit/jit_note.c
similarity index 98%
rename from lib/jit_note.c
rename to jit/jit_note.c
index f834de6..ced3506 100644
--- a/lib/jit_note.c
+++ b/jit/jit_note.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2013-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -17,8 +17,8 @@
  *     Paulo Cesar Pereira de Andrade
  */
 
-#include <lightning.h>
-#include <lightning/jit_private.h>
+#include "jit.h"
+#include "jit/jit_private.h"
 
 /*
  * Prototypes
diff --git a/lib/jit_ppc-cpu.c b/jit/jit_ppc-cpu.c
similarity index 100%
rename from lib/jit_ppc-cpu.c
rename to jit/jit_ppc-cpu.c
diff --git a/lib/jit_ppc-fpu.c b/jit/jit_ppc-fpu.c
similarity index 100%
rename from lib/jit_ppc-fpu.c
rename to jit/jit_ppc-fpu.c
diff --git a/lib/jit_ppc-sz.c b/jit/jit_ppc-sz.c
similarity index 100%
rename from lib/jit_ppc-sz.c
rename to jit/jit_ppc-sz.c
diff --git a/lib/jit_ppc.c b/jit/jit_ppc.c
similarity index 100%
rename from lib/jit_ppc.c
rename to jit/jit_ppc.c
diff --git a/include/lightning/jit_ppc.h b/jit/jit_ppc.h
similarity index 100%
rename from include/lightning/jit_ppc.h
rename to jit/jit_ppc.h
diff --git a/lib/jit_print.c b/jit/jit_print.c
similarity index 98%
rename from lib/jit_print.c
rename to jit/jit_print.c
index 8fe9885..57eb4d1 100644
--- a/lib/jit_print.c
+++ b/jit/jit_print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2012-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -17,8 +17,8 @@
  *     Paulo Cesar Pereira de Andrade
  */
 
-#include <lightning.h>
-#include <lightning/jit_private.h>
+#include "jit.h"
+#include "jit/jit_private.h"
 
 #define print_chr(value)               fputc(value, stdout)
 #define print_hex(value)               fprintf(stdout, "0x%lx", value)
diff --git a/include/lightning/jit_private.h b/jit/jit_private.h
similarity index 100%
rename from include/lightning/jit_private.h
rename to jit/jit_private.h
diff --git a/lib/jit_rewind.c b/jit/jit_rewind.c
similarity index 97%
rename from lib/jit_rewind.c
rename to jit/jit_rewind.c
index 518d2f6..29f09aa 100644
--- a/lib/jit_rewind.c
+++ b/jit/jit_rewind.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2015-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -17,8 +17,8 @@
  *     Paulo Cesar Pereira de Andrade
  */
 
-#include <lightning.h>
-#include <lightning/jit_private.h>
+#include "jit.h"
+#include "jit/jit_private.h"
 
 #if PROTO
 #  define free_synth_list(node)                _free_synth_list(_jit,node)
diff --git a/lib/jit_s390-cpu.c b/jit/jit_s390-cpu.c
similarity index 100%
rename from lib/jit_s390-cpu.c
rename to jit/jit_s390-cpu.c
diff --git a/lib/jit_s390-fpu.c b/jit/jit_s390-fpu.c
similarity index 100%
rename from lib/jit_s390-fpu.c
rename to jit/jit_s390-fpu.c
diff --git a/lib/jit_s390-sz.c b/jit/jit_s390-sz.c
similarity index 100%
rename from lib/jit_s390-sz.c
rename to jit/jit_s390-sz.c
diff --git a/lib/jit_s390.c b/jit/jit_s390.c
similarity index 99%
rename from lib/jit_s390.c
rename to jit/jit_s390.c
index 27e8871..b7e9bce 100644
--- a/lib/jit_s390.c
+++ b/jit/jit_s390.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2013-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -17,8 +17,8 @@
  *     Paulo Cesar Pereira de Andrade
  */
 
-#include <lightning.h>
-#include <lightning/jit_private.h>
+#include "jit.h"
+#include "jit/jit_private.h"
 
 #if __WORDSIZE == 32
 #  define NUM_FLOAT_REG_ARGS           2
diff --git a/include/lightning/jit_s390.h b/jit/jit_s390.h
similarity index 100%
rename from include/lightning/jit_s390.h
rename to jit/jit_s390.h
diff --git a/lib/jit_size.c b/jit/jit_size.c
similarity index 95%
rename from lib/jit_size.c
rename to jit/jit_size.c
index 3585ada..47b41df 100644
--- a/lib/jit_size.c
+++ b/jit/jit_size.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2013-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -17,8 +17,8 @@
  *     Paulo Cesar Pereira de Andrade
  */
 
-#include <lightning.h>
-#include <lightning/jit_private.h>
+#include "jit.h"
+#include "jit/jit_private.h"
 #if GET_JIT_SIZE
 #  include <stdio.h>
 #endif
diff --git a/lib/jit_sparc-cpu.c b/jit/jit_sparc-cpu.c
similarity index 100%
rename from lib/jit_sparc-cpu.c
rename to jit/jit_sparc-cpu.c
diff --git a/lib/jit_sparc-fpu.c b/jit/jit_sparc-fpu.c
similarity index 100%
rename from lib/jit_sparc-fpu.c
rename to jit/jit_sparc-fpu.c
diff --git a/lib/jit_sparc-sz.c b/jit/jit_sparc-sz.c
similarity index 100%
rename from lib/jit_sparc-sz.c
rename to jit/jit_sparc-sz.c
diff --git a/lib/jit_sparc.c b/jit/jit_sparc.c
similarity index 100%
rename from lib/jit_sparc.c
rename to jit/jit_sparc.c
diff --git a/include/lightning/jit_sparc.h b/jit/jit_sparc.h
similarity index 100%
rename from include/lightning/jit_sparc.h
rename to jit/jit_sparc.h
diff --git a/lib/jit_x86-cpu.c b/jit/jit_x86-cpu.c
similarity index 100%
rename from lib/jit_x86-cpu.c
rename to jit/jit_x86-cpu.c
diff --git a/lib/jit_x86-sse.c b/jit/jit_x86-sse.c
similarity index 100%
rename from lib/jit_x86-sse.c
rename to jit/jit_x86-sse.c
diff --git a/lib/jit_x86-sz.c b/jit/jit_x86-sz.c
similarity index 100%
rename from lib/jit_x86-sz.c
rename to jit/jit_x86-sz.c
diff --git a/lib/jit_x86-x87.c b/jit/jit_x86-x87.c
similarity index 100%
rename from lib/jit_x86-x87.c
rename to jit/jit_x86-x87.c
diff --git a/lib/jit_x86.c b/jit/jit_x86.c
similarity index 99%
rename from lib/jit_x86.c
rename to jit/jit_x86.c
index aae796b..40f6674 100644
--- a/lib/jit_x86.c
+++ b/jit/jit_x86.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2012-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -17,8 +17,8 @@
  *     Paulo Cesar Pereira de Andrade
  */
 
-#include <lightning.h>
-#include <lightning/jit_private.h>
+#include "jit.h"
+#include "jit/jit_private.h"
 
 #if __X32
 #  define jit_arg_reg_p(i)             0
diff --git a/include/lightning/jit_x86.h b/jit/jit_x86.h
similarity index 100%
rename from include/lightning/jit_x86.h
rename to jit/jit_x86.h
diff --git a/lib/lightning.c b/jit/lightning.c
similarity index 99%
rename from lib/lightning.c
rename to jit/lightning.c
index bce5968..c2cb75f 100644
--- a/lib/lightning.c
+++ b/jit/lightning.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2012-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -17,13 +17,14 @@
  *     Paulo Cesar Pereira de Andrade
  */
 
-#include <lightning.h>
-#include <lightning/jit_private.h>
 #include <sys/mman.h>
 #if defined(__sgi)
 #  include <fcntl.h>
 #endif
 
+#include "jit.h"
+#include "jit/jit_private.h"
+
 #ifndef MAP_ANON
 #  define MAP_ANON                     MAP_ANONYMOUS
 #  ifndef MAP_ANONYMOUS