diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt
index be3eab56e93221baca3c909dcb9bffbe3896a08d..d6b0f56d76a6d7d81d6ffcfe6fad7f1335e3c16d 100644
--- a/BaseLib/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -6,7 +6,7 @@ if(OGS_BUILD_GUI)
 endif()
 
 # Create the library
-ogs_add_library(BaseLib ${SOURCES})
+ogs_add_library(BaseLib GENERATE_EXPORT_HEADER ${SOURCES})
 
 target_link_libraries(
     BaseLib
diff --git a/InfoLib/CMakeLists.txt b/InfoLib/CMakeLists.txt
index 4d1d1f6a86bbbcac617a31ba78d6a3f08849b3b9..229641fbeee41400c0e8a7e7ce5423ae375b3d02 100644
--- a/InfoLib/CMakeLists.txt
+++ b/InfoLib/CMakeLists.txt
@@ -5,6 +5,6 @@ foreach(lib Git CMake Test)
     )
 
     ogs_add_library(
-        ${lib}InfoLib ${CMAKE_CURRENT_BINARY_DIR}/${lib}Info.cpp ${lib}Info.h
+        ${lib}InfoLib GENERATE_EXPORT_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${lib}Info.cpp ${lib}Info.h
     )
 endforeach(lib)
diff --git a/MaterialLib/CMakeLists.txt b/MaterialLib/CMakeLists.txt
index 9cd0317ce3c6da9931f0c7f1032fa0a9d7f915f4..35100bc7dc6fb4cee28e5f5cea9d9f235d7a1196 100644
--- a/MaterialLib/CMakeLists.txt
+++ b/MaterialLib/CMakeLists.txt
@@ -36,7 +36,7 @@ append_source_files(
 )
 append_source_files(SOURCES TwoPhaseModels)
 
-ogs_add_library(MaterialLib ${SOURCES})
+ogs_add_library(MaterialLib GENERATE_EXPORT_HEADER ${SOURCES})
 
 target_link_libraries(
     MaterialLib PUBLIC MaterialLib_SolidModels MaterialLib_FractureModels
diff --git a/MaterialLib/FractureModels/CMakeLists.txt b/MaterialLib/FractureModels/CMakeLists.txt
index 3891c7a17d10126005dbdac461f3a4f5627e83fb..ac8fecf84c108ed8aa6003e6623eb81590fa68ce 100644
--- a/MaterialLib/FractureModels/CMakeLists.txt
+++ b/MaterialLib/FractureModels/CMakeLists.txt
@@ -1,7 +1,7 @@
 get_source_files(SOURCES)
 append_source_files(SOURCES Permeability)
 
-ogs_add_library(MaterialLib_FractureModels ${SOURCES})
+ogs_add_library(MaterialLib_FractureModels GENERATE_EXPORT_HEADER ${SOURCES})
 target_link_libraries(
     MaterialLib_FractureModels PUBLIC MathLib PRIVATE ParameterLib NumLib
 )
diff --git a/MathLib/CMakeLists.txt b/MathLib/CMakeLists.txt
index 45f7919c38e33c03e34c918bf90b319dc0a39f60..204d6fa93a4eca84d7c22b1e0ff8da25e746a392 100644
--- a/MathLib/CMakeLists.txt
+++ b/MathLib/CMakeLists.txt
@@ -21,7 +21,7 @@ if(OGS_USE_PETSC)
 endif()
 
 # Create the library
-ogs_add_library(MathLib ${SOURCES})
+ogs_add_library(MathLib GENERATE_EXPORT_HEADER ${SOURCES})
 
 set_target_properties(MathLib PROPERTIES LINKER_LANGUAGE CXX)
 
diff --git a/NumLib/CMakeLists.txt b/NumLib/CMakeLists.txt
index d001882687dd56043560e80cd07d4db2c27cfc79..d9f78959352aaeb527651e43d1b35b5ed6ed65b5 100644
--- a/NumLib/CMakeLists.txt
+++ b/NumLib/CMakeLists.txt
@@ -14,7 +14,7 @@ append_source_files(SOURCES ODESolver)
 append_source_files(SOURCES Extrapolation)
 
 # Create the library
-ogs_add_library(NumLib ${SOURCES})
+ogs_add_library(NumLib GENERATE_EXPORT_HEADER ${SOURCES})
 set_target_properties(NumLib PROPERTIES LINKER_LANGUAGE CXX)
 
 target_link_libraries(
diff --git a/scripts/cmake/Functions.cmake b/scripts/cmake/Functions.cmake
index 1f8213cdd0c48759984a147213e9da2c96f08350..fa2c6d7db06656bee19ef60ea5df3ebf187e924c 100644
--- a/scripts/cmake/Functions.cmake
+++ b/scripts/cmake/Functions.cmake
@@ -80,7 +80,7 @@ endfunction()
 
 # Replacement for add_library() for ogs libraries
 function(ogs_add_library targetName)
-    set(options STATIC SHARED)
+    set(options STATIC SHARED GENERATE_EXPORT_HEADER)
     cmake_parse_arguments(ogs_add_library "${options}" "" "" ${ARGN})
 
     foreach(file ${ogs_add_library_UNPARSED_ARGUMENTS})
@@ -117,9 +117,11 @@ function(ogs_add_library targetName)
         )
     endif()
 
-    include(GenerateExportHeader)
-    generate_export_header(${targetName})
-    target_include_directories(${targetName} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+    if(ogs_add_library_GENERATE_EXPORT_HEADER)
+        include(GenerateExportHeader)
+        generate_export_header(${targetName})
+        target_include_directories(${targetName} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+    endif()
 
     if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.16)
         set_target_properties(