diff --git a/libnd4j/blas/NDArray.h b/libnd4j/blas/NDArray.h
index 403f8d71d..a55a10768 100644
--- a/libnd4j/blas/NDArray.h
+++ b/libnd4j/blas/NDArray.h
@@ -39,7 +39,7 @@
 #include <ShapeDescriptor.h>
 #include <helpers/ConstantShapeHelper.h>
 #include <array/DataBuffer.h>
-#include <AffinityManager.h>
+#include <execution/AffinityManager.h>
 
 
 namespace nd4j {
diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml
index d491f6d37..1c5b3ea5c 100644
--- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml
+++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml
@@ -122,10 +122,13 @@
                         <includePath>${libnd4jhome}/include</includePath>
                         <includePath>${libnd4jhome}/include/helpers</includePath>
                         <includePath>${libnd4jhome}/include/array</includePath>
-                        <includePath>${libnd4jhome}/include/memory</includePath>
-                        <includePath>${libnd4jhome}/include/graph</includePath>
                         <includePath>${libnd4jhome}/include/cnpy</includePath>
+                        <includePath>${libnd4jhome}/include/execution</includePath>
+                        <includePath>${libnd4jhome}/include/exceptions</includePath>
+                        <includePath>${libnd4jhome}/include/graph</includePath>
                         <includePath>${libnd4jhome}/include/indexing</includePath>
+                        <includePath>${libnd4jhome}/include/memory</includePath>
+                        <includePath>${libnd4jhome}/include/performance</includePath>
                     </includePaths>
                     <linkPaths>
                         <linkPath>${libnd4jhome}/blasbuild/cuda/blas</linkPath>
diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml
index 44d416233..3b008222d 100644
--- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml
+++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml
@@ -246,10 +246,13 @@
                         <includePath>${libnd4jhome}/include</includePath>
                         <includePath>${libnd4jhome}/include/helpers</includePath>
                         <includePath>${libnd4jhome}/include/array</includePath>
-                        <includePath>${libnd4jhome}/include/memory</includePath>
-                        <includePath>${libnd4jhome}/include/graph</includePath>
                         <includePath>${libnd4jhome}/include/cnpy</includePath>
+                        <includePath>${libnd4jhome}/include/execution</includePath>
+                        <includePath>${libnd4jhome}/include/exceptions</includePath>
+                        <includePath>${libnd4jhome}/include/graph</includePath>
                         <includePath>${libnd4jhome}/include/indexing</includePath>
+                        <includePath>${libnd4jhome}/include/memory</includePath>
+                        <includePath>${libnd4jhome}/include/performance</includePath>
                     </includePaths>
                     <linkPath>${libnd4jhome}/blasbuild/cpu/blas</linkPath>
                     <buildResources>