From 74e3514dc554c882b423b621b5e02267613f6312 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Tue, 11 Dec 2018 16:29:07 +0100
Subject: [PATCH] Replace logog includes with BaseLib/Logging.h.

Include spdlog via BaseLib/Logging.h, which
provides macro replacements for
ERR/DBUG/WARN/INFO...
---
 Applications/ApplicationsLib/ProjectData.cpp        |  2 +-
 Applications/CLI/ogs_embedded_python.cpp            |  2 +-
 .../DataView/DataExplorerSettingsDialog.cpp         |  2 +-
 .../DataView/DiagramView/DiagramList.cpp            |  2 +-
 .../DataView/DirectConditionGenerator.cpp           |  2 +-
 Applications/DataExplorer/DataView/GEOModels.cpp    |  2 +-
 .../DataView/GeoOnMeshMappingDialog.cpp             |  2 +-
 Applications/DataExplorer/DataView/GeoTreeModel.cpp |  2 +-
 .../DataExplorer/DataView/MeshAnalysisDialog.cpp    |  2 +-
 .../DataExplorer/DataView/MeshLayerEditDialog.cpp   |  2 +-
 Applications/DataExplorer/DataView/MeshModel.cpp    |  4 ++--
 Applications/DataExplorer/DataView/ProcessModel.cpp |  8 +++-----
 .../DataExplorer/DataView/SaveMeshDialog.cpp        |  2 +-
 .../DataExplorer/DataView/StationTreeModel.cpp      |  2 +-
 .../DataExplorer/VtkVis/VtkAddFilterDialog.cpp      |  2 +-
 .../DataExplorer/VtkVis/VtkAlgorithmProperties.cpp  |  2 +-
 .../DataExplorer/VtkVis/VtkAppendArrayFilter.cpp    |  2 +-
 .../DataExplorer/VtkVis/VtkColorByHeightFilter.cpp  |  2 +-
 .../DataExplorer/VtkVis/VtkColorLookupTable.cpp     |  2 +-
 .../VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp   |  2 +-
 .../VtkVis/VtkCompositeThresholdFilter.cpp          |  2 +-
 .../VtkVis/VtkCustomInteractorStyle.cpp             |  2 +-
 .../DataExplorer/VtkVis/VtkPickCallback.cpp         |  2 +-
 .../DataExplorer/VtkVis/VtkPointsSource.cpp         |  2 +-
 .../DataExplorer/VtkVis/VtkPolylinesSource.cpp      |  2 +-
 Applications/DataExplorer/VtkVis/VtkRaster.cpp      |  2 +-
 .../DataExplorer/VtkVis/VtkStationSource.cpp        |  2 +-
 .../VtkVis/VtkTextureOnSurfaceFilter.cpp            |  2 +-
 .../DataExplorer/VtkVis/VtkVisImageItem.cpp         |  2 +-
 Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp |  3 +--
 .../DataExplorer/VtkVis/VtkVisPointSetItem.cpp      |  2 +-
 .../DataExplorer/VtkVis/VtkVisTabWidget.cpp         |  2 +-
 Applications/DataExplorer/main.cpp                  |  2 +-
 Applications/DataExplorer/mainwindow.cpp            |  2 +-
 Applications/DataHolderLib/Color.cpp                |  2 +-
 Applications/DataHolderLib/Project.cpp              |  2 +-
 Applications/FileIO/AsciiRasterInterface.cpp        |  2 +-
 Applications/FileIO/CsvInterface.h                  |  2 +-
 Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp   |  2 +-
 Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp  |  2 +-
 Applications/FileIO/GMSInterface.cpp                |  2 +-
 .../FileIO/Gmsh/GMSHAdaptiveMeshDensity.cpp         |  2 +-
 Applications/FileIO/Gmsh/GMSHInterface.cpp          |  2 +-
 Applications/FileIO/Legacy/OGSIOVer4.cpp            |  2 +-
 Applications/FileIO/Legacy/createSurface.cpp        |  2 +-
 Applications/FileIO/PetrelInterface.cpp             |  2 +-
 Applications/FileIO/SHPInterface.cpp                |  2 +-
 Applications/FileIO/SWMM/SWMMInterface.h            |  2 +-
 Applications/FileIO/TetGenInterface.cpp             |  2 +-
 Applications/FileIO/XmlIO/Qt/XmlLutReader.h         |  2 +-
 Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp    |  2 +-
 Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp    |  2 +-
 .../Utils/FileConverter/NetCdfConverter.cpp         | 13 ++++++-------
 Applications/Utils/FileConverter/VTK2TIN.cpp        |  2 +-
 .../PartitionMesh/NodeWiseMeshPartitioner.cpp       |  2 +-
 BaseLib/ConfigTree.cpp                              |  2 +-
 BaseLib/ConfigTreeUtil.cpp                          |  2 +-
 BaseLib/DateTools.cpp                               |  2 +-
 BaseLib/Error.h                                     |  2 +-
 BaseLib/FileFinder.cpp                              |  3 +--
 BaseLib/FileTools.h                                 |  2 +-
 BaseLib/Histogram.h                                 |  3 +--
 BaseLib/IO/Writer.cpp                               |  2 +-
 BaseLib/IO/XmlIO/Qt/XMLQtInterface.cpp              |  2 +-
 BaseLib/StringTools.cpp                             |  2 +-
 GeoLib/AABB.h                                       |  2 +-
 GeoLib/AnalyticalGeometry.cpp                       |  2 +-
 GeoLib/DuplicateGeometry.cpp                        |  2 +-
 GeoLib/GEOObjects.cpp                               |  2 +-
 GeoLib/Grid.h                                       |  2 +-
 GeoLib/IO/TINInterface.cpp                          |  2 +-
 GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp      |  2 +-
 GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp              |  2 +-
 GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp              |  2 +-
 GeoLib/PointVec.cpp                                 |  2 +-
 GeoLib/Polygon.cpp                                  |  2 +-
 GeoLib/Polyline.cpp                                 |  4 ++--
 GeoLib/QuadTree.h                                   |  3 ++-
 GeoLib/Raster.cpp                                   |  2 +-
 GeoLib/SensorData.cpp                               |  2 +-
 GeoLib/Station.cpp                                  |  2 +-
 GeoLib/StationBorehole.cpp                          |  2 +-
 GeoLib/Surface.cpp                                  |  2 +-
 GeoLib/SurfaceGrid.cpp                              |  2 +-
 GeoLib/TemplateVec.h                                |  2 +-
 MaterialLib/Adsorption/Adsorption.cpp               |  2 +-
 MaterialLib/Adsorption/Reaction.cpp                 |  2 +-
 MaterialLib/Adsorption/ReactionCaOH2.cpp            |  4 ++--
 MaterialLib/Adsorption/ReactionSinusoidal.h         |  2 +-
 .../CreateTwoPhaseFlowMaterialProperties.cpp        |  2 +-
 .../TwoPhaseFlowWithPPMaterialProperties.cpp        |  2 +-
 MathLib/GeometricBasics.cpp                         |  2 +-
 MathLib/LinAlg/Eigen/EigenLinearSolver.cpp          |  2 +-
 MathLib/LinAlg/Eigen/EigenTools.cpp                 |  2 +-
 MathLib/LinAlg/Eigen/EigenTools.h                   |  2 +-
 MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp    |  2 +-
 MathLib/LinAlg/Lis/LisCheck.h                       |  2 +-
 MathLib/LinAlg/Lis/LisLinearSolver.cpp              |  2 +-
 MathLib/LinAlg/Lis/LisMatrix.cpp                    |  2 +-
 MathLib/LinAlg/Lis/LisOption.h                      |  2 +-
 MathLib/LinAlg/PETSc/PETScLinearSolver.h            |  2 +-
 MathLib/Nonlinear/Root1D.h                          |  2 +-
 MathLib/ODE/CVodeSolver.cpp                         |  2 +-
 MathLib/ODE/ODESolverBuilder.h                      |  2 +-
 MeshGeoToolsLib/AppendLinesAlongPolyline.cpp        |  2 +-
 MeshGeoToolsLib/ConstructMeshesFromGeometries.cpp   |  2 +-
 MeshGeoToolsLib/GeoMapper.cpp                       |  2 +-
 MeshGeoToolsLib/HeuristicSearchLength.cpp           |  2 +-
 MeshGeoToolsLib/MeshNodeSearcher.cpp                |  2 +-
 MeshLib/Elements/EdgeReturn.cpp                     |  2 +-
 MeshLib/Elements/Element.cpp                        |  2 +-
 MeshLib/Elements/HexRule20.cpp                      |  2 +-
 MeshLib/Elements/HexRule8.cpp                       |  2 +-
 MeshLib/Elements/LineRule2.cpp                      |  2 +-
 MeshLib/Elements/PrismRule15.cpp                    |  2 +-
 MeshLib/Elements/PrismRule6.cpp                     |  2 +-
 MeshLib/Elements/PyramidRule13.cpp                  |  2 +-
 MeshLib/Elements/PyramidRule5.cpp                   |  2 +-
 MeshLib/Elements/QuadRule4.cpp                      |  2 +-
 MeshLib/Elements/TetRule10.cpp                      |  2 +-
 MeshLib/Elements/TetRule4.cpp                       |  2 +-
 MeshLib/Elements/TriRule3.cpp                       |  2 +-
 MeshLib/IO/Legacy/MeshIO.cpp                        |  2 +-
 MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp     |  2 +-
 MeshLib/IO/VtkIO/PVDFile.cpp                        |  2 +-
 MeshLib/IO/VtkIO/VtuInterface-impl.h                |  2 +-
 MeshLib/IO/VtkIO/VtuInterface.cpp                   |  2 +-
 MeshLib/IO/readMeshFromFile.cpp                     |  2 +-
 MeshLib/IO/writeMeshToFile.cpp                      |  2 +-
 MeshLib/MeshEditing/AddLayerToMesh.cpp              |  2 +-
 MeshLib/MeshEditing/ElementValueModification.cpp    |  2 +-
 .../MeshEditing/Mesh2MeshPropertyInterpolation.cpp  |  2 +-
 MeshLib/MeshEditing/MeshRevision.cpp                |  2 +-
 MeshLib/MeshGenerators/LayeredMeshGenerator.cpp     |  2 +-
 MeshLib/MeshGenerators/MeshLayerMapper.cpp          |  2 +-
 MeshLib/MeshGenerators/RasterToMesh.h               |  2 +-
 MeshLib/MeshGenerators/VtkMeshConverter.h           |  2 +-
 MeshLib/MeshQuality/ElementQualityMetric.h          |  2 +-
 MeshLib/MeshQuality/MeshValidation.cpp              |  2 +-
 MeshLib/MeshSearch/ElementSearch.cpp                |  2 +-
 MeshLib/MeshSearch/MeshElementGrid.cpp              |  2 +-
 MeshLib/MeshSearch/NodeSearch.cpp                   |  2 +-
 MeshLib/MeshSurfaceExtraction.cpp                   |  2 +-
 MeshLib/Properties.h                                |  2 +-
 MeshLib/convertMeshToGeo.cpp                        |  2 +-
 NumLib/DOF/SimpleMatrixVectorProvider.cpp           |  2 +-
 .../LocalLinearLeastSquaresExtrapolator.cpp         |  2 +-
 NumLib/NewtonRaphson.h                              |  2 +-
 NumLib/ODESolver/ConvergenceCriterionDeltaX.cpp     |  2 +-
 .../ConvergenceCriterionPerComponentDeltaX.cpp      |  2 +-
 .../ConvergenceCriterionPerComponentResidual.cpp    |  2 +-
 NumLib/ODESolver/ConvergenceCriterionResidual.cpp   |  2 +-
 NumLib/ODESolver/NonlinearSolver.cpp                |  2 +-
 NumLib/ODESolver/NonlinearSolver.h                  |  2 +-
 .../Algorithms/EvolutionaryPIDcontroller.cpp        |  2 +-
 ParameterLib/ConstantParameter.cpp                  |  1 +
 .../ConstraintDirichletBoundaryCondition.cpp        |  2 +-
 .../DirichletBoundaryCondition.cpp                  |  2 +-
 ...eldIrreversibleDamageOracleBoundaryCondition.cpp |  2 +-
 .../LocalAssemblers/CreateLocalAssemblers.h         |  2 +-
 ProcessLib/HydroMechanics/CreateLocalAssemblers.h   |  2 +-
 .../LocalAssembler/CreateLocalAssemblers.h          |  2 +-
 .../LocalAssembler/CreateLocalAssemblers.h          |  2 +-
 ProcessLib/Output/CreateOutput.cpp                  |  2 +-
 ProcessLib/Output/Output.cpp                        |  2 +-
 ProcessLib/ProcessVariable.cpp                      |  2 +-
 .../RichardsMechanics/CreateLocalAssemblers.h       |  2 +-
 ProcessLib/SmallDeformation/CreateLocalAssemblers.h |  2 +-
 ProcessLib/SourceTerms/CreateNodalSourceTerm.cpp    |  2 +-
 ProcessLib/SurfaceFlux/SurfaceFluxData.h            |  2 +-
 ProcessLib/TES/TESLocalAssemblerInner-impl.h        |  2 +-
 ProcessLib/TES/TESReactionAdaptor.cpp               |  2 +-
 ...eThermalTwoPhaseFlowWithPPMaterialProperties.cpp |  2 +-
 .../ThermalTwoPhaseFlowWithPPMaterialProperties.cpp |  2 +-
 ProcessLib/TimeLoop.h                               |  2 +-
 .../CreateTwoPhaseFlowPrhoMaterialProperties.cpp    |  2 +-
 .../TwoPhaseFlowWithPrhoMaterialProperties.cpp      |  2 +-
 ProcessLib/Utils/CreateLocalAssemblers.h            |  2 +-
 Tests/BaseLib/TestConfigTree.cpp                    |  2 +-
 Tests/MathLib/TestNonlinear1D.cpp                   |  4 ++--
 Tests/MathLib/TestODESolver.cpp                     |  2 +-
 Tests/NumLib/TestComponentNorms.cpp                 |  2 +-
 Tests/NumLib/TestODEInt.cpp                         |  2 +-
 .../TestTimeSteppingEvolutionaryPIDcontroller.cpp   |  2 +-
 Tests/NumLib/TestTimeSteppingFixed.cpp              |  2 +-
 Tests/NumLib/TestTimeSteppingIterationNumber.cpp    |  2 +-
 Tests/NumLib/TimeSteppingTestingTools.h             |  2 +-
 Tests/ParameterLib/Parameter.cpp                    |  2 +-
 188 files changed, 200 insertions(+), 204 deletions(-)

diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index b4323809ba4..c9a5ae17833 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -15,7 +15,7 @@
 
 #include <algorithm>
 #include <cctype>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 #include <set>
 
 #ifdef OGS_USE_PYTHON
diff --git a/Applications/CLI/ogs_embedded_python.cpp b/Applications/CLI/ogs_embedded_python.cpp
index 2bb020fa908..08ad7b5df0a 100644
--- a/Applications/CLI/ogs_embedded_python.cpp
+++ b/Applications/CLI/ogs_embedded_python.cpp
@@ -11,7 +11,7 @@
 
 #include <pybind11/embed.h>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryConditionModule.h"
 #include "ProcessLib/BoundaryCondition/Python/PythonBoundaryConditionModule.h"
diff --git a/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
index 0b694027c1f..135088a8892 100644
--- a/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
+++ b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
@@ -17,7 +17,7 @@
 #include <QFileDialog>
 #include <QSettings>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "OGSError.h"
 
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
index e3231e598ee..a0a06e9706f 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
@@ -15,7 +15,7 @@
 #include "DiagramList.h"
 #include "GetDateTime.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "DateTools.h"
 #include "StringTools.h"
diff --git a/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp b/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
index da46c1e378f..ed8c2625e27 100644
--- a/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
+++ b/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
@@ -15,7 +15,7 @@
 #include <fstream>
 #include <memory>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "DirectConditionGenerator.h"
 
diff --git a/Applications/DataExplorer/DataView/GEOModels.cpp b/Applications/DataExplorer/DataView/GEOModels.cpp
index dabe3c4101a..216c36d9204 100644
--- a/Applications/DataExplorer/DataView/GEOModels.cpp
+++ b/Applications/DataExplorer/DataView/GEOModels.cpp
@@ -15,7 +15,7 @@
 // ** INCLUDES **
 #include "GEOModels.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "Applications/FileIO/Legacy/createSurface.h"
 #include "GeoTreeModel.h"
diff --git a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
index f6f59149c3e..0b0a506ab74 100644
--- a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
+++ b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
@@ -15,7 +15,7 @@
 #include "GeoOnMeshMappingDialog.h"
 #include "Mesh.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "OGSError.h"
 
diff --git a/Applications/DataExplorer/DataView/GeoTreeModel.cpp b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
index 5ca4c7b664f..59433d3097f 100644
--- a/Applications/DataExplorer/DataView/GeoTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "GeoObjectListItem.h"
 #include "GeoTreeItem.h"
diff --git a/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
index 63df6becc07..0df2ceb519e 100644
--- a/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
@@ -20,7 +20,7 @@
 
 #include "StrictDoubleValidator.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 MeshAnalysisDialog::MeshAnalysisDialog(
     std::vector<std::unique_ptr<MeshLib::Mesh>> const& mesh_vec,
diff --git a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
index 823d56ca733..97d8213c009 100644
--- a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
@@ -15,7 +15,7 @@
 #include "MeshGenerators/LayeredVolume.h"
 #include "MeshLayerEditDialog.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "OGSError.h"
 #include "StringTools.h"
diff --git a/Applications/DataExplorer/DataView/MeshModel.cpp b/Applications/DataExplorer/DataView/MeshModel.cpp
index 85ec9a95656..095a4a79211 100644
--- a/Applications/DataExplorer/DataView/MeshModel.cpp
+++ b/Applications/DataExplorer/DataView/MeshModel.cpp
@@ -14,10 +14,10 @@
 
 #include "MeshModel.h"
 
+#include <vtkUnstructuredGridAlgorithm.h>
 #include <QFileInfo>
 #include <QString>
-#include <vtkUnstructuredGridAlgorithm.h>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "Applications/DataHolderLib/Project.h"
 #include "BaseLib/StringTools.h"
diff --git a/Applications/DataExplorer/DataView/ProcessModel.cpp b/Applications/DataExplorer/DataView/ProcessModel.cpp
index eff66c7cc90..2a5738fbbb9 100644
--- a/Applications/DataExplorer/DataView/ProcessModel.cpp
+++ b/Applications/DataExplorer/DataView/ProcessModel.cpp
@@ -10,17 +10,15 @@
 
 #include "ProcessModel.h"
 
-// ThirdParty/logog
-#include <logog/include/logog.hpp>
-
 #include <vtkPolyDataAlgorithm.h>
+
 #include <QFileInfo>
 
 #include "Applications/DataHolderLib/FemCondition.h"
+#include "BaseLib/Logging.h"
+#include "CondItem.h"
 #include "GeoLib/GEOObjects.h"
 #include "GeoLib/GeoObject.h"
-
-#include "CondItem.h"
 #include "GeoType.h"
 #include "ProcessVarItem.h"
 
diff --git a/Applications/DataExplorer/DataView/SaveMeshDialog.cpp b/Applications/DataExplorer/DataView/SaveMeshDialog.cpp
index 3710d19a124..345d9b5c6f2 100644
--- a/Applications/DataExplorer/DataView/SaveMeshDialog.cpp
+++ b/Applications/DataExplorer/DataView/SaveMeshDialog.cpp
@@ -17,7 +17,7 @@
 #include <QFileDialog>
 #include <QSettings>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/IO/VtkIO/VtuInterface.h"
 #include "MeshLib/IO/Legacy/MeshIO.h"
diff --git a/Applications/DataExplorer/DataView/StationTreeModel.cpp b/Applications/DataExplorer/DataView/StationTreeModel.cpp
index 8e34aa7e6bc..dd7a40ab23d 100644
--- a/Applications/DataExplorer/DataView/StationTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/StationTreeModel.cpp
@@ -14,7 +14,7 @@
 
 #include "StationTreeModel.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseItem.h"
 #include "OGSError.h"
diff --git a/Applications/DataExplorer/VtkVis/VtkAddFilterDialog.cpp b/Applications/DataExplorer/VtkVis/VtkAddFilterDialog.cpp
index 94e96ef77c8..5f5a2b46633 100644
--- a/Applications/DataExplorer/VtkVis/VtkAddFilterDialog.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAddFilterDialog.cpp
@@ -15,7 +15,7 @@
 // ** INCLUDES **
 #include "VtkAddFilterDialog.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "VtkCompositeFilter.h"
 #include "VtkFilterFactory.h"
diff --git a/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp b/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
index 2c0818643c1..0eed0599ed8 100644
--- a/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
@@ -15,7 +15,7 @@
 // ** INCLUDES **
 #include "VtkAlgorithmProperties.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <vtkProperty.h>
 #include <vtkTexture.h>
diff --git a/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp b/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
index 66d693f2fa9..8375577e77d 100644
--- a/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
@@ -15,7 +15,7 @@
 // ** VTK INCLUDES **
 #include "VtkAppendArrayFilter.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <vtkCellData.h>
 #include <vtkDoubleArray.h>
diff --git a/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp b/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp
index b64d733785f..fc47e8a1858 100644
--- a/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp
@@ -15,7 +15,7 @@
 // ** VTK INCLUDES **
 #include "VtkColorByHeightFilter.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "VtkColorLookupTable.h"
 
diff --git a/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp b/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
index 8c7a1230691..2f8d0b92295 100644
--- a/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
@@ -17,7 +17,7 @@
 #include <cmath>
 #include <sstream>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <vtkObjectFactory.h>
 
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
index 5076fc6b71d..4106499b54c 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
@@ -15,7 +15,7 @@
 // ** INCLUDES **
 #include "VtkCompositeTextureOnSurfaceFilter.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "VtkTextureOnSurfaceFilter.h"
 #include <vtkDataSetSurfaceFilter.h>
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
index ede58aae2f0..3e8815af673 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
@@ -15,7 +15,7 @@
 // ** INCLUDES **
 #include "VtkCompositeThresholdFilter.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <vtkCellData.h>
 #include <vtkThreshold.h>
diff --git a/Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.cpp b/Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.cpp
index d522b0b7fae..5df35939a7f 100644
--- a/Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.cpp
@@ -15,7 +15,7 @@
 // ** INCLUDES **
 #include "VtkCustomInteractorStyle.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <vtkActor.h>
 #include <vtkAlgorithmOutput.h>
