diff --git a/tests/Lia64-test-rbs.c b/tests/Lia64-test-rbs.c
index 8790ae23..d735dceb 100644
--- a/tests/Lia64-test-rbs.c
+++ b/tests/Lia64-test-rbs.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gia64-test-rbs.c"
 #endif
diff --git a/tests/Lia64-test-stack.c b/tests/Lia64-test-stack.c
index 196dff4b..d18a9c60 100644
--- a/tests/Lia64-test-stack.c
+++ b/tests/Lia64-test-stack.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gia64-test-stack.c"
 #endif
diff --git a/tests/Ltest-dyn1.c b/tests/Ltest-dyn1.c
index 8231a3e8..92e63483 100644
--- a/tests/Ltest-dyn1.c
+++ b/tests/Ltest-dyn1.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gtest-dyn1.c"
 #endif
diff --git a/tests/Ltest-exc.c b/tests/Ltest-exc.c
index 2c0463fc..03bb100d 100644
--- a/tests/Ltest-exc.c
+++ b/tests/Ltest-exc.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gtest-exc.c"
 #endif
diff --git a/tests/Ltest-init.cxx b/tests/Ltest-init.cxx
index e69de29b..79ddfaaf 100644
--- a/tests/Ltest-init.cxx
+++ b/tests/Ltest-init.cxx
@@ -0,0 +1,5 @@
+#define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
+#include "Gtest-init.cxx"
+#endif
diff --git a/tests/Ltest-resume-sig.c b/tests/Ltest-resume-sig.c
index 556d2ee7..52002e21 100644
--- a/tests/Ltest-resume-sig.c
+++ b/tests/Ltest-resume-sig.c
@@ -1,4 +1,5 @@
-#ifndef UNW_REMOTE_ONLY
 #define UNW_LOCAL_ONLY
+#include <libunwind.h>
+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
 #include "Gtest-resume-sig.c"
 #endif