diff --git a/src/include/ranges/container_range.h b/src/include/container_index.h
similarity index 99%
rename from src/include/ranges/container_range.h
rename to src/include/container_index.h
index 3a81a4b..ee3101f 100644
--- a/src/include/ranges/container_range.h
+++ b/src/include/container_index.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
-#ifndef __container_range_h__
-#define __container_range_h__
+#ifndef __container_index_h__
+#define __container_index_h__
 
 #include <cstdlib>
 #include <tuple>
@@ -9,6 +9,9 @@
 
 #include "ranges/range_base.h"
 #include "ranges/index_base.h"
+#include "mbase_def.h"
+#include "statics/static_for.h"
+#include "ranges/range_helper.h"
 
 namespace MultiArrayTools
 {
diff --git a/src/include/mbase_def.h b/src/include/mbase_def.h
index d97e4ae..1550c21 100644
--- a/src/include/mbase_def.h
+++ b/src/include/mbase_def.h
@@ -11,6 +11,16 @@ namespace MultiArrayTools
      *  Provided Types     *
      ***********************/
     
+    template <class... Ranges>
+    using ContainerRangeFactory = MultiRangeFactory<Ranges...>;
+
+    template <class... Ranges>
+    using ContainerRange = MultiRange<Ranges...>;
+    
+    // container_index.h
+    template <typename T, class... Indices>
+    class ConstContainerIndex;
+
     // multi_array.h
     template <typename T, class... SRanges>
     class MultiArrayBase;
@@ -27,10 +37,6 @@ namespace MultiArrayTools
     template <typename T, class OperationClass>
     class OperationBase;
 
-    // multi_array_operation.h
-    //template <typename T>
-    //class MutableOperationBase;
-
     // multi_array_operation.h
     template <typename T, class OperationClass>
     class OperationTemplate;
diff --git a/src/include/multi_array_header.h b/src/include/multi_array_header.h
index bc306bf..f8f2903 100644
--- a/src/include/multi_array_header.h
+++ b/src/include/multi_array_header.h
@@ -4,6 +4,7 @@
 #define __multi_array_header_h__
 
 #include <cstdlib>
+#include "container_index.h"
 #include "multi_array_operation.h"
 #include "multi_array_base.h"
 #include "multi_array.h"
@@ -13,7 +14,6 @@
 #include "map_range.h"
 #include "dynamic_operation.h"
 #include "high_level_operation.h"
-//#include "expressions.h"
 
 #include "multi_array_header.cc.h"
 
diff --git a/src/include/ranges/rbase_def.h b/src/include/ranges/rbase_def.h
index a30891c..289b2b6 100644
--- a/src/include/ranges/rbase_def.h
+++ b/src/include/ranges/rbase_def.h
@@ -80,18 +80,6 @@ namespace MultiArrayTools
     template <class... Indices>
     class MultiIndex;
 
-    // container_range.h
-    template <class... Ranges>
-    using ContainerRangeFactory = MultiRangeFactory<Ranges...>;
-
-    // container_range.h
-    template <class... Ranges>
-    using ContainerRange = MultiRange<Ranges...>;
-    
-    // container_range.h
-    template <typename T, class... Indices>
-    class ConstContainerIndex;
-
     // anonymous_range.h
     class AnonymousRangeFactory;
 
@@ -103,15 +91,12 @@ namespace MultiArrayTools
     class IndexWrapper;
 
     // dynamic_range.h
-    //template <class EC>
     class DynamicIndex;
     
     // dynamic_range.h
-    //template <class EC>
     class DynamicRangeFactory;
     
     // dynamic_range.h
-    //template <class EC>
     class DynamicRange;
 
     // value_range.h
diff --git a/src/include/ranges/rpheader.h b/src/include/ranges/rpheader.h
index 4dfd831..3de270f 100644
--- a/src/include/ranges/rpheader.h
+++ b/src/include/ranges/rpheader.h
@@ -4,7 +4,6 @@
 
 #include "single_range.h"
 #include "multi_range.h"
-#include "container_range.h"
 #include "subrange.h"
 //#include "anonymous_range.h"
 
diff --git a/src/tests/ranges/index_unit_test.cc b/src/tests/ranges/index_unit_test.cc
index f9d81b5..77c24cd 100644
--- a/src/tests/ranges/index_unit_test.cc
+++ b/src/tests/ranges/index_unit_test.cc
@@ -4,11 +4,7 @@
 #include "gtest/gtest.h"
 #include <iostream>
 
-#include "ranges/rheader.h"
-//#include "expressions.h"
-//#include "ranges/dynamic_range.cc.h"
-//#include "multi_array_header.h"
-#include "ranges/ranges_header.cc.h"
+#include "multi_array_header.h"
 
 namespace MAT = MultiArrayTools;