diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index b119d924..efd134a7 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -36,7 +36,6 @@ if (MSVC)
     target_include_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/include/")
 
     # Volk
-    target_include_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/include/volk/")
     target_link_libraries(sdrpp_core PUBLIC volk)
     
     # SoapySDR
@@ -65,8 +64,6 @@ if (MSVC)
 endif (MSVC)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    target_include_directories(sdrpp_core PUBLIC "/usr/include/volk")
-
     target_link_libraries(sdrpp_core PUBLIC pthread)
     target_link_libraries(sdrpp_core PUBLIC GL)
     target_link_libraries(sdrpp_core PUBLIC GLEW)
@@ -96,7 +93,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         ${GLEW_INCLUDE_DIRS}
         ${FFTW3_INCLUDE_DIRS}
         ${GLFW3_INCLUDE_DIRS}
-        ${VOLK_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS}/volk
+        ${VOLK_INCLUDE_DIRS}
         ${PORTAUDIO_INCLUDE_DIRS}
         )
 
diff --git a/core/src/dsp/block.h b/core/src/dsp/block.h
index e4fdfa53..73ba90f2 100644
--- a/core/src/dsp/block.h
+++ b/core/src/dsp/block.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <vector>
 #include <dsp/stream.h>
-#include <volk.h>
+#include <volk/volk.h>
 
 namespace dsp {
     template <class D, class I, class O, int IC, int OC>
diff --git a/core/src/dsp/math.h b/core/src/dsp/math.h
index e8fdbdc3..0347378f 100644
--- a/core/src/dsp/math.h
+++ b/core/src/dsp/math.h
@@ -2,7 +2,7 @@
 #include <thread>
 #include <dsp/stream.h>
 #include <dsp/types.h>
-#include <volk.h>
+#include <volk/volk.h>
 
 #ifndef M_PI
 #define M_PI    3.1415926535f
diff --git a/core/src/dsp/source.h b/core/src/dsp/source.h
index 5130abbc..15083728 100644
--- a/core/src/dsp/source.h
+++ b/core/src/dsp/source.h
@@ -2,7 +2,6 @@
 #include <thread>
 #include <dsp/stream.h>
 #include <dsp/types.h>
-#include <volk.h>
 #include <spdlog/spdlog.h>
 
 namespace dsp {