diff --git a/Gdestroy_addr_space.c b/Gdestroy_addr_space.c
index 83a01b9..bfacfd2 100644
--- a/Gdestroy_addr_space.c
+++ b/Gdestroy_addr_space.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 PROTECTED void
 unw_destroy_addr_space (unw_addr_space_t as)
diff --git a/Gdyn-extract.c b/Gdyn-extract.c
index 5258839..36b1ce7 100644
--- a/Gdyn-extract.c
+++ b/Gdyn-extract.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 HIDDEN int
 unwi_extract_dynamic_proc_info (unw_addr_space_t as, unw_word_t ip,
diff --git a/Gdyn-remote.c b/Gdyn-remote.c
index 917a11d..b6c394e 100644
--- a/Gdyn-remote.c
+++ b/Gdyn-remote.c
@@ -25,7 +25,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #include <stdlib.h>
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 #include "remote.h"
 
 static void
diff --git a/Gfind_dynamic_proc_info.c b/Gfind_dynamic_proc_info.c
index 6cf3b42..1d0e758 100644
--- a/Gfind_dynamic_proc_info.c
+++ b/Gfind_dynamic_proc_info.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 #ifdef UNW_REMOTE_ONLY
 
diff --git a/Gget_accessors.c b/Gget_accessors.c
index 0e3606c..193e184 100644
--- a/Gget_accessors.c
+++ b/Gget_accessors.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 PROTECTED unw_accessors_t *
 unw_get_accessors (unw_addr_space_t as)
diff --git a/Gget_fpreg.c b/Gget_fpreg.c
index a9ae9bf..1b0628a 100644
--- a/Gget_fpreg.c
+++ b/Gget_fpreg.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 PROTECTED int
 unw_get_fpreg (unw_cursor_t *cursor, int regnum, unw_fpreg_t *valp)
diff --git a/Gget_proc_info_by_ip.c b/Gget_proc_info_by_ip.c
index 4c9de77..4d068e4 100644
--- a/Gget_proc_info_by_ip.c
+++ b/Gget_proc_info_by_ip.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 PROTECTED int
 unw_get_proc_info_by_ip (unw_addr_space_t as, unw_word_t ip,
diff --git a/Gget_proc_name.c b/Gget_proc_name.c
index 7251c59..7f1dbe5 100644
--- a/Gget_proc_name.c
+++ b/Gget_proc_name.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 #include "remote.h"
 
 static inline int
diff --git a/Gget_reg.c b/Gget_reg.c
index 021d913..a90543f 100644
--- a/Gget_reg.c
+++ b/Gget_reg.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 PROTECTED int
 unw_get_reg (unw_cursor_t *cursor, int regnum, unw_word_t *valp)
diff --git a/Gput_dynamic_unwind_info.c b/Gput_dynamic_unwind_info.c
index 13a9c1a..b09f8e5 100644
--- a/Gput_dynamic_unwind_info.c
+++ b/Gput_dynamic_unwind_info.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 HIDDEN void
 unwi_put_dynamic_unwind_info (unw_addr_space_t as, unw_proc_info_t *pi,
diff --git a/Gset_caching_policy.c b/Gset_caching_policy.c
index 421c435..98fa352 100644
--- a/Gset_caching_policy.c
+++ b/Gset_caching_policy.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 PROTECTED int
 unw_set_caching_policy (unw_addr_space_t as, unw_caching_policy_t policy)
diff --git a/Gset_fpreg.c b/Gset_fpreg.c
index d3b202d..0571613 100644
--- a/Gset_fpreg.c
+++ b/Gset_fpreg.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 PROTECTED int
 unw_set_fpreg (unw_cursor_t *cursor, int regnum, unw_fpreg_t val)
diff --git a/Gset_reg.c b/Gset_reg.c
index 09fa09a..56cdead 100644
--- a/Gset_reg.c
+++ b/Gset_reg.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 PROTECTED int
 unw_set_reg (unw_cursor_t *cursor, int regnum, unw_word_t valp)
diff --git a/dyn-cancel.c b/dyn-cancel.c
index e784317..888eb98 100644
--- a/dyn-cancel.c
+++ b/dyn-cancel.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 void
 _U_dyn_cancel (unw_dyn_info_t *di)
diff --git a/dyn-info-list.c b/dyn-info-list.c
index 5a5e30e..919db68 100644
--- a/dyn-info-list.c
+++ b/dyn-info-list.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 HIDDEN unw_dyn_info_list_t _U_dyn_info_list;
 
diff --git a/dyn-register.c b/dyn-register.c
index c28954a..e5632bf 100644
--- a/dyn-register.c
+++ b/dyn-register.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 HIDDEN define_lock (_U_dyn_info_list_lock);
 
diff --git a/elfxx.c b/elfxx.c
index 3d87331..3da8b1e 100644
--- a/elfxx.c
+++ b/elfxx.c
@@ -24,7 +24,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 #include <stdio.h>
 #include <sys/param.h>
diff --git a/elfxx.h b/elfxx.h
index dea0463..598960a 100644
--- a/elfxx.h
+++ b/elfxx.h
@@ -41,7 +41,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 # define elf_w(x)	_Uelf64_##x
 #endif
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 extern int elf_w (get_proc_name) (unw_addr_space_t as,
 				  pid_t pid, unw_word_t ip,
diff --git a/flush_cache.c b/flush_cache.c
index 2e88fa8..30b57e1 100644
--- a/flush_cache.c
+++ b/flush_cache.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 PROTECTED void
 unw_flush_cache (unw_addr_space_t as, unw_word_t lo, unw_word_t hi)
diff --git a/init.c b/init.c
index 4bf97c4..ced1f45 100644
--- a/init.c
+++ b/init.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 HIDDEN intrmask_t unwi_full_mask;
 
diff --git a/mempool.c b/mempool.c
index ad75f0c..990b040 100644
--- a/mempool.c
+++ b/mempool.c
@@ -24,7 +24,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 /* From GCC docs: ``Gcc also provides a target specific macro
  * __BIGGEST_ALIGNMENT__, which is the largest alignment ever used for any data
diff --git a/os-freebsd-kern.c b/os-freebsd-kern.c
index 191289a..47f8b79 100644
--- a/os-freebsd-kern.c
+++ b/os-freebsd-kern.c
@@ -32,7 +32,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #include <stdio.h>
 #include <errno.h>
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 static void *
 get_mem(size_t sz)
diff --git a/setjmp/setjmp_i.h b/setjmp/setjmp_i.h
index 1d7ca15..e533503 100644
--- a/setjmp/setjmp_i.h
+++ b/setjmp/setjmp_i.h
@@ -25,7 +25,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #if UNW_TARGET_IA64
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 #include "tdep-ia64/rse.h"
 
 static inline int
diff --git a/setjmp/siglongjmp.c b/setjmp/siglongjmp.c
index 55c2003..4e26a23 100644
--- a/setjmp/siglongjmp.c
+++ b/setjmp/siglongjmp.c
@@ -27,7 +27,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #include <setjmp.h>
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 #include "jmpbuf.h"
 #include "setjmp_i.h"
 
diff --git a/strerror.c b/strerror.c
index ef64716..b13c5fa 100644
--- a/strerror.c
+++ b/strerror.c
@@ -23,7 +23,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
-#include "libunwind_i.h"
+#include "include/libunwind_i.h"
 
 /* Returns the text corresponding to the given err_code or the
    text "invalid error code" if the err_code is invalid.  */