diff --git a/stim/cuda/cost.h b/stim/cuda/cost.h
index 64fcf49..aaed177 100644
--- a/stim/cuda/cost.h
+++ b/stim/cuda/cost.h
@@ -3,11 +3,11 @@
 #include <cuda_runtime.h>
 #include <cublas_v2.h>
 #include <stdio.h>
-#include "../visualization/colormap.h"
+#include <stim/visualization/colormap.h>
 #include <sstream>
-#include "../math/vector.h"
-#include "../cuda/devices.h"
-#include "../cuda/threads.h"
+#include <stim/math/vector.h>
+#include <stim/cuda/cudatools/devices.h>
+#include <stim/cuda/cudatools/threads.h>
 
 ///Cost function that works with the gl-spider class to find index of the item with min-cost.
 typedef unsigned char uchar;
diff --git a/stim/cuda/cudatools/glbind.h b/stim/cuda/cudatools/glbind.h
index bd841cc..85a8f31 100644
--- a/stim/cuda/cudatools/glbind.h
+++ b/stim/cuda/cudatools/glbind.h
@@ -9,7 +9,7 @@
 
 //#include <cudaHandleError.h>
 #include "cuda_gl_interop.h"
-#include "../gl/error.h"
+#include <stim/gl/error.h>
 
 namespace stim
 {
diff --git a/stim/gl/gl_spider.h b/stim/gl/gl_spider.h
index 11b0e1b..ed5d99b 100644
--- a/stim/gl/gl_spider.h
+++ b/stim/gl/gl_spider.h
@@ -14,7 +14,7 @@
 #include "stim/math/rect.h"
 #include "stim/math/matrix.h"
 #include "stim/cuda/cost.h"
-#include "stim/cuda/glbind.h"
+#include <stim/cuda/cudatools/glbind.h>
 #include <stim/visualization/obj.h>
 #include <vector>
 
diff --git a/stim/math/matrix.h b/stim/math/matrix.h
index 6437a71..777ba9e 100644
--- a/stim/math/matrix.h
+++ b/stim/math/matrix.h
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <iostream>
 #include <stim/math/vector.h>
-#include "../cuda/callable.h"
+#include <stim/cuda/cudatools/callable.h>
 
 namespace stim{
 
diff --git a/stim/math/quaternion.h b/stim/math/quaternion.h
index 09b3db5..57bfa45 100644
--- a/stim/math/quaternion.h
+++ b/stim/math/quaternion.h
@@ -1,8 +1,8 @@
 #ifndef RTS_QUATERNION_H
 #define RTS_QUATERNION_H
 
-#include "../math/matrix.h"
-#include "../cuda/callable.h"
+#include <stim/math/matrix.h>
+#include <stim/cuda/cudatools/callable.h>
 
 namespace stim{
 
diff --git a/stim/math/rect.h b/stim/math/rect.h
index 8627063..9767f26 100644
--- a/stim/math/rect.h
+++ b/stim/math/rect.h
@@ -2,7 +2,7 @@
 #define RTS_RECT_H
 
 //enable CUDA_CALLABLE macro
-#include <stim/cuda/callable.h>
+#include <stim/cuda/cudatools/callable.h>
 #include <stim/math/vector.h>
 #include <stim/math/triangle.h>
 #include <stim/math/quaternion.h>
diff --git a/stim/math/triangle.h b/stim/math/triangle.h
index d816e1b..bf81fcc 100644
--- a/stim/math/triangle.h
+++ b/stim/math/triangle.h
@@ -2,7 +2,7 @@
 #define RTS_TRIANGLE_H
 
 //enable CUDA_CALLABLE macro
-#include <stim/cuda/callable.h>
+#include <stim/cuda/cudatools/callable.h>
 #include <stim/math/vector.h>
 #include <iostream>
 
diff --git a/stim/math/vector.h b/stim/math/vector.h
index b2a7db7..dac19c0 100644
--- a/stim/math/vector.h
+++ b/stim/math/vector.h
@@ -5,7 +5,7 @@
 #include <cmath>
 #include <sstream>
 #include <vector>
-#include "../cuda/callable.h"
+#include <stim/cuda/cudatools/callable.h>
 
 namespace stim
 {
diff --git a/stim/visualization/colormap.h b/stim/visualization/colormap.h
index 14fbde9..8a43c33 100644
--- a/stim/visualization/colormap.h
+++ b/stim/visualization/colormap.h
@@ -4,12 +4,12 @@
 #include <string>
 #include <stdlib.h>
 #ifdef __CUDACC__
-#include "../cuda/error.h"
+#include <stim/cuda/cudatools/error.h>
 #endif
 
 //saving an image to a file uses the CImg library
 	//this currently throws a lot of "unreachable" warnings (as of GCC 4.8.2, nvcc 6.5.12)
-#include "../image/image.h"
+#include <stim/image/image.h>
 
 
 #define BREWER_CTRL_PTS 11
--
libgit2 0.21.4