diff --git a/include/realizations/catchment/Formulation_Constructors.hpp b/include/realizations/catchment/Formulation_Constructors.hpp
index 640c3abbbb..92c394b6fb 100644
--- a/include/realizations/catchment/Formulation_Constructors.hpp
+++ b/include/realizations/catchment/Formulation_Constructors.hpp
@@ -29,7 +29,7 @@ namespace realization {
         return [](std::string id, std::shared_ptr<data_access::GenericDataProvider> forcing_provider, utils::StreamHandler output_stream) -> std::shared_ptr<Catchment_Formulation>{
             return std::make_shared<T>(id, forcing_provider, output_stream);
         };
-    };
+    }
 
     static std::map<std::string, constructor> formulations = {
         {"bmi_c++", create_formulation_constructor<Bmi_Cpp_Formulation>()},
@@ -83,7 +83,7 @@ namespace realization {
                     "\", provider: \"" + forcing_config.provider + "\"");
         }
         return formulation_constructor(identifier, fp, output_stream);
-    };
+    }
 
     static std::string get_formulation_key(const boost::property_tree::ptree &tree) {
         /*for (auto &node : tree) {
diff --git a/include/realizations/config/config.hpp b/include/realizations/config/config.hpp
index 6b47aba5c2..fb11dffa38 100644
--- a/include/realizations/config/config.hpp
+++ b/include/realizations/config/config.hpp
@@ -55,6 +55,6 @@ namespace realization{
     };
 
     
-  };//end namespace config
+  }//end namespace config
 }//end namespace realization
 #endif //NGEN_REALIZATION_CONFIG_H
diff --git a/include/realizations/config/forcing.hpp b/include/realizations/config/forcing.hpp
index 9d0f24fe76..3583cb85dd 100644
--- a/include/realizations/config/forcing.hpp
+++ b/include/realizations/config/forcing.hpp
@@ -53,6 +53,6 @@ namespace realization{
   };
 
 
-  };//end namespace config
+  }//end namespace config
 }//end namespace realization
 #endif //NGEN_REALIZATION_CONFIG_FORCING_H
diff --git a/include/realizations/config/formulation.hpp b/include/realizations/config/formulation.hpp
index 4b80e19303..594a2900c1 100644
--- a/include/realizations/config/formulation.hpp
+++ b/include/realizations/config/formulation.hpp
@@ -130,6 +130,6 @@ namespace realization{
     }
   };
 
-  };//end namespace config
+  }//end namespace config
 }//end namespace realization
 #endif //NGEN_REALIZATION_CONFIG_FORMULATION_H
diff --git a/include/realizations/config/routing.hpp b/include/realizations/config/routing.hpp
index b731d8dcb3..349c1e1466 100644
--- a/include/realizations/config/routing.hpp
+++ b/include/realizations/config/routing.hpp
@@ -16,6 +16,6 @@ namespace realization{
         }
     };
 
-  };//end namespace config
+  }//end namespace config
 }//end namespace realization
 #endif //NGEN_REALIZATION_CONFIG_ROUTING_H
diff --git a/include/realizations/config/time.hpp b/include/realizations/config/time.hpp
index a40633ae05..666305c6a8 100644
--- a/include/realizations/config/time.hpp
+++ b/include/realizations/config/time.hpp
@@ -74,6 +74,6 @@ namespace realization{
                     );
         }
     };
-  };//end namespace config
+  }//end namespace config
 }//end namespace realization
 #endif //NGEN_REALIZATION_CONFIG_TIME_H
diff --git a/src/geojson/FeatureCollection.cpp b/src/geojson/FeatureCollection.cpp
index 0d5d320866..ac25c540b5 100644
--- a/src/geojson/FeatureCollection.cpp
+++ b/src/geojson/FeatureCollection.cpp
@@ -64,7 +64,7 @@ Feature FeatureCollection::remove_feature_by_id(std::string ID) {
 
 int FeatureCollection::get_size() {
     return features.size();
-};
+}
 
 bool FeatureCollection::is_empty() {
     return features.size() == 0;
diff --git a/src/geojson/JSONProperty.cpp b/src/geojson/JSONProperty.cpp
index 9bb45495be..df0a8203c5 100644
--- a/src/geojson/JSONProperty.cpp
+++ b/src/geojson/JSONProperty.cpp
@@ -18,7 +18,7 @@ long JSONProperty::as_natural_number() const {
     // Throw an exception since this can't be considered a natural number
     std::string message = key + " is a " + get_propertytype_name(get_type()) + " and cannot be converted into a natural number.";
     throw std::runtime_error(message);
-};
+}
 
 /**
  * Get the type of the property (Natural, Real, String, etc)
@@ -27,7 +27,7 @@ long JSONProperty::as_natural_number() const {
  */
 PropertyType JSONProperty::get_type() const {
     return type;
-};
+}
 
 
 double JSONProperty::as_real_number() const {
@@ -40,7 +40,7 @@ double JSONProperty::as_real_number() const {
 
     std::string message = key + " is a " + get_propertytype_name(get_type()) + " and cannot be converted into a real number.";
     throw std::runtime_error(message);
-};
+}
 
 bool JSONProperty::as_boolean() const {
     if (type == PropertyType::Boolean) {
@@ -49,7 +49,7 @@ bool JSONProperty::as_boolean() const {
 
     std::string message = key + " is a " + get_propertytype_name(get_type()) + " and cannot be converted into a boolean.";
     throw std::runtime_error(message);
-};
+}
 
 std::vector<JSONProperty> JSONProperty::as_list() const {
     std::vector<JSONProperty> copy;
@@ -131,7 +131,7 @@ std::string JSONProperty::as_string() const {
 
     std::string message = key + " is a " + get_propertytype_name(get_type()) + " and cannot be converted into a string.";
     throw std::runtime_error(message);
-};
+}
 
 JSONProperty JSONProperty::at(std::string key) const {
     if (type == PropertyType::Object) {
diff --git a/src/geopackage/ngen_sqlite.cpp b/src/geopackage/ngen_sqlite.cpp
index 9f98288f81..6ddf9f72f8 100644
--- a/src/geopackage/ngen_sqlite.cpp
+++ b/src/geopackage/ngen_sqlite.cpp
@@ -14,7 +14,7 @@ sqlite_error::sqlite_error(const std::string& origin_func, int code, const std::
     origin_func + " returned code " + std::to_string(code)
         + " (msg: " + sqlite3_errstr(code) + ")"
         + (extra.empty() ? "" : " " + extra)
-  ){};
+  ){}
 
 const auto sqlite_not_started_error = sqlite_error{
     "sqlite iteration is has not started, get() is not callable "
@@ -41,7 +41,7 @@ database::iterator::iterator(stmt_t&& stmt)
     }
 
     restart();
-};
+}
 
 auto database::iterator::ptr_() const noexcept -> sqlite3_stmt*
 {
diff --git a/src/routing/Routing_Py_Adapter.cpp b/src/routing/Routing_Py_Adapter.cpp
index 3e41e1c7d0..2a3cd48170 100644
--- a/src/routing/Routing_Py_Adapter.cpp
+++ b/src/routing/Routing_Py_Adapter.cpp
@@ -32,7 +32,7 @@ Routing_Py_Adapter::Routing_Py_Adapter(std::string t_route_config_file_with_path
 void Routing_Py_Adapter::route(int number_of_timesteps, int delta_time,
                           const std::vector<double> &flow_vector){
   throw "Routing_Py_Adapter::route overload with flow_vector unimplemented.";
-};
+}
 
 void Routing_Py_Adapter::route(int number_of_timesteps, int delta_time)
 {