diff --git a/power_grid_model_c/power_grid_model_c/CMakeLists.txt b/power_grid_model_c/power_grid_model_c/CMakeLists.txt
index 9ac85a69b5..52fc6bee8c 100644
--- a/power_grid_model_c/power_grid_model_c/CMakeLists.txt
+++ b/power_grid_model_c/power_grid_model_c/CMakeLists.txt
@@ -19,17 +19,10 @@ target_include_directories(power_grid_model_c PUBLIC
   $<INSTALL_INTERFACE:include>
 )
 
-set(PGM_PUBLIC_HEADERS
-  "${CMAKE_CURRENT_SOURCE_DIR}/include/power_grid_model_c/basics.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/include/power_grid_model_c/buffer.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/include/power_grid_model_c/handle.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/include/power_grid_model_c/meta_data.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/include/power_grid_model_c/model.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/include/power_grid_model_c/options.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/include/power_grid_model_c/dataset_definitions.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/include/power_grid_model_c/serialization.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/include/power_grid_model_c/dataset.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/include/power_grid_model_c.h"
+file(
+  GLOB_RECURSE
+  pgm_c_public_headers
+  "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h"
 )
 
 target_link_libraries(power_grid_model_c
@@ -37,10 +30,10 @@ target_link_libraries(power_grid_model_c
 )
 
 target_sources(power_grid_model_c PUBLIC 
-  FILE_SET pgm_public_headers 
+  FILE_SET pgm_c_public_headers 
   TYPE HEADERS 
   BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include/" 
-  FILES "${PGM_PUBLIC_HEADERS}"
+  FILES "${pgm_c_public_headers}"
   )
 
 set_target_properties(power_grid_model_c PROPERTIES
@@ -53,5 +46,5 @@ set_target_properties(power_grid_model_c PROPERTIES
 install(TARGETS power_grid_model_c
   EXPORT power_grid_modelTargets
   COMPONENT power_grid_model
-  FILE_SET pgm_public_headers
+  FILE_SET pgm_c_public_headers
 )
diff --git a/power_grid_model_c/power_grid_model_cpp/CMakeLists.txt b/power_grid_model_c/power_grid_model_cpp/CMakeLists.txt
index 3fa501ee79..989ba8572f 100644
--- a/power_grid_model_c/power_grid_model_cpp/CMakeLists.txt
+++ b/power_grid_model_c/power_grid_model_cpp/CMakeLists.txt
@@ -10,12 +10,31 @@ target_include_directories(power_grid_model_cpp INTERFACE
   $<INSTALL_INTERFACE:include>
 )
 
+file(
+  GLOB_RECURSE
+  pgm_cpp_public_headers
+  "${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp"
+)
+
+target_link_libraries(power_grid_model_cpp
+	INTERFACE power_grid_model_c
+)
+
+target_sources(power_grid_model_cpp PUBLIC 
+  FILE_SET pgm_cpp_public_headers 
+  TYPE HEADERS 
+  BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include/" 
+  FILES "${pgm_cpp_public_headers}"
+)
+
+set_target_properties(power_grid_model_cpp PROPERTIES
+  VERSION ${PGM_VERSION}
+  SOVERSION ${PGM_VERSION}
+)
+
+
 install(TARGETS power_grid_model_cpp
   EXPORT power_grid_modelTargets
   COMPONENT power_grid_model
-)
-
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
-  DESTINATION include
-  FILES_MATCHING PATTERN "*.hpp"
+  FILE_SET pgm_cpp_public_headers
 )
diff --git a/tests/native_api_tests/CMakeLists.txt b/tests/native_api_tests/CMakeLists.txt
index a43d1514f6..b6e3b97eee 100644
--- a/tests/native_api_tests/CMakeLists.txt
+++ b/tests/native_api_tests/CMakeLists.txt
@@ -18,4 +18,10 @@ target_link_libraries(power_grid_model_api_tests
         doctest::doctest
 )
 
+# TODO: remove this when the API becomes stable
+target_compile_definitions(power_grid_model_api_tests
+    PRIVATE
+    PGM_ENABLE_EXPERIMENTAL
+)
+
 doctest_discover_tests(power_grid_model_api_tests)
diff --git a/tests/native_api_tests/test_api_meta_data.cpp b/tests/native_api_tests/test_api_meta_data.cpp
index 73de391bd0..a50cf60e9b 100644
--- a/tests/native_api_tests/test_api_meta_data.cpp
+++ b/tests/native_api_tests/test_api_meta_data.cpp
@@ -2,8 +2,6 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-#define PGM_ENABLE_EXPERIMENTAL
-
 #include "power_grid_model_cpp.hpp"
 
 #include <doctest/doctest.h>
diff --git a/tests/native_api_tests/test_api_model.cpp b/tests/native_api_tests/test_api_model.cpp
index 9d2249d424..df46a05e21 100644
--- a/tests/native_api_tests/test_api_model.cpp
+++ b/tests/native_api_tests/test_api_model.cpp
@@ -2,8 +2,6 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-#define PGM_ENABLE_EXPERIMENTAL
-
 #include "power_grid_model_cpp.hpp"
 
 #include <power_grid_model_c/dataset_definitions.h>
diff --git a/tests/native_api_tests/test_api_serialization.cpp b/tests/native_api_tests/test_api_serialization.cpp
index fe1b6a8a2e..40405ee73f 100644
--- a/tests/native_api_tests/test_api_serialization.cpp
+++ b/tests/native_api_tests/test_api_serialization.cpp
@@ -2,8 +2,6 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-#define PGM_ENABLE_EXPERIMENTAL
-
 #include "power_grid_model_cpp.hpp"
 
 #include <power_grid_model_c/dataset_definitions.h>
diff --git a/tests/package_tests/CMakeLists.txt b/tests/package_tests/CMakeLists.txt
index fdafd34764..605c304207 100644
--- a/tests/package_tests/CMakeLists.txt
+++ b/tests/package_tests/CMakeLists.txt
@@ -20,7 +20,11 @@ set(PROJECT_SOURCES
 # Link against shared power_grid_model object installed by main project
 add_executable(power_grid_model_package_test ${PROJECT_SOURCES})
 target_link_libraries(power_grid_model_package_test PRIVATE power_grid_model::power_grid_model_c)
+target_link_libraries(power_grid_model_package_test PRIVATE power_grid_model::power_grid_model_cpp)
 set_target_properties(power_grid_model_package_test PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
 
+# TODO: remove this when the API becomes stable
+target_compile_definitions(power_grid_model_package_test PRIVATE PGM_ENABLE_EXPERIMENTAL)
+
 install(TARGETS power_grid_model_package_test)
 install(IMPORTED_RUNTIME_ARTIFACTS power_grid_model::power_grid_model_c)
diff --git a/tests/package_tests/test_c_api_package.cpp b/tests/package_tests/test_c_api_package.cpp
index 967fd18a89..5e8bd6b25c 100644
--- a/tests/package_tests/test_c_api_package.cpp
+++ b/tests/package_tests/test_c_api_package.cpp
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #include "power_grid_model_c.h"
+#include "power_grid_model_cpp.hpp"
 
 #include <iostream>
 #include <memory>
@@ -17,8 +18,12 @@ using HandlePtr = std::unique_ptr<PGM_Handle, DeleterFunctor<&PGM_destroy_handle
 } // namespace
 
 auto main() -> int {
-    // get handle
-    HandlePtr const unique_handle{PGM_create_handle()};
-    std::cout << (unique_handle ? "Handle created: API is available.\n" : "No handle could be created.\n");
-    return unique_handle ? 0 : 1;
+    // get handle from C-API
+    HandlePtr const c_handle{PGM_create_handle()};
+    std::cout << (c_handle ? "Handle created: C-API is available.\n" : "No handle could be created.\n");
+    // get handle from C++ API
+    power_grid_model_cpp::Handle const cpp_handle{};
+    std::cout << (cpp_handle.get() ? "Handle created: C++ API is available.\n" : "No handle could be created.\n");
+    int return_code = (c_handle != nullptr) && (cpp_handle.get() != nullptr) ? 0 : 1;
+    return return_code;
 }