diff --git a/software/include/basec++/memory b/software/include/basec++/memory
deleted file mode 100644
index 899bb3d44..000000000
--- a/software/include/basec++/memory
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __CXX_MEMORY
-#define __CXX_MEMORY
-
-#endif /* __CXX_MEMORY */
diff --git a/software/include/basec++/tuple b/software/include/basec++/tuple
deleted file mode 100644
index c97a8a11d..000000000
--- a/software/include/basec++/tuple
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __CXX_TUPLE
-#define __CXX_TUPLE
-
-#endif /* __CXX_TUPLE */
diff --git a/software/include/basec++/vector b/software/include/basec++/vector
deleted file mode 100644
index ec2844118..000000000
--- a/software/include/basec++/vector
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __CXX_VECTOR
-#define __CXX_VECTOR
-
-#endif /* __CXX_VECTOR */
diff --git a/software/libunwind/__cxxabi_config.h b/software/libunwind/__cxxabi_config.h
index e69de29bb..42cd6fe5c 100644
--- a/software/libunwind/__cxxabi_config.h
+++ b/software/libunwind/__cxxabi_config.h
@@ -0,0 +1 @@
+#define LIBCXXABI_ARM_EHABI 0
diff --git a/software/libunwind/strings.h b/software/libunwind/strings.h
deleted file mode 100644
index 18f596f63..000000000
--- a/software/libunwind/strings.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// This is some obsolete BSD crap that libunwind pulls in
-// that's so old and useless it's not worth putting into libbase.
diff --git a/software/unwinder b/software/unwinder
index 7ce966d59..70a7d2ad4 160000
--- a/software/unwinder
+++ b/software/unwinder
@@ -1 +1 @@
-Subproject commit 7ce966d59aa6c5a8b962dca43a34279b69bec597
+Subproject commit 70a7d2ad43da6ebf9113b0101bfd4b202e0c7b6b