diff --git a/dbal/cpp/build-config/CMakeLists.txt b/dbal/cpp/build-config/CMakeLists.txt
index 42fbc003c..804bbe2fe 100644
--- a/dbal/cpp/build-config/CMakeLists.txt
+++ b/dbal/cpp/build-config/CMakeLists.txt
@@ -12,7 +12,7 @@ set(DBAL_INCLUDE_DIR ${DBAL_ROOT}/include)
 
 find_package(Threads REQUIRED)
 
-include_directories(${DBAL_INCLUDE_DIR} ${DBAL_SRC_DIR})
+include_directories(${DBAL_INCLUDE_DIR} ${DBAL_INCLUDE_DIR}/dbal ${DBAL_SRC_DIR})
 
 # Try to find Conan dependencies, but don't fail if they're not available
 find_package(fmt QUIET)
diff --git a/dbal/cpp/include/dbal/blob_storage.hpp b/dbal/cpp/include/dbal/blob_storage.hpp
index 0ed85edad..89d15fe1f 100644
--- a/dbal/cpp/include/dbal/blob_storage.hpp
+++ b/dbal/cpp/include/dbal/blob_storage.hpp
@@ -1,6 +1,3 @@
-#ifndef DBAL_BLOB_STORAGE_WRAPPER_HPP
-#define DBAL_BLOB_STORAGE_WRAPPER_HPP
+#pragma once
 
 #include "dbal/storage/blob_storage.hpp"
-
-#endif // DBAL_BLOB_STORAGE_WRAPPER_HPP
diff --git a/dbal/cpp/src/capabilities.hpp b/dbal/cpp/include/dbal/capabilities.hpp
similarity index 100%
rename from dbal/cpp/src/capabilities.hpp
rename to dbal/cpp/include/dbal/capabilities.hpp
diff --git a/dbal/cpp/include/dbal/errors.hpp b/dbal/cpp/include/dbal/errors.hpp
index 682504ee7..4bb357202 100644
--- a/dbal/cpp/include/dbal/errors.hpp
+++ b/dbal/cpp/include/dbal/errors.hpp
@@ -1,6 +1,3 @@
-#ifndef DBAL_ERRORS_WRAPPER_HPP
-#define DBAL_ERRORS_WRAPPER_HPP
+#pragma once
 
 #include "dbal/core/errors.hpp"
-
-#endif // DBAL_ERRORS_WRAPPER_HPP
diff --git a/dbal/cpp/include/dbal/result.hpp b/dbal/cpp/include/dbal/result.hpp
index 5916309d2..014fb4338 100644
--- a/dbal/cpp/include/dbal/result.hpp
+++ b/dbal/cpp/include/dbal/result.hpp
@@ -1,6 +1,3 @@
-#ifndef DBAL_RESULT_WRAPPER_HPP
-#define DBAL_RESULT_WRAPPER_HPP
+#pragma once
 
 #include "dbal/errors.hpp"
-
-#endif // DBAL_RESULT_WRAPPER_HPP
diff --git a/dbal/cpp/include/dbal/types.hpp b/dbal/cpp/include/dbal/types.hpp
index 5be4c5750..f25fb5d17 100644
--- a/dbal/cpp/include/dbal/types.hpp
+++ b/dbal/cpp/include/dbal/types.hpp
@@ -1,6 +1,3 @@
-#ifndef DBAL_TYPES_WRAPPER_HPP
-#define DBAL_TYPES_WRAPPER_HPP
+#pragma once
 
 #include "dbal/core/types.hpp"
-
-#endif // DBAL_TYPES_WRAPPER_HPP