diff --git a/app/main.cc b/app/main.cc
index f91304306..990c97913 100644
--- a/app/main.cc
+++ b/app/main.cc
@@ -23,8 +23,8 @@
 
 #include <algorithm>
 #include <exception>
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <memory>
 
 #include <world_builder/assert.h>
diff --git a/include/visualization/main.h b/include/visualization/main.h
index e597159e1..de5685a9a 100644
--- a/include/visualization/main.h
+++ b/include/visualization/main.h
@@ -20,6 +20,9 @@
 #ifndef WORLD_BUILDER_VISUALIZATION_MAIN_H_
 #define WORLD_BUILDER_VISUALIZATION_MAIN_H_
 
+#include <vector>
+#include <string>
+
 void project_on_sphere(double, double &, double &, double &);
 
 void lay_points(double x1, double y1, double z1,
diff --git a/include/world_builder/nan.h b/include/world_builder/nan.h
index f42f06fcb..7bda999e4 100644
--- a/include/world_builder/nan.h
+++ b/include/world_builder/nan.h
@@ -20,7 +20,7 @@
 #ifndef _world_nan_h
 #define _world_nan_h
 
-#include <cmath>
+#include <limits>
 
 namespace WorldBuilder
 {
diff --git a/source/coordinate_systems/cartesian.cc b/source/coordinate_systems/cartesian.cc
index cfe035708..f5b81dbaa 100644
--- a/source/coordinate_systems/cartesian.cc
+++ b/source/coordinate_systems/cartesian.cc
@@ -17,9 +17,10 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/assert.h>
 #include <world_builder/coordinate_systems/cartesian.h>
 
+#include <world_builder/assert.h>
+
 namespace WorldBuilder
 {
   namespace CoordinateSystems
@@ -87,6 +88,6 @@ namespace WorldBuilder
      * Register plugin
      */
     WB_REGISTER_COORDINATE_SYSTEM(Cartesian, cartesian)
-  }
-}
+  } // namespace CoordinateSystems
+} // namespace WorldBuilder
 
diff --git a/source/coordinate_systems/interface.cc b/source/coordinate_systems/interface.cc
index b892fff9c..1be0abd73 100644
--- a/source/coordinate_systems/interface.cc
+++ b/source/coordinate_systems/interface.cc
@@ -18,11 +18,10 @@
 */
 
 #include <world_builder/coordinate_systems/interface.h>
-#include <world_builder/coordinate_systems/cartesian.h>
-#include <world_builder/coordinate_systems/spherical.h>
-#include <world_builder/assert.h>
 
+#include <world_builder/assert.h>
 #include <world_builder/types/object.h>
+
 #include <algorithm>
 
 
@@ -97,6 +96,6 @@ namespace WorldBuilder
       // thrown when the name is not present.
       return get_factory_map().at(lower_case_name)->create(world);
     }
-  }
-}
+  } // namespace CoordinateSystems
+} // namespace WorldBuilder
 
diff --git a/source/coordinate_systems/spherical.cc b/source/coordinate_systems/spherical.cc
index 425375644..b7a8967cc 100644
--- a/source/coordinate_systems/spherical.cc
+++ b/source/coordinate_systems/spherical.cc
@@ -17,10 +17,11 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/assert.h>
 #include <world_builder/coordinate_systems/spherical.h>
-#include <world_builder/types/string.h>
+
+#include <world_builder/assert.h>
 #include <world_builder/types/object.h>
+#include <world_builder/types/string.h>
 
 namespace WorldBuilder
 {
@@ -132,6 +133,6 @@ namespace WorldBuilder
      * Register plugin
      */
     WB_REGISTER_COORDINATE_SYSTEM(Spherical, spherical)
-  }
-}
+  } // namespace CoordinateSystems
+} // namespace WorldBuilder
 
diff --git a/source/features/continental_plate.cc b/source/features/continental_plate.cc
index 2df7c6825..229d61921 100644
--- a/source/features/continental_plate.cc
+++ b/source/features/continental_plate.cc
@@ -18,20 +18,17 @@
 */
 
 #include <world_builder/features/continental_plate.h>
-#include <world_builder/features/continental_plate_models/temperature/interface.h>
-#include <world_builder/features/continental_plate_models/composition/interface.h>
 
-#include <world_builder/utilities.h>
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -237,5 +234,5 @@ namespace WorldBuilder
 
     WB_REGISTER_FEATURE(ContinentalPlate, continental plate)
 
-  }
-}
+  } // namespace Features
+} // namespace WorldBuilder
diff --git a/source/features/continental_plate_models/composition/interface.cc b/source/features/continental_plate_models/composition/interface.cc
index 028533817..8fb68ac69 100644
--- a/source/features/continental_plate_models/composition/interface.cc
+++ b/source/features/continental_plate_models/composition/interface.cc
@@ -17,13 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/continental_plate_models/composition/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/continental_plate_models/composition/interface.h>
+#include <world_builder/types/string.h>
+
+#include <algorithm>
 
 
 namespace WorldBuilder
@@ -78,8 +78,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Composition
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/continental_plate_models/composition/uniform.cc b/source/features/continental_plate_models/composition/uniform.cc
index 95c92ebca..b9426f944 100644
--- a/source/features/continental_plate_models/composition/uniform.cc
+++ b/source/features/continental_plate_models/composition/uniform.cc
@@ -17,17 +17,17 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/continental_plate_models/composition/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
+#include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
-#include <world_builder/features/continental_plate_models/composition/uniform.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -114,9 +114,9 @@ namespace WorldBuilder
           return composition;
         }
         WB_REGISTER_FEATURE_CONTINENTAL_PLATE_COMPOSITION_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Composition
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/continental_plate_models/grains/interface.cc b/source/features/continental_plate_models/grains/interface.cc
index ecea5cde3..6b0315b51 100644
--- a/source/features/continental_plate_models/grains/interface.cc
+++ b/source/features/continental_plate_models/grains/interface.cc
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/continental_plate_models/grains/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/continental_plate_models/grains/interface.h>
+#include <world_builder/types/string.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -78,8 +77,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/continental_plate_models/grains/random_uniform_distribution.cc b/source/features/continental_plate_models/grains/random_uniform_distribution.cc
index 5f37c02cc..0ae6b3382 100644
--- a/source/features/continental_plate_models/grains/random_uniform_distribution.cc
+++ b/source/features/continental_plate_models/grains/random_uniform_distribution.cc
@@ -17,19 +17,19 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/continental_plate_models/grains/random_uniform_distribution.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/bool.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
-#include <world_builder/features/continental_plate_models/grains/random_uniform_distribution.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
 #include <algorithm>
 
@@ -208,9 +208,9 @@ namespace WorldBuilder
           return grains_local;
         }
         WB_REGISTER_FEATURE_CONTINENTAL_PLATE_GRAINS_MODEL(RandomUniformDistribution, random uniform distribution)
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/continental_plate_models/grains/uniform.cc b/source/features/continental_plate_models/grains/uniform.cc
index 3b5234dfa..f4c04a25d 100644
--- a/source/features/continental_plate_models/grains/uniform.cc
+++ b/source/features/continental_plate_models/grains/uniform.cc
@@ -17,18 +17,18 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/continental_plate_models/grains/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
-#include <world_builder/features/continental_plate_models/grains/uniform.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
 #include <algorithm>
 