diff --git a/Applications/DataExplorer/VtkVis/VtkPickCallback.cpp b/Applications/DataExplorer/VtkVis/VtkPickCallback.cpp
index 3286f3ef417..52591cc297c 100644
--- a/Applications/DataExplorer/VtkVis/VtkPickCallback.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkPickCallback.cpp
@@ -18,7 +18,7 @@
 #include <vtkActor.h>
 #include <vtkCellPicker.h>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 VtkPickCallback* VtkPickCallback::New()
 {
diff --git a/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp b/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
index 4639b11fbd0..58c1d36230f 100644
--- a/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
@@ -14,7 +14,7 @@
 
 #include "VtkPointsSource.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <vtkCellArray.h>
 #include <vtkInformation.h>
diff --git a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
index 7f58d565497..e6159db1ef4 100644
--- a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
@@ -15,7 +15,7 @@
 // ** INCLUDES **
 #include "VtkPolylinesSource.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <vtkCellArray.h>
 #include <vtkCellData.h>
diff --git a/Applications/DataExplorer/VtkVis/VtkRaster.cpp b/Applications/DataExplorer/VtkVis/VtkRaster.cpp
index ec3d8f4436d..5fc5154019f 100644
--- a/Applications/DataExplorer/VtkVis/VtkRaster.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkRaster.cpp
@@ -33,8 +33,8 @@
 #include "xtiffio.h"
 #endif
 
-#include <logog/include/logog.hpp>
 #include <memory>
+#include "BaseLib/Logging.h"
 
 #include "Applications/FileIO/AsciiRasterInterface.h"
 #include "BaseLib/StringTools.h"
diff --git a/Applications/DataExplorer/VtkVis/VtkStationSource.cpp b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
index ed63ad7babc..c6bd9b1bdb3 100644
--- a/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
@@ -15,7 +15,7 @@
 // ** VTK INCLUDES **
 #include "VtkStationSource.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "StationBorehole.h"
 
diff --git a/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp b/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
index 3ec3ed4039c..e7bc83ba2e3 100644
--- a/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
@@ -15,7 +15,7 @@
 // ** INCLUDES **
 #include "VtkTextureOnSurfaceFilter.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <vtkCellData.h>
 #include <vtkFloatArray.h>
diff --git a/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
index a0af1abf756..0d3259e58ef 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
@@ -15,7 +15,7 @@
 // ** INCLUDES **
 #include "VtkVisImageItem.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/FileTools.h"
 
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
index 1ed5f98cf0c..c80a3aaa6d7 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
@@ -42,8 +42,7 @@
 #include <QString>
 #include <QTime>
 
-
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MathLib/InterpolationAlgorithms/LinearIntervalInterpolation.h"
 #include "MeshLib/Mesh.h"
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
index 9f818c99539..46ad898ef7a 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
@@ -22,7 +22,7 @@
 #include <QSettings>
 #include <QStringList>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/FileTools.h"
 
diff --git a/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp b/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
index ec6eee99112..6cdb96a410b 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
@@ -22,7 +22,7 @@
 #include "VtkVisImageItem.h"
 #include "VtkVisPipelineItem.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <vtkActor.h>
 #include <vtkImageChangeInformation.h>
diff --git a/Applications/DataExplorer/main.cpp b/Applications/DataExplorer/main.cpp
index 512f4a9075a..6d1fddafb69 100644
--- a/Applications/DataExplorer/main.cpp
+++ b/Applications/DataExplorer/main.cpp
@@ -3,8 +3,8 @@
 #include <QApplication>
 #include <QSurfaceFormat>
 #include <QVTKOpenGLWidget.h>
-#include <logog/include/logog.hpp>
 #include <memory>
+#include "BaseLib/Logging.h"
 
 #ifdef VTKFBXCONVERTER_FOUND
 #include <fbxsdk.h>
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index 73b630a784b..85dac3b2392 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -14,7 +14,7 @@
 
 #include "mainwindow.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 // Qt includes
 #include <QDate>
diff --git a/Applications/DataHolderLib/Color.cpp b/Applications/DataHolderLib/Color.cpp
index 6a7cc3f7ba4..1ee19e5581f 100644
--- a/Applications/DataHolderLib/Color.cpp
+++ b/Applications/DataHolderLib/Color.cpp
@@ -14,7 +14,7 @@
 
 #include "Color.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 namespace DataHolderLib {
 
diff --git a/Applications/DataHolderLib/Project.cpp b/Applications/DataHolderLib/Project.cpp
index 097367bea39..a090d0e2be5 100644
--- a/Applications/DataHolderLib/Project.cpp
+++ b/Applications/DataHolderLib/Project.cpp
@@ -11,7 +11,7 @@
 #include "Project.h"
 
 #include <algorithm>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Algorithm.h"
 #include "BaseLib/FileTools.h"
diff --git a/Applications/FileIO/AsciiRasterInterface.cpp b/Applications/FileIO/AsciiRasterInterface.cpp
index 295263ee3a8..be8b8eda679 100644
--- a/Applications/FileIO/AsciiRasterInterface.cpp
+++ b/Applications/FileIO/AsciiRasterInterface.cpp
@@ -13,8 +13,8 @@
 
 #include "AsciiRasterInterface.h"
 
-#include <logog/include/logog.hpp>
 #include <boost/optional.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/FileTools.h"
 #include "BaseLib/StringTools.h"
diff --git a/Applications/FileIO/CsvInterface.h b/Applications/FileIO/CsvInterface.h
index 43e2e145782..1e7f42c4b88 100644
--- a/Applications/FileIO/CsvInterface.h
+++ b/Applications/FileIO/CsvInterface.h
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include <logog/include/logog.hpp>
 #include <boost/any.hpp>
+#include "BaseLib/Logging.h"
 
 #include <array>
 #include <fstream>
diff --git a/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp b/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp
index 2026465ca14..74e267e18f9 100644
--- a/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp
+++ b/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp
@@ -17,7 +17,7 @@
 #include <QString>
 #include <QtXml/QDomDocument>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/FileTools.h"
 #include "BaseLib/StringTools.h"
diff --git a/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp b/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp
index 7adfd15467b..3c34c3d6d52 100644
--- a/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp
+++ b/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/algorithm/string/trim.hpp>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/FileTools.h"
 #include "BaseLib/StringTools.h"
diff --git a/Applications/FileIO/GMSInterface.cpp b/Applications/FileIO/GMSInterface.cpp
index 1ddb17a718d..cd947748391 100644
--- a/Applications/FileIO/GMSInterface.cpp
+++ b/Applications/FileIO/GMSInterface.cpp
@@ -19,9 +19,9 @@
 
 #include <fstream>
 #include <list>
-#include <logog/include/logog.hpp>
 
 #include "BaseLib/FileTools.h"
+#include "BaseLib/Logging.h"
 #include "BaseLib/StringTools.h"
 #include "GeoLib/StationBorehole.h"
 #include "MeshLib/Elements/Prism.h"
diff --git a/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.cpp b/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.cpp
index 605ccce75e2..bd9a3dbcccc 100644
--- a/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.cpp
+++ b/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.cpp
@@ -15,7 +15,7 @@
 
 #include <list>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "GeoLib/Point.h"
 #include "GeoLib/Polygon.h"
diff --git a/Applications/FileIO/Gmsh/GMSHInterface.cpp b/Applications/FileIO/Gmsh/GMSHInterface.cpp
index 987835480b2..e3dcd13ceba 100644
--- a/Applications/FileIO/Gmsh/GMSHInterface.cpp
+++ b/Applications/FileIO/Gmsh/GMSHInterface.cpp
@@ -11,7 +11,7 @@
 #include <memory>
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "InfoLib/GitInfo.h"
 #include "BaseLib/FileTools.h"
diff --git a/Applications/FileIO/Legacy/OGSIOVer4.cpp b/Applications/FileIO/Legacy/OGSIOVer4.cpp
index da5e7a32276..a896e9e91a7 100644
--- a/Applications/FileIO/Legacy/OGSIOVer4.cpp
+++ b/Applications/FileIO/Legacy/OGSIOVer4.cpp
@@ -18,7 +18,7 @@
 #include <limits>
 #include <sstream>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "Applications/FileIO/Legacy/createSurface.h"
 
diff --git a/Applications/FileIO/Legacy/createSurface.cpp b/Applications/FileIO/Legacy/createSurface.cpp
index 69698a3cc65..c720c5e6079 100644
--- a/Applications/FileIO/Legacy/createSurface.cpp
+++ b/Applications/FileIO/Legacy/createSurface.cpp
@@ -12,7 +12,7 @@
 #include <list>
 #include <memory>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "createSurface.h"
 #include "filesystem.h"
diff --git a/Applications/FileIO/PetrelInterface.cpp b/Applications/FileIO/PetrelInterface.cpp
index 4fe4c66d0ce..685052b3f42 100644
--- a/Applications/FileIO/PetrelInterface.cpp
+++ b/Applications/FileIO/PetrelInterface.cpp
@@ -19,7 +19,7 @@
 
 #include <fstream>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/StringTools.h"
 #include "GeoLib/StationBorehole.h"
diff --git a/Applications/FileIO/SHPInterface.cpp b/Applications/FileIO/SHPInterface.cpp
index 60ccc0f8ce1..88bbd0341c7 100644
--- a/Applications/FileIO/SHPInterface.cpp
+++ b/Applications/FileIO/SHPInterface.cpp
@@ -17,7 +17,7 @@
 
 #include "SHPInterface.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "Applications/FileIO/Legacy/createSurface.h"
 
diff --git a/Applications/FileIO/SWMM/SWMMInterface.h b/Applications/FileIO/SWMM/SWMMInterface.h
index 25a88aa325a..be93dc3de9a 100644
--- a/Applications/FileIO/SWMM/SWMMInterface.h
+++ b/Applications/FileIO/SWMM/SWMMInterface.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "GeoLib/Station.h"
 
diff --git a/Applications/FileIO/TetGenInterface.cpp b/Applications/FileIO/TetGenInterface.cpp
index c3ef06535a8..ac5df95aa66 100644
--- a/Applications/FileIO/TetGenInterface.cpp
+++ b/Applications/FileIO/TetGenInterface.cpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <fstream>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/FileTools.h"
 #include "BaseLib/StringTools.h"
diff --git a/Applications/FileIO/XmlIO/Qt/XmlLutReader.h b/Applications/FileIO/XmlIO/Qt/XmlLutReader.h
index 4cbd0e74721..2988812c97f 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlLutReader.h
+++ b/Applications/FileIO/XmlIO/Qt/XmlLutReader.h
@@ -17,7 +17,7 @@
 #include <QFile>
 #include <QtXml/QDomDocument>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "Applications/DataHolderLib/ColorLookupTable.h"
 
diff --git a/Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp b/Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp
index b949719cb41..5e19b5d3e17 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp
+++ b/Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp
@@ -18,7 +18,7 @@
 #include <QTextCodec>
 #include <QtXml/QDomDocument>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/FileFinder.h"
 
diff --git a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
index 1c6817bf9c3..82785dd2548 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
+++ b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
@@ -16,7 +16,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QtXml/QDomDocument>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "Applications/DataExplorer/Base/OGSError.h"
 #include "Applications/DataHolderLib/FemCondition.h"
diff --git a/Applications/Utils/FileConverter/NetCdfConverter.cpp b/Applications/Utils/FileConverter/NetCdfConverter.cpp
index 5f5995f49fa..fc60a166cf4 100644
--- a/Applications/Utils/FileConverter/NetCdfConverter.cpp
+++ b/Applications/Utils/FileConverter/NetCdfConverter.cpp
@@ -8,28 +8,27 @@
  */
 
 // STL
+#include <tclap/CmdLine.h>
+
 #include <cctype>
 #include <iostream>
 #include <limits>
 #include <memory>
+#include <netcdf>
 #include <numeric>
 #include <sstream>
 #include <string>
 #include <utility>
 
-#include <tclap/CmdLine.h>
-
 #include "Applications/ApplicationsLib/LogogSetup.h"
-
-#include <netcdf>
-
 #include "BaseLib/FileTools.h"
 #include "BaseLib/LogogSimpleFormatter.h"
-#include "InfoLib/GitInfo.h"
+#include "BaseLib/Logging.h"
 #include "GeoLib/Raster.h"
+#include "InfoLib/GitInfo.h"
+#include "MeshLib/IO/VtkIO/VtuInterface.h"
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshGenerators/RasterToMesh.h"
-#include "MeshLib/IO/VtkIO/VtuInterface.h"
 
 using namespace netCDF;
 
diff --git a/Applications/Utils/FileConverter/VTK2TIN.cpp b/Applications/Utils/FileConverter/VTK2TIN.cpp
index 31e8866342e..5f8adc5e3cc 100644
--- a/Applications/Utils/FileConverter/VTK2TIN.cpp
+++ b/Applications/Utils/FileConverter/VTK2TIN.cpp
@@ -17,7 +17,7 @@
 
 // BaseLib
 #include "InfoLib/GitInfo.h"
-#include "BaseLib/LogogSimpleFormatter.h"
+#include "BaseLib/Logging.h"
 
 // GeoLib
 #include "GeoLib/GEOObjects.h"
diff --git a/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp b/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
index 6a40ea79f66..aa9c6b366a3 100644
--- a/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
+++ b/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
@@ -18,7 +18,7 @@
 #include <numeric>
 #include <unordered_map>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Error.h"
 #include "BaseLib/Stream.h"
diff --git a/BaseLib/ConfigTree.cpp b/BaseLib/ConfigTree.cpp
index a678b9da581..a9216a3ddfd 100644
--- a/BaseLib/ConfigTree.cpp
+++ b/BaseLib/ConfigTree.cpp
@@ -11,8 +11,8 @@
 #include "ConfigTree.h"
 
 #include <forward_list>
-#include <logog/include/logog.hpp>
 #include <utility>
+#include "Logging.h"
 
 #include "Error.h"
 
diff --git a/BaseLib/ConfigTreeUtil.cpp b/BaseLib/ConfigTreeUtil.cpp
index 6a6d060bc4b..de662d47203 100644
--- a/BaseLib/ConfigTreeUtil.cpp
+++ b/BaseLib/ConfigTreeUtil.cpp
@@ -11,7 +11,7 @@
 #include "ConfigTreeUtil.h"
 
 #include <boost/property_tree/xml_parser.hpp>
-#include <logog/include/logog.hpp>
+#include "Logging.h"
 
 #include "Error.h"
 
diff --git a/BaseLib/DateTools.cpp b/BaseLib/DateTools.cpp
index 16be485ee3a..973244a4307 100644
--- a/BaseLib/DateTools.cpp
+++ b/BaseLib/DateTools.cpp
@@ -19,7 +19,7 @@
 #include <ctime>
 #include <sstream>
 
-#include <logog/include/logog.hpp>
+#include "Logging.h"
 
 namespace BaseLib
 {
diff --git a/BaseLib/Error.h b/BaseLib/Error.h
index e10b793ac1f..cb275743002 100644
--- a/BaseLib/Error.h
+++ b/BaseLib/Error.h
@@ -13,7 +13,7 @@
 #ifdef OGS_FATAL_ABORT
 
 #include <cstdlib>
-#include <logog/include/logog.hpp>
+#include "Logging.h"
 
 namespace BaseLib
 {
diff --git a/BaseLib/FileFinder.cpp b/BaseLib/FileFinder.cpp
index bfcd7ca812a..fb697517306 100644
--- a/BaseLib/FileFinder.cpp
+++ b/BaseLib/FileFinder.cpp
@@ -16,8 +16,7 @@
 
 #include <fstream>
 
-#include <logog/include/logog.hpp>
-
+#include "Logging.h"
 
 namespace BaseLib
 {
diff --git a/BaseLib/FileTools.h b/BaseLib/FileTools.h
index 33ce35c9af9..cc5b9246fbc 100644
--- a/BaseLib/FileTools.h
+++ b/BaseLib/FileTools.h
@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "Logging.h"
 
 namespace BaseLib
 {
diff --git a/BaseLib/Histogram.h b/BaseLib/Histogram.h
index 0ee8c81a816..10666050f2e 100644
--- a/BaseLib/Histogram.h
+++ b/BaseLib/Histogram.h
@@ -20,8 +20,7 @@
 #include <utility>
 #include <vector>
 
-#include <logog/include/logog.hpp>
-
+#include "Logging.h"
 
 namespace BaseLib
 {
diff --git a/BaseLib/IO/Writer.cpp b/BaseLib/IO/Writer.cpp
index 7c5c375c6e3..6e52e777473 100644
--- a/BaseLib/IO/Writer.cpp
+++ b/BaseLib/IO/Writer.cpp
@@ -17,7 +17,7 @@
 #include <fstream>
 #include <limits>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 namespace BaseLib
 {
diff --git a/BaseLib/IO/XmlIO/Qt/XMLQtInterface.cpp b/BaseLib/IO/XmlIO/Qt/XMLQtInterface.cpp
index 1208448c2db..428fb142e1b 100644
--- a/BaseLib/IO/XmlIO/Qt/XMLQtInterface.cpp
+++ b/BaseLib/IO/XmlIO/Qt/XMLQtInterface.cpp
@@ -24,8 +24,8 @@
 #include <QXmlSchemaValidator>
 #include <QXmlStreamReader>
 
-#include <logog/include/logog.hpp>
 #include <utility>
+#include "Logging.h"
 
 namespace BaseLib
 {
diff --git a/BaseLib/StringTools.cpp b/BaseLib/StringTools.cpp
index 4faa7ee9909..a7649493c99 100644
--- a/BaseLib/StringTools.cpp
+++ b/BaseLib/StringTools.cpp
@@ -21,8 +21,8 @@
 #include <cstdarg>
 #include <cstdio>
 #include <iomanip>
-#include <logog/include/logog.hpp>
 #include <random>
+#include "Logging.h"
 
 namespace BaseLib
 {
diff --git a/GeoLib/AABB.h b/GeoLib/AABB.h
index 49676faa835..f09e768b559 100644
--- a/GeoLib/AABB.h
+++ b/GeoLib/AABB.h
@@ -24,7 +24,7 @@
 #include <tuple>
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Error.h"
 #include "MathLib/Point3d.h"
diff --git a/GeoLib/AnalyticalGeometry.cpp b/GeoLib/AnalyticalGeometry.cpp
index eb19bfb4b16..623d0913e03 100644
--- a/GeoLib/AnalyticalGeometry.cpp
+++ b/GeoLib/AnalyticalGeometry.cpp
@@ -18,7 +18,7 @@
 #include <cmath>
 #include <limits>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <Eigen/Dense>
 
diff --git a/GeoLib/DuplicateGeometry.cpp b/GeoLib/DuplicateGeometry.cpp
index c1ecc93560f..43d1de8a524 100644
--- a/GeoLib/DuplicateGeometry.cpp
+++ b/GeoLib/DuplicateGeometry.cpp
@@ -10,8 +10,8 @@
 
 #include "DuplicateGeometry.h"
 
-#include <logog/include/logog.hpp>
 #include <utility>
+#include "BaseLib/Logging.h"
 
 #include "GeoLib/GEOObjects.h"
 #include "GeoLib/Point.h"
diff --git a/GeoLib/GEOObjects.cpp b/GeoLib/GEOObjects.cpp
index 9ff9a848c75..25f16641438 100644
--- a/GeoLib/GEOObjects.cpp
+++ b/GeoLib/GEOObjects.cpp
@@ -15,7 +15,7 @@
 #include "GEOObjects.h"
 
 #include <fstream>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "Triangle.h"
 
diff --git a/GeoLib/Grid.h b/GeoLib/Grid.h
index 8421aa96c44..cac765a5919 100644
--- a/GeoLib/Grid.h
+++ b/GeoLib/Grid.h
@@ -17,7 +17,7 @@
 #include <bitset>
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 // GeoLib
 #include "AABB.h"
diff --git a/GeoLib/IO/TINInterface.cpp b/GeoLib/IO/TINInterface.cpp
index 7e4e44e01f4..4fa8cd92657 100644
--- a/GeoLib/IO/TINInterface.cpp
+++ b/GeoLib/IO/TINInterface.cpp
@@ -11,7 +11,7 @@
 #include <fstream>
 #include <limits>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/FileTools.h"
 #include "BaseLib/StringTools.h"
diff --git a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp
index 2dee219f70e..d029a6bd1ea 100644
--- a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp
+++ b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp
@@ -15,7 +15,7 @@
 #include "BoostXmlGmlInterface.h"
 
 #include <boost/property_tree/xml_parser.hpp>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Algorithm.h"
 #include "BaseLib/ConfigTreeUtil.h"
diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
index 319d5ff33bb..d29004cecd6 100644
--- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
+++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
@@ -18,7 +18,7 @@
 #include <QTextCodec>
 #include <QtXml/QDomDocument>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/FileFinder.h"
 #include "GeoLib/Triangle.h"
diff --git a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp
index 4c03bf10b0b..95d7d6a666b 100644
--- a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp
+++ b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp
@@ -19,7 +19,7 @@
 #include <QFile>
 #include <QtXml/QDomDocument>
 #include <RapidXML/rapidxml.hpp>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/DateTools.h"
 #include "BaseLib/FileTools.h"
diff --git a/GeoLib/PointVec.cpp b/GeoLib/PointVec.cpp
index 7b88a549f9c..8da015a35f4 100644
--- a/GeoLib/PointVec.cpp
+++ b/GeoLib/PointVec.cpp
@@ -14,7 +14,7 @@
 
 #include <numeric>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "PointVec.h"
 
diff --git a/GeoLib/Polygon.cpp b/GeoLib/Polygon.cpp
index 37690defb2e..93ebe4765d3 100644
--- a/GeoLib/Polygon.cpp
+++ b/GeoLib/Polygon.cpp
@@ -14,8 +14,8 @@
 
 #include "Polygon.h"
 
-#include <logog/include/logog.hpp>
 #include <boost/math/constants/constants.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/quicksort.h"
 
diff --git a/GeoLib/Polyline.cpp b/GeoLib/Polyline.cpp
index d73db8ba102..e73302642fa 100644
--- a/GeoLib/Polyline.cpp
+++ b/GeoLib/Polyline.cpp
@@ -15,9 +15,9 @@
 #include "Polyline.h"
 
 #include <algorithm>
-#include <logog/include/logog.hpp>
-#include "BaseLib/Error.h"
 #include "AnalyticalGeometry.h"
+#include "BaseLib/Error.h"
+#include "BaseLib/Logging.h"
 #include "MathLib/GeometricBasics.h"
 
 namespace GeoLib
diff --git a/GeoLib/QuadTree.h b/GeoLib/QuadTree.h
index 58a9eb75b92..d844c9da33a 100644
--- a/GeoLib/QuadTree.h
+++ b/GeoLib/QuadTree.h
@@ -17,9 +17,10 @@
 #include <cassert>
 #include <limits>
 #include <list>
-#include <logog/include/logog.hpp>
 #include <utility>
 
+#include "BaseLib/Logging.h"
+
 namespace GeoLib
 {
 /**
diff --git a/GeoLib/Raster.cpp b/GeoLib/Raster.cpp
index a589c62459e..0337b17aa3f 100644
--- a/GeoLib/Raster.cpp
+++ b/GeoLib/Raster.cpp
@@ -13,7 +13,7 @@
 
 #include <fstream>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "Raster.h"
 
diff --git a/GeoLib/SensorData.cpp b/GeoLib/SensorData.cpp
index 9604040cfa4..da1c08843a9 100644
--- a/GeoLib/SensorData.cpp
+++ b/GeoLib/SensorData.cpp
@@ -17,7 +17,7 @@
 #include <cstdlib>
 #include <fstream>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/StringTools.h"
 #include "BaseLib/DateTools.h"
diff --git a/GeoLib/Station.cpp b/GeoLib/Station.cpp
index 6dc8a71c260..09304564edb 100644
--- a/GeoLib/Station.cpp
+++ b/GeoLib/Station.cpp
@@ -17,7 +17,7 @@
 #include <cstdlib>
 #include <utility>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/StringTools.h"
 
diff --git a/GeoLib/StationBorehole.cpp b/GeoLib/StationBorehole.cpp
index 8682faa6789..9d859c80f7d 100644
--- a/GeoLib/StationBorehole.cpp
+++ b/GeoLib/StationBorehole.cpp
@@ -19,7 +19,7 @@
 #include <cstdlib>
 #include <fstream>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/StringTools.h"
 #include "BaseLib/DateTools.h"
diff --git a/GeoLib/Surface.cpp b/GeoLib/Surface.cpp
index cf8e002b804..5cba7ba68bf 100644
--- a/GeoLib/Surface.cpp
+++ b/GeoLib/Surface.cpp
@@ -9,7 +9,7 @@
 
 #include <list>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "Surface.h"
 
diff --git a/GeoLib/SurfaceGrid.cpp b/GeoLib/SurfaceGrid.cpp
index 48bbf28a9f2..60347d3a651 100644
--- a/GeoLib/SurfaceGrid.cpp
+++ b/GeoLib/SurfaceGrid.cpp
@@ -14,7 +14,7 @@
 #include <algorithm>
 #include <bitset>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Error.h"
 
diff --git a/GeoLib/TemplateVec.h b/GeoLib/TemplateVec.h
index 57c00822cee..85c89401031 100644
--- a/GeoLib/TemplateVec.h
+++ b/GeoLib/TemplateVec.h
@@ -22,7 +22,7 @@
 #include <utility>
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Error.h"
 
diff --git a/MaterialLib/Adsorption/Adsorption.cpp b/MaterialLib/Adsorption/Adsorption.cpp
index 4461066a81a..49381c0914f 100644
--- a/MaterialLib/Adsorption/Adsorption.cpp
+++ b/MaterialLib/Adsorption/Adsorption.cpp
@@ -8,7 +8,7 @@
  */
 
 #include "Adsorption.h"
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 #include "MaterialLib/PhysicalConstant.h"
 
 namespace {
diff --git a/MaterialLib/Adsorption/Reaction.cpp b/MaterialLib/Adsorption/Reaction.cpp
index 70bc4246d6e..80e587bfd23 100644
--- a/MaterialLib/Adsorption/Reaction.cpp
+++ b/MaterialLib/Adsorption/Reaction.cpp
@@ -7,7 +7,7 @@
  *              http://www.opengeosys.org/project/license
  */
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/StringTools.h"
 
diff --git a/MaterialLib/Adsorption/ReactionCaOH2.cpp b/MaterialLib/Adsorption/ReactionCaOH2.cpp
index 9279cfd256d..9bd1f356497 100644
--- a/MaterialLib/Adsorption/ReactionCaOH2.cpp
+++ b/MaterialLib/Adsorption/ReactionCaOH2.cpp
@@ -9,10 +9,10 @@
 
 #include "ReactionCaOH2.h"
 #include <cassert>
-#include <logog/include/logog.hpp>
+#include "Adsorption.h"
 #include "BaseLib/Error.h"
+#include "BaseLib/Logging.h"
 #include "MaterialLib/PhysicalConstant.h"
-#include "Adsorption.h"
 
 namespace Adsorption
 {
diff --git a/MaterialLib/Adsorption/ReactionSinusoidal.h b/MaterialLib/Adsorption/ReactionSinusoidal.h
index 9ecd5ddeb18..0282d81370a 100644
--- a/MaterialLib/Adsorption/ReactionSinusoidal.h
+++ b/MaterialLib/Adsorption/ReactionSinusoidal.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "Reaction.h"
 #include "BaseLib/ConfigTree.h"
diff --git a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
index 78ff7ffad69..5ec91bf25cf 100644
--- a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
+++ b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
@@ -9,7 +9,7 @@
 
 #include "CreateTwoPhaseFlowMaterialProperties.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Algorithm.h"
 #include "MaterialLib/Fluid/FluidProperty.h"
diff --git a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
index bbea95d169b..5693aafba3e 100644
--- a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
+++ b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
@@ -10,8 +10,8 @@
 #include "TwoPhaseFlowWithPPMaterialProperties.h"
 
 #include <boost/math/special_functions/pow.hpp>
-#include <logog/include/logog.hpp>
 #include <utility>
+#include "BaseLib/Logging.h"
 
 #include "MaterialLib/Fluid/FluidProperty.h"
 #include "MaterialLib/PorousMedium/Porosity/Porosity.h"
diff --git a/MathLib/GeometricBasics.cpp b/MathLib/GeometricBasics.cpp
index 267166a0d1a..8fd6bc43dc9 100644
--- a/MathLib/GeometricBasics.cpp
+++ b/MathLib/GeometricBasics.cpp
@@ -7,7 +7,7 @@
  *              http://www.opengeosys.org/project/license
  */
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <Eigen/Dense>
 
diff --git a/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp b/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
index 3c4fc974466..124e0f3c8b0 100644
--- a/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
+++ b/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
@@ -10,7 +10,7 @@
 
 #include "EigenLinearSolver.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #ifdef USE_MKL
 #include <Eigen/PardisoSupport>
diff --git a/MathLib/LinAlg/Eigen/EigenTools.cpp b/MathLib/LinAlg/Eigen/EigenTools.cpp
index 8fd3c2335d1..88fac8ea857 100644
--- a/MathLib/LinAlg/Eigen/EigenTools.cpp
+++ b/MathLib/LinAlg/Eigen/EigenTools.cpp
@@ -10,7 +10,7 @@
 
 #include "EigenTools.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "EigenVector.h"
 
diff --git a/MathLib/LinAlg/Eigen/EigenTools.h b/MathLib/LinAlg/Eigen/EigenTools.h
index 0dd4ba27e81..a64edfceaf7 100644
--- a/MathLib/LinAlg/Eigen/EigenTools.h
+++ b/MathLib/LinAlg/Eigen/EigenTools.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include <vector>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Error.h"
 #include "EigenMatrix.h" // for EigenMatrix::IndexType
diff --git a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp
index fe5e8cfcf8f..4c039ba886f 100644
--- a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp
+++ b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp
@@ -13,7 +13,7 @@
 #ifdef _OPENMP
 #include <omp.h>
 #endif
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/ConfigTree.h"
 #include "MathLib/LinAlg/Eigen/EigenMatrix.h"
diff --git a/MathLib/LinAlg/Lis/LisCheck.h b/MathLib/LinAlg/Lis/LisCheck.h
index 02c8f3cc70a..a6d26869de1 100644
--- a/MathLib/LinAlg/Lis/LisCheck.h
+++ b/MathLib/LinAlg/Lis/LisCheck.h
@@ -15,8 +15,8 @@
 #pragma once
 
 #include <vector>
+#include "BaseLib/Logging.h"
 #include "lis.h"
-#include <logog/include/logog.hpp>
 
 namespace MathLib
 {
diff --git a/MathLib/LinAlg/Lis/LisLinearSolver.cpp b/MathLib/LinAlg/Lis/LisLinearSolver.cpp
index 8db668e7e27..21438d8ea25 100644
--- a/MathLib/LinAlg/Lis/LisLinearSolver.cpp
+++ b/MathLib/LinAlg/Lis/LisLinearSolver.cpp
@@ -18,7 +18,7 @@
 
 #include "LisLinearSolver.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "LisCheck.h"
 #include "LisMatrix.h"
diff --git a/MathLib/LinAlg/Lis/LisMatrix.cpp b/MathLib/LinAlg/Lis/LisMatrix.cpp
index b44d44d76a6..2552a4befe8 100644
--- a/MathLib/LinAlg/Lis/LisMatrix.cpp
+++ b/MathLib/LinAlg/Lis/LisMatrix.cpp
@@ -17,7 +17,7 @@
 #include <cmath>
 #include <cstdlib>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Error.h"
 #include "LisVector.h"
diff --git a/MathLib/LinAlg/Lis/LisOption.h b/MathLib/LinAlg/Lis/LisOption.h
index 03dd2c7847f..10037ab5d6d 100644
--- a/MathLib/LinAlg/Lis/LisOption.h
+++ b/MathLib/LinAlg/Lis/LisOption.h
@@ -17,7 +17,7 @@
 #include <string>
 #include <map>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/ConfigTree.h"
 #include "MathLib/LinAlg/LinearSolverOptions.h"
diff --git a/MathLib/LinAlg/PETSc/PETScLinearSolver.h b/MathLib/LinAlg/PETSc/PETScLinearSolver.h
index 6d367fb53c5..40a695cce5b 100644
--- a/MathLib/LinAlg/PETSc/PETScLinearSolver.h
+++ b/MathLib/LinAlg/PETSc/PETScLinearSolver.h
@@ -20,7 +20,7 @@
 
 #include <petscksp.h>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/ConfigTree.h"
 
diff --git a/MathLib/Nonlinear/Root1D.h b/MathLib/Nonlinear/Root1D.h
index 0849a8c37c3..a2934fd8a55 100644
--- a/MathLib/Nonlinear/Root1D.h
+++ b/MathLib/Nonlinear/Root1D.h
@@ -14,8 +14,8 @@
 #include <cmath>
 #include <limits>
 #include <type_traits>
-#include <logog/include/logog.hpp>
 #include "BaseLib/Error.h"
+#include "BaseLib/Logging.h"
 
 namespace MathLib
 {
diff --git a/MathLib/ODE/CVodeSolver.cpp b/MathLib/ODE/CVodeSolver.cpp
index 46b07195b58..b8a2416572f 100644
--- a/MathLib/ODE/CVodeSolver.cpp
+++ b/MathLib/ODE/CVodeSolver.cpp
@@ -10,7 +10,7 @@
 #include "CVodeSolver.h"
 
 #include <cassert>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <cvode/cvode.h>             /* prototypes for CVODE fcts., consts. */
 #include <nvector/nvector_serial.h>  /* serial N_Vector types, fcts., macros */
diff --git a/MathLib/ODE/ODESolverBuilder.h b/MathLib/ODE/ODESolverBuilder.h
index 3d44dbe21c9..5919346c7a0 100644
--- a/MathLib/ODE/ODESolverBuilder.h
+++ b/MathLib/ODE/ODESolverBuilder.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Error.h"
 #include "ODESolver.h"
diff --git a/MeshGeoToolsLib/AppendLinesAlongPolyline.cpp b/MeshGeoToolsLib/AppendLinesAlongPolyline.cpp
index 30d50ec3c94..30344e05b43 100644
--- a/MeshGeoToolsLib/AppendLinesAlongPolyline.cpp
+++ b/MeshGeoToolsLib/AppendLinesAlongPolyline.cpp
@@ -8,7 +8,7 @@
 
 #include "AppendLinesAlongPolyline.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "GeoLib/Polyline.h"
 #include "GeoLib/PolylineVec.h"
diff --git a/MeshGeoToolsLib/ConstructMeshesFromGeometries.cpp b/MeshGeoToolsLib/ConstructMeshesFromGeometries.cpp
index 85e6bc55e98..c782c4c6993 100644
--- a/MeshGeoToolsLib/ConstructMeshesFromGeometries.cpp
+++ b/MeshGeoToolsLib/ConstructMeshesFromGeometries.cpp
@@ -9,7 +9,7 @@
 
 #include "ConstructMeshesFromGeometries.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Elements/Element.h"
 #include "MeshLib/MeshEditing/DuplicateMeshComponents.h"
diff --git a/MeshGeoToolsLib/GeoMapper.cpp b/MeshGeoToolsLib/GeoMapper.cpp
index 3ddf204318c..2d58d769752 100644
--- a/MeshGeoToolsLib/GeoMapper.cpp
+++ b/MeshGeoToolsLib/GeoMapper.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <numeric>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Algorithm.h"
 
diff --git a/MeshGeoToolsLib/HeuristicSearchLength.cpp b/MeshGeoToolsLib/HeuristicSearchLength.cpp
index d1ac7abbf96..e7eaf3a4110 100644
--- a/MeshGeoToolsLib/HeuristicSearchLength.cpp
+++ b/MeshGeoToolsLib/HeuristicSearchLength.cpp
@@ -11,7 +11,7 @@
 
 #include "HeuristicSearchLength.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Elements/Element.h"
 
diff --git a/MeshGeoToolsLib/MeshNodeSearcher.cpp b/MeshGeoToolsLib/MeshNodeSearcher.cpp
index efb3600bf28..b18140540c0 100644
--- a/MeshGeoToolsLib/MeshNodeSearcher.cpp
+++ b/MeshGeoToolsLib/MeshNodeSearcher.cpp
@@ -18,7 +18,7 @@
 #include "MeshNodesAlongSurface.h"
 #include "MeshNodesOnPoint.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "GeoLib/Point.h"
 #include "GeoLib/Polyline.h"
diff --git a/MeshLib/Elements/EdgeReturn.cpp b/MeshLib/Elements/EdgeReturn.cpp
index 361fe356792..12952e9644c 100644
--- a/MeshLib/Elements/EdgeReturn.cpp
+++ b/MeshLib/Elements/EdgeReturn.cpp
@@ -10,7 +10,7 @@
 
 #include "EdgeReturn.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Node.h"
 #include "Element.h"
diff --git a/MeshLib/Elements/Element.cpp b/MeshLib/Elements/Element.cpp
index 9b15aa45969..baa4e1f82c1 100644
--- a/MeshLib/Elements/Element.cpp
+++ b/MeshLib/Elements/Element.cpp
@@ -14,7 +14,7 @@
 
 #include "Element.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MathLib/GeometricBasics.h"
 #include "MathLib/MathTools.h"
diff --git a/MeshLib/Elements/HexRule20.cpp b/MeshLib/Elements/HexRule20.cpp
index 9484fe287ca..3ce8467f95f 100644
--- a/MeshLib/Elements/HexRule20.cpp
+++ b/MeshLib/Elements/HexRule20.cpp
@@ -12,7 +12,7 @@
 
 #include <array>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Node.h"
 #include "Quad.h"
diff --git a/MeshLib/Elements/HexRule8.cpp b/MeshLib/Elements/HexRule8.cpp
index 4eb944b5879..81d6e875df5 100644
--- a/MeshLib/Elements/HexRule8.cpp
+++ b/MeshLib/Elements/HexRule8.cpp
@@ -12,7 +12,7 @@
 
 #include <array>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MathLib/GeometricBasics.h"
 
diff --git a/MeshLib/Elements/LineRule2.cpp b/MeshLib/Elements/LineRule2.cpp
index b9f2130397c..dbc0f17faf8 100644
--- a/MeshLib/Elements/LineRule2.cpp
+++ b/MeshLib/Elements/LineRule2.cpp
@@ -10,7 +10,7 @@
 
 #include "LineRule2.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Node.h"
 
diff --git a/MeshLib/Elements/PrismRule15.cpp b/MeshLib/Elements/PrismRule15.cpp
index 1845445e728..8786f34a3f1 100644
--- a/MeshLib/Elements/PrismRule15.cpp
+++ b/MeshLib/Elements/PrismRule15.cpp
@@ -10,7 +10,7 @@
 
 #include "PrismRule15.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Node.h"
 #include "Quad.h"
diff --git a/MeshLib/Elements/PrismRule6.cpp b/MeshLib/Elements/PrismRule6.cpp
index 8f7a45f821b..029fe718b0f 100644
--- a/MeshLib/Elements/PrismRule6.cpp
+++ b/MeshLib/Elements/PrismRule6.cpp
@@ -10,7 +10,7 @@
 
 #include "PrismRule6.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MathLib/GeometricBasics.h"
 
diff --git a/MeshLib/Elements/PyramidRule13.cpp b/MeshLib/Elements/PyramidRule13.cpp
index be8b51cafd8..b50cd867931 100644
--- a/MeshLib/Elements/PyramidRule13.cpp
+++ b/MeshLib/Elements/PyramidRule13.cpp
@@ -10,7 +10,7 @@
 
 #include "PyramidRule13.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Node.h"
 #include "Quad.h"
diff --git a/MeshLib/Elements/PyramidRule5.cpp b/MeshLib/Elements/PyramidRule5.cpp
index e4f4db04ec2..69812cbc87a 100644
--- a/MeshLib/Elements/PyramidRule5.cpp
+++ b/MeshLib/Elements/PyramidRule5.cpp
@@ -10,7 +10,7 @@
 
 #include "PyramidRule5.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MathLib/GeometricBasics.h"
 
diff --git a/MeshLib/Elements/QuadRule4.cpp b/MeshLib/Elements/QuadRule4.cpp
index e8d41ec3845..c8297fd61d8 100644
--- a/MeshLib/Elements/QuadRule4.cpp
+++ b/MeshLib/Elements/QuadRule4.cpp
@@ -10,7 +10,7 @@
 
 #include "QuadRule4.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MathLib/GeometricBasics.h"
 
diff --git a/MeshLib/Elements/TetRule10.cpp b/MeshLib/Elements/TetRule10.cpp
index 7d41675c5b3..f7aaf659643 100644
--- a/MeshLib/Elements/TetRule10.cpp
+++ b/MeshLib/Elements/TetRule10.cpp
@@ -12,7 +12,7 @@
 
 #include <array>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Node.h"
 #include "Tri.h"
diff --git a/MeshLib/Elements/TetRule4.cpp b/MeshLib/Elements/TetRule4.cpp
index 512fe1c9dd0..d423f91088d 100644
--- a/MeshLib/Elements/TetRule4.cpp
+++ b/MeshLib/Elements/TetRule4.cpp
@@ -12,7 +12,7 @@
 
 #include <array>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MathLib/GeometricBasics.h"
 
diff --git a/MeshLib/Elements/TriRule3.cpp b/MeshLib/Elements/TriRule3.cpp
index cd4981201f0..fe2c4809b72 100644
--- a/MeshLib/Elements/TriRule3.cpp
+++ b/MeshLib/Elements/TriRule3.cpp
@@ -10,7 +10,7 @@
 
 #include "TriRule3.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MathLib/GeometricBasics.h"
 
diff --git a/MeshLib/IO/Legacy/MeshIO.cpp b/MeshLib/IO/Legacy/MeshIO.cpp
index 2a1d94c5d14..84406556a61 100644
--- a/MeshLib/IO/Legacy/MeshIO.cpp
+++ b/MeshLib/IO/Legacy/MeshIO.cpp
@@ -22,7 +22,7 @@
 #include <memory>
 #include <sstream>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/FileTools.h"
 #include "BaseLib/StringTools.h"
diff --git a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp
index 4d33bfa7674..7bc9ae04343 100644
--- a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp
+++ b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp
@@ -15,7 +15,7 @@
 
 #include "NodePartitionedMeshReader.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #ifdef USE_PETSC
 #include <mpi.h>
diff --git a/MeshLib/IO/VtkIO/PVDFile.cpp b/MeshLib/IO/VtkIO/PVDFile.cpp
index e5963df6b0e..4ad3b12ad85 100644
--- a/MeshLib/IO/VtkIO/PVDFile.cpp
+++ b/MeshLib/IO/VtkIO/PVDFile.cpp
@@ -13,8 +13,8 @@
 #include <fstream>
 #include <iomanip>
 #include <limits>
-#include <logog/include/logog.hpp>
 #include "BaseLib/Error.h"
+#include "BaseLib/Logging.h"
 #include "MeshLib/IO/VtkIO/VtuInterface.h"
 
 namespace MeshLib
diff --git a/MeshLib/IO/VtkIO/VtuInterface-impl.h b/MeshLib/IO/VtkIO/VtuInterface-impl.h
index 4e40ffa8b55..579c9f10afc 100644
--- a/MeshLib/IO/VtkIO/VtuInterface-impl.h
+++ b/MeshLib/IO/VtkIO/VtuInterface-impl.h
@@ -22,7 +22,7 @@
 #include <vtkSmartPointer.h>
 #include <vtkUnstructuredGrid.h>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Vtk/VtkMappedMeshSource.h"
 
diff --git a/MeshLib/IO/VtkIO/VtuInterface.cpp b/MeshLib/IO/VtkIO/VtuInterface.cpp
index bb6da05903d..9953a61b3b9 100644
--- a/MeshLib/IO/VtkIO/VtuInterface.cpp
+++ b/MeshLib/IO/VtkIO/VtuInterface.cpp
@@ -22,7 +22,7 @@
 #include <vtkSmartPointer.h>
 #include <vtkUnstructuredGrid.h>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <boost/algorithm/string/erase.hpp>
 
diff --git a/MeshLib/IO/readMeshFromFile.cpp b/MeshLib/IO/readMeshFromFile.cpp
index d17b43d9891..8dd6dd54dd6 100644
--- a/MeshLib/IO/readMeshFromFile.cpp
+++ b/MeshLib/IO/readMeshFromFile.cpp
@@ -23,7 +23,7 @@
 
 #include <boost/algorithm/string/erase.hpp>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/FileTools.h"
 #include "BaseLib/StringTools.h"
diff --git a/MeshLib/IO/writeMeshToFile.cpp b/MeshLib/IO/writeMeshToFile.cpp
index 25c06354e1a..ef6ecb80f80 100644
--- a/MeshLib/IO/writeMeshToFile.cpp
+++ b/MeshLib/IO/writeMeshToFile.cpp
@@ -9,7 +9,7 @@
 
 #include "writeMeshToFile.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/FileTools.h"
 #include "BaseLib/StringTools.h"
diff --git a/MeshLib/MeshEditing/AddLayerToMesh.cpp b/MeshLib/MeshEditing/AddLayerToMesh.cpp
index 8ef2f24dad1..56c8e6098af 100644
--- a/MeshLib/MeshEditing/AddLayerToMesh.cpp
+++ b/MeshLib/MeshEditing/AddLayerToMesh.cpp
@@ -18,7 +18,7 @@
 #include <numeric>
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Mesh.h"
 #include "MeshLib/Node.h"
diff --git a/MeshLib/MeshEditing/ElementValueModification.cpp b/MeshLib/MeshEditing/ElementValueModification.cpp
index f484f1da070..9ddbb957d7e 100644
--- a/MeshLib/MeshEditing/ElementValueModification.cpp
+++ b/MeshLib/MeshEditing/ElementValueModification.cpp
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Elements/Element.h"
 #include "MeshLib/Mesh.h"
diff --git a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
index 2aa166e7c88..556bf92f0c7 100644
--- a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
+++ b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
@@ -17,7 +17,7 @@
 
 #include "Mesh2MeshPropertyInterpolation.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "GeoLib/AABB.h"
 #include "GeoLib/Grid.h"
diff --git a/MeshLib/MeshEditing/MeshRevision.cpp b/MeshLib/MeshEditing/MeshRevision.cpp
index 7e3fb000bf4..1122b411597 100644
--- a/MeshLib/MeshEditing/MeshRevision.cpp
+++ b/MeshLib/MeshEditing/MeshRevision.cpp
@@ -16,7 +16,7 @@
 
 #include <numeric>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "GeoLib/Grid.h"
 #include "MathLib/GeometricBasics.h"
diff --git a/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp b/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp
index c30200e17fd..d7ee063c579 100644
--- a/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp
+++ b/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp
@@ -17,7 +17,7 @@
 #include <vector>
 #include <fstream>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "GeoLib/Raster.h"
 
diff --git a/MeshLib/MeshGenerators/MeshLayerMapper.cpp b/MeshLib/MeshGenerators/MeshLayerMapper.cpp
index 24456e82ad8..36e6d926ad2 100644
--- a/MeshLib/MeshGenerators/MeshLayerMapper.cpp
+++ b/MeshLib/MeshGenerators/MeshLayerMapper.cpp
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "GeoLib/Raster.h"
 
diff --git a/MeshLib/MeshGenerators/RasterToMesh.h b/MeshLib/MeshGenerators/RasterToMesh.h
index e0c1fee1b0b..512c5947a3c 100644
--- a/MeshLib/MeshGenerators/RasterToMesh.h
+++ b/MeshLib/MeshGenerators/RasterToMesh.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "GeoLib/Raster.h"
 #include "MeshLib/Location.h"
diff --git a/MeshLib/MeshGenerators/VtkMeshConverter.h b/MeshLib/MeshGenerators/VtkMeshConverter.h
index 30736d6076b..6c0e6c47ff7 100644
--- a/MeshLib/MeshGenerators/VtkMeshConverter.h
+++ b/MeshLib/MeshGenerators/VtkMeshConverter.h
@@ -17,7 +17,7 @@
 #include <vtkDataArray.h>
 #include <vtkType.h>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "GeoLib/Raster.h"
 #include "MeshLib/Location.h"
diff --git a/MeshLib/MeshQuality/ElementQualityMetric.h b/MeshLib/MeshQuality/ElementQualityMetric.h
index 9d2480f98f9..865b526598c 100644
--- a/MeshLib/MeshQuality/ElementQualityMetric.h
+++ b/MeshLib/MeshQuality/ElementQualityMetric.h
@@ -16,7 +16,7 @@
 
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Histogram.h"
 
diff --git a/MeshLib/MeshQuality/MeshValidation.cpp b/MeshLib/MeshQuality/MeshValidation.cpp
index c3cd73c154b..9fd6b87acc6 100644
--- a/MeshLib/MeshQuality/MeshValidation.cpp
+++ b/MeshLib/MeshQuality/MeshValidation.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <stack>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Mesh.h"
 #include "MeshLib/Node.h"
diff --git a/MeshLib/MeshSearch/ElementSearch.cpp b/MeshLib/MeshSearch/ElementSearch.cpp
index 87f7a1e9d65..4dfbd7e0f78 100644
--- a/MeshLib/MeshSearch/ElementSearch.cpp
+++ b/MeshLib/MeshSearch/ElementSearch.cpp
@@ -10,7 +10,7 @@
 
 #include "ElementSearch.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Algorithm.h"
 #include "MeshLib/Elements/Element.h"
diff --git a/MeshLib/MeshSearch/MeshElementGrid.cpp b/MeshLib/MeshSearch/MeshElementGrid.cpp
index f225a174d89..a27bbe6ab6d 100644
--- a/MeshLib/MeshSearch/MeshElementGrid.cpp
+++ b/MeshLib/MeshSearch/MeshElementGrid.cpp
@@ -15,7 +15,7 @@
 #include <cmath>
 #include <memory>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "../Mesh.h"
 #include "../Node.h"
diff --git a/MeshLib/MeshSearch/NodeSearch.cpp b/MeshLib/MeshSearch/NodeSearch.cpp
index 3157b168819..cc34bc43539 100644
--- a/MeshLib/MeshSearch/NodeSearch.cpp
+++ b/MeshLib/MeshSearch/NodeSearch.cpp
@@ -13,7 +13,7 @@
 #include <memory>
 #include <set>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/Mesh.h"
 #include "MeshLib/Node.h"
diff --git a/MeshLib/MeshSurfaceExtraction.cpp b/MeshLib/MeshSurfaceExtraction.cpp
index 5e5b6810200..ca63ba1c6e1 100644
--- a/MeshLib/MeshSurfaceExtraction.cpp
+++ b/MeshLib/MeshSurfaceExtraction.cpp
@@ -15,7 +15,7 @@
 #include "MeshSurfaceExtraction.h"
 
 #include <boost/math/constants/constants.hpp>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 #include <memory>
 
 #include "MeshLib/Elements/Line.h"
diff --git a/MeshLib/Properties.h b/MeshLib/Properties.h
index bd0f28c8210..6f619e6cffd 100644
--- a/MeshLib/Properties.h
+++ b/MeshLib/Properties.h
@@ -16,7 +16,7 @@
 #include <string>
 #include <map>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "Location.h"
 
diff --git a/MeshLib/convertMeshToGeo.cpp b/MeshLib/convertMeshToGeo.cpp
index 6e09abe59c8..2b6776c7dbd 100644
--- a/MeshLib/convertMeshToGeo.cpp
+++ b/MeshLib/convertMeshToGeo.cpp
@@ -14,7 +14,7 @@
 
 #include "convertMeshToGeo.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "GeoLib/GEOObjects.h"
 #include "GeoLib/Surface.h"
diff --git a/NumLib/DOF/SimpleMatrixVectorProvider.cpp b/NumLib/DOF/SimpleMatrixVectorProvider.cpp
index 19c7c38b6cd..97fcd0a76be 100644
--- a/NumLib/DOF/SimpleMatrixVectorProvider.cpp
+++ b/NumLib/DOF/SimpleMatrixVectorProvider.cpp
@@ -11,7 +11,7 @@
 #include "SimpleMatrixVectorProvider.h"
 
 #include <cassert>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Error.h"
 #include "MathLib/LinAlg/LinAlg.h"
diff --git a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp
index bdd04ef2b5f..24aaec4ab34 100644
--- a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp
+++ b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp
@@ -11,7 +11,7 @@
 #include "LocalLinearLeastSquaresExtrapolator.h"
 
 #include <Eigen/SVD>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MathLib/LinAlg/Eigen/EigenMapTools.h"
 #include "MathLib/LinAlg/LinAlg.h"
diff --git a/NumLib/NewtonRaphson.h b/NumLib/NewtonRaphson.h
index 87a6f278b8c..eb0209080e4 100644
--- a/NumLib/NewtonRaphson.h
+++ b/NumLib/NewtonRaphson.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include <boost/optional.hpp>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <Eigen/Dense>
 
diff --git a/NumLib/ODESolver/ConvergenceCriterionDeltaX.cpp b/NumLib/ODESolver/ConvergenceCriterionDeltaX.cpp
index f62eaa8a376..2c846325e66 100644
--- a/NumLib/ODESolver/ConvergenceCriterionDeltaX.cpp
+++ b/NumLib/ODESolver/ConvergenceCriterionDeltaX.cpp
@@ -9,7 +9,7 @@
  */
 
 #include "ConvergenceCriterionDeltaX.h"
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/ConfigTree.h"
 #include "MathLib/LinAlg/LinAlg.h"
diff --git a/NumLib/ODESolver/ConvergenceCriterionPerComponentDeltaX.cpp b/NumLib/ODESolver/ConvergenceCriterionPerComponentDeltaX.cpp
index 9311aa94a82..a289aa81bde 100644
--- a/NumLib/ODESolver/ConvergenceCriterionPerComponentDeltaX.cpp
+++ b/NumLib/ODESolver/ConvergenceCriterionPerComponentDeltaX.cpp
@@ -9,8 +9,8 @@
  */
 
 #include "ConvergenceCriterionPerComponentDeltaX.h"
-#include <logog/include/logog.hpp>
 #include <limits>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/ConfigTree.h"
 #include "NumLib/DOF/LocalToGlobalIndexMap.h"
diff --git a/NumLib/ODESolver/ConvergenceCriterionPerComponentResidual.cpp b/NumLib/ODESolver/ConvergenceCriterionPerComponentResidual.cpp
index e10481159f0..e725ee37a9b 100644
--- a/NumLib/ODESolver/ConvergenceCriterionPerComponentResidual.cpp
+++ b/NumLib/ODESolver/ConvergenceCriterionPerComponentResidual.cpp
@@ -9,7 +9,7 @@
  */
 
 #include "ConvergenceCriterionPerComponentResidual.h"
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/ConfigTree.h"
 #include "NumLib/DOF/DOFTableUtil.h"
diff --git a/NumLib/ODESolver/ConvergenceCriterionResidual.cpp b/NumLib/ODESolver/ConvergenceCriterionResidual.cpp
index 7366239b091..97196e21aba 100644
--- a/NumLib/ODESolver/ConvergenceCriterionResidual.cpp
+++ b/NumLib/ODESolver/ConvergenceCriterionResidual.cpp
@@ -9,7 +9,7 @@
  */
 
 #include "ConvergenceCriterionResidual.h"
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/ConfigTree.h"
 #include "MathLib/LinAlg/LinAlg.h"
diff --git a/NumLib/ODESolver/NonlinearSolver.cpp b/NumLib/ODESolver/NonlinearSolver.cpp
index 4852d09f51c..97d867739be 100644
--- a/NumLib/ODESolver/NonlinearSolver.cpp
+++ b/NumLib/ODESolver/NonlinearSolver.cpp
@@ -10,7 +10,7 @@
 
 #include "NonlinearSolver.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/ConfigTree.h"
 #include "BaseLib/Error.h"
diff --git a/NumLib/ODESolver/NonlinearSolver.h b/NumLib/ODESolver/NonlinearSolver.h
index 10510ba9db7..ad0fdf89e98 100644
--- a/NumLib/ODESolver/NonlinearSolver.h
+++ b/NumLib/ODESolver/NonlinearSolver.h
@@ -12,7 +12,7 @@
 
 #include <memory>
 #include <utility>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "ConvergenceCriterion.h"
 #include "NonlinearSolverStatus.h"
diff --git a/NumLib/TimeStepping/Algorithms/EvolutionaryPIDcontroller.cpp b/NumLib/TimeStepping/Algorithms/EvolutionaryPIDcontroller.cpp
index 1f8a692ac89..9810500f207 100644
--- a/NumLib/TimeStepping/Algorithms/EvolutionaryPIDcontroller.cpp
+++ b/NumLib/TimeStepping/Algorithms/EvolutionaryPIDcontroller.cpp
@@ -14,7 +14,7 @@
 #include <functional>
 #include <limits>
 #include <vector>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Algorithm.h"
 
diff --git a/ParameterLib/ConstantParameter.cpp b/ParameterLib/ConstantParameter.cpp
index 46b54d7fe24..f38fc02ac80 100644
--- a/ParameterLib/ConstantParameter.cpp
+++ b/ParameterLib/ConstantParameter.cpp
@@ -11,6 +11,7 @@
 #include "ConstantParameter.h"
 #include "BaseLib/ConfigTree.h"
 #include "BaseLib/Error.h"
+#include "BaseLib/Logging.h"
 
 namespace ParameterLib
 {
diff --git a/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryCondition.cpp
index 780fb47089e..8722182e4b3 100644
--- a/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryCondition.cpp
@@ -12,7 +12,7 @@
 
 #include <algorithm>
 #include <vector>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MeshLib/MeshSearch/NodeSearch.h"  // for getUniqueNodes
 #include "MeshLib/Node.h"
diff --git a/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.cpp
index 9c33483f180..da46b7b0121 100644
--- a/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.cpp
@@ -11,8 +11,8 @@
 #include "DirichletBoundaryCondition.h"
 
 #include <algorithm>
-#include <logog/include/logog.hpp>
 #include <vector>
+#include "BaseLib/Logging.h"
 
 #include "DirichletBoundaryConditionAuxiliaryFunctions.h"
 
diff --git a/ProcessLib/BoundaryCondition/PhaseFieldIrreversibleDamageOracleBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/PhaseFieldIrreversibleDamageOracleBoundaryCondition.cpp
index aca477f0f1d..55ee54835ac 100644
--- a/ProcessLib/BoundaryCondition/PhaseFieldIrreversibleDamageOracleBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/PhaseFieldIrreversibleDamageOracleBoundaryCondition.cpp
@@ -11,8 +11,8 @@
 #include "PhaseFieldIrreversibleDamageOracleBoundaryCondition.h"
 
 #include <algorithm>
-#include <logog/include/logog.hpp>
 #include <vector>
+#include "BaseLib/Logging.h"
 
 namespace ProcessLib
 {
diff --git a/ProcessLib/HeatTransportBHE/LocalAssemblers/CreateLocalAssemblers.h b/ProcessLib/HeatTransportBHE/LocalAssemblers/CreateLocalAssemblers.h
index f688635254d..f5360d5986b 100644
--- a/ProcessLib/HeatTransportBHE/LocalAssemblers/CreateLocalAssemblers.h
+++ b/ProcessLib/HeatTransportBHE/LocalAssemblers/CreateLocalAssemblers.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "LocalDataInitializer.h"
 #include "NumLib/DOF/LocalToGlobalIndexMap.h"
diff --git a/ProcessLib/HydroMechanics/CreateLocalAssemblers.h b/ProcessLib/HydroMechanics/CreateLocalAssemblers.h
index 411ae779688..a941597e453 100644
--- a/ProcessLib/HydroMechanics/CreateLocalAssemblers.h
+++ b/ProcessLib/HydroMechanics/CreateLocalAssemblers.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "NumLib/DOF/LocalToGlobalIndexMap.h"
 
diff --git a/ProcessLib/LIE/HydroMechanics/LocalAssembler/CreateLocalAssemblers.h b/ProcessLib/LIE/HydroMechanics/LocalAssembler/CreateLocalAssemblers.h
index 9b83821e27a..f749059da1d 100644
--- a/ProcessLib/LIE/HydroMechanics/LocalAssembler/CreateLocalAssemblers.h
+++ b/ProcessLib/LIE/HydroMechanics/LocalAssembler/CreateLocalAssemblers.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "NumLib/DOF/LocalToGlobalIndexMap.h"
 
diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/CreateLocalAssemblers.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/CreateLocalAssemblers.h
index 07f1ddf7162..39dc70f5fea 100644
--- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/CreateLocalAssemblers.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/CreateLocalAssemblers.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "NumLib/DOF/LocalToGlobalIndexMap.h"
 
diff --git a/ProcessLib/Output/CreateOutput.cpp b/ProcessLib/Output/CreateOutput.cpp
index 224dcd3c9c6..e4877233299 100644
--- a/ProcessLib/Output/CreateOutput.cpp
+++ b/ProcessLib/Output/CreateOutput.cpp
@@ -10,9 +10,9 @@
 
 #include "CreateOutput.h"
 
-#include <logog/include/logog.hpp>
 #include <memory>
 #include <tuple>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Algorithm.h"
 #include "BaseLib/ConfigTree.h"
diff --git a/ProcessLib/Output/Output.cpp b/ProcessLib/Output/Output.cpp
index 75075e1f880..f5f4809202f 100644
--- a/ProcessLib/Output/Output.cpp
+++ b/ProcessLib/Output/Output.cpp
@@ -14,7 +14,7 @@
 #include <fstream>
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "Applications/InSituLib/Adaptor.h"
 #include "BaseLib/FileTools.h"
diff --git a/ProcessLib/ProcessVariable.cpp b/ProcessLib/ProcessVariable.cpp
index 05e5466a53d..a36cb23f288 100644
--- a/ProcessLib/ProcessVariable.cpp
+++ b/ProcessLib/ProcessVariable.cpp
@@ -11,8 +11,8 @@
 #include "ProcessVariable.h"
 
 #include <algorithm>
-#include <logog/include/logog.hpp>
 #include <utility>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/Algorithm.h"
 #include "BaseLib/TimeInterval.h"
diff --git a/ProcessLib/RichardsMechanics/CreateLocalAssemblers.h b/ProcessLib/RichardsMechanics/CreateLocalAssemblers.h
index 74047067c12..6275ff59da5 100644
--- a/ProcessLib/RichardsMechanics/CreateLocalAssemblers.h
+++ b/ProcessLib/RichardsMechanics/CreateLocalAssemblers.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "NumLib/DOF/LocalToGlobalIndexMap.h"
 
diff --git a/ProcessLib/SmallDeformation/CreateLocalAssemblers.h b/ProcessLib/SmallDeformation/CreateLocalAssemblers.h
index a3e434221b1..89dccb7eb96 100644
--- a/ProcessLib/SmallDeformation/CreateLocalAssemblers.h
+++ b/ProcessLib/SmallDeformation/CreateLocalAssemblers.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "NumLib/DOF/LocalToGlobalIndexMap.h"
 
diff --git a/ProcessLib/SourceTerms/CreateNodalSourceTerm.cpp b/ProcessLib/SourceTerms/CreateNodalSourceTerm.cpp
index 1ca28d9ffd5..421c1983231 100644
--- a/ProcessLib/SourceTerms/CreateNodalSourceTerm.cpp
+++ b/ProcessLib/SourceTerms/CreateNodalSourceTerm.cpp
@@ -10,7 +10,7 @@
 
 #include "CreateNodalSourceTerm.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/ConfigTree.h"
 #include "ParameterLib/Utils.h"
diff --git a/ProcessLib/SurfaceFlux/SurfaceFluxData.h b/ProcessLib/SurfaceFlux/SurfaceFluxData.h
index c576b94ec91..2442dfd4224 100644
--- a/ProcessLib/SurfaceFlux/SurfaceFluxData.h
+++ b/ProcessLib/SurfaceFlux/SurfaceFluxData.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <memory>
 #include <string>
diff --git a/ProcessLib/TES/TESLocalAssemblerInner-impl.h b/ProcessLib/TES/TESLocalAssemblerInner-impl.h
index 879c16d4077..57e09e391fa 100644
--- a/ProcessLib/TES/TESLocalAssemblerInner-impl.h
+++ b/ProcessLib/TES/TESLocalAssemblerInner-impl.h
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "NumLib/Function/Interpolation.h"
 
diff --git a/ProcessLib/TES/TESReactionAdaptor.cpp b/ProcessLib/TES/TESReactionAdaptor.cpp
index bec12f56709..94c3ac4651a 100644
--- a/ProcessLib/TES/TESReactionAdaptor.cpp
+++ b/ProcessLib/TES/TESReactionAdaptor.cpp
@@ -10,7 +10,7 @@
 
 #include <cassert>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MathLib/Nonlinear/Root1D.h"
 #include "MathLib/ODE/ODESolverBuilder.h"
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.cpp
index 124fceffeea..1b3cc617c3e 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.cpp
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.cpp
@@ -10,8 +10,8 @@
 
 #include "CreateThermalTwoPhaseFlowWithPPMaterialProperties.h"
 
-#include <logog/include/logog.hpp>
 #include <tuple>
+#include "BaseLib/Logging.h"
 
 #include "MaterialLib/Fluid/FluidProperty.h"
 #include "MaterialLib/Fluid/SpecificHeatCapacity/CreateSpecificFluidHeatCapacityModel.h"
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.cpp
index 7b734822a3d..dd1596465a9 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.cpp
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPMaterialProperties.cpp
@@ -10,7 +10,7 @@
 
 #include "ThermalTwoPhaseFlowWithPPMaterialProperties.h"
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "MaterialLib/Fluid/FluidProperty.h"
 #include "MaterialLib/PorousMedium/Porosity/Porosity.h"
diff --git a/ProcessLib/TimeLoop.h b/ProcessLib/TimeLoop.h
index 0fb6c5527b3..792a7507abd 100644
--- a/ProcessLib/TimeLoop.h
+++ b/ProcessLib/TimeLoop.h
@@ -13,7 +13,7 @@
 #include <functional>
 #include <memory>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "NumLib/ODESolver/NonlinearSolver.h"
 #include "NumLib/TimeStepping/Algorithms/TimeStepAlgorithm.h"
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.cpp b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.cpp
index dc4f1505088..f11fce34fb7 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowPrhoMaterialProperties.cpp
@@ -9,8 +9,8 @@
  */
 
 #include "CreateTwoPhaseFlowPrhoMaterialProperties.h"
-#include <logog/include/logog.hpp>
 #include "BaseLib/Algorithm.h"
+#include "BaseLib/Logging.h"
 #include "MaterialLib/Fluid/FluidProperty.h"
 #include "MaterialLib/PorousMedium/Porosity/Porosity.h"
 #include "MaterialLib/PorousMedium/Storage/Storage.h"
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.cpp b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.cpp
index 2a4ae2113db..98ef4430bdd 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoMaterialProperties.cpp
@@ -9,8 +9,8 @@
  */
 
 #include "TwoPhaseFlowWithPrhoMaterialProperties.h"
-#include <logog/include/logog.hpp>
 #include <utility>
+#include "BaseLib/Logging.h"
 #include "MaterialLib/Fluid/FluidProperty.h"
 #include "MaterialLib/PorousMedium/Porosity/Porosity.h"
 #include "MaterialLib/PorousMedium/Storage/Storage.h"
diff --git a/ProcessLib/Utils/CreateLocalAssemblers.h b/ProcessLib/Utils/CreateLocalAssemblers.h
index fad22797bec..df4798282cb 100644
--- a/ProcessLib/Utils/CreateLocalAssemblers.h
+++ b/ProcessLib/Utils/CreateLocalAssemblers.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "NumLib/DOF/LocalToGlobalIndexMap.h"
 
diff --git a/Tests/BaseLib/TestConfigTree.cpp b/Tests/BaseLib/TestConfigTree.cpp
index ab71ca1f7b7..d001d680481 100644
--- a/Tests/BaseLib/TestConfigTree.cpp
+++ b/Tests/BaseLib/TestConfigTree.cpp
@@ -8,7 +8,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <boost/property_tree/xml_parser.hpp>
 #include <numeric>
diff --git a/Tests/MathLib/TestNonlinear1D.cpp b/Tests/MathLib/TestNonlinear1D.cpp
index 12827a3c270..13898e5a5c9 100644
--- a/Tests/MathLib/TestNonlinear1D.cpp
+++ b/Tests/MathLib/TestNonlinear1D.cpp
@@ -7,10 +7,10 @@
  *
  */
 
+#include <gtest/gtest.h>
 #include <limits>
 #include <type_traits>
-#include <gtest/gtest.h>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 #include "MathLib/Nonlinear/Root1D.h"
 
 double f(double x)
diff --git a/Tests/MathLib/TestODESolver.cpp b/Tests/MathLib/TestODESolver.cpp
index c1376b9f225..028fe150c68 100644
--- a/Tests/MathLib/TestODESolver.cpp
+++ b/Tests/MathLib/TestODESolver.cpp
@@ -8,7 +8,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/ConfigTree.h"
 #include "MathLib/ODE/ODESolverBuilder.h"
diff --git a/Tests/NumLib/TestComponentNorms.cpp b/Tests/NumLib/TestComponentNorms.cpp
index 031307f06c1..a0e714120ad 100644
--- a/Tests/NumLib/TestComponentNorms.cpp
+++ b/Tests/NumLib/TestComponentNorms.cpp
@@ -9,7 +9,7 @@
 
 #include <gtest/gtest.h>
 #include <limits>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #ifdef USE_PETSC
 #include "InfoLib/TestInfo.h"
diff --git a/Tests/NumLib/TestODEInt.cpp b/Tests/NumLib/TestODEInt.cpp
index ca6d00bc2ed..0abb4b57bfd 100644
--- a/Tests/NumLib/TestODEInt.cpp
+++ b/Tests/NumLib/TestODEInt.cpp
@@ -13,8 +13,8 @@
 #include <memory>
 #include <typeinfo>
 
-#include <logog/include/logog.hpp>
 #include <boost/property_tree/xml_parser.hpp>
+#include "BaseLib/Logging.h"
 
 #include "InfoLib/TestInfo.h"
 #include "NumLib/NumericsConfig.h"
diff --git a/Tests/NumLib/TestTimeSteppingEvolutionaryPIDcontroller.cpp b/Tests/NumLib/TestTimeSteppingEvolutionaryPIDcontroller.cpp
index 36d36be8bbe..7d03e7fed91 100644
--- a/Tests/NumLib/TestTimeSteppingEvolutionaryPIDcontroller.cpp
+++ b/Tests/NumLib/TestTimeSteppingEvolutionaryPIDcontroller.cpp
@@ -14,7 +14,7 @@
 #include <memory>
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "BaseLib/ConfigTree.h"
 
diff --git a/Tests/NumLib/TestTimeSteppingFixed.cpp b/Tests/NumLib/TestTimeSteppingFixed.cpp
index c1104be261b..20e4be4e51a 100644
--- a/Tests/NumLib/TestTimeSteppingFixed.cpp
+++ b/Tests/NumLib/TestTimeSteppingFixed.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "NumLib/TimeStepping/Algorithms/FixedTimeStepping.h"
 #include "NumLib/TimeStepping/TimeStep.h"
diff --git a/Tests/NumLib/TestTimeSteppingIterationNumber.cpp b/Tests/NumLib/TestTimeSteppingIterationNumber.cpp
index d9c9ab49fab..d64a4cee342 100644
--- a/Tests/NumLib/TestTimeSteppingIterationNumber.cpp
+++ b/Tests/NumLib/TestTimeSteppingIterationNumber.cpp
@@ -14,7 +14,7 @@
 #include <utility>
 #include <vector>
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "NumLib/TimeStepping/TimeStep.h"
 #include "NumLib/TimeStepping/Algorithms/IterationNumberBasedTimeStepping.h"
diff --git a/Tests/NumLib/TimeSteppingTestingTools.h b/Tests/NumLib/TimeSteppingTestingTools.h
index 45a2ba8ebcc..afa43d6b69c 100644
--- a/Tests/NumLib/TimeSteppingTestingTools.h
+++ b/Tests/NumLib/TimeSteppingTestingTools.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include "NumLib/TimeStepping/TimeStep.h"
 
diff --git a/Tests/ParameterLib/Parameter.cpp b/Tests/ParameterLib/Parameter.cpp
index fdb387ff4c6..9ab0bed879f 100644
--- a/Tests/ParameterLib/Parameter.cpp
+++ b/Tests/ParameterLib/Parameter.cpp
@@ -8,7 +8,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <logog/include/logog.hpp>
+#include "BaseLib/Logging.h"
 
 #include <boost/property_tree/xml_parser.hpp>
 #include <numeric>
-- 
GitLab