diff --git a/example/rewrite.cxx b/example/rewrite.cxx
index 1bc83dc..30e121b 100644
--- a/example/rewrite.cxx
+++ b/example/rewrite.cxx
@@ -1,5 +1,5 @@
 #include "CiftiFile.h"
-#include "MultiDimIterator.h"
+#include "CiftiMultiDimIterator.h"
 
 #include <iostream>
 #include <vector>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4531a29..9cb6cca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(src)
 SET(HEADERS
 CiftiFile.h
 NiftiIO.h
-MultiDimIterator.h
+CiftiMultiDimIterator.h
 )
 
 SET(SOURCES
diff --git a/src/CiftiFile.cxx b/src/CiftiFile.cxx
index f429dd3..9a565c6 100644
--- a/src/CiftiFile.cxx
+++ b/src/CiftiFile.cxx
@@ -29,7 +29,7 @@
 
 #include "Common/CiftiAssert.h"
 #include "Common/MultiDimArray.h"
-#include "MultiDimIterator.h"
+#include "CiftiMultiDimIterator.h"
 #include "NiftiIO.h"
 
 #ifdef CIFTILIB_USE_QT
diff --git a/src/MultiDimIterator.h b/src/CiftiMultiDimIterator.h
similarity index 100%
rename from src/MultiDimIterator.h
rename to src/CiftiMultiDimIterator.h
diff --git a/src/NiftiIO.cxx b/src/NiftiIO.cxx
index 16b518c..1c582a0 100644
--- a/src/NiftiIO.cxx
+++ b/src/NiftiIO.cxx
@@ -25,6 +25,7 @@
  *  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "Common/CiftiAssert.h"
 #include "NiftiIO.h"
 
 #include "Common/CiftiException.h"