diff --git a/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp b/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp
index 32bdb622e8d7ba560f1920a3ffabf2a9fb1dc3d2..8716859c02b6503cbf91bb20d3b5ff8a6360e690 100644
--- a/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp
+++ b/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp
@@ -157,10 +157,10 @@ void NetCdfConfigureDialog::on_comboBoxDim4_currentIndexChanged(int id)
 
 int NetCdfConfigureDialog::setVariableSelect()
 {
-    std::size_t max_dim(0);
-    std::size_t max_dim_idx(0);
-    std::size_t const n_vars (_currentFile->num_vars());
-    for (int i=0; i<n_vars; i++)
+    int max_dim = 0;
+    int max_dim_idx = 0;
+    auto const n_vars = _currentFile->num_vars();
+    for (int i = 0; i < n_vars; i++)
     {
         NcVar const& focusedVar = *_currentFile->get_var(i);
         if (focusedVar.num_dims() > 1)
@@ -179,10 +179,10 @@ int NetCdfConfigureDialog::setVariableSelect()
 
 void NetCdfConfigureDialog::setDimensionSelect()
 {
-    int const dim (_currentVar->num_dims());
+    int const dim = _currentVar->num_dims();
     std::array<QComboBox*,4> dim_box = {{ comboBoxDim1, comboBoxDim2, comboBoxDim3, comboBoxDim4 }};
 
-    for (std::size_t i=0; i<4; ++i)
+    for (int i = 0; i < 4; ++i)
     {
         dim_box[i]->clear();
         dim_box[i]->setEnabled(i < dim);
@@ -190,7 +190,7 @@ void NetCdfConfigureDialog::setDimensionSelect()
 
     for (int i=0; i < dim; ++i) //write dimension-names into selection-boxes
     {
-        for (std::size_t j=0; j<dim; ++j)
+        for (int j = 0; j < dim; ++j)
             dim_box[j]->addItem(_currentVar->get_dim(i)->name());
     }
     comboBoxDim1->setCurrentIndex(dim-2);
diff --git a/Applications/DataExplorer/DataView/StationTreeModel.cpp b/Applications/DataExplorer/DataView/StationTreeModel.cpp
index 70b7fa9defa23456f18a3d8d961003ef195f1808..3939130824b77d4b495b494dc05c33df4c08b919 100644
--- a/Applications/DataExplorer/DataView/StationTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/StationTreeModel.cpp
@@ -100,7 +100,7 @@ vtkPolyDataAlgorithm* StationTreeModel::vtkSource(const std::string &name) const
 }
 
 void StationTreeModel::setNameForItem(const std::string& stn_vec_name,
-                                      std::size_t id,
+                                      std::size_t const id,
                                       std::string const& item_name)
 {
     auto const stn_list = find_if(
@@ -108,7 +108,8 @@ void StationTreeModel::setNameForItem(const std::string& stn_vec_name,
             return (stn_vec_name == item->data(0).toString().toStdString());
         });
 
-    if (id >=  (*stn_list)->childCount())
+    if (stn_list == _lists.end() ||
+        id >= static_cast<std::size_t>((*stn_list)->childCount()))
         return;
     TreeItem *const item = (*stn_list)->child(id);
     item->setData(0, QString::fromStdString(item_name));
diff --git a/Applications/FileIO/CsvInterface.cpp b/Applications/FileIO/CsvInterface.cpp
index adb2ffe87511e309231b351d19b38b2d7479fe57..4330651f94b8959fb1d8ca2989a102a0375e5b99 100644
--- a/Applications/FileIO/CsvInterface.cpp
+++ b/Applications/FileIO/CsvInterface.cpp
@@ -14,9 +14,8 @@
 #include "CsvInterface.h"
 
 #include <algorithm>
-#include <iostream>
+#include <fstream>
 #include <numeric>
-#include <stdexcept>
 
 #include "GeoLib/Point.h"
 
diff --git a/Applications/FileIO/SWMM/SWMMInterface.cpp b/Applications/FileIO/SWMM/SWMMInterface.cpp
index 8826f009d2c7f5536e62ef27bc50550093959408..cf049b5a159813ab035ec635edbcb1362e43673d 100644
--- a/Applications/FileIO/SWMM/SWMMInterface.cpp
+++ b/Applications/FileIO/SWMM/SWMMInterface.cpp
@@ -9,7 +9,7 @@
 #include "SwmmInterface.h"
 
 #include <cctype>
-#include <iostream>
+#include <fstream>
 #include <utility>
 
 #include "BaseLib/FileTools.h"
diff --git a/BaseLib/LogogCustomCout.h b/BaseLib/LogogCustomCout.h
index 37c65a54270849a35d7a06effad53a0b124f49aa..750a4e2513d5f0bc7c8d9cf709fcf312289f8957 100644
--- a/BaseLib/LogogCustomCout.h
+++ b/BaseLib/LogogCustomCout.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <iostream>
+#include <ostream>
 
 #include <logog/include/logog.hpp>
 
diff --git a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h
index 3f778b2cb9f719461a281a4711332836a5cf4117..a88b56bde923d9b09843af0b986af89c3ba3d7de 100644
--- a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h
+++ b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include <iostream>
 #include <memory>
 #include <vector>
 
diff --git a/NumLib/DOF/LocalToGlobalIndexMap.cpp b/NumLib/DOF/LocalToGlobalIndexMap.cpp
index 4adb3786812c50cd0739f59bf4d601c2121c3306..92456d96a6a09c5d4d9251c1ed381a9ae2cfc293 100644
--- a/NumLib/DOF/LocalToGlobalIndexMap.cpp
+++ b/NumLib/DOF/LocalToGlobalIndexMap.cpp
@@ -284,7 +284,7 @@ LocalToGlobalIndexMap::getNumberOfElementDOF(std::size_t const mesh_item_id) con
 {
     std::size_t ndof = 0;
 
-    for (unsigned c=0; c<_rows.cols(); ++c)
+    for (Table::Index c = 0; c < _rows.cols(); ++c)
     {
         ndof += _rows(mesh_item_id, c).size();
     }
@@ -296,7 +296,7 @@ std::size_t
 LocalToGlobalIndexMap::getNumberOfElementComponents(std::size_t const mesh_item_id) const
 {
     std::size_t n = 0;
-    for (unsigned c=0; c<_rows.cols(); ++c)
+    for (Table::Index c = 0; c < _rows.cols(); ++c)
     {
         if (!_rows(mesh_item_id, c).empty())
             n++;
diff --git a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp
index 5c5a15784ef8366cce321e621d41ca8166a157e9..29c973ae10a4dc8ba548f89b990a0bb07a63d44d 100644
--- a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp
+++ b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp
@@ -97,7 +97,7 @@ void LocalLinearLeastSquaresExtrapolator::extrapolateElement(
            "integration points.");
 
     auto const pair_it_inserted = _qr_decomposition_cache.emplace(
-        std::make_pair(num_nodes, num_int_pts), CachedData{{}});
+        std::make_pair(num_nodes, num_int_pts), CachedData{});
 
     auto& cached_data = pair_it_inserted.first->second;
     if (pair_it_inserted.second)
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.h
index fd232b493a986ed0c04c368764530e840dc4a0b7..5566d3638674ad1c7dcea7a849bfaa20b82af9b9 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.h
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include <iostream>
 #include <memory>
 #include <vector>
 #include "MaterialLib/Fluid/FluidPropertyHeaders.h"