From 80132c8e221aa5a922496c46e23432685885ba04 Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Tue, 23 Jan 2024 16:23:53 +0100
Subject: modules-all: Renamed every .h file to .hpp

---
 modules/async/c++/SConscript                |  2 +-
 modules/async/c++/async.cpp                 |  6 +++---
 modules/async/c++/async.hpp                 |  6 +++---
 modules/async/c++/async.tmpl.hpp            |  4 ++--
 modules/codec-json/c++/SConscript           |  2 +-
 modules/codec-json/c++/json.hpp             |  8 ++++----
 modules/codec-json/tests/SConscript         |  2 +-
 modules/codec-json/tests/codec-json.cpp     |  4 ++--
 modules/codec-minecraft/SConscript          |  2 +-
 modules/codec-minecraft/minecraft.hpp       |  6 +++---
 modules/codec-minecraft/var_int_data.cpp    |  2 +-
 modules/codec-minecraft/var_int_data.hpp    |  2 +-
 modules/codec-netcdf/c++/SConscript         |  2 +-
 modules/codec-netcdf/c++/netcdf.hpp         |  8 ++++----
 modules/codec-netcdf/tests/SConscript       |  2 +-
 modules/codec-netcdf/tests/codec-netcdf.cpp |  4 ++--
 modules/codec/c++/SConscript                |  2 +-
 modules/codec/c++/args.hpp                  |  2 +-
 modules/codec/c++/crc32.hpp                 |  6 +++---
 modules/codec/c++/csv.hpp                   |  8 ++++----
 modules/codec/c++/data.hpp                  |  8 ++++----
 modules/codec/c++/forst.hpp                 |  2 +-
 modules/codec/c++/interface.hpp             |  6 +++---
 modules/codec/c++/schema.hpp                |  4 ++--
 modules/codec/c++/schema_factory.hpp        |  2 +-
 modules/codec/c++/schema_hash.hpp           |  6 +++---
 modules/codec/c++/schema_stringify.hpp      |  2 +-
 modules/codec/c++/simple.hpp                |  8 ++++----
 modules/codec/c++/stream_value.hpp          |  6 +++---
 modules/codec/tests/SConscript              |  2 +-
 modules/codec/tests/codec.cpp               |  8 ++++----
 modules/codec/tests/csv.cpp                 |  6 +++---
 modules/codec/tests/schema.cpp              |  8 ++++----
 modules/core/c++/SConscript                 |  2 +-
 modules/core/c++/error.cpp                  |  2 +-
 modules/core/c++/error.hpp                  |  2 +-
 modules/core/c++/id_map.hpp                 |  4 ++--
 modules/core/c++/mcts.hpp                   |  2 +-
 modules/core/c++/platonic.hpp               |  2 +-
 modules/core/c++/templates.hpp              |  2 +-
 modules/core/c++/test/SConscript            |  2 +-
 modules/core/c++/test/suite.cpp             |  2 +-
 modules/core/c++/test/suite.hpp             |  2 +-
 modules/core/c++/tree.hpp                   |  2 +-
 modules/core/tests/SConscript               |  2 +-
 modules/core/tests/core.cpp                 |  8 ++++----
 modules/core/tests/tree.cpp                 |  4 ++--
 modules/device-hip/c++/SConscript           |  2 +-
 modules/device-hip/c++/rpc.hpp              |  2 +-
 modules/device-hip/tests/SConscript         |  2 +-
 modules/io-fs/SConscript                    |  2 +-
 modules/io-tls/SConscript                   |  2 +-
 modules/io-tls/tls.cpp                      |  4 ++--
 modules/io-tls/tls.hpp                      |  4 ++--
 modules/io/SConscript                       |  2 +-
 modules/io/io.cpp                           |  2 +-
 modules/io/io.hpp                           |  6 +++---
 modules/io/io_helpers.cpp                   |  4 ++--
 modules/io/io_helpers.hpp                   |  4 ++--
 modules/io/io_unix.cpp                      |  2 +-
 modules/io_codec/SConscript                 |  2 +-
 modules/io_codec/io_peer.hpp                | 10 +++++-----
 modules/io_codec/rpc.hpp                    |  2 +-
 modules/tools/SConscript                    |  2 +-
 modules/tools/c_gen_iface.hpp               |  8 ++++----
 modules/tools/cli_analyzer.hpp              |  2 +-
 modules/window-opengl/SConscript            |  2 +-
 modules/window-opengl/gl_xcb.cpp            |  2 +-
 modules/window-opengl/gl_xcb.hpp            | 10 +++++-----
 modules/window/c++/SConscript               |  2 +-
 modules/window/c++/device.hpp               | 10 +++++-----
 modules/window/c++/linux_xcb.hpp            |  2 +-
 modules/window/c++/window.hpp               | 10 +++++-----
 modules/window/c++/xcb.cpp                  |  2 +-
 modules/window/c++/xcb.hpp                  | 10 +++++-----
 75 files changed, 150 insertions(+), 150 deletions(-)

