diff --git a/habitat-cpp-connector b/habitat-cpp-connector
index 8a2e0891..64c18110 160000
--- a/habitat-cpp-connector
+++ b/habitat-cpp-connector
@@ -1 +1 @@
-Subproject commit 8a2e0891ad5b971bdcf594a34373ad342ee58706
+Subproject commit 64c18110fda18065390e4937a633aef9c63ce271
diff --git a/src/habitat b/src/habitat
index 1cf97f85..3ed726d6 120000
--- a/src/habitat
+++ b/src/habitat
@@ -1 +1 @@
-../../habitat-cpp-connector/src/
\ No newline at end of file
+../habitat-cpp-connector/src/
\ No newline at end of file
diff --git a/src/include/habitat b/src/include/habitat
new file mode 120000
index 00000000..78ed2cef
--- /dev/null
+++ b/src/include/habitat
@@ -0,0 +1 @@
+../../habitat-cpp-connector/habitat/
\ No newline at end of file
diff --git a/src/include/habitat/CouchDB.h b/src/include/habitat/CouchDB.h
deleted file mode 120000
index 75d76b7b..00000000
--- a/src/include/habitat/CouchDB.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../habitat-cpp-connector/src/CouchDB.h
\ No newline at end of file
diff --git a/src/include/habitat/EZ.h b/src/include/habitat/EZ.h
deleted file mode 120000
index 63ace10c..00000000
--- a/src/include/habitat/EZ.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../habitat-cpp-connector/src/EZ.h
\ No newline at end of file
diff --git a/src/include/habitat/Extractor.h b/src/include/habitat/Extractor.h
deleted file mode 120000
index 9383eafc..00000000
--- a/src/include/habitat/Extractor.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../habitat-cpp-connector/src/Extractor.h
\ No newline at end of file
diff --git a/src/include/habitat/README b/src/include/habitat/README
deleted file mode 100644
index 607170f4..00000000
--- a/src/include/habitat/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Note: In order to build habitat-cpp-connector directly into fldigi, the
-includes are both here (so that they are are available to dl-fldigi as
-#include "habitat/*.h"), and in dl-fldigi/src/habitat/ via the symlink to
-habitat-cpp-connector/src/ (since when the habitat-cpp-connector cpp files
-themselves are compiled they expect the headers to be available in the same
-directory).
diff --git a/src/include/habitat/UKHASExtractor.h b/src/include/habitat/UKHASExtractor.h
deleted file mode 120000
index 525e766a..00000000
--- a/src/include/habitat/UKHASExtractor.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../habitat-cpp-connector/src/UKHASExtractor.h
\ No newline at end of file
diff --git a/src/include/habitat/Uploader.h b/src/include/habitat/Uploader.h
deleted file mode 120000
index 7ded9971..00000000
--- a/src/include/habitat/Uploader.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../habitat-cpp-connector/src/Uploader.h
\ No newline at end of file
diff --git a/src/include/habitat/UploaderThread.h b/src/include/habitat/UploaderThread.h
deleted file mode 120000
index 3b0d80eb..00000000
--- a/src/include/habitat/UploaderThread.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../habitat-cpp-connector/src/UploaderThread.h
\ No newline at end of file