diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34c6fb2..28b0163 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,7 +158,7 @@
 
     add_library(DoctestIntegration STATIC
         tests/doctest_integration.cpp
-        tests/trompeloeil_doctest.h
+        tests/trompeloeil_doctest.hpp
         tests/wait-a-bit-longer.cpp
         )
     target_include_directories(DoctestIntegration PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/tests/ ${CMAKE_CURRENT_SOURCE_DIR}/src/)
diff --git a/src/UniqueResource.h b/src/UniqueResource.hpp
similarity index 100%
rename from src/UniqueResource.h
rename to src/UniqueResource.hpp
diff --git a/src/netconf-client.cpp b/src/netconf-client.cpp
index 9f6908b..2869a1f 100644
--- a/src/netconf-client.cpp
+++ b/src/netconf-client.cpp
@@ -13,8 +13,8 @@
 #include <nc_client.h>
 }
 #include <sstream>
-#include "netconf-client.h"
-#include "UniqueResource.h"
+#include "netconf-client.hpp"
+#include "UniqueResource.hpp"
 
 namespace libnetconf {
 
diff --git a/src/netconf-client.h b/src/netconf-client.hpp
similarity index 100%
rename from src/netconf-client.h
rename to src/netconf-client.hpp
diff --git a/src/netconf_access.cpp b/src/netconf_access.cpp
index 9fb456d..fd8f2a8 100644
--- a/src/netconf_access.cpp
+++ b/src/netconf_access.cpp
@@ -8,7 +8,7 @@
 #include <libyang/Libyang.hpp>
 #include <libyang/Tree_Data.hpp>
 #include "libyang_utils.hpp"
-#include "netconf-client.h"
+#include "netconf-client.hpp"
 #include "netconf_access.hpp"
 #include "utils.hpp"
 #include "yang_schema.hpp"
diff --git a/src/python_netconf.cpp b/src/python_netconf.cpp
index 260395a..49a4339 100644
--- a/src/python_netconf.cpp
+++ b/src/python_netconf.cpp
@@ -9,7 +9,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 #include "netconf_access.hpp"
-#include "netconf-client.h"
+#include "netconf-client.hpp"
 
 using namespace std::literals;
 using namespace pybind11::literals;
diff --git a/src/yang_schema.cpp b/src/yang_schema.cpp
index ddd6f37..dddebf5 100644
--- a/src/yang_schema.cpp
+++ b/src/yang_schema.cpp
@@ -10,7 +10,7 @@
 #include <libyang/Tree_Data.hpp>
 #include <libyang/Tree_Schema.hpp>
 #include <string_view>
-#include "UniqueResource.h"
+#include "UniqueResource.hpp"
 #include "utils.hpp"
 #include "yang_schema.hpp"
 
diff --git a/tests/cd.cpp b/tests/cd.cpp
index 8b569b7..def2bdd 100644
--- a/tests/cd.cpp
+++ b/tests/cd.cpp
@@ -6,7 +6,7 @@
  *
 */
 
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "ast_commands.hpp"
 #include "parser.hpp"
 #include "static_schema.hpp"
diff --git a/tests/command_completion.cpp b/tests/command_completion.cpp
index d439394..9ab146e 100644
--- a/tests/command_completion.cpp
+++ b/tests/command_completion.cpp
@@ -6,7 +6,7 @@
  *
 */
 
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "parser.hpp"
 #include "pretty_printers.hpp"
 #include "static_schema.hpp"
diff --git a/tests/data_query.cpp b/tests/data_query.cpp
index c62c240..1fd461c 100644
--- a/tests/data_query.cpp
+++ b/tests/data_query.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <experimental/iterator>
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 
 #ifdef sysrepo_BACKEND
 #include "sysrepo_access.hpp"
diff --git a/tests/datastore_access.cpp b/tests/datastore_access.cpp
index 88b05c3..a7fc6f5 100644
--- a/tests/datastore_access.cpp
+++ b/tests/datastore_access.cpp
@@ -6,7 +6,7 @@
  *
 */
 
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include <sysrepo-cpp/Session.hpp>
 
 #ifdef sysrepo_BACKEND
diff --git a/tests/datastoreaccess_mock.hpp b/tests/datastoreaccess_mock.hpp
index 289d919..e9dc870 100644
--- a/tests/datastoreaccess_mock.hpp
+++ b/tests/datastoreaccess_mock.hpp
@@ -7,7 +7,7 @@
 
 #include <map>
 #include "datastore_access.hpp"
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "utils.hpp"
 
 namespace trompeloeil {
diff --git a/tests/enum_completion.cpp b/tests/enum_completion.cpp
index c6b31d8..939243f 100644
--- a/tests/enum_completion.cpp
+++ b/tests/enum_completion.cpp
@@ -7,7 +7,7 @@
  *
  */
 
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "datastoreaccess_mock.hpp"
 #include "parser.hpp"
 #include "pretty_printers.hpp"
diff --git a/tests/keyvalue_completion.cpp b/tests/keyvalue_completion.cpp
index 56c7841..c6a2350 100644
--- a/tests/keyvalue_completion.cpp
+++ b/tests/keyvalue_completion.cpp
@@ -7,7 +7,7 @@
 
 #include <experimental/iterator>
 #include <iostream>
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "ast_commands.hpp"
 #include "datastoreaccess_mock.hpp"
 #include "parser.hpp"
diff --git a/tests/leaf_editing.cpp b/tests/leaf_editing.cpp
index 61704f6..655f269 100644
--- a/tests/leaf_editing.cpp
+++ b/tests/leaf_editing.cpp
@@ -6,7 +6,7 @@
  *
 */
 
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include <boost/core/demangle.hpp>
 #include "ast_commands.hpp"
 #include "parser.hpp"
diff --git a/tests/list_manipulation.cpp b/tests/list_manipulation.cpp
index 5100c61..b71ee7b 100644
--- a/tests/list_manipulation.cpp
+++ b/tests/list_manipulation.cpp
@@ -5,7 +5,7 @@
  *
 */
 
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "parser.hpp"
 #include "static_schema.hpp"
 
diff --git a/tests/ls.cpp b/tests/ls.cpp
index 8709f13..2c72041 100644
--- a/tests/ls.cpp
+++ b/tests/ls.cpp
@@ -6,7 +6,7 @@
  *
 */
 
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "ast_commands.hpp"
 #include "parser.hpp"
 #include "static_schema.hpp"
diff --git a/tests/parser_methods.cpp b/tests/parser_methods.cpp
index 2a84428..bd53a24 100644
--- a/tests/parser_methods.cpp
+++ b/tests/parser_methods.cpp
@@ -7,7 +7,7 @@
 */
 
 #include <experimental/iterator>
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "ast_commands.hpp"
 #include "parser.hpp"
 #include "static_schema.hpp"
diff --git a/tests/path_completion.cpp b/tests/path_completion.cpp
index 0ad6089..1550326 100644
--- a/tests/path_completion.cpp
+++ b/tests/path_completion.cpp
@@ -6,7 +6,7 @@
  *
 */
 
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "datastoreaccess_mock.hpp"
 #include "parser.hpp"
 #include "pretty_printers.hpp"
diff --git a/tests/path_utils.cpp b/tests/path_utils.cpp
index c23984d..3a3fb72 100644
--- a/tests/path_utils.cpp
+++ b/tests/path_utils.cpp
@@ -5,7 +5,7 @@
  *
 */
 
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "ast_path.hpp"
 
 TEST_CASE("path utils")
diff --git a/tests/presence_containers.cpp b/tests/presence_containers.cpp
index d634daf..af79d00 100644
--- a/tests/presence_containers.cpp
+++ b/tests/presence_containers.cpp
@@ -7,7 +7,7 @@
  *
 */
 
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "ast_commands.hpp"
 #include "parser.hpp"
 #include "static_schema.hpp"
diff --git a/tests/trompeloeil_doctest.h b/tests/trompeloeil_doctest.hpp
similarity index 100%
rename from tests/trompeloeil_doctest.h
rename to tests/trompeloeil_doctest.hpp
diff --git a/tests/utils.cpp b/tests/utils.cpp
index 7717480..c862980 100644
--- a/tests/utils.cpp
+++ b/tests/utils.cpp
@@ -6,7 +6,7 @@
  *
 */
 
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "utils.hpp"
 
 TEST_CASE("utils")
diff --git a/tests/yang.cpp b/tests/yang.cpp
index fa394b5..162a194 100644
--- a/tests/yang.cpp
+++ b/tests/yang.cpp
@@ -7,7 +7,7 @@
 */
 
 #include <experimental/iterator>
-#include "trompeloeil_doctest.h"
+#include "trompeloeil_doctest.hpp"
 #include "yang_schema.hpp"
 
 const char* second_schema = R"(