diff --git a/stim/cuda/timer.h b/stim/cuda/timer.h
index fd2786d..f7ce5e1 100644
--- a/stim/cuda/timer.h
+++ b/stim/cuda/timer.h
@@ -1,6 +1,12 @@
+#ifndef STIM_CUDA_TIMER
+#define STIM_CUDA_TIMER
+
 static cudaEvent_t tStartEvent;
 static cudaEvent_t tStopEvent;
 
+namespace stim{
+
+/// These functions calculate the time between GPU functions in milliseconds
 static void gpuStartTimer()
 {
 	//set up timing events
@@ -18,4 +24,8 @@ static float gpuStopTimer()
 	cudaEventDestroy(tStartEvent);
 	cudaEventDestroy(tStopEvent);
 	return elapsedTime;
-}
\ No newline at end of file
+}
+
+}	//end namespace stim
+
+#endif
\ No newline at end of file
diff --git a/stim/envi/envi.h b/stim/envi/envi.h
index 5c7bcef..1c27f04 100644
--- a/stim/envi/envi.h
+++ b/stim/envi/envi.h
@@ -6,7 +6,7 @@
 #include "../envi/bip.h"
 #include "../envi/bil.h"
 #include <iostream>
-#include "../image/image.h"
+//#include "../image/image.h"
 
 namespace stim{
 
@@ -927,7 +927,7 @@ public:
 
 	/// @param mask is a pointer to pre-allocated memory of size X*Y
 	/// @param maskname is the file name for the image that will serve as the mask
-	bool load_mask(unsigned char * mask, std::string maskname){
+	/*bool load_mask(unsigned char * mask, std::string maskname){
 		//open the mask file
 		stim::image<unsigned char> mask_image(maskname);
 		mask_image.data_noninterleaved(mask);
@@ -935,7 +935,7 @@ public:
 		//memcpy(mask, mask_image.data_noninterleaved(), mask_image.size());
 		//mask_image.clear();
 		return true;
-	}
+	}*/
 
 	/// Calculate the mean value for all masked (or valid) pixels in a band and returns the average spectrum
 
--
libgit2 0.21.4