diff --git a/modules/async/c++/SConscript b/modules/async/c++/SConscript
index 69f8950..57707c4 100644
--- a/modules/async/c++/SConscript
+++ b/modules/async/c++/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 async_env = env.Clone();
 
 async_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-async_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+async_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += async_env.sources;
 env.headers += async_env.headers;
diff --git a/modules/async/c++/async.cpp b/modules/async/c++/async.cpp
index e10ee16..742d43c 100644
--- a/modules/async/c++/async.cpp
+++ b/modules/async/c++/async.cpp
@@ -1,6 +1,6 @@
-#include "async.h"
-#include <forstio/common.h>
-#include <forstio/error.h>
+#include "async.hpp"
+#include <forstio/common.hpp>
+#include <forstio/error.hpp>
 
 #include <algorithm>
 #include <cassert>
diff --git a/modules/async/c++/async.hpp b/modules/async/c++/async.hpp
index 92ada9c..d116499 100644
--- a/modules/async/c++/async.hpp
+++ b/modules/async/c++/async.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <forstio/common.h>
-#include <forstio/error.h>
+#include <forstio/common.hpp>
+#include <forstio/error.hpp>
 
 #include <chrono>
 #include <functional>
@@ -1020,4 +1020,4 @@ public:
 
 } // namespace saw
 
-#include "async.tmpl.hpp
+#include "async.tmpl.hpp"
diff --git a/modules/async/c++/async.tmpl.hpp b/modules/async/c++/async.tmpl.hpp
index 8fcb59c..ba2a0b3 100644
--- a/modules/async/c++/async.tmpl.hpp
+++ b/modules/async/c++/async.tmpl.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <forstio/common.h>
-#include <forstio/error.h>
+#include <forstio/common.hpp>
+#include <forstio/error.hpp>
 
 #include <cassert>
 // Template inlining
diff --git a/modules/codec-json/c++/SConscript b/modules/codec-json/c++/SConscript
index 868e11e..1b93e07 100644
--- a/modules/codec-json/c++/SConscript
+++ b/modules/codec-json/c++/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 codec_json_env = env.Clone();
 
 codec_json_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-codec_json_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+codec_json_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += codec_json_env.sources;
 env.headers += codec_json_env.headers;
diff --git a/modules/codec-json/c++/json.hpp b/modules/codec-json/c++/json.hpp
index d81a508..c7e4203 100644
--- a/modules/codec-json/c++/json.hpp
+++ b/modules/codec-json/c++/json.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <forstio/buffer.h>
-#include <forstio/common.h>
-#include <forstio/codec/data.h>
+#include <forstio/buffer.hpp>
+#include <forstio/common.hpp>
+#include <forstio/codec/data.hpp>
 
 #include <algorithm>
 
@@ -60,7 +60,7 @@ public:
 };
 }
 
