diff --git a/cudautils.h b/cudautils.h
index f38a1d6..b65fd0c 100644
--- a/cudautils.h
+++ b/cudautils.h
@@ -8,6 +8,8 @@
 #include <intrin.h>
 #endif
 
+#include "cuda_runtime_api.h"
+
 #define safeCall(err)       __safeCall(err, __FILE__, __LINE__)
 #define safeThreadSync()    __safeThreadSync(__FILE__, __LINE__)
 #define checkMsg(msg)       __checkMsg(msg, __FILE__, __LINE__)
diff --git a/extras/debug.h b/extras/debug.h
index 5c13bfc..bd62aa6 100644
--- a/extras/debug.h
+++ b/extras/debug.h
@@ -7,10 +7,10 @@
 #include "opencv2/core.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgcodecs.hpp"
-#include <opencv2/imgproc/imgproc.hpp>
+#include "opencv2/imgproc/imgproc.hpp"
 #include "cuda_runtime_api.h"
-#include "cudaSift.h"
 #include "cudautils.h"
+#include "cudaSift.h"
 
 using namespace std;
 
diff --git a/extras/homography.h b/extras/homography.h
index c97392a..6bca36b 100644
--- a/extras/homography.h
+++ b/extras/homography.h
@@ -1,10 +1,9 @@
 #ifndef HOMOGRAPHY_H
 #define HOMOGRAPHY_H
 
-#include "cuda_runtime_api.h"
-#include "cudaSift.h"
-#include "cudautils.h"
 #include <opencv2/core/core.hpp>
+#include "cudautils.h"
+#include "cudaSift.h"
 
 double FindHomography(SiftData &data,  float *homography, int *numMatches, int numLoops = 1000, float minScore = 0.85f, float maxAmbiguity = 0.95f, float thresh = 5.0f);
 
diff --git a/extras/matching.h b/extras/matching.h
index 7d2e981..3b8ebfd 100644
--- a/extras/matching.h
+++ b/extras/matching.h
@@ -1,9 +1,8 @@
 #ifndef MATCHING_H
 #define MATCHING_H
 
-#include "cuda_runtime_api.h"
-#include "cudaSift.h"
 #include "cudautils.h"
+#include "cudaSift.h"
 
 double MatchSiftData(SiftData &data1, SiftData &data2);
 
diff --git a/extras/rigidTransform.h b/extras/rigidTransform.h
index e541ec1..b4bd3cd 100644
--- a/extras/rigidTransform.h
+++ b/extras/rigidTransform.h
@@ -1,10 +1,13 @@
 #ifndef RIGIDTRANSFORM_H
 #define RIGIDTRANSFORM_H
 
-#include "cuda_runtime_api.h"
 #include <opencv2/core/core.hpp>
 #include "cudautils.h"
 
+// Not strictly necessary, but because all other extras also include, creates
+// easier interface
+#include "cudaSift.h"
+
 void FindRigidTransform(const float *h_coord, int *h_randPts, float *Rt_relative, int *numInliers,
                         int numLoops, int numPts, float thresh2);