diff --git a/src/dwarf/Lexpr-dwarf.c b/src/dwarf/Lexpr-dwarf.c
deleted file mode 100644
index b2eedc96..00000000
--- a/src/dwarf/Lexpr-dwarf.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gexpr-dwarf.c"
-#endif
diff --git a/src/dwarf/Lfde-dwarf.c b/src/dwarf/Lfde-dwarf.c
deleted file mode 100644
index 9437a1a4..00000000
--- a/src/dwarf/Lfde-dwarf.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gfde-dwarf.c"
-#endif
diff --git a/src/dwarf/Lparser-dwarf.c b/src/dwarf/Lparser-dwarf.c
deleted file mode 100644
index c8599aa5..00000000
--- a/src/dwarf/Lparser-dwarf.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gparser-dwarf.c"
-#endif
diff --git a/src/dwarf/Lpe-dwarf.c b/src/dwarf/Lpe-dwarf.c
deleted file mode 100644
index 2810b9f3..00000000
--- a/src/dwarf/Lpe-dwarf.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gpe-dwarf.c"
-#endif
diff --git a/src/dwarf/Lstep-dwarf.c b/src/dwarf/Lstep-dwarf.c
deleted file mode 100644
index 728a0341..00000000
--- a/src/dwarf/Lstep-dwarf.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gstep-dwarf.c"
-#endif
diff --git a/src/hppa/Lget_proc_info-hppa.c b/src/hppa/Lget_proc_info-hppa.c
deleted file mode 100644
index 0ba99338..00000000
--- a/src/hppa/Lget_proc_info-hppa.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gget_proc_info-hppa.c"
-#endif
diff --git a/src/hppa/Lget_proc_name-hppa.c b/src/hppa/Lget_proc_name-hppa.c
deleted file mode 100644
index 096ba1c5..00000000
--- a/src/hppa/Lget_proc_name-hppa.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gget_proc_name-hppa.c"
-#endif
diff --git a/src/hppa/Lget_reg-hppa.c b/src/hppa/Lget_reg-hppa.c
deleted file mode 100644
index cacc41fe..00000000
--- a/src/hppa/Lget_reg-hppa.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gget_reg-hppa.c"
-#endif
diff --git a/src/hppa/Linit-hppa.c b/src/hppa/Linit-hppa.c
deleted file mode 100644
index 80fe4154..00000000
--- a/src/hppa/Linit-hppa.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Ginit-hppa.c"
-#endif
diff --git a/src/hppa/Linit_local-hppa.c b/src/hppa/Linit_local-hppa.c
deleted file mode 100644
index 6ca5f043..00000000
--- a/src/hppa/Linit_local-hppa.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Ginit_local-hppa.c"
-#endif
diff --git a/src/hppa/Lregs-hppa.c b/src/hppa/Lregs-hppa.c
deleted file mode 100644
index 977ad845..00000000
--- a/src/hppa/Lregs-hppa.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gregs-hppa.c"
-#endif
diff --git a/src/hppa/Lstep-hppa.c b/src/hppa/Lstep-hppa.c
deleted file mode 100644
index 81dcbf96..00000000
--- a/src/hppa/Lstep-hppa.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gstep-hppa.c"
-#endif
diff --git a/src/ia64/Lcreate_addr_space-ia64.c b/src/ia64/Lcreate_addr_space-ia64.c
deleted file mode 100644
index fe56d3ca..00000000
--- a/src/ia64/Lcreate_addr_space-ia64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gcreate_addr_space-ia64.c"
-#endif
diff --git a/src/ia64/Lget_proc_info-ia64.c b/src/ia64/Lget_proc_info-ia64.c
deleted file mode 100644
index 787a5a5f..00000000
--- a/src/ia64/Lget_proc_info-ia64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gget_proc_info-ia64.c"
-#endif
diff --git a/src/ia64/Lget_save_loc-ia64.c b/src/ia64/Lget_save_loc-ia64.c
deleted file mode 100644
index 1687ea0c..00000000
--- a/src/ia64/Lget_save_loc-ia64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gget_save_loc-ia64.c"
-#endif
diff --git a/src/ia64/Lglobal-ia64.c b/src/ia64/Lglobal-ia64.c
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/ia64/Linit-ia64.c b/src/ia64/Linit-ia64.c
deleted file mode 100644
index 6924f3e3..00000000
--- a/src/ia64/Linit-ia64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Ginit-ia64.c"
-#endif
diff --git a/src/ia64/Linit_local-ia64.c b/src/ia64/Linit_local-ia64.c
deleted file mode 100644
index e23d6dcf..00000000
--- a/src/ia64/Linit_local-ia64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Ginit_local-ia64.c"
-#endif
diff --git a/src/ia64/Linit_remote-ia64.c b/src/ia64/Linit_remote-ia64.c
deleted file mode 100644
index ea821c45..00000000
--- a/src/ia64/Linit_remote-ia64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Ginit_remote-ia64.c"
-#endif
diff --git a/src/ia64/Linstall_cursor-ia64.S b/src/ia64/Linstall_cursor-ia64.S
deleted file mode 100644
index 512fd02d..00000000
--- a/src/ia64/Linstall_cursor-ia64.S
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Ginstall_cursor-ia64.S"
-#endif
diff --git a/src/ia64/Lis_signal_frame-ia64.c b/src/ia64/Lis_signal_frame-ia64.c
deleted file mode 100644
index df4911a5..00000000
--- a/src/ia64/Lis_signal_frame-ia64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gis_signal_frame-ia64.c"
-#endif
diff --git a/src/ia64/Lparser-ia64.c b/src/ia64/Lparser-ia64.c
deleted file mode 100644
index 1f94ef7c..00000000
--- a/src/ia64/Lparser-ia64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gparser-ia64.c"
-#endif
diff --git a/src/ia64/Lrbs-ia64.c b/src/ia64/Lrbs-ia64.c
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/ia64/Lregs-ia64.c b/src/ia64/Lregs-ia64.c
deleted file mode 100644
index 0743f2c3..00000000
--- a/src/ia64/Lregs-ia64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gregs-ia64.c"
-#endif
diff --git a/src/ia64/Lresume-ia64.c b/src/ia64/Lresume-ia64.c
deleted file mode 100644
index ad3ecbc6..00000000
--- a/src/ia64/Lresume-ia64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gresume-ia64.c"
-#endif
diff --git a/src/ia64/Lscript-ia64.c b/src/ia64/Lscript-ia64.c
deleted file mode 100644
index c54509cc..00000000
--- a/src/ia64/Lscript-ia64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gscript-ia64.c"
-#endif
diff --git a/src/ia64/Lstep-ia64.c b/src/ia64/Lstep-ia64.c
deleted file mode 100644
index 3c61850f..00000000
--- a/src/ia64/Lstep-ia64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gstep-ia64.c"
-#endif
diff --git a/src/ia64/Ltables-ia64.c b/src/ia64/Ltables-ia64.c
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/ia64/mk_Lcursor_i-ia64.c b/src/ia64/mk_Lcursor_i-ia64.c
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/x86/Lcreate_addr_space-x86.c b/src/x86/Lcreate_addr_space-x86.c
deleted file mode 100644
index fe53985f..00000000
--- a/src/x86/Lcreate_addr_space-x86.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gcreate_addr_space-x86.c"
-#endif
diff --git a/src/x86/Lget_proc_info-x86.c b/src/x86/Lget_proc_info-x86.c
deleted file mode 100644
index a118758d..00000000
--- a/src/x86/Lget_proc_info-x86.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gget_proc_info-x86.c"
-#endif
diff --git a/src/x86/Lget_save_loc-x86.c b/src/x86/Lget_save_loc-x86.c
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/x86/Lglobal-x86.c b/src/x86/Lglobal-x86.c
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/x86/Linit-x86.c b/src/x86/Linit-x86.c
deleted file mode 100644
index c073efd6..00000000
--- a/src/x86/Linit-x86.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Ginit-x86.c"
-#endif
diff --git a/src/x86/Linit_local-x86.c b/src/x86/Linit_local-x86.c
deleted file mode 100644
index 92e6c8bd..00000000
--- a/src/x86/Linit_local-x86.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Ginit_local-x86.c"
-#endif
diff --git a/src/x86/Linit_remote-x86.c b/src/x86/Linit_remote-x86.c
deleted file mode 100644
index 58c9d728..00000000
--- a/src/x86/Linit_remote-x86.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Ginit_remote-x86.c"
-#endif
diff --git a/src/x86/Lis_signal_frame-x86.c b/src/x86/Lis_signal_frame-x86.c
deleted file mode 100644
index fa45d073..00000000
--- a/src/x86/Lis_signal_frame-x86.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gis_signal_frame-x86.c"
-#endif
diff --git a/src/x86/Lregs-x86.c b/src/x86/Lregs-x86.c
deleted file mode 100644
index 58e96db3..00000000
--- a/src/x86/Lregs-x86.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gregs-x86.c"
-#endif
diff --git a/src/x86/Lresume-x86.c b/src/x86/Lresume-x86.c
deleted file mode 100644
index 4fbfe58a..00000000
--- a/src/x86/Lresume-x86.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gresume-x86.c"
-#endif
diff --git a/src/x86/Lstep-x86.c b/src/x86/Lstep-x86.c
deleted file mode 100644
index b55da876..00000000
--- a/src/x86/Lstep-x86.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-#include "Gstep-x86.c"
-#endif