-#include "json.tmpl.hpp
+#include "json.tmpl.hpp"
 
 namespace saw {
 
diff --git a/modules/codec-json/tests/SConscript b/modules/codec-json/tests/SConscript
index 608c2b7..f8ffc92 100644
--- a/modules/codec-json/tests/SConscript
+++ b/modules/codec-json/tests/SConscript
@@ -15,7 +15,7 @@ test_cases_env = env.Clone();
 test_cases_env.Append(LIBS=['forstio-test']);
 
 test_cases_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-test_cases_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+test_cases_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += test_cases_env.sources;
 env.headers += test_cases_env.headers;
diff --git a/modules/codec-json/tests/codec-json.cpp b/modules/codec-json/tests/codec-json.cpp
index 83ec859..375d543 100644
--- a/modules/codec-json/tests/codec-json.cpp
+++ b/modules/codec-json/tests/codec-json.cpp
@@ -1,5 +1,5 @@
-#include <forstio/test/suite.h>
-#include "../c++/json.h"
+#include <forstio/test/suite.hpp>
+#include "../c++/json.hpp"
 
 #include <iostream>
 
diff --git a/modules/codec-minecraft/SConscript b/modules/codec-minecraft/SConscript
index 4d1deab..55f9293 100644
--- a/modules/codec-minecraft/SConscript
+++ b/modules/codec-minecraft/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 codec_minecraft_env = env.Clone();
 
 codec_minecraft_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-codec_minecraft_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+codec_minecraft_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += codec_minecraft_env.sources;
 env.headers += codec_minecraft_env.headers;
diff --git a/modules/codec-minecraft/minecraft.hpp b/modules/codec-minecraft/minecraft.hpp
index c54549e..88566a6 100644
--- a/modules/codec-minecraft/minecraft.hpp
+++ b/modules/codec-minecraft/minecraft.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <forstio/error.h>
-#include <forstio/codec/data.h>
-#include <forstio/codec/stream_value.h>
+#include <forstio/error.hpp>
+#include <forstio/codec/data.hpp>
+#include <forstio/codec/stream_value.hpp>
 
 namespace saw {
 namespace encode {
diff --git a/modules/codec-minecraft/var_int_data.cpp b/modules/codec-minecraft/var_int_data.cpp
index 59e4317..59157e1 100644
--- a/modules/codec-minecraft/var_int_data.cpp
+++ b/modules/codec-minecraft/var_int_data.cpp
@@ -1,4 +1,4 @@
-#include "var_int_data.h"
+#include "var_int_data.hpp"
 
 namespace saw {
 data<schema::VarInt,encode::Native>::data():
diff --git a/modules/codec-minecraft/var_int_data.hpp b/modules/codec-minecraft/var_int_data.hpp
index 4fbdd57..4df52a0 100644
--- a/modules/codec-minecraft/var_int_data.hpp
+++ b/modules/codec-minecraft/var_int_data.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <forstio/data.h>
+#include <forstio/data.hpp>
 
 namespace saw {
 template<>
diff --git a/modules/codec-netcdf/c++/SConscript b/modules/codec-netcdf/c++/SConscript
index fd95267..6d8866b 100644
--- a/modules/codec-netcdf/c++/SConscript
+++ b/modules/codec-netcdf/c++/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 codec_netcdf_env = env.Clone();
 
 codec_netcdf_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-codec_netcdf_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+codec_netcdf_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += codec_netcdf_env.sources;
 env.headers += codec_netcdf_env.headers;
diff --git a/modules/codec-netcdf/c++/netcdf.hpp b/modules/codec-netcdf/c++/netcdf.hpp
index 66d6391..f93eceb 100644
--- a/modules/codec-netcdf/c++/netcdf.hpp
+++ b/modules/codec-netcdf/c++/netcdf.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <forstio/string_literal.h>
-#include <forstio/error.h>
-#include <forstio/codec/data.h>
+#include <forstio/string_literal.hpp>
+#include <forstio/error.hpp>
+#include <forstio/codec/data.hpp>
 
 #include <netcdf.h>
 #include <netcdf_mem.h>
@@ -49,7 +49,7 @@ class codec<Schema, encode::Netcdf>{
 };
 
 }
-#include "netcdf.tmpl.hpp
+#include "netcdf.tmpl.hpp"
 namespace saw {
 
 template<typename... Vals, string_literal... Keys>
diff --git a/modules/codec-netcdf/tests/SConscript b/modules/codec-netcdf/tests/SConscript
index 608c2b7..f8ffc92 100644
--- a/modules/codec-netcdf/tests/SConscript
+++ b/modules/codec-netcdf/tests/SConscript
@@ -15,7 +15,7 @@ test_cases_env = env.Clone();
 test_cases_env.Append(LIBS=['forstio-test']);
 
 test_cases_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-test_cases_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+test_cases_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += test_cases_env.sources;
 env.headers += test_cases_env.headers;
diff --git a/modules/codec-netcdf/tests/codec-netcdf.cpp b/modules/codec-netcdf/tests/codec-netcdf.cpp
index 29ba4fa..fe943bc 100644
--- a/modules/codec-netcdf/tests/codec-netcdf.cpp
+++ b/modules/codec-netcdf/tests/codec-netcdf.cpp
@@ -1,5 +1,5 @@
-#include <forstio/test/suite.h>
-#include "../c++/netcdf.h"
+#include <forstio/test/suite.hpp>
+#include "../c++/netcdf.hpp"
 
 namespace {
 namespace schema {
diff --git a/modules/codec/c++/SConscript b/modules/codec/c++/SConscript
index 14e7b5c..7a44574 100644
--- a/modules/codec/c++/SConscript
+++ b/modules/codec/c++/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 codec_env = env.Clone();
 
 codec_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-codec_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+codec_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += codec_env.sources;
 env.headers += codec_env.headers;
diff --git a/modules/codec/c++/args.hpp b/modules/codec/c++/args.hpp
index fc5037e..eb13459 100644
--- a/modules/codec/c++/args.hpp
+++ b/modules/codec/c++/args.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "schema.hpp
+#include "schema.hpp"
 
 namespace saw {
 namespace encode {
diff --git a/modules/codec/c++/crc32.hpp b/modules/codec/c++/crc32.hpp
index 0d2f72b..6cd8129 100644
--- a/modules/codec/c++/crc32.hpp
+++ b/modules/codec/c++/crc32.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <forstio/common.h>
-#include "schema.hpp
-#include "data.hpp
+#include <forstio/common.hpp>
+#include "schema.hpp"
+#include "data.hpp"
 
 namespace saw {
 namespace algs {
diff --git a/modules/codec/c++/csv.hpp b/modules/codec/c++/csv.hpp
index 1cb4263..3cb11c2 100644
--- a/modules/codec/c++/csv.hpp
+++ b/modules/codec/c++/csv.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <forstio/error.h>
-#include <forstio/buffer.h>
+#include <forstio/error.hpp>
+#include <forstio/buffer.hpp>
 
-#include "data.hpp
-#include "stream_value.hpp
+#include "data.hpp"
+#include "stream_value.hpp"
 
 namespace saw {
 namespace encode {
diff --git a/modules/codec/c++/data.hpp b/modules/codec/c++/data.hpp
index 3aebc89..3fe7494 100644
--- a/modules/codec/c++/data.hpp
+++ b/modules/codec/c++/data.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <forstio/common.h>
-#include <forstio/error.h>
-#include <forstio/templates.h>
+#include <forstio/common.hpp>
+#include <forstio/error.hpp>
+#include <forstio/templates.hpp>
 
 #include <cassert>
 
@@ -11,7 +11,7 @@
 #include <variant>
 #include <vector>
 
-#include "schema.hpp
+#include "schema.hpp"
 
 namespace saw {
 namespace encode {
diff --git a/modules/codec/c++/forst.hpp b/modules/codec/c++/forst.hpp
index aa1532b..0e200cb 100644
--- a/modules/codec/c++/forst.hpp
+++ b/modules/codec/c++/forst.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "data.hpp
+#include "data.hpp"
 
 namespace saw {
 namespace encode {
diff --git a/modules/codec/c++/interface.hpp b/modules/codec/c++/interface.hpp
index 7f7deb4..23eb3be 100644
--- a/modules/codec/c++/interface.hpp
+++ b/modules/codec/c++/interface.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <forstio/error.h>
-#include "schema.hpp
-#include "data.hpp
+#include <forstio/error.hpp>
+#include "schema.hpp"
+#include "data.hpp"
 
 namespace saw {
 template<typename SchemaFunc, typename Encode, typename Func>
diff --git a/modules/codec/c++/schema.hpp b/modules/codec/c++/schema.hpp
index 4549916..1feb951 100644
--- a/modules/codec/c++/schema.hpp
+++ b/modules/codec/c++/schema.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <forstio/common.h>
-#include <forstio/string_literal.h>
+#include <forstio/common.hpp>
+#include <forstio/string_literal.hpp>
 
 namespace saw {
 namespace schema {
diff --git a/modules/codec/c++/schema_factory.hpp b/modules/codec/c++/schema_factory.hpp
index f39c93c..8896fdf 100644
--- a/modules/codec/c++/schema_factory.hpp
+++ b/modules/codec/c++/schema_factory.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "schema.hpp
+#include "schema.hpp"
 
 namespace saw {
 template<typename T>
diff --git a/modules/codec/c++/schema_hash.hpp b/modules/codec/c++/schema_hash.hpp
index c799311..90ab208 100644
--- a/modules/codec/c++/schema_hash.hpp
+++ b/modules/codec/c++/schema_hash.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <forstio/string_literal.h>
-#include "schema.hpp
-#include "crc32.hpp
+#include <forstio/string_literal.hpp>
+#include "schema.hpp"
+#include "crc32.hpp"
 
 namespace saw {
 template<string_literal lit>
diff --git a/modules/codec/c++/schema_stringify.hpp b/modules/codec/c++/schema_stringify.hpp
index c8d8942..05978e3 100644
--- a/modules/codec/c++/schema_stringify.hpp
+++ b/modules/codec/c++/schema_stringify.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "schema.hpp
+#include "schema.hpp"
 
 #include <sstream>
 #include <type_traits>
diff --git a/modules/codec/c++/simple.hpp b/modules/codec/c++/simple.hpp
index 6582f35..b0b353e 100644
--- a/modules/codec/c++/simple.hpp
+++ b/modules/codec/c++/simple.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "data.hpp
-#include "stream_value.hpp
+#include "data.hpp"
+#include "stream_value.hpp"
 
-#include <forstio/buffer.h>
-#include <forstio/error.h>
+#include <forstio/buffer.hpp>
+#include <forstio/error.hpp>
 
 namespace saw {
 namespace encode {
diff --git a/modules/codec/c++/stream_value.hpp b/modules/codec/c++/stream_value.hpp
index 30dff75..80613ea 100644
--- a/modules/codec/c++/stream_value.hpp
+++ b/modules/codec/c++/stream_value.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "schema.hpp
+#include "schema.hpp"
 
-#include <forstio/buffer.h>
-#include <forstio/error.h>
+#include <forstio/buffer.hpp>
+#include <forstio/error.hpp>
 
 #include <cstdint>
 #include <cstring>
diff --git a/modules/codec/tests/SConscript b/modules/codec/tests/SConscript
index 608c2b7..f8ffc92 100644
--- a/modules/codec/tests/SConscript
+++ b/modules/codec/tests/SConscript
@@ -15,7 +15,7 @@ test_cases_env = env.Clone();
 test_cases_env.Append(LIBS=['forstio-test']);
 
 test_cases_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-test_cases_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+test_cases_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += test_cases_env.sources;
 env.headers += test_cases_env.headers;
diff --git a/modules/codec/tests/codec.cpp b/modules/codec/tests/codec.cpp
index 652c55d..b9ac4ea 100644
--- a/modules/codec/tests/codec.cpp
+++ b/modules/codec/tests/codec.cpp
@@ -1,7 +1,7 @@
-#include <forstio/test/suite.h>
-#include "../c++/data.h"
-#include "../c++/simple.h"
-#include "../c++/interface.h"
+#include <forstio/test/suite.hpp>
+#include "../c++/data.hpp"
+#include "../c++/simple.hpp"
+#include "../c++/interface.hpp"
 
 #include <iostream>
 
diff --git a/modules/codec/tests/csv.cpp b/modules/codec/tests/csv.cpp
index a9e8c20..ac394ce 100644
--- a/modules/codec/tests/csv.cpp
+++ b/modules/codec/tests/csv.cpp
@@ -1,6 +1,6 @@
-#include <forstio/test/suite.h>
-#include "../c++/data.h"
-#include "../c++/csv.h"
+#include <forstio/test/suite.hpp>
+#include "../c++/data.hpp"
+#include "../c++/csv.hpp"
 
 #include <iostream>
 
diff --git a/modules/codec/tests/schema.cpp b/modules/codec/tests/schema.cpp
index 31c68f2..408a142 100644
--- a/modules/codec/tests/schema.cpp
+++ b/modules/codec/tests/schema.cpp
@@ -1,8 +1,8 @@
-#include <forstio/test/suite.h>
+#include <forstio/test/suite.hpp>
 
-#include <forstio/templates.h>
-#include "../c++/schema.h"
-#include "../c++/schema_hash.h"
+#include <forstio/templates.hpp>
+#include "../c++/schema.hpp"
+#include "../c++/schema_hash.hpp"
 
 namespace {
 template<typename T>
diff --git a/modules/core/c++/SConscript b/modules/core/c++/SConscript
index 3f9bd92..b1ea69e 100644
--- a/modules/core/c++/SConscript
+++ b/modules/core/c++/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 core_env = env.Clone();
 
 core_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-core_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+core_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += core_env.sources;
 env.headers += core_env.headers;
diff --git a/modules/core/c++/error.cpp b/modules/core/c++/error.cpp
index 360e628..192cab6 100644
--- a/modules/core/c++/error.cpp
+++ b/modules/core/c++/error.cpp
@@ -1,4 +1,4 @@
-#include "error.h"
+#include "error.hpp"
 
 namespace saw {
 error::error(error::code code_, bool is_critical__)
diff --git a/modules/core/c++/error.hpp b/modules/core/c++/error.hpp
index 798b923..790281d 100644
--- a/modules/core/c++/error.hpp
+++ b/modules/core/c++/error.hpp
@@ -9,7 +9,7 @@
 
 #include <cassert>
 
-#include "common.hpp
+#include "common.hpp"
 
 namespace saw {
 /**
diff --git a/modules/core/c++/id_map.hpp b/modules/core/c++/id_map.hpp
index 0ffe4e0..6172840 100644
--- a/modules/core/c++/id_map.hpp
+++ b/modules/core/c++/id_map.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "id.hpp
-#include "error.hpp
+#include "id.hpp"
+#include "error.hpp"
 
 #include <deque>
 
diff --git a/modules/core/c++/mcts.hpp b/modules/core/c++/mcts.hpp
index bfb7459..2594140 100644
--- a/modules/core/c++/mcts.hpp
+++ b/modules/core/c++/mcts.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "tree.hpp
+#include "tree.hpp"
 
 namespace saw {
 template<typename T>
diff --git a/modules/core/c++/platonic.hpp b/modules/core/c++/platonic.hpp
index a84a080..9434319 100644
--- a/modules/core/c++/platonic.hpp
+++ b/modules/core/c++/platonic.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "error.hpp
+#include "error.hpp"
 
 namespace saw {
 namespace impl {
diff --git a/modules/core/c++/templates.hpp b/modules/core/c++/templates.hpp
index 9baaf9f..a448911 100644
--- a/modules/core/c++/templates.hpp
+++ b/modules/core/c++/templates.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "string_literal.hpp
+#include "string_literal.hpp"
 
 namespace saw {
 
diff --git a/modules/core/c++/test/SConscript b/modules/core/c++/test/SConscript
index 1c4de76..e8dac6a 100644
--- a/modules/core/c++/test/SConscript
+++ b/modules/core/c++/test/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 test_env = env.Clone();
 
 test_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-test_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+test_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += test_env.sources;
 env.headers += test_env.headers;
diff --git a/modules/core/c++/test/suite.cpp b/modules/core/c++/test/suite.cpp
index 0fca8f9..090d5cb 100644
--- a/modules/core/c++/test/suite.cpp
+++ b/modules/core/c++/test/suite.cpp
@@ -1,4 +1,4 @@
-#include "suite.h"
+#include "suite.hpp"
 
 #include <map>
 #include <string>
diff --git a/modules/core/c++/test/suite.hpp b/modules/core/c++/test/suite.hpp
index fd6ca68..38a4716 100644
--- a/modules/core/c++/test/suite.hpp
+++ b/modules/core/c++/test/suite.hpp
@@ -5,7 +5,7 @@
 #include <stdexcept>
 #include <type_traits>
 
-#include "../common.hpp
+#include "../common.hpp"
 
 namespace saw {
 namespace test {
diff --git a/modules/core/c++/tree.hpp b/modules/core/c++/tree.hpp
index 4a721b5..8ed25a5 100644
--- a/modules/core/c++/tree.hpp
+++ b/modules/core/c++/tree.hpp
@@ -3,7 +3,7 @@
 #include <variant>
 #include <vector>
 
-#include "error.hpp
+#include "error.hpp"
 
 namespace saw {
 /**
diff --git a/modules/core/tests/SConscript b/modules/core/tests/SConscript
index cec3132..b14b75d 100644
--- a/modules/core/tests/SConscript
+++ b/modules/core/tests/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 test_cases_env = env.Clone();
 
 test_cases_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-test_cases_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+test_cases_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += test_cases_env.sources;
 env.headers += test_cases_env.headers;
diff --git a/modules/core/tests/core.cpp b/modules/core/tests/core.cpp
index 2b63b94..48a25ea 100644
--- a/modules/core/tests/core.cpp
+++ b/modules/core/tests/core.cpp
@@ -1,7 +1,7 @@
-#include "../c++/test/suite.h"
-#include "../c++/id.h"
-#include "../c++/id_map.h"
-#include "../c++/string_literal.h"
+#include "../c++/test/suite.hpp"
+#include "../c++/id.hpp"
+#include "../c++/id_map.hpp"
+#include "../c++/string_literal.hpp"
 
 namespace {
 SAW_TEST("ID functionality") {
diff --git a/modules/core/tests/tree.cpp b/modules/core/tests/tree.cpp
index 78f72ef..b9b15e4 100644
--- a/modules/core/tests/tree.cpp
+++ b/modules/core/tests/tree.cpp
@@ -1,5 +1,5 @@
-#include "../c++/test/suite.h"
-#include "../c++/tree.h"
+#include "../c++/test/suite.hpp"
+#include "../c++/tree.hpp"
 
 namespace {
 SAW_TEST("Tree add child"){
diff --git a/modules/device-hip/c++/SConscript b/modules/device-hip/c++/SConscript
index 57d3992..b66ce79 100644
--- a/modules/device-hip/c++/SConscript
+++ b/modules/device-hip/c++/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 dev_hip_env = env.Clone();
 
 dev_hip_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-dev_hip_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+dev_hip_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += dev_hip_env.sources;
 env.headers += dev_hip_env.headers;
diff --git a/modules/device-hip/c++/rpc.hpp b/modules/device-hip/c++/rpc.hpp
index 0bcda0c..5bce553 100644
--- a/modules/device-hip/c++/rpc.hpp
+++ b/modules/device-hip/c++/rpc.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <hip.h>
+#include <hip.hpp>
 
 namespace saw {
 namespace rmt {
diff --git a/modules/device-hip/tests/SConscript b/modules/device-hip/tests/SConscript
index 608c2b7..f8ffc92 100644
--- a/modules/device-hip/tests/SConscript
+++ b/modules/device-hip/tests/SConscript
@@ -15,7 +15,7 @@ test_cases_env = env.Clone();
 test_cases_env.Append(LIBS=['forstio-test']);
 
 test_cases_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-test_cases_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+test_cases_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += test_cases_env.sources;
 env.headers += test_cases_env.headers;
diff --git a/modules/io-fs/SConscript b/modules/io-fs/SConscript
index 0d85f62..dfc3b76 100644
--- a/modules/io-fs/SConscript
+++ b/modules/io-fs/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 io_env = env.Clone();
 
 io_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-io_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+io_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += io_env.sources;
 env.headers += io_env.headers;
diff --git a/modules/io-tls/SConscript b/modules/io-tls/SConscript
index 4f88f37..f823103 100644
--- a/modules/io-tls/SConscript
+++ b/modules/io-tls/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 io_tls_env = env.Clone();
 
 io_tls_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-io_tls_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+io_tls_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += io_tls_env.sources;
 env.headers += io_tls_env.headers;
diff --git a/modules/io-tls/tls.cpp b/modules/io-tls/tls.cpp
index 9fa143c..57406e3 100644
--- a/modules/io-tls/tls.cpp
+++ b/modules/io-tls/tls.cpp
@@ -1,9 +1,9 @@
-#include "tls.h"
+#include "tls.hpp"
 
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
-#include <forstio/io/io_helpers.h>
+#include <forstio/io/io_helpers.hpp>
 
 #include <cassert>
 
diff --git a/modules/io-tls/tls.hpp b/modules/io-tls/tls.hpp
index b7d575b..5313bf7 100644
--- a/modules/io-tls/tls.hpp
+++ b/modules/io-tls/tls.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <forstio/common.h>
-#include <forstio/io/io.h>
+#include <forstio/common.hpp>
+#include <forstio/io/io.hpp>
 
 #include <optional>
 #include <variant>
diff --git a/modules/io/SConscript b/modules/io/SConscript
index 62ad58a..cb10119 100644
--- a/modules/io/SConscript
+++ b/modules/io/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 io_env = env.Clone();
 
 io_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-io_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+io_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += io_env.sources;
 env.headers += io_env.headers;
diff --git a/modules/io/io.cpp b/modules/io/io.cpp
index f0705d2..06c9cbb 100644
--- a/modules/io/io.cpp
+++ b/modules/io/io.cpp
@@ -1,4 +1,4 @@
-#include "io.h"
+#include "io.hpp"
 
 #include <cassert>
 
diff --git a/modules/io/io.hpp b/modules/io/io.hpp
index e2022be..ea185a8 100644
--- a/modules/io/io.hpp
+++ b/modules/io/io.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <forstio/async/async.h>
-#include <forstio/common.h>
-#include "io_helpers.hpp
+#include <forstio/async/async.hpp>
+#include <forstio/common.hpp>
+#include "io_helpers.hpp"
 
 #include <string>
 #include <variant>
diff --git a/modules/io/io_helpers.cpp b/modules/io/io_helpers.cpp
index c2cf2be..975dbcb 100644
--- a/modules/io/io_helpers.cpp
+++ b/modules/io/io_helpers.cpp
@@ -1,6 +1,6 @@
-#include "io_helpers.h"
+#include "io_helpers.hpp"
 
-#include "io.h"
+#include "io.hpp"
 
 #include <cassert>
 
diff --git a/modules/io/io_helpers.hpp b/modules/io/io_helpers.hpp
index 761ee35..4f45382 100644
--- a/modules/io/io_helpers.hpp
+++ b/modules/io/io_helpers.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <forstio/async/async.h>
-#include <forstio/common.h>
+#include <forstio/async/async.hpp>
+#include <forstio/common.hpp>
 
 #include <cstdint>
 #include <optional>
diff --git a/modules/io/io_unix.cpp b/modules/io/io_unix.cpp
index c3b4f17..8afdae9 100644
--- a/modules/io/io_unix.cpp
+++ b/modules/io/io_unix.cpp
@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "io.h"
+#include "io.hpp"
 
 namespace saw {
 namespace unix {
diff --git a/modules/io_codec/SConscript b/modules/io_codec/SConscript
index 0afd6d6..2a277cb 100644
--- a/modules/io_codec/SConscript
+++ b/modules/io_codec/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 io_env = env.Clone();
 
 io_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-io_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+io_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += io_env.sources;
 env.headers += io_env.headers;
diff --git a/modules/io_codec/io_peer.hpp b/modules/io_codec/io_peer.hpp
index 46a7d11..9ba623f 100644
--- a/modules/io_codec/io_peer.hpp
+++ b/modules/io_codec/io_peer.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <forstio/async/async.h>
-#include <forstio/buffer.h>
-#include <forsto/io/io.h>
-#include <forstio/schema/message.h>
+#include <forstio/async/async.hpp>
+#include <forstio/buffer.hpp>
+#include <forsto/io/io.hpp>
+#include <forstio/schema/message.hpp>
 
 namespace saw {
 
@@ -101,4 +101,4 @@ new_streaming_io_peer(own<async_io_stream> stream);
 
 } // namespace saw
 
-#include "io_peer.tmpl.hpp
+#include "io_peer.tmpl.hpp"
diff --git a/modules/io_codec/rpc.hpp b/modules/io_codec/rpc.hpp
index 020bf96..eec149f 100644
--- a/modules/io_codec/rpc.hpp
+++ b/modules/io_codec/rpc.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <forstio/codec/rpc.h>
+#include <forstio/codec/rpc.hpp>
 
 namespace saw {
 namespace rmt {
diff --git a/modules/tools/SConscript b/modules/tools/SConscript
index 7c9efd7..9b1ad89 100644
--- a/modules/tools/SConscript
+++ b/modules/tools/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 tools_env = env.Clone();
 
 tools_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-tools_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+tools_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += tools_env.sources;
 env.headers += tools_env.headers;
diff --git a/modules/tools/c_gen_iface.hpp b/modules/tools/c_gen_iface.hpp
index 8bdbca9..f9ff219 100644
--- a/modules/tools/c_gen_iface.hpp
+++ b/modules/tools/c_gen_iface.hpp
@@ -1,6 +1,6 @@
-#include <forstio/error.h>
-#include <forstio/templates.h>
-#include <forstio/codec/schema.h>
+#include <forstio/error.hpp>
+#include <forstio/templates.hpp>
+#include <forstio/codec/schema.hpp>
 
 #include <string>
 #include <sstream>
@@ -8,7 +8,7 @@
 
 #include <iostream>
 
-#include <forstio/codec/schema_stringify.h>
+#include <forstio/codec/schema_stringify.hpp>
 
 namespace saw {
 
diff --git a/modules/tools/cli_analyzer.hpp b/modules/tools/cli_analyzer.hpp
index 7f3f013..402f03c 100644
--- a/modules/tools/cli_analyzer.hpp
+++ b/modules/tools/cli_analyzer.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <forstio/codec/schema.h>
+#include <forstio/codec/schema.hpp>
 
 #include <iostream>
 
diff --git a/modules/window-opengl/SConscript b/modules/window-opengl/SConscript
index 7beee1a..1985c0f 100644
--- a/modules/window-opengl/SConscript
+++ b/modules/window-opengl/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 window_env = env.Clone();
 
 window_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-window_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+window_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += window_env.sources;
 env.headers += window_env.headers;
diff --git a/modules/window-opengl/gl_xcb.cpp b/modules/window-opengl/gl_xcb.cpp
index 5ea03f3..bddb4bb 100644
--- a/modules/window-opengl/gl_xcb.cpp
+++ b/modules/window-opengl/gl_xcb.cpp
@@ -1,4 +1,4 @@
-#include "gl_xcb.h"
+#include "gl_xcb.hpp"
 
 #include <cassert>
 #include <cstdint>
diff --git a/modules/window-opengl/gl_xcb.hpp b/modules/window-opengl/gl_xcb.hpp
index a737e41..79f182c 100644
--- a/modules/window-opengl/gl_xcb.hpp
+++ b/modules/window-opengl/gl_xcb.hpp
@@ -1,16 +1,16 @@
 #pragma once
 
-#include <forstio/window/xcb.h>
+#include <forstio/window/xcb.hpp>
 
 #ifndef SAW_OGL
 #error "OpenGL is not supported"
 #endif
 
-#include "gl_backends.hpp
-#include "gl_context.hpp
-#include "gl_window.hpp
+#include "gl_backends.hpp"
+#include "gl_context.hpp"
+#include "gl_window.hpp"
 
-#include <GL/glx.h>
+#include <GL/glx.hpp>
 
 namespace saw {
 namespace gfx {
diff --git a/modules/window/c++/SConscript b/modules/window/c++/SConscript
index 10d88c6..0147ff5 100644
--- a/modules/window/c++/SConscript
+++ b/modules/window/c++/SConscript
@@ -13,7 +13,7 @@ dir_path = Dir('.').abspath
 window_env = env.Clone();
 
 window_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
-window_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+window_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
 
 env.sources += window_env.sources;
 env.headers += window_env.headers;
diff --git a/modules/window/c++/device.hpp b/modules/window/c++/device.hpp
index f2524db..cfcc2e2 100644
--- a/modules/window/c++/device.hpp
+++ b/modules/window/c++/device.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "window.hpp
+#include "window.hpp"
 
-#include <forstio/async/async.h>
-#include <forstio/common.h>
-#include <forstio/codec/data.h>
-#include <forstio/io/io.h>
+#include <forstio/async/async.hpp>
+#include <forstio/common.hpp>
+#include <forstio/codec/data.hpp>
+#include <forstio/io/io.hpp>
 
 #include <string_view>
 #include <variant>
diff --git a/modules/window/c++/linux_xcb.hpp b/modules/window/c++/linux_xcb.hpp
index 534404c..5dd688d 100644
--- a/modules/window/c++/linux_xcb.hpp
+++ b/modules/window/c++/linux_xcb.hpp
@@ -1,5 +1,5 @@
 #pragma once
 
 #ifdef SAW_UNIX_XCB
-#include "xcb.hpp
+#include "xcb.hpp"
 #endif
diff --git a/modules/window/c++/window.hpp b/modules/window/c++/window.hpp
index 4637ea7..68c625e 100644
--- a/modules/window/c++/window.hpp
+++ b/modules/window/c++/window.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "video_mode.hpp
+#include "video_mode.hpp"
 
-#include <forstio/async/async.h>
-#include <forstio/common.h>
-#include <forstio/codec/schema.h>
+#include <forstio/async/async.hpp>
+#include <forstio/common.hpp>
+#include <forstio/codec/schema.hpp>
 
 #include <string_view>
 #include <variant>
@@ -27,7 +27,7 @@ class window;
 }
 }
 
-#include "linux_xcb.hpp
+#include "linux_xcb.hpp"
 
 /**
 namespace saw {
diff --git a/modules/window/c++/xcb.cpp b/modules/window/c++/xcb.cpp
index 1b804ba..e90fa5a 100644
--- a/modules/window/c++/xcb.cpp
+++ b/modules/window/c++/xcb.cpp
@@ -2,7 +2,7 @@
 #error "XCB is not supported"
 #endif
 
-#include "xcb.h"
+#include "xcb.hpp"
 
 namespace saw {
 namespace gfx {
diff --git a/modules/window/c++/xcb.hpp b/modules/window/c++/xcb.hpp
index 4c7b9fa..1694923 100644
--- a/modules/window/c++/xcb.hpp
+++ b/modules/window/c++/xcb.hpp
@@ -4,14 +4,14 @@
 #error "XCB is not supported"
 #endif
 
-#include "backends.hpp
-#include "device.hpp
-#include "window.hpp
+#include "backends.hpp"
+#include "device.hpp"
+#include "window.hpp"
 
 #include <map>
 
-#include <X11/Xlib-xcb.h>
-#include <X11/Xlib.h>
+#include <X11/Xlib-xcb.hpp>
+#include <X11/Xlib.hpp>
 
 namespace saw {
 namespace gfx {
-- 
cgit v1.2.3