@@ -160,9 +160,9 @@ namespace WorldBuilder
           return grains_local;
         }
         WB_REGISTER_FEATURE_CONTINENTAL_PLATE_GRAINS_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/continental_plate_models/temperature/adiabatic.cc b/source/features/continental_plate_models/temperature/adiabatic.cc
index 33796eb0e..246bd53e2 100644
--- a/source/features/continental_plate_models/temperature/adiabatic.cc
+++ b/source/features/continental_plate_models/temperature/adiabatic.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/continental_plate_models/temperature/adiabatic.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/continental_plate_models/temperature/adiabatic.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -156,8 +156,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_CONTINENTAL_PLATE_TEMPERATURE_MODEL(Adiabatic, adiabatic)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/continental_plate_models/temperature/interface.cc b/source/features/continental_plate_models/temperature/interface.cc
index 298b49546..5e8454197 100644
--- a/source/features/continental_plate_models/temperature/interface.cc
+++ b/source/features/continental_plate_models/temperature/interface.cc
@@ -17,16 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/continental_plate_models/temperature/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/continental_plate_models/temperature/interface.h>
-#include <world_builder/features/continental_plate_models/temperature/adiabatic.h>
-#include <world_builder/features/continental_plate_models/temperature/linear.h>
-#include <world_builder/features/continental_plate_models/temperature/uniform.h>
+#include <world_builder/types/string.h>
+
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -92,8 +89,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/continental_plate_models/temperature/linear.cc b/source/features/continental_plate_models/temperature/linear.cc
index 56c4a9a94..ce2840325 100644
--- a/source/features/continental_plate_models/temperature/linear.cc
+++ b/source/features/continental_plate_models/temperature/linear.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/continental_plate_models/temperature/linear.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/continental_plate_models/temperature/linear.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -128,8 +128,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_CONTINENTAL_PLATE_TEMPERATURE_MODEL(Linear, linear)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/continental_plate_models/temperature/uniform.cc b/source/features/continental_plate_models/temperature/uniform.cc
index 3820b0c87..70984d05b 100644
--- a/source/features/continental_plate_models/temperature/uniform.cc
+++ b/source/features/continental_plate_models/temperature/uniform.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/continental_plate_models/temperature/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/continental_plate_models/temperature/uniform.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -99,8 +99,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_CONTINENTAL_PLATE_TEMPERATURE_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace ContinentalPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/fault.cc b/source/features/fault.cc
index 2c500d210..f34b0bd81 100644
--- a/source/features/fault.cc
+++ b/source/features/fault.cc
@@ -18,18 +18,18 @@
  */
 
 #include <world_builder/features/fault.h>
-#include <world_builder/utilities.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/segment.h>
+#include <world_builder/types/plugin_system.h>
 #include <world_builder/types/point.h>
+#include <world_builder/types/segment.h>
 #include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
-#include <world_builder/types/plugin_system.h>
+#include <world_builder/utilities.h>
 
 #include "rapidjson/prettywriter.h"
 #include "rapidjson/stringbuffer.h"
@@ -762,6 +762,6 @@ namespace WorldBuilder
      * Register plugin
      */
     WB_REGISTER_FEATURE(Fault, fault)
-  }
-}
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/fault_models/composition/interface.cc b/source/features/fault_models/composition/interface.cc
index 3fa694202..a13564680 100644
--- a/source/features/fault_models/composition/interface.cc
+++ b/source/features/fault_models/composition/interface.cc
@@ -17,15 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/fault_models/composition/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/fault_models/composition/interface.h>
-#include <world_builder/features/fault_models/composition/uniform.h>
+#include <world_builder/types/string.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -79,8 +77,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Composition
+    } // namespace FaultModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/fault_models/composition/uniform.cc b/source/features/fault_models/composition/uniform.cc
index 9819dc8d3..c177dbb57 100644
--- a/source/features/fault_models/composition/uniform.cc
+++ b/source/features/fault_models/composition/uniform.cc
@@ -17,17 +17,17 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/fault_models/composition/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
+#include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
-#include <world_builder/features/fault_models/composition/uniform.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -114,9 +114,9 @@ namespace WorldBuilder
           return composition;
         }
         WB_REGISTER_FEATURE_FAULT_COMPOSITION_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Composition
+    } // namespace FaultModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/fault_models/grains/interface.cc b/source/features/fault_models/grains/interface.cc
index 8bd42c6bb..97b034295 100644
--- a/source/features/fault_models/grains/interface.cc
+++ b/source/features/fault_models/grains/interface.cc
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/fault_models/grains/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/fault_models/grains/interface.h>
+#include <world_builder/types/string.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -106,8 +105,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace FaultModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/fault_models/grains/random_uniform_distribution.cc b/source/features/fault_models/grains/random_uniform_distribution.cc
index 8b8fcda26..e00791b4a 100644
--- a/source/features/fault_models/grains/random_uniform_distribution.cc
+++ b/source/features/fault_models/grains/random_uniform_distribution.cc
@@ -17,22 +17,21 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <algorithm>
+#include <world_builder/features/fault_models/grains/random_uniform_distribution.h>
 
-#include <world_builder/utilities.h>
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/bool.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
-#include <world_builder/features/fault_models/grains/random_uniform_distribution.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -208,9 +207,9 @@ namespace WorldBuilder
           return grains_local;
         }
         WB_REGISTER_FEATURE_FAULT_GRAINS_MODEL(RandomUniformDistribution, random uniform distribution)
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace FaultModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/fault_models/grains/uniform.cc b/source/features/fault_models/grains/uniform.cc
index 2ac94d63f..117647cd0 100644
--- a/source/features/fault_models/grains/uniform.cc
+++ b/source/features/fault_models/grains/uniform.cc
@@ -17,18 +17,18 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/fault_models/grains/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
-#include <world_builder/features/fault_models/grains/uniform.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -160,9 +160,9 @@ namespace WorldBuilder
           return grains_local;
         }
         WB_REGISTER_FEATURE_FAULT_GRAINS_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace FaultModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/fault_models/temperature/adiabatic.cc b/source/features/fault_models/temperature/adiabatic.cc
index eab522003..109063695 100644
--- a/source/features/fault_models/temperature/adiabatic.cc
+++ b/source/features/fault_models/temperature/adiabatic.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/fault_models/temperature/adiabatic.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/fault_models/temperature/adiabatic.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -157,8 +157,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_FAULT_TEMPERATURE_MODEL(Adiabatic, adiabatic)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace FaultModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/fault_models/temperature/interface.cc b/source/features/fault_models/temperature/interface.cc
index 74830ebb2..f9b438bca 100644
--- a/source/features/fault_models/temperature/interface.cc
+++ b/source/features/fault_models/temperature/interface.cc
@@ -18,16 +18,13 @@
 */
 
 
-#include <algorithm>
+#include <world_builder/features/fault_models/temperature/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/fault_models/temperature/interface.h>
-#include <world_builder/features/fault_models/temperature/adiabatic.h>
-#include <world_builder/features/fault_models/temperature/linear.h>
-#include <world_builder/features/fault_models/temperature/uniform.h>
+#include <world_builder/types/string.h>
 
+#include <algorithm>
 namespace WorldBuilder
 {
   namespace Features
@@ -92,8 +89,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace FaultModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/fault_models/temperature/linear.cc b/source/features/fault_models/temperature/linear.cc
index cacae19e0..1e4060ca1 100644
--- a/source/features/fault_models/temperature/linear.cc
+++ b/source/features/fault_models/temperature/linear.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/fault_models/temperature/linear.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/fault_models/temperature/linear.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -130,8 +130,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_FAULT_TEMPERATURE_MODEL(Linear, linear)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace FaultModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/fault_models/temperature/uniform.cc b/source/features/fault_models/temperature/uniform.cc
index 7b2689463..c5cd9a7ec 100644
--- a/source/features/fault_models/temperature/uniform.cc
+++ b/source/features/fault_models/temperature/uniform.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/fault_models/temperature/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/fault_models/temperature/uniform.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -99,8 +99,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_FAULT_TEMPERATURE_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace FaultModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/interface.cc b/source/features/interface.cc
index 12fe9dee2..93123de06 100644
--- a/source/features/interface.cc
+++ b/source/features/interface.cc
@@ -17,23 +17,16 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <algorithm>
-
 #include <world_builder/features/interface.h>
-#include <world_builder/features/continental_plate.h>
-#include <world_builder/features/fault.h>
-#include <world_builder/features/oceanic_plate.h>
-#include <world_builder/features/subducting_plate.h>
-#include <world_builder/features/mantle_layer.h>
-#include <world_builder/assert.h>
-#include <world_builder/utilities.h>
-
 
+#include <world_builder/assert.h>
 #include <world_builder/types/array.h>
+#include <world_builder/types/object.h>
 #include <world_builder/types/point.h>
 #include <world_builder/types/string.h>
-#include <world_builder/types/object.h>
+#include <world_builder/utilities.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -74,7 +67,7 @@ namespace WorldBuilder
 
         return InterpolationType::Invalid;
       }
-    }
+    } // namespace Internal
     Interface::Interface()
       = default;
 
@@ -244,6 +237,6 @@ namespace WorldBuilder
       return get_factory_map().at(lower_case_name)->create(world);
     }
 
-  }
-}
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/mantle_layer.cc b/source/features/mantle_layer.cc
index e0b3f6051..a612a5790 100644
--- a/source/features/mantle_layer.cc
+++ b/source/features/mantle_layer.cc
@@ -18,16 +18,16 @@
 */
 
 #include <world_builder/features/mantle_layer.h>
-#include <world_builder/utilities.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/plugin_system.h>
+#include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -231,5 +231,5 @@ namespace WorldBuilder
 
     WB_REGISTER_FEATURE(MantleLayer, mantle layer)
 
-  }
-}
+  } // namespace Features
+} // namespace WorldBuilder
diff --git a/source/features/mantle_layer_models/composition/interface.cc b/source/features/mantle_layer_models/composition/interface.cc
index 11b53d55c..9ef2a8e3a 100644
--- a/source/features/mantle_layer_models/composition/interface.cc
+++ b/source/features/mantle_layer_models/composition/interface.cc
@@ -17,15 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/mantle_layer_models/composition/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/mantle_layer_models/composition/interface.h>
-#include <world_builder/features/mantle_layer_models/composition/uniform.h>
+#include <world_builder/types/string.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -79,8 +77,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Composition
+    } // namespace MantleLayerModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/mantle_layer_models/composition/uniform.cc b/source/features/mantle_layer_models/composition/uniform.cc
index 2ff04fdc8..036e259f6 100644
--- a/source/features/mantle_layer_models/composition/uniform.cc
+++ b/source/features/mantle_layer_models/composition/uniform.cc
@@ -17,17 +17,17 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/mantle_layer_models/composition/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
+#include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
-#include <world_builder/features/mantle_layer_models/composition/uniform.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -114,9 +114,9 @@ namespace WorldBuilder
           return composition;
         }
         WB_REGISTER_FEATURE_MANTLE_LAYER_COMPOSITION_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Composition
+    } // namespace MantleLayerModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/mantle_layer_models/grains/interface.cc b/source/features/mantle_layer_models/grains/interface.cc
index d1238bb47..f31bf86ca 100644
--- a/source/features/mantle_layer_models/grains/interface.cc
+++ b/source/features/mantle_layer_models/grains/interface.cc
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/mantle_layer_models/grains/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/mantle_layer_models/grains/interface.h>
+#include <world_builder/types/string.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -106,8 +105,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace MantleLayerModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/mantle_layer_models/grains/random_uniform_distribution.cc b/source/features/mantle_layer_models/grains/random_uniform_distribution.cc
index a3759a153..5e8e9420d 100644
--- a/source/features/mantle_layer_models/grains/random_uniform_distribution.cc
+++ b/source/features/mantle_layer_models/grains/random_uniform_distribution.cc
@@ -17,22 +17,21 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <algorithm>
+#include <world_builder/features/mantle_layer_models/grains/random_uniform_distribution.h>
 
-#include <world_builder/utilities.h>
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/bool.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
-#include <world_builder/features/mantle_layer_models/grains/random_uniform_distribution.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -207,9 +206,9 @@ namespace WorldBuilder
           return grains_local;
         }
         WB_REGISTER_FEATURE_MANTLE_LAYER_GRAINS_MODEL(RandomUniformDistribution, random uniform distribution)
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace MantleLayerModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/mantle_layer_models/grains/uniform.cc b/source/features/mantle_layer_models/grains/uniform.cc
index 54774cb83..200c38986 100644
--- a/source/features/mantle_layer_models/grains/uniform.cc
+++ b/source/features/mantle_layer_models/grains/uniform.cc
@@ -17,18 +17,18 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/mantle_layer_models/grains/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
-#include <world_builder/features/mantle_layer_models/grains/uniform.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -157,9 +157,9 @@ namespace WorldBuilder
           return grains_local;
         }
         WB_REGISTER_FEATURE_MANTLE_LAYER_GRAINS_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace MantleLayerModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/mantle_layer_models/temperature/adiabatic.cc b/source/features/mantle_layer_models/temperature/adiabatic.cc
index cb1911449..61423eb0f 100644
--- a/source/features/mantle_layer_models/temperature/adiabatic.cc
+++ b/source/features/mantle_layer_models/temperature/adiabatic.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/mantle_layer_models/temperature/adiabatic.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/mantle_layer_models/temperature/adiabatic.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -151,8 +151,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_MANTLE_LAYER_TEMPERATURE_MODEL(Adiabatic, adiabatic)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace MantleLayerModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/mantle_layer_models/temperature/interface.cc b/source/features/mantle_layer_models/temperature/interface.cc
index d2c6c8d87..30cc92c2e 100644
--- a/source/features/mantle_layer_models/temperature/interface.cc
+++ b/source/features/mantle_layer_models/temperature/interface.cc
@@ -16,15 +16,14 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include <algorithm>
+
+#include <world_builder/features/mantle_layer_models/temperature/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/mantle_layer_models/temperature/interface.h>
-#include <world_builder/features/mantle_layer_models/temperature/adiabatic.h>
-#include <world_builder/features/mantle_layer_models/temperature/linear.h>
-#include <world_builder/features/mantle_layer_models/temperature/uniform.h>
+#include <world_builder/types/string.h>
+
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -90,8 +89,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace MantleLayerModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/mantle_layer_models/temperature/linear.cc b/source/features/mantle_layer_models/temperature/linear.cc
index c252fd4cc..141321250 100644
--- a/source/features/mantle_layer_models/temperature/linear.cc
+++ b/source/features/mantle_layer_models/temperature/linear.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/mantle_layer_models/temperature/linear.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/mantle_layer_models/temperature/linear.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -128,8 +128,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_MANTLE_LAYER_TEMPERATURE_MODEL(Linear, linear)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace MantleLayerModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/mantle_layer_models/temperature/uniform.cc b/source/features/mantle_layer_models/temperature/uniform.cc
index 167a7f6e1..24c44e43e 100644
--- a/source/features/mantle_layer_models/temperature/uniform.cc
+++ b/source/features/mantle_layer_models/temperature/uniform.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/mantle_layer_models/temperature/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/mantle_layer_models/temperature/uniform.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -100,8 +100,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_MANTLE_LAYER_TEMPERATURE_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace MantleLayerModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/oceanic_plate.cc b/source/features/oceanic_plate.cc
index f251802ef..0352cb2d1 100644
--- a/source/features/oceanic_plate.cc
+++ b/source/features/oceanic_plate.cc
@@ -18,20 +18,17 @@
  */
 
 #include <world_builder/features/oceanic_plate.h>
-#include <world_builder/features/oceanic_plate_models/temperature/interface.h>
-#include <world_builder/features/oceanic_plate_models/composition/interface.h>
 
-#include <world_builder/utilities.h>
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
+#include <world_builder/types/plugin_system.h>
 #include <world_builder/types/point.h>
 #include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
-#include <world_builder/types/plugin_system.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -239,6 +236,6 @@ namespace WorldBuilder
      * Register plugin
      */
     WB_REGISTER_FEATURE(OceanicPlate, oceanic plate)
-  }
-}
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/oceanic_plate_models/composition/interface.cc b/source/features/oceanic_plate_models/composition/interface.cc
index e75e24cb6..03605bd74 100644
--- a/source/features/oceanic_plate_models/composition/interface.cc
+++ b/source/features/oceanic_plate_models/composition/interface.cc
@@ -17,15 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/oceanic_plate_models/composition/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/oceanic_plate_models/composition/interface.h>
-#include <world_builder/features/oceanic_plate_models/composition/uniform.h>
+#include <world_builder/types/string.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -79,8 +77,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Composition
+    } // namespace OceanicPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/oceanic_plate_models/composition/uniform.cc b/source/features/oceanic_plate_models/composition/uniform.cc
index d2f5d9fe4..aab9aa236 100644
--- a/source/features/oceanic_plate_models/composition/uniform.cc
+++ b/source/features/oceanic_plate_models/composition/uniform.cc
@@ -17,17 +17,17 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/oceanic_plate_models/composition/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
+#include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
-#include <world_builder/features/oceanic_plate_models/composition/uniform.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -113,9 +113,9 @@ namespace WorldBuilder
           return composition;
         }
         WB_REGISTER_FEATURE_OCEANIC_PLATE_COMPOSITION_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Composition
+    } // namespace OceanicPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/oceanic_plate_models/grains/interface.cc b/source/features/oceanic_plate_models/grains/interface.cc
index 5f4488cfb..f6c6373a9 100644
--- a/source/features/oceanic_plate_models/grains/interface.cc
+++ b/source/features/oceanic_plate_models/grains/interface.cc
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/oceanic_plate_models/grains/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/oceanic_plate_models/grains/interface.h>
+#include <world_builder/types/string.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -106,8 +105,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace OceanicPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/oceanic_plate_models/grains/random_uniform_distribution.cc b/source/features/oceanic_plate_models/grains/random_uniform_distribution.cc
index 5bde15da1..a783d29d4 100644
--- a/source/features/oceanic_plate_models/grains/random_uniform_distribution.cc
+++ b/source/features/oceanic_plate_models/grains/random_uniform_distribution.cc
@@ -17,22 +17,21 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <algorithm>
+#include <world_builder/features/oceanic_plate_models/grains/random_uniform_distribution.h>
 
-#include <world_builder/utilities.h>
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/bool.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
-#include <world_builder/features/oceanic_plate_models/grains/random_uniform_distribution.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -207,9 +206,9 @@ namespace WorldBuilder
           return grains_local;
         }
         WB_REGISTER_FEATURE_OCEANIC_PLATE_GRAINS_MODEL(RandomUniformDistribution, random uniform distribution)
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace OceanicPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/oceanic_plate_models/grains/uniform.cc b/source/features/oceanic_plate_models/grains/uniform.cc
index 395d74bfb..73041315d 100644
--- a/source/features/oceanic_plate_models/grains/uniform.cc
+++ b/source/features/oceanic_plate_models/grains/uniform.cc
@@ -17,18 +17,18 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/oceanic_plate_models/grains/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
-#include <world_builder/features/oceanic_plate_models/grains/uniform.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -158,9 +158,9 @@ namespace WorldBuilder
           return grains_local;
         }
         WB_REGISTER_FEATURE_OCEANIC_PLATE_GRAINS_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace OceanicPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/oceanic_plate_models/temperature/adiabatic.cc b/source/features/oceanic_plate_models/temperature/adiabatic.cc
index 485e4b6df..353542094 100644
--- a/source/features/oceanic_plate_models/temperature/adiabatic.cc
+++ b/source/features/oceanic_plate_models/temperature/adiabatic.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/oceanic_plate_models/temperature/adiabatic.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/oceanic_plate_models/temperature/adiabatic.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -157,8 +157,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_OCEANIC_PLATE_TEMPERATURE_MODEL(Adiabatic, adiabatic)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace OceanicPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/oceanic_plate_models/temperature/interface.cc b/source/features/oceanic_plate_models/temperature/interface.cc
index e647e4112..6626f965b 100644
--- a/source/features/oceanic_plate_models/temperature/interface.cc
+++ b/source/features/oceanic_plate_models/temperature/interface.cc
@@ -17,16 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <algorithm>
+#include <world_builder/features/oceanic_plate_models/temperature/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/oceanic_plate_models/temperature/interface.h>
-#include <world_builder/features/oceanic_plate_models/temperature/adiabatic.h>
-#include <world_builder/features/oceanic_plate_models/temperature/linear.h>
-#include <world_builder/features/oceanic_plate_models/temperature/plate_model.h>
-#include <world_builder/features/oceanic_plate_models/temperature/uniform.h>
+#include <world_builder/types/string.h>
+
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -92,8 +89,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace OceanicPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/oceanic_plate_models/temperature/linear.cc b/source/features/oceanic_plate_models/temperature/linear.cc
index f01a41a23..9cf0cc2ec 100644
--- a/source/features/oceanic_plate_models/temperature/linear.cc
+++ b/source/features/oceanic_plate_models/temperature/linear.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/oceanic_plate_models/temperature/linear.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/oceanic_plate_models/temperature/linear.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -127,8 +127,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_OCEANIC_PLATE_TEMPERATURE_MODEL(Linear, linear)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace OceanicPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/oceanic_plate_models/temperature/plate_model.cc b/source/features/oceanic_plate_models/temperature/plate_model.cc
index b21a02fc8..3745cb6a9 100644
--- a/source/features/oceanic_plate_models/temperature/plate_model.cc
+++ b/source/features/oceanic_plate_models/temperature/plate_model.cc
@@ -17,17 +17,17 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/oceanic_plate_models/temperature/plate_model.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
+#include <world_builder/types/object.h>
 #include <world_builder/types/point.h>
 #include <world_builder/types/string.h>
-#include <world_builder/types/object.h>
-#include <world_builder/features/oceanic_plate_models/temperature/plate_model.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -205,8 +205,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_OCEANIC_PLATE_TEMPERATURE_MODEL(PlateModel, plate model)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace OceanicPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/oceanic_plate_models/temperature/uniform.cc b/source/features/oceanic_plate_models/temperature/uniform.cc
index 0ae07ccc6..a54e9f736 100644
--- a/source/features/oceanic_plate_models/temperature/uniform.cc
+++ b/source/features/oceanic_plate_models/temperature/uniform.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/oceanic_plate_models/temperature/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/oceanic_plate_models/temperature/uniform.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -99,8 +99,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_OCEANIC_PLATE_TEMPERATURE_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace OceanicPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/subducting_plate.cc b/source/features/subducting_plate.cc
index e575ed05e..fde01ac81 100644
--- a/source/features/subducting_plate.cc
+++ b/source/features/subducting_plate.cc
@@ -18,24 +18,18 @@
  */
 
 #include <world_builder/features/subducting_plate.h>
-#include <world_builder/utilities.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/point.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
 #include <world_builder/types/plugin_system.h>
+#include <world_builder/types/point.h>
+#include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
-
-#include <rapidjson/istreamwrapper.h>
-#include "rapidjson/pointer.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/error/en.h"
+#include <world_builder/utilities.h>
 
 #include "glm/glm.h"
 
@@ -774,6 +768,6 @@ namespace WorldBuilder
      * Register plugin
      */
     WB_REGISTER_FEATURE(SubductingPlate, subducting plate)
-  }
-}
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/subducting_plate_models/composition/interface.cc b/source/features/subducting_plate_models/composition/interface.cc
index 68f746ca3..2607943c0 100644
--- a/source/features/subducting_plate_models/composition/interface.cc
+++ b/source/features/subducting_plate_models/composition/interface.cc
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/subducting_plate_models/composition/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/subducting_plate_models/composition/interface.h>
-#include <world_builder/features/subducting_plate_models/composition/uniform.h>
+#include <world_builder/types/string.h>
+
+#include <algorithm>
 
 
 namespace WorldBuilder
@@ -79,8 +78,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Composition
+    } // namespace SubductingPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/subducting_plate_models/composition/uniform.cc b/source/features/subducting_plate_models/composition/uniform.cc
index 6ae6c8e13..25ab7f3ff 100644
--- a/source/features/subducting_plate_models/composition/uniform.cc
+++ b/source/features/subducting_plate_models/composition/uniform.cc
@@ -17,17 +17,17 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/subducting_plate_models/composition/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
+#include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
-#include <world_builder/features/subducting_plate_models/composition/uniform.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -114,9 +114,9 @@ namespace WorldBuilder
           return composition;
         }
         WB_REGISTER_FEATURE_SUBDUCTING_PLATE_COMPOSITION_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Composition
+    } // namespace SubductingPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/subducting_plate_models/grains/interface.cc b/source/features/subducting_plate_models/grains/interface.cc
index 9ccb6ee34..4541637f8 100644
--- a/source/features/subducting_plate_models/grains/interface.cc
+++ b/source/features/subducting_plate_models/grains/interface.cc
@@ -17,14 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/subducting_plate_models/grains/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/subducting_plate_models/grains/interface.h>
+#include <world_builder/types/string.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -106,8 +105,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace SubductingPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/subducting_plate_models/grains/random_uniform_distribution.cc b/source/features/subducting_plate_models/grains/random_uniform_distribution.cc
index 55ef7a2a2..4e6f99bfc 100644
--- a/source/features/subducting_plate_models/grains/random_uniform_distribution.cc
+++ b/source/features/subducting_plate_models/grains/random_uniform_distribution.cc
@@ -17,22 +17,21 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <algorithm>
+#include <world_builder/features/subducting_plate_models/grains/random_uniform_distribution.h>
 
-#include <world_builder/utilities.h>
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/bool.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
-#include <world_builder/features/subducting_plate_models/grains/random_uniform_distribution.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -208,9 +207,9 @@ namespace WorldBuilder
           return grains_local;
         }
         WB_REGISTER_FEATURE_SUBDUCTING_PLATE_GRAINS_MODEL(RandomUniformDistribution, random uniform distribution)
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace SubductingPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/subducting_plate_models/grains/uniform.cc b/source/features/subducting_plate_models/grains/uniform.cc
index ad5ffd429..7f1a4b832 100644
--- a/source/features/subducting_plate_models/grains/uniform.cc
+++ b/source/features/subducting_plate_models/grains/uniform.cc
@@ -17,18 +17,18 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/subducting_plate_models/grains/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/types/unsigned_int.h>
 #include <world_builder/types/plugin_system.h>
-#include <world_builder/features/subducting_plate_models/grains/uniform.h>
+#include <world_builder/types/string.h>
+#include <world_builder/types/unsigned_int.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -160,9 +160,9 @@ namespace WorldBuilder
           return grains_local;
         }
         WB_REGISTER_FEATURE_SUBDUCTING_PLATE_GRAINS_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Grains
+    } // namespace SubductingPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
 
diff --git a/source/features/subducting_plate_models/temperature/adiabatic.cc b/source/features/subducting_plate_models/temperature/adiabatic.cc
index d1c4b2054..25d2af195 100644
--- a/source/features/subducting_plate_models/temperature/adiabatic.cc
+++ b/source/features/subducting_plate_models/temperature/adiabatic.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/subducting_plate_models/temperature/adiabatic.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/subducting_plate_models/temperature/adiabatic.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -159,8 +159,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_SUBDUCTING_PLATE_TEMPERATURE_MODEL(Adiabatic, adiabatic)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace SubductingPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/subducting_plate_models/temperature/interface.cc b/source/features/subducting_plate_models/temperature/interface.cc
index ec0aede62..58a5ae1dc 100644
--- a/source/features/subducting_plate_models/temperature/interface.cc
+++ b/source/features/subducting_plate_models/temperature/interface.cc
@@ -17,17 +17,13 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-
-#include <algorithm>
+#include <world_builder/features/subducting_plate_models/temperature/interface.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/subducting_plate_models/temperature/interface.h>
-#include <world_builder/features/subducting_plate_models/temperature/adiabatic.h>
-#include <world_builder/features/subducting_plate_models/temperature/linear.h>
-#include <world_builder/features/subducting_plate_models/temperature/plate_model.h>
-#include <world_builder/features/subducting_plate_models/temperature/uniform.h>
+#include <world_builder/types/string.h>
+
+#include <algorithm>
 
 namespace WorldBuilder
 {
@@ -93,8 +89,8 @@ namespace WorldBuilder
           // thrown when the name is not present.
           return get_factory_map().at(lower_case_name)->create(world);
         }
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace SubductingPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/subducting_plate_models/temperature/linear.cc b/source/features/subducting_plate_models/temperature/linear.cc
index f41377354..884ad475f 100644
--- a/source/features/subducting_plate_models/temperature/linear.cc
+++ b/source/features/subducting_plate_models/temperature/linear.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/subducting_plate_models/temperature/linear.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/subducting_plate_models/temperature/linear.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -128,8 +128,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_SUBDUCTING_PLATE_TEMPERATURE_MODEL(Linear, linear)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace SubductingPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/subducting_plate_models/temperature/plate_model.cc b/source/features/subducting_plate_models/temperature/plate_model.cc
index df7da95b3..5812f89ef 100644
--- a/source/features/subducting_plate_models/temperature/plate_model.cc
+++ b/source/features/subducting_plate_models/temperature/plate_model.cc
@@ -17,18 +17,18 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/subducting_plate_models/temperature/plate_model.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/array.h>
 #include <world_builder/types/bool.h>
 #include <world_builder/types/double.h>
+#include <world_builder/types/object.h>
 #include <world_builder/types/point.h>
 #include <world_builder/types/string.h>
-#include <world_builder/types/object.h>
-#include <world_builder/features/subducting_plate_models/temperature/plate_model.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -218,8 +218,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_SUBDUCTING_PLATE_TEMPERATURE_MODEL(PlateModel, plate model)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace SubductingPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/subducting_plate_models/temperature/uniform.cc b/source/features/subducting_plate_models/temperature/uniform.cc
index 0a1250bc0..a05275d83 100644
--- a/source/features/subducting_plate_models/temperature/uniform.cc
+++ b/source/features/subducting_plate_models/temperature/uniform.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/utilities.h>
+#include <world_builder/features/subducting_plate_models/temperature/uniform.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
-#include <world_builder/features/subducting_plate_models/temperature/uniform.h>
+#include <world_builder/types/string.h>
+#include <world_builder/utilities.h>
 
 
 namespace WorldBuilder
@@ -101,8 +101,8 @@ namespace WorldBuilder
         }
 
         WB_REGISTER_FEATURE_SUBDUCTING_PLATE_TEMPERATURE_MODEL(Uniform, uniform)
-      }
-    }
-  }
-}
+      } // namespace Temperature
+    } // namespace SubductingPlateModels
+  } // namespace Features
+} // namespace WorldBuilder
 
diff --git a/source/features/utilities.cc b/source/features/utilities.cc
index 017304d2e..a267e6ca2 100644
--- a/source/features/utilities.cc
+++ b/source/features/utilities.cc
@@ -34,6 +34,6 @@ namespace WorldBuilder
         WBAssert(operation == "replace", "Could not find operation: " << operation << ".");
         return Operations::REPLACE;
       }
-    }
-  }
-}
\ No newline at end of file
+    } // namespace Utilities
+  } // namespace Features
+} // namespace WorldBuilder
\ No newline at end of file
diff --git a/source/parameters.cc b/source/parameters.cc
index d4838f1b9..0fd2e23c5 100644
--- a/source/parameters.cc
+++ b/source/parameters.cc
@@ -16,54 +16,57 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include <fstream>
-#include <memory>
-#include <sstream>
-#include <vector>
-#include <tuple>
 
-#include <rapidjson/istreamwrapper.h>
-#include "rapidjson/pointer.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/latexwriter.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/error/en.h"
+#include <world_builder/parameters.h>
 
 #include <world_builder/assert.h>
 #include <world_builder/config.h>
-#include <world_builder/parameters.h>
 #include <world_builder/utilities.h>
 
+#include <world_builder/types/array.h>
+#include <world_builder/types/double.h>
 #include <world_builder/types/object.h>
+#include <world_builder/types/plugin_system.h>
 #include <world_builder/types/point.h>
-#include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/segment.h>
-#include <world_builder/types/array.h>
+#include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
-#include <world_builder/types/plugin_system.h>
 
-#include <world_builder/features/continental_plate_models/temperature/interface.h>
 #include <world_builder/features/continental_plate_models/composition/interface.h>
 #include <world_builder/features/continental_plate_models/grains/interface.h>
-#include <world_builder/features/oceanic_plate_models/temperature/interface.h>
-#include <world_builder/features/oceanic_plate_models/composition/interface.h>
-#include <world_builder/features/oceanic_plate_models/grains/interface.h>
-#include <world_builder/features/mantle_layer_models/temperature/interface.h>
+#include <world_builder/features/continental_plate_models/temperature/interface.h>
 #include <world_builder/features/mantle_layer_models/composition/interface.h>
 #include <world_builder/features/mantle_layer_models/grains/interface.h>
-#include <world_builder/features/subducting_plate_models/temperature/interface.h>
+#include <world_builder/features/mantle_layer_models/temperature/interface.h>
+#include <world_builder/features/oceanic_plate_models/composition/interface.h>
+#include <world_builder/features/oceanic_plate_models/grains/interface.h>
+#include <world_builder/features/oceanic_plate_models/temperature/interface.h>
 #include <world_builder/features/subducting_plate_models/composition/interface.h>
 #include <world_builder/features/subducting_plate_models/grains/interface.h>
-
-#include <world_builder/features/subducting_plate.h>
 #include <world_builder/features/subducting_plate_models/temperature/interface.h>
-#include <world_builder/features/subducting_plate_models/composition/interface.h>
-#include <world_builder/features/subducting_plate_models/grains/interface.h>
+
 #include <world_builder/features/fault.h>
-#include <world_builder/features/fault_models/temperature/interface.h>
 #include <world_builder/features/fault_models/composition/interface.h>
 #include <world_builder/features/fault_models/grains/interface.h>
+#include <world_builder/features/fault_models/temperature/interface.h>
+#include <world_builder/features/subducting_plate.h>
+#include <world_builder/features/subducting_plate_models/composition/interface.h>
+#include <world_builder/features/subducting_plate_models/grains/interface.h>
+#include <world_builder/features/subducting_plate_models/temperature/interface.h>
+
+
+#include "rapidjson/error/en.h"
+#include "rapidjson/istreamwrapper.h"
+#include "rapidjson/latexwriter.h"
+#include "rapidjson/pointer.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/stringbuffer.h"
+
+#include <fstream>
+#include <memory>
+#include <sstream>
+#include <tuple>
+#include <vector>
 
 using namespace rapidjson;
 
@@ -1572,5 +1575,5 @@ namespace WorldBuilder
 
 
 
-}
+} // namespace WorldBuilder
 
diff --git a/source/point.cc b/source/point.cc
index 96793b49b..1548ac527 100644
--- a/source/point.cc
+++ b/source/point.cc
@@ -17,12 +17,14 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <limits>
-#include <iostream>
-
 #include <world_builder/point.h>
+
 #include <world_builder/assert.h>
 
+#include <iostream>
+#include <limits>
+
+
 namespace WorldBuilder
 {
   template<>
@@ -332,4 +334,4 @@ namespace WorldBuilder
    * Multiplies a 3d point with a scalar.
    */
   template Point<3> operator*(const double scalar, const Point<3> &point);
-}
+} // namespace WorldBuilder
diff --git a/source/types/array.cc b/source/types/array.cc
index ba7b3b73b..534e25cc0 100644
--- a/source/types/array.cc
+++ b/source/types/array.cc
@@ -17,7 +17,7 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include <world_builder/types/array.h>
-#include <world_builder/types/bool.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/parameters.h>
 
@@ -80,6 +80,6 @@ namespace WorldBuilder
 
 
     }
-  }
-}
+  } // namespace Types
+} // namespace WorldBuilder
 
diff --git a/source/types/bool.cc b/source/types/bool.cc
index 1f2b6d267..ba4f362d6 100644
--- a/source/types/bool.cc
+++ b/source/types/bool.cc
@@ -17,9 +17,9 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include <world_builder/types/bool.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/utilities.h>
-#include <world_builder/parameters.h>
 
 namespace WorldBuilder
 {
@@ -58,6 +58,6 @@ namespace WorldBuilder
       Pointer((base + "/type").c_str()).Set(declarations,"boolean");
       Pointer((base + "/documentation").c_str()).Set(declarations,documentation.c_str());
     }
-  }
-}
+  } // namespace Types
+} // namespace WorldBuilder
 
diff --git a/source/types/double.cc b/source/types/double.cc
index 1bbc9f8c1..7fcebd297 100644
--- a/source/types/double.cc
+++ b/source/types/double.cc
@@ -17,9 +17,9 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include <world_builder/types/double.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/utilities.h>
-#include <world_builder/parameters.h>
 
 namespace WorldBuilder
 {
@@ -59,6 +59,6 @@ namespace WorldBuilder
       Pointer((base + "/type").c_str()).Set(declarations,"number");
       Pointer((base + "/documentation").c_str()).Set(declarations,documentation.c_str());
     }
-  }
-}
+  } // namespace Types
+} // namespace WorldBuilder
 
diff --git a/source/types/interface.cc b/source/types/interface.cc
index e7e530817..3c00590c5 100644
--- a/source/types/interface.cc
+++ b/source/types/interface.cc
@@ -17,11 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <algorithm>
+#include <world_builder/types/interface.h>
 
 #include <world_builder/assert.h>
 
-#include <world_builder/types/interface.h>
+#include <algorithm>
+
 
 
 namespace WorldBuilder
@@ -42,6 +43,6 @@ namespace WorldBuilder
     {
       return type_name;
     }
-  }
-}
+  } // namespace Types
+} // namespace WorldBuilder
 
diff --git a/source/types/object.cc b/source/types/object.cc
index 39b9c38d5..c34efcbc4 100644
--- a/source/types/object.cc
+++ b/source/types/object.cc
@@ -16,7 +16,9 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
+
 #include <world_builder/types/object.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/parameters.h>
 
@@ -86,6 +88,6 @@ namespace WorldBuilder
       }
       prm.enter_subsection("properties");
     }
-  }
-}
+  } // namespace Types
+} // namespace WorldBuilder
 
diff --git a/source/types/plugin_system.cc b/source/types/plugin_system.cc
index e3d7966dc..88dd84cc3 100644
--- a/source/types/plugin_system.cc
+++ b/source/types/plugin_system.cc
@@ -19,7 +19,6 @@
 #include <world_builder/types/plugin_system.h>
 
 #include <world_builder/assert.h>
-#include <world_builder/parameters.h>
 
 #include <utility>
 
@@ -94,6 +93,6 @@ namespace WorldBuilder
       }
       prm.leave_subsection();
     }
-  }
-}
+  } // namespace Types
+} // namespace WorldBuilder
 
diff --git a/source/types/point.cc b/source/types/point.cc
index 2bf69548a..e9424f444 100644
--- a/source/types/point.cc
+++ b/source/types/point.cc
@@ -17,9 +17,9 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include <world_builder/types/point.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/utilities.h>
-#include <world_builder/parameters.h>
 
 #include <utility>
 
@@ -172,6 +172,6 @@ namespace WorldBuilder
      * WorldBuilder::Point<3>.
      */
     template WorldBuilder::Point<3> operator*(const double scalar, const Point<3> &point);
-  }
-}
+  } // namespace Types
+} // namespace WorldBuilder
 
diff --git a/source/types/segment.cc b/source/types/segment.cc
index 6b05668bc..2d9ffae2e 100644
--- a/source/types/segment.cc
+++ b/source/types/segment.cc
@@ -17,17 +17,16 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include <world_builder/types/segment.h>
-#include <world_builder/assert.h>
-#include <world_builder/utilities.h>
-#include <world_builder/parameters.h>
-
 
-#include <world_builder/features/subducting_plate_models/temperature/interface.h>
-#include <world_builder/features/subducting_plate_models/composition/interface.h>
-#include <world_builder/features/subducting_plate_models/grains/interface.h>
-#include <world_builder/features/fault_models/temperature/interface.h>
+#include <world_builder/assert.h>
 #include <world_builder/features/fault_models/composition/interface.h>
 #include <world_builder/features/fault_models/grains/interface.h>
+#include <world_builder/features/fault_models/temperature/interface.h>
+#include <world_builder/features/subducting_plate_models/composition/interface.h>
+#include <world_builder/features/subducting_plate_models/grains/interface.h>
+#include <world_builder/features/subducting_plate_models/temperature/interface.h>
+#include <world_builder/parameters.h>
+#include <world_builder/utilities.h>
 
 namespace WorldBuilder
 {
@@ -140,7 +139,7 @@ namespace WorldBuilder
       prm.leave_subsection();
 
     }
-  }
+  } // namespace Types
 
   namespace Objects
   {
@@ -217,6 +216,6 @@ namespace WorldBuilder
     //template class
     //Segment<char,char>;
 
-  }
-}
+  } // namespace Objects
+} // namespace WorldBuilder
 
diff --git a/source/types/string.cc b/source/types/string.cc
index f9c292f3a..223e95ba2 100644
--- a/source/types/string.cc
+++ b/source/types/string.cc
@@ -17,6 +17,7 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include <world_builder/types/string.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/parameters.h>
 
@@ -116,6 +117,6 @@ namespace WorldBuilder
         }
     }
 
-  }
-}
+  } // namespace Types
+} // namespace WorldBuilder
 
diff --git a/source/types/unsigned_int.cc b/source/types/unsigned_int.cc
index 457861c28..63f712c50 100644
--- a/source/types/unsigned_int.cc
+++ b/source/types/unsigned_int.cc
@@ -17,9 +17,9 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include <world_builder/types/unsigned_int.h>
+
 #include <world_builder/assert.h>
 #include <world_builder/utilities.h>
-#include <world_builder/parameters.h>
 
 #include <world_builder/nan.h>
 
@@ -62,6 +62,6 @@ namespace WorldBuilder
       Pointer((base + "/documentation").c_str()).Set(declarations,documentation.c_str());
 
     }
-  }
-}
+  } // namespace Types
+} // namespace WorldBuilder
 
diff --git a/source/utilities.cc b/source/utilities.cc
index fd9156105..7fbf1d0dc 100644
--- a/source/utilities.cc
+++ b/source/utilities.cc
@@ -17,15 +17,15 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <iostream>
-#include <iomanip>
-#include <algorithm>
-
 #include <world_builder/assert.h>
 #include <world_builder/coordinate_systems/interface.h>
 #include <world_builder/nan.h>
 #include <world_builder/utilities.h>
 
+#include <algorithm>
+#include <iomanip>
+#include <iostream>
+
 
 namespace WorldBuilder
 {
@@ -1350,8 +1350,8 @@ namespace WorldBuilder
 
     template std::array<double,2> convert_point_to_array<2>(const Point<2> &point_);
     template std::array<double,3> convert_point_to_array<3>(const Point<3> &point_);
-  }
-}
+  } // namespace Utilities
+} // namespace WorldBuilder
 
 
 
diff --git a/source/world.cc b/source/world.cc
index efd9ea88f..b7b13cc7c 100644
--- a/source/world.cc
+++ b/source/world.cc
@@ -17,35 +17,35 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifdef WB_WITH_MPI
-#define OMPI_SKIP_MPICXX 1
-#include <mpi.h>
-#endif
-
-#include <sstream>
-#include <utility>
-
-#include "rapidjson/pointer.h"
-
-#include <world_builder/config.h>
 #include <world_builder/world.h>
-#include <world_builder/utilities.h>
+
 #include <world_builder/assert.h>
-#include <world_builder/point.h>
+#include <world_builder/config.h>
+#include <world_builder/coordinate_systems/interface.h>
 #include <world_builder/nan.h>
 #include <world_builder/parameters.h>
-#include <world_builder/coordinate_systems/interface.h>
+#include <world_builder/point.h>
 #include <world_builder/types/interface.h>
+#include <world_builder/utilities.h>
 
 #include <world_builder/types/array.h>
 #include <world_builder/types/bool.h>
 #include <world_builder/types/double.h>
-#include <world_builder/types/string.h>
 #include <world_builder/types/object.h>
+#include <world_builder/types/plugin_system.h>
 #include <world_builder/types/point.h>
+#include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
-#include <world_builder/types/plugin_system.h>
 
+#include "rapidjson/pointer.h"
+
+#ifdef WB_WITH_MPI
+#define OMPI_SKIP_MPICXX 1
+#include <mpi.h>
+#endif
+
+#include <sstream>
+#include <utility>
 
 namespace WorldBuilder
 {
@@ -438,5 +438,5 @@ namespace WorldBuilder
     return random_number_engine;
   }
 
-}
+} // namespace WorldBuilder
 
diff --git a/source/wrapper_c.cc b/source/wrapper_c.cc
index 076801e21..7724e761a 100644
--- a/source/wrapper_c.cc
+++ b/source/wrapper_c.cc
@@ -17,9 +17,10 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <world_builder/world.h>
 #include <world_builder/wrapper_c.h>
+
 #include <world_builder/assert.h>
+#include <world_builder/world.h>
 
 extern "C" {
   /**
diff --git a/source/wrapper_cpp.cc b/source/wrapper_cpp.cc
index c132e9352..777699d23 100644
--- a/source/wrapper_cpp.cc
+++ b/source/wrapper_cpp.cc
@@ -17,12 +17,12 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <utility>
+#include "world_builder/world.h"
 
 #include "world_builder/wrapper_cpp.h"
-#include "world_builder/world.h"
-#include "iostream"
 
+#include <iostream>
+#include <utility>
 using namespace WorldBuilder;
 namespace wrapper_cpp
 {
@@ -65,4 +65,4 @@ namespace wrapper_cpp
     std::array<double,3> position = {{x,y,z}};
     return reinterpret_cast<WorldBuilder::World *>(ptr_ptr_world)->composition(position,depth,composition_number);
   }
-}
\ No newline at end of file
+} // namespace wrapper_cpp
\ No newline at end of file
diff --git a/tests/unit_tests/unit_test_world_builder.cc b/tests/unit_tests/unit_test_world_builder.cc
index 499bca130..6071e229b 100644
--- a/tests/unit_tests/unit_test_world_builder.cc
+++ b/tests/unit_tests/unit_test_world_builder.cc
@@ -27,20 +27,20 @@
 #include <world_builder/config.h>
 #include <world_builder/coordinate_systems/interface.h>
 
-#include <world_builder/features/interface.h>
 #include <world_builder/features/continental_plate.h>
+#include <world_builder/features/fault_models/composition/uniform.h>
 #include <world_builder/features/fault_models/grains/interface.h>
 #include <world_builder/features/fault_models/temperature/uniform.h>
-#include <world_builder/features/fault_models/composition/uniform.h>
+#include <world_builder/features/interface.h>
 
 #include <world_builder/point.h>
 
 #include <world_builder/types/array.h>
 #include <world_builder/types/bool.h>
 #include <world_builder/types/double.h>
+#include <world_builder/types/object.h>
 #include <world_builder/types/plugin_system.h>
 #include <world_builder/types/point.h>
-#include <world_builder/types/object.h>
 #include <world_builder/types/segment.h>
 #include <world_builder/types/string.h>
 #include <world_builder/types/unsigned_int.h>
diff --git a/visualization/main.cc b/visualization/main.cc
index 293be8a07..6920d665c 100644
--- a/visualization/main.cc
+++ b/visualization/main.cc
@@ -22,34 +22,34 @@
  * and was contribute to the World Builder with the permission and help of
  * the author of GHOST.
  */
-#include <cmath>
-
-#ifdef WB_WITH_MPI
-#include <mpi.h>
-#endif
-
 
-#include <algorithm>
-#include <exception>
-#include <iostream>
-#include <array>
-#include <fstream>
-#include <memory>
-#include <thread>
+#include <visualization/main.h>
 
 #include <world_builder/assert.h>
+#include <world_builder/coordinate_system.h>
 #include <world_builder/nan.h>
 #include <world_builder/utilities.h>
 #include <world_builder/world.h>
-#include <world_builder/coordinate_system.h>
 
-#include <visualization/main.h>
 
 #include <vtu11/vtu11.hpp>
-
 #undef max
 #undef min
 
+#ifdef WB_WITH_MPI
+#include <mpi.h>
+#endif
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <exception>
+#include <fstream>
+#include <iostream>
+#include <memory>
+#include <thread>
+
+
 using namespace WorldBuilder;
 using namespace WorldBuilder::Utilities;