diff --git a/CMakeLists.txt b/CMakeLists.txt
index 285a957..f64f5ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,9 +40,7 @@ if(${ros_environment_FOUND})
             oculus
             PUBLIC
                 "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-                "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/thirdparty>"
-                "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
-                "$<INSTALL_INTERFACE:include/thirdparty>"
+                "$<INSTALL_INTERFACE:include/>"
         )
 
         install(
@@ -54,7 +52,7 @@ if(${ros_environment_FOUND})
         )
 
         install(
-            DIRECTORY include/ thirdparty
+            DIRECTORY include/
             DESTINATION include
             FILES_MATCHING
             PATTERN "*.hpp"
@@ -73,13 +71,13 @@ if(${ros_environment_FOUND})
 
         catkin_package(
             CATKIN_DEPENDS g3log_ros
-            INCLUDE_DIRS include thirdparty
+            INCLUDE_DIRS include
             LIBRARIES liboculus
         )
 
         add_library(liboculus ${oculus_SRCS})
 
-        include_directories(liboculus include thirdparty ${catkin_INCLUDE_DIRS})
+        include_directories(liboculus include ${catkin_INCLUDE_DIRS})
 
         target_link_libraries(liboculus ${catkin_LIBRARIES})
 
@@ -92,7 +90,7 @@ if(${ros_environment_FOUND})
 
         ## Install headers
         install(
-            DIRECTORY include/${PROJECT_NAME}/ thirdparty/
+            DIRECTORY include/${PROJECT_NAME}/
             DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
             FILES_MATCHING
             PATTERN "*.hpp"
diff --git a/README.md b/README.md
index 48a287f..0f08995 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ The client must implement callbacks that will handle data from the sonar ([for e
 This library makes liberal use of overlay classes in order to provide
 zero-copy accessor functions into the raw data chunks received from
 the oculus.  These classes overlay the struct hierarchy defined in
-thirdparty/Oculus/Oculus.h, making it possible to directly cast between the types depending on which accessors you want to use:
+`include/liboculus/thirdparty/Oculus/Oculus.h`, making it possible to directly cast between the types depending on which accessors you want to use:
 * OculusSimplePingResult carries all image data from the oculus.
 * Its first field is the OculusSimpleFireMessage that triggered data collection
 * In turn, the first field of the OculusSimpleFireMessage is an OculusMessageHeader
@@ -142,4 +142,4 @@ Other files/classes:
 
 This code is released under the [BSD 3-clause license](LICENSE).
 
-This repository contains one file provided by Blueprint as part of their free "Oculus Viewer" sample application: ([thirdparty/Oculus/Oculus.h](thirdpart/Oculus/Oculus.h)).  It describes their protocol and data formats.   This file is distributed under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
+This repository contains one file provided by Blueprint as part of their free "Oculus Viewer" sample application: ([include/liboculus/thirdparty/Oculus/Oculus.h](thirdpart/Oculus/Oculus.h)).  It describes their protocol and data formats.   This file is distributed under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
diff --git a/include/liboculus/BearingData.h b/include/liboculus/BearingData.h
index 0c73812..f934a7f 100644
--- a/include/liboculus/BearingData.h
+++ b/include/liboculus/BearingData.h
@@ -32,8 +32,8 @@
 
 #include <g3log/g3log.hpp> // needed for CHECK macro
 
-#include "Oculus/Oculus.h"
 #include "liboculus/DataTypes.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 
diff --git a/include/liboculus/Constants.h b/include/liboculus/Constants.h
index d2aea40..f9adeb9 100644
--- a/include/liboculus/Constants.h
+++ b/include/liboculus/Constants.h
@@ -37,7 +37,7 @@
 #include <string>
 #include <vector>
 
-#include "Oculus/Oculus.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 
diff --git a/include/liboculus/DataTypes.h b/include/liboculus/DataTypes.h
index 8843d78..d511959 100644
--- a/include/liboculus/DataTypes.h
+++ b/include/liboculus/DataTypes.h
@@ -37,7 +37,7 @@
 #include <string>
 #include <vector>
 
-#include "Oculus/Oculus.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 
diff --git a/include/liboculus/GainData.h b/include/liboculus/GainData.h
index cdf1232..ad215dc 100644
--- a/include/liboculus/GainData.h
+++ b/include/liboculus/GainData.h
@@ -36,8 +36,8 @@
 #include <iostream>
 #include <vector>
 
-#include "Oculus/Oculus.h"
 #include "liboculus/DataTypes.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 
diff --git a/include/liboculus/ImageData.h b/include/liboculus/ImageData.h
index 6253a7f..bfa1e9b 100644
--- a/include/liboculus/ImageData.h
+++ b/include/liboculus/ImageData.h
@@ -37,7 +37,7 @@
 #include <iostream>
 
 #include "DataTypes.h"
-#include "Oculus/Oculus.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 
diff --git a/include/liboculus/MessageHeader.h b/include/liboculus/MessageHeader.h
index dd11fdf..ebe4ea7 100644
--- a/include/liboculus/MessageHeader.h
+++ b/include/liboculus/MessageHeader.h
@@ -39,7 +39,7 @@
 #include "BearingData.h"
 #include "DataTypes.h"
 #include "ImageData.h"
-#include "Oculus/Oculus.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 
diff --git a/include/liboculus/SimpleFireMessage.h b/include/liboculus/SimpleFireMessage.h
index 2bbdf30..97d9ea4 100644
--- a/include/liboculus/SimpleFireMessage.h
+++ b/include/liboculus/SimpleFireMessage.h
@@ -36,10 +36,10 @@
 #include <string>
 #include <vector>
 
-#include "Oculus/Oculus.h"
 #include "liboculus/Constants.h"
 #include "liboculus/MessageHeader.h"
 #include "liboculus/SonarConfiguration.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 
diff --git a/include/liboculus/SimplePingResult.h b/include/liboculus/SimplePingResult.h
index 40dc340..75ae82f 100644
--- a/include/liboculus/SimplePingResult.h
+++ b/include/liboculus/SimplePingResult.h
@@ -37,13 +37,13 @@
 #include <string>
 #include <vector>
 
-#include "Oculus/Oculus.h"
 #include "liboculus/BearingData.h"
 #include "liboculus/DataTypes.h"
 #include "liboculus/GainData.h"
 #include "liboculus/ImageData.h"
 #include "liboculus/SimpleFireMessage.h"
 #include "liboculus/SonarConfiguration.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 
diff --git a/include/liboculus/SonarConfiguration.h b/include/liboculus/SonarConfiguration.h
index c675e35..b9292b0 100644
--- a/include/liboculus/SonarConfiguration.h
+++ b/include/liboculus/SonarConfiguration.h
@@ -33,8 +33,8 @@
 #include <boost/asio.hpp>
 #include <vector>
 
-#include "Oculus/Oculus.h"
 #include "liboculus/Constants.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 
diff --git a/include/liboculus/SonarStatus.h b/include/liboculus/SonarStatus.h
index 7015bf2..6f27907 100644
--- a/include/liboculus/SonarStatus.h
+++ b/include/liboculus/SonarStatus.h
@@ -36,9 +36,9 @@
 #include <mutex>
 #include <thread>
 
-#include "Oculus/Oculus.h"
 #include "g3log/g3log.hpp"
 #include "liboculus/DataTypes.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 
diff --git a/include/liboculus/StatusRx.h b/include/liboculus/StatusRx.h
index 20eacd2..1f95ae2 100644
--- a/include/liboculus/StatusRx.h
+++ b/include/liboculus/StatusRx.h
@@ -35,9 +35,9 @@
 #include <memory>
 #include <mutex>
 
-#include "Oculus/Oculus.h"
 #include "liboculus/IoServiceThread.h"
 #include "liboculus/SonarStatus.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 
diff --git a/thirdparty/Oculus/Oculus.h b/include/liboculus/thirdparty/Oculus/Oculus.h
similarity index 100%
rename from thirdparty/Oculus/Oculus.h
rename to include/liboculus/thirdparty/Oculus/Oculus.h
diff --git a/lib/SonarPlayer.cpp b/lib/SonarPlayer.cpp
index 1ffb53e..0214f7c 100644
--- a/lib/SonarPlayer.cpp
+++ b/lib/SonarPlayer.cpp
@@ -33,12 +33,12 @@
 #include <fstream>
 #include <iostream>
 
-#include "Oculus/Oculus.h"
 #include "g3log/g3log.hpp"
 #include "liboculus/Constants.h"
 #include "liboculus/DataTypes.h"
 #include "liboculus/MessageHeader.h"
 #include "liboculus/SimplePingResult.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {