diff --git a/library/api/CMakeLists.txt b/library/api/CMakeLists.txt
index 14a63952..ae4d4a0b 100755
--- a/library/api/CMakeLists.txt
+++ b/library/api/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_api STATIC)
 # Public include headers
 target_include_directories(minecpp_api
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp
 )
 
 # Source subdirectory
diff --git a/library/api/src/nbt/block/Block.schema.cpp b/library/api/src/nbt/block/Block.schema.cpp
index cff578a2..da3ac2da 100644
--- a/library/api/src/nbt/block/Block.schema.cpp
+++ b/library/api/src/nbt/block/Block.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/block/Block.schema.h"
+#include <minecpp/nbt/block/Block.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::block {
diff --git a/library/api/src/nbt/block/BlockState.schema.cpp b/library/api/src/nbt/block/BlockState.schema.cpp
index cd6af320..49453a8c 100644
--- a/library/api/src/nbt/block/BlockState.schema.cpp
+++ b/library/api/src/nbt/block/BlockState.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/block/BlockState.schema.h"
+#include <minecpp/nbt/block/BlockState.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::block {
diff --git a/library/api/src/nbt/chunk/Chunk.schema.cpp b/library/api/src/nbt/chunk/Chunk.schema.cpp
index 40f1e677..d41eba9d 100644
--- a/library/api/src/nbt/chunk/Chunk.schema.cpp
+++ b/library/api/src/nbt/chunk/Chunk.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/chunk/Chunk.schema.h"
+#include <minecpp/nbt/chunk/Chunk.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::chunk {
diff --git a/library/api/src/nbt/common/Common.schema.cpp b/library/api/src/nbt/common/Common.schema.cpp
index 64b3e398..124d0769 100644
--- a/library/api/src/nbt/common/Common.schema.cpp
+++ b/library/api/src/nbt/common/Common.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/common/Common.schema.h"
+#include <minecpp/nbt/common/Common.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::common {
diff --git a/library/api/src/nbt/item/Item.schema.cpp b/library/api/src/nbt/item/Item.schema.cpp
index e9115143..26900f7a 100644
--- a/library/api/src/nbt/item/Item.schema.cpp
+++ b/library/api/src/nbt/item/Item.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/item/Item.schema.h"
+#include <minecpp/nbt/item/Item.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::item {
diff --git a/library/api/src/nbt/level/Level.schema.cpp b/library/api/src/nbt/level/Level.schema.cpp
index 4beebbab..e6513e4f 100644
--- a/library/api/src/nbt/level/Level.schema.cpp
+++ b/library/api/src/nbt/level/Level.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/level/Level.schema.h"
+#include <minecpp/nbt/level/Level.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::level {
diff --git a/library/api/src/nbt/player/Player.schema.cpp b/library/api/src/nbt/player/Player.schema.cpp
index c0945e39..821394a9 100644
--- a/library/api/src/nbt/player/Player.schema.cpp
+++ b/library/api/src/nbt/player/Player.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/player/Player.schema.h"
+#include <minecpp/nbt/player/Player.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::player {
diff --git a/library/api/src/nbt/repository/Biome.schema.cpp b/library/api/src/nbt/repository/Biome.schema.cpp
index 3c7d30a4..f1782a46 100644
--- a/library/api/src/nbt/repository/Biome.schema.cpp
+++ b/library/api/src/nbt/repository/Biome.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Biome.schema.h"
+#include <minecpp/nbt/repository/Biome.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {
diff --git a/library/api/src/nbt/repository/Chat.schema.cpp b/library/api/src/nbt/repository/Chat.schema.cpp
index 7925f23e..c1bf65ce 100644
--- a/library/api/src/nbt/repository/Chat.schema.cpp
+++ b/library/api/src/nbt/repository/Chat.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Chat.schema.h"
+#include <minecpp/nbt/repository/Chat.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {
diff --git a/library/api/src/nbt/repository/Damage.schema.cpp b/library/api/src/nbt/repository/Damage.schema.cpp
index 0db199af..f4eee651 100644
--- a/library/api/src/nbt/repository/Damage.schema.cpp
+++ b/library/api/src/nbt/repository/Damage.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Damage.schema.h"
+#include <minecpp/nbt/repository/Damage.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {
diff --git a/library/api/src/nbt/repository/Dimension.schema.cpp b/library/api/src/nbt/repository/Dimension.schema.cpp
index 9325c215..58b960c5 100644
--- a/library/api/src/nbt/repository/Dimension.schema.cpp
+++ b/library/api/src/nbt/repository/Dimension.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Dimension.schema.h"
+#include <minecpp/nbt/repository/Dimension.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {
diff --git a/library/api/src/nbt/repository/Registry.schema.cpp b/library/api/src/nbt/repository/Registry.schema.cpp
index 2889c2f4..9e212a41 100644
--- a/library/api/src/nbt/repository/Registry.schema.cpp
+++ b/library/api/src/nbt/repository/Registry.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Registry.schema.h"
+#include <minecpp/nbt/repository/Registry.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {
diff --git a/library/api/src/nbt/repository/Repository.schema.cpp b/library/api/src/nbt/repository/Repository.schema.cpp
index 91d3e3fd..333a7a3e 100644
--- a/library/api/src/nbt/repository/Repository.schema.cpp
+++ b/library/api/src/nbt/repository/Repository.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Repository.schema.h"
+#include <minecpp/nbt/repository/Repository.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {
diff --git a/library/api/src/nbt/repository/Trim.schema.cpp b/library/api/src/nbt/repository/Trim.schema.cpp
index 3dfbbafa..dc039fcd 100644
--- a/library/api/src/nbt/repository/Trim.schema.cpp
+++ b/library/api/src/nbt/repository/Trim.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Trim.schema.h"
+#include <minecpp/nbt/repository/Trim.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {
diff --git a/library/api/src/nbt/trace/Trace.schema.cpp b/library/api/src/nbt/trace/Trace.schema.cpp
index 94cfa784..89153555 100644
--- a/library/api/src/nbt/trace/Trace.schema.cpp
+++ b/library/api/src/nbt/trace/Trace.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/trace/Trace.schema.h"
+#include <minecpp/nbt/trace/Trace.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::trace {
diff --git a/library/api/src/net/Chunk.schema.cpp b/library/api/src/net/Chunk.schema.cpp
index 62522d00..683519e9 100644
--- a/library/api/src/net/Chunk.schema.cpp
+++ b/library/api/src/net/Chunk.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/Chunk.schema.h"
+#include <minecpp/net/Chunk.schema.h>
 #include <algorithm>
 
 namespace minecpp::net {
diff --git a/library/api/src/net/Common.schema.cpp b/library/api/src/net/Common.schema.cpp
index 690e7b39..44b80936 100644
--- a/library/api/src/net/Common.schema.cpp
+++ b/library/api/src/net/Common.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/Common.schema.h"
+#include <minecpp/net/Common.schema.h>
 #include <algorithm>
 
 namespace minecpp::net {
diff --git a/library/api/src/net/engine/Clientbound.schema.cpp b/library/api/src/net/engine/Clientbound.schema.cpp
index e90f629a..de49834e 100644
--- a/library/api/src/net/engine/Clientbound.schema.cpp
+++ b/library/api/src/net/engine/Clientbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/engine/Clientbound.schema.h"
+#include <minecpp/net/engine/Clientbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::engine::cb {
diff --git a/library/api/src/net/engine/Serverbound.schema.cpp b/library/api/src/net/engine/Serverbound.schema.cpp
index ec9c42f1..1ed006d6 100644
--- a/library/api/src/net/engine/Serverbound.schema.cpp
+++ b/library/api/src/net/engine/Serverbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/engine/Serverbound.schema.h"
+#include <minecpp/net/engine/Serverbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::engine::sb {
diff --git a/library/api/src/net/login/Clientbound.schema.cpp b/library/api/src/net/login/Clientbound.schema.cpp
index 4ea41ac9..97fc6e81 100644
--- a/library/api/src/net/login/Clientbound.schema.cpp
+++ b/library/api/src/net/login/Clientbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/login/Clientbound.schema.h"
+#include <minecpp/net/login/Clientbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::login::cb {
diff --git a/library/api/src/net/login/Serverbound.schema.cpp b/library/api/src/net/login/Serverbound.schema.cpp
index 07e6e20a..cafb2567 100644
--- a/library/api/src/net/login/Serverbound.schema.cpp
+++ b/library/api/src/net/login/Serverbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/login/Serverbound.schema.h"
+#include <minecpp/net/login/Serverbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::login::sb {
diff --git a/library/api/src/net/play/Clientbound.schema.cpp b/library/api/src/net/play/Clientbound.schema.cpp
index 00c0514d..c73a6139 100644
--- a/library/api/src/net/play/Clientbound.schema.cpp
+++ b/library/api/src/net/play/Clientbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/play/Clientbound.schema.h"
+#include <minecpp/net/play/Clientbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::play::cb {
diff --git a/library/api/src/net/play/Common.schema.cpp b/library/api/src/net/play/Common.schema.cpp
index ae799308..b122c060 100644
--- a/library/api/src/net/play/Common.schema.cpp
+++ b/library/api/src/net/play/Common.schema.cpp
@@ -1,4 +1,4 @@
-#include "net/play/Common.schema.h"
+#include <minecpp/net/play/Common.schema.h>
 #include "minecpp/network/NetworkUtil.h"
 #include <algorithm>
 
diff --git a/library/api/src/net/play/Serverbound.schema.cpp b/library/api/src/net/play/Serverbound.schema.cpp
index 59fca66f..ce7f1c34 100644
--- a/library/api/src/net/play/Serverbound.schema.cpp
+++ b/library/api/src/net/play/Serverbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/play/Serverbound.schema.h"
+#include <minecpp/net/play/Serverbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::play::sb {
diff --git a/library/api/src/net/status/Clientbound.schema.cpp b/library/api/src/net/status/Clientbound.schema.cpp
index 943208d4..8ef597ef 100644
--- a/library/api/src/net/status/Clientbound.schema.cpp
+++ b/library/api/src/net/status/Clientbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/status/Clientbound.schema.h"
+#include <minecpp/net/status/Clientbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::status::cb {
diff --git a/library/api/src/net/status/Serverbound.schema.cpp b/library/api/src/net/status/Serverbound.schema.cpp
index 17a58d9c..f0767fc2 100644
--- a/library/api/src/net/status/Serverbound.schema.cpp
+++ b/library/api/src/net/status/Serverbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/status/Serverbound.schema.h"
+#include <minecpp/net/status/Serverbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::status::sb {
diff --git a/library/api/src/net/storage/Clientbound.schema.cpp b/library/api/src/net/storage/Clientbound.schema.cpp
index e9cf60a0..e90b4ec2 100644
--- a/library/api/src/net/storage/Clientbound.schema.cpp
+++ b/library/api/src/net/storage/Clientbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/storage/Clientbound.schema.h"
+#include <minecpp/net/storage/Clientbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::storage::cb {
diff --git a/library/api/src/net/storage/Serverbound.schema.cpp b/library/api/src/net/storage/Serverbound.schema.cpp
index f3cb2986..309b1353 100644
--- a/library/api/src/net/storage/Serverbound.schema.cpp
+++ b/library/api/src/net/storage/Serverbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/storage/Serverbound.schema.h"
+#include <minecpp/net/storage/Serverbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::storage::sb {
diff --git a/library/chat/CMakeLists.txt b/library/chat/CMakeLists.txt
index 0c9db1a6..4dfa7a14 100755
--- a/library/chat/CMakeLists.txt
+++ b/library/chat/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_chat STATIC)
 # Public include headers
 target_include_directories(minecpp_chat
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/chat
 )
 
 # Source subdirectory
diff --git a/library/command/CMakeLists.txt b/library/command/CMakeLists.txt
index 5cc33772..c4a8dae2 100755
--- a/library/command/CMakeLists.txt
+++ b/library/command/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_command STATIC)
 # Public include headers
 target_include_directories(minecpp_command
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/command
 )
 
 # Source subdirectory
diff --git a/library/command/src/core/Core.cpp b/library/command/src/core/Core.cpp
index 31a63cf4..403cb51b 100644
--- a/library/command/src/core/Core.cpp
+++ b/library/command/src/core/Core.cpp
@@ -1,18 +1,17 @@
-#include "core/Core.h"
-
-#include "CommandManager.h"
-#include "core/Cord.h"
-#include "core/DecimateBlocks.h"
-#include "core/Echo.h"
-#include "core/Fly.h"
-#include "core/Format.h"
-#include "core/Give.h"
-#include "core/KillAll.h"
-#include "core/ListEntities.h"
-#include "core/ReloadChunk.h"
-#include "core/Spawn.h"
-#include "core/Sync.h"
-#include "core/Teleport.h"
+#include <minecpp/command/core/Core.h>
+#include <minecpp/command/CommandManager.h>
+#include <minecpp/command/core/Cord.h>
+#include <minecpp/command/core/DecimateBlocks.h>
+#include <minecpp/command/core/Echo.h>
+#include <minecpp/command/core/Fly.h>
+#include <minecpp/command/core/Format.h>
+#include <minecpp/command/core/Give.h>
+#include <minecpp/command/core/KillAll.h>
+#include <minecpp/command/core/ListEntities.h>
+#include <minecpp/command/core/ReloadChunk.h>
+#include <minecpp/command/core/Spawn.h>
+#include <minecpp/command/core/Sync.h>
+#include <minecpp/command/core/Teleport.h>
 
 namespace minecpp::command::core {
 
diff --git a/library/command/src/core/DecimateBlocks.cpp b/library/command/src/core/DecimateBlocks.cpp
index 81858899..3eed1bc1 100644
--- a/library/command/src/core/DecimateBlocks.cpp
+++ b/library/command/src/core/DecimateBlocks.cpp
@@ -1,5 +1,5 @@
-#include "core/DecimateBlocks.h"
-#include "RuntimeContext.h"
+#include <minecpp/command/core/DecimateBlocks.h>
+#include <minecpp/command/RuntimeContext.h>
 
 #include "minecpp/entity/Aliases.hpp"
 #include "minecpp/entity/component/Abilities.h"
diff --git a/library/command/test/CMakeLists.txt b/library/command/test/CMakeLists.txt
index 7cc3d684..046c605d 100644
--- a/library/command/test/CMakeLists.txt
+++ b/library/command/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_command_test)
 # Public include headers
 target_include_directories(minecpp_command_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/command_test
 )
 
 # Source subdirectory
diff --git a/library/container/CMakeLists.txt b/library/container/CMakeLists.txt
index 2eeb5886..86428c9b 100755
--- a/library/container/CMakeLists.txt
+++ b/library/container/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_container STATIC)
 # Public include headers
 target_include_directories(minecpp_container
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/container
 )
 
 # Source subdirectory
diff --git a/library/container/test/CMakeLists.txt b/library/container/test/CMakeLists.txt
index 4f9bb8ac..d300df3b 100755
--- a/library/container/test/CMakeLists.txt
+++ b/library/container/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_container_test)
 # Public include headers
 target_include_directories(minecpp_container_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/container_test
 )
 
 # Source subdirectory
diff --git a/library/controller/CMakeLists.txt b/library/controller/CMakeLists.txt
index 82692b74..9e383a42 100755
--- a/library/controller/CMakeLists.txt
+++ b/library/controller/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_controller STATIC)
 # Public include headers
 target_include_directories(minecpp_controller
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/controller
 )
 
 # Source subdirectory
diff --git a/library/controller/src/block/Block.cpp b/library/controller/src/block/Block.cpp
index ca28ab54..aa95c21b 100644
--- a/library/controller/src/block/Block.cpp
+++ b/library/controller/src/block/Block.cpp
@@ -1,14 +1,14 @@
-#include "block/Block.h"
-#include "block/Door.h"
-#include "block/Fence.h"
-#include "block/Foliage.h"
-#include "block/Grass.h"
-#include "block/Slab.h"
-#include "block/Stairs.h"
-#include "block/Torch.h"
-#include "block/TrapDoor.h"
-#include "block/Wood.h"
-#include "BlockManager.h"
+#include <minecpp/controller/block/Block.h>
+#include <minecpp/controller/block/Door.h>
+#include <minecpp/controller/block/Fence.h>
+#include <minecpp/controller/block/Foliage.h>
+#include <minecpp/controller/block/Grass.h>
+#include <minecpp/controller/block/Slab.h>
+#include <minecpp/controller/block/Stairs.h>
+#include <minecpp/controller/block/Torch.h>
+#include <minecpp/controller/block/TrapDoor.h>
+#include <minecpp/controller/block/Wood.h>
+#include <minecpp/controller/BlockManager.h>
 #include "minecpp/repository/Block.h"
 #include <spdlog/spdlog.h>
 
diff --git a/library/controller/src/block/Foliage.cpp b/library/controller/src/block/Foliage.cpp
index bb1b3b28..021d9b4f 100644
--- a/library/controller/src/block/Foliage.cpp
+++ b/library/controller/src/block/Foliage.cpp
@@ -1,4 +1,4 @@
-#include "block/Foliage.h"
+#include <minecpp/controller/block/Foliage.h>
 
 #include "minecpp/world/BlockState.h"
 
diff --git a/library/controller/src/item/Item.cpp b/library/controller/src/item/Item.cpp
index 8991439f..59855a05 100644
--- a/library/controller/src/item/Item.cpp
+++ b/library/controller/src/item/Item.cpp
@@ -1,9 +1,9 @@
-#include "item/Item.h"
-#include "item/Bow.h"
-#include "item/Food.h"
-#include "item/Sword.h"
+#include <minecpp/controller/item/Item.h>
+#include <minecpp/controller/item/Bow.h>
+#include <minecpp/controller/item/Food.h>
+#include <minecpp/controller/item/Sword.h>
 #include "minecpp/repository/Item.h"
-#include "RootItem.h"
+#include <minecpp/controller/RootItem.h>
 
 namespace minecpp::controller::item {
 
diff --git a/library/crypto/CMakeLists.txt b/library/crypto/CMakeLists.txt
index b9f73471..aea4e3be 100755
--- a/library/crypto/CMakeLists.txt
+++ b/library/crypto/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_crypto STATIC)
 # Public include headers
 target_include_directories(minecpp_crypto
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/crypto
 )
 
 # Source subdirectory
diff --git a/library/crypto/test/CMakeLists.txt b/library/crypto/test/CMakeLists.txt
index ca91c62b..dc00b10c 100755
--- a/library/crypto/test/CMakeLists.txt
+++ b/library/crypto/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_crypto_test)
 # Public include headers
 target_include_directories(minecpp_crypto_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/crypto_test
 )
 
 # Source subdirectory
diff --git a/library/debug/CMakeLists.txt b/library/debug/CMakeLists.txt
index 77c030cb..e88508f1 100644
--- a/library/debug/CMakeLists.txt
+++ b/library/debug/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_debug STATIC)
 # Public include headers
 target_include_directories(minecpp_debug
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/debug
 )
 
 # Source subdirectory
diff --git a/library/debug/src/TraceManager.cpp b/library/debug/src/TraceManager.cpp
index b84b3d99..687b248d 100644
--- a/library/debug/src/TraceManager.cpp
+++ b/library/debug/src/TraceManager.cpp
@@ -1,4 +1,4 @@
-#include "TraceManager.h"
+#include <minecpp/debug/TraceManager.h>
 
 #include <cassert>
 
diff --git a/library/debug/test/CMakeLists.txt b/library/debug/test/CMakeLists.txt
index a1df5fdb..63bd97cf 100644
--- a/library/debug/test/CMakeLists.txt
+++ b/library/debug/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_debug_test)
 # Public include headers
 target_include_directories(minecpp_debug_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/debug_test
 )
 
 # Source subdirectory
diff --git a/library/entity/CMakeLists.txt b/library/entity/CMakeLists.txt
index 4b8e06fb..00b432e2 100644
--- a/library/entity/CMakeLists.txt
+++ b/library/entity/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_entity STATIC)
 # Public include headers
 target_include_directories(minecpp_entity
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/entity
 )
 
 # Source subdirectory
diff --git a/library/entity/test/CMakeLists.txt b/library/entity/test/CMakeLists.txt
index 69c3d5e6..4bd0322e 100644
--- a/library/entity/test/CMakeLists.txt
+++ b/library/entity/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_entity_test)
 # Public include headers
 target_include_directories(minecpp_entity_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/entity_test
 )
 
 # Source subdirectory
diff --git a/library/format/CMakeLists.txt b/library/format/CMakeLists.txt
index 1da40c33..d54b420d 100755
--- a/library/format/CMakeLists.txt
+++ b/library/format/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_format STATIC)
 # Public include headers
 target_include_directories(minecpp_format
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/format
 )
 
 # Source subdirectory
diff --git a/library/format/test/CMakeLists.txt b/library/format/test/CMakeLists.txt
index af280063..ee76d7a0 100644
--- a/library/format/test/CMakeLists.txt
+++ b/library/format/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_format_test)
 # Public include headers
 target_include_directories(minecpp_format_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/format_test
 )
 
 # Source subdirectory
diff --git a/library/game/CMakeLists.txt b/library/game/CMakeLists.txt
index cc06545d..0726f472 100755
--- a/library/game/CMakeLists.txt
+++ b/library/game/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_game STATIC)
 # Public include headers
 target_include_directories(minecpp_game
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/game
 )
 
 # Source subdirectory
diff --git a/library/game/src/ChunkRange.cpp b/library/game/src/ChunkRange.cpp
index 5ed0fff9..a841793b 100644
--- a/library/game/src/ChunkRange.cpp
+++ b/library/game/src/ChunkRange.cpp
@@ -1,4 +1,4 @@
-#include "ChunkRange.h"
+#include <minecpp/game/ChunkRange.h>
 
 namespace minecpp::game {
 
diff --git a/library/game/src/SectionRange.cpp b/library/game/src/SectionRange.cpp
index 9cc86df4..de0a0ca2 100644
--- a/library/game/src/SectionRange.cpp
+++ b/library/game/src/SectionRange.cpp
@@ -1,5 +1,5 @@
-#include "SectionRange.h"
-#include "ChunkRange.h"
+#include <minecpp/game/SectionRange.h>
+#include <minecpp/game/ChunkRange.h>
 
 namespace minecpp::game {
 
diff --git a/library/game/test/CMakeLists.txt b/library/game/test/CMakeLists.txt
index a995d90a..eb105587 100644
--- a/library/game/test/CMakeLists.txt
+++ b/library/game/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_game_test)
 # Public include headers
 target_include_directories(minecpp_game_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/game_test
 )
 
 # Source subdirectory
diff --git a/library/lexer/CMakeLists.txt b/library/lexer/CMakeLists.txt
index 5d98e363..5844b9af 100755
--- a/library/lexer/CMakeLists.txt
+++ b/library/lexer/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_lexer STATIC)
 # Public include headers
 target_include_directories(minecpp_lexer
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/lexer
 )
 
 # Source subdirectory
diff --git a/library/lexer/example/python/CMakeLists.txt b/library/lexer/example/python/CMakeLists.txt
index 484f7fe5..89578306 100644
--- a/library/lexer/example/python/CMakeLists.txt
+++ b/library/lexer/example/python/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_lexer_example_python)
 # Public include headers
 target_include_directories(minecpp_lexer_example_python
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/lexer_example_python
 )
 
 # Source subdirectory
diff --git a/library/lexer/src/IStreamReader.cpp b/library/lexer/src/IStreamReader.cpp
index cbf8d087..c1daf7f7 100644
--- a/library/lexer/src/IStreamReader.cpp
+++ b/library/lexer/src/IStreamReader.cpp
@@ -1,4 +1,4 @@
-#include "IStreamReader.h"
+#include <minecpp/lexer/IStreamReader.h>
 
 namespace minecpp::lexer {
 
diff --git a/library/math/test/CMakeLists.txt b/library/math/test/CMakeLists.txt
index 9e0bfc23..2b673e25 100644
--- a/library/math/test/CMakeLists.txt
+++ b/library/math/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_math_test)
 # Public include headers
 target_include_directories(minecpp_math_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/math_test
 )
 
 # Source subdirectory
diff --git a/library/nbt/CMakeLists.txt b/library/nbt/CMakeLists.txt
index b24834b8..ba3abb32 100755
--- a/library/nbt/CMakeLists.txt
+++ b/library/nbt/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_nbt STATIC)
 # Public include headers
 target_include_directories(minecpp_nbt
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/nbt
 )
 
 # Source subdirectory
diff --git a/library/nbt/test/CMakeLists.txt b/library/nbt/test/CMakeLists.txt
index 18f569b9..2d197854 100644
--- a/library/nbt/test/CMakeLists.txt
+++ b/library/nbt/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_nbt_test)
 # Public include headers
 target_include_directories(minecpp_nbt_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/nbt_test
 )
 
 # Source subdirectory
diff --git a/library/network/CMakeLists.txt b/library/network/CMakeLists.txt
index 7a4e1407..07655fab 100755
--- a/library/network/CMakeLists.txt
+++ b/library/network/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_network STATIC)
 # Public include headers
 target_include_directories(minecpp_network
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/network
 )
 
 # Source subdirectory
diff --git a/library/network/src/Network.cpp b/library/network/src/Network.cpp
index e8a90e3b..1d3e88a9 100644
--- a/library/network/src/Network.cpp
+++ b/library/network/src/Network.cpp
@@ -1,4 +1,4 @@
-#include "Network.h"
+#include <minecpp/network/Network.h>
 
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/ip/udp.hpp>
diff --git a/library/network/src/NetworkUtil.cpp b/library/network/src/NetworkUtil.cpp
index f46da6be..35e2c22b 100644
--- a/library/network/src/NetworkUtil.cpp
+++ b/library/network/src/NetworkUtil.cpp
@@ -1,4 +1,4 @@
-#include "NetworkUtil.h"
+#include <minecpp/network/NetworkUtil.h>
 
 namespace minecpp::network {
 
diff --git a/library/network/test/CMakeLists.txt b/library/network/test/CMakeLists.txt
index 74746adc..2307d1d4 100644
--- a/library/network/test/CMakeLists.txt
+++ b/library/network/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_network_test)
 # Public include headers
 target_include_directories(minecpp_network_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/network_test
 )
 
 # Source subdirectory
diff --git a/library/random/CMakeLists.txt b/library/random/CMakeLists.txt
index 77a08110..57cec5fe 100755
--- a/library/random/CMakeLists.txt
+++ b/library/random/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_random STATIC)
 # Public include headers
 target_include_directories(minecpp_random
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/random
 )
 
 # Source subdirectory
diff --git a/library/random/test/CMakeLists.txt b/library/random/test/CMakeLists.txt
index 9465c092..f690cd39 100644
--- a/library/random/test/CMakeLists.txt
+++ b/library/random/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_random_test)
 # Public include headers
 target_include_directories(minecpp_random_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/random_test
 )
 
 # Source subdirectory
diff --git a/library/region/CMakeLists.txt b/library/region/CMakeLists.txt
index a1b6c784..f36991ef 100755
--- a/library/region/CMakeLists.txt
+++ b/library/region/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_region STATIC)
 # Public include headers
 target_include_directories(minecpp_region
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/region
 )
 
 # Source subdirectory
diff --git a/library/repository/CMakeLists.txt b/library/repository/CMakeLists.txt
index 6c3de5e7..bee8db8f 100755
--- a/library/repository/CMakeLists.txt
+++ b/library/repository/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_repository STATIC)
 # Public include headers
 target_include_directories(minecpp_repository
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/repository
 )
 
 # Source subdirectory
diff --git a/library/repository/test/CMakeLists.txt b/library/repository/test/CMakeLists.txt
index 1fdbd11a..fc696eba 100644
--- a/library/repository/test/CMakeLists.txt
+++ b/library/repository/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_repository_test)
 # Public include headers
 target_include_directories(minecpp_repository_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/repository_test
 )
 
 # Source subdirectory
diff --git a/library/stream/CMakeLists.txt b/library/stream/CMakeLists.txt
index 289737d5..91e2d4a7 100644
--- a/library/stream/CMakeLists.txt
+++ b/library/stream/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_stream STATIC)
 # Public include headers
 target_include_directories(minecpp_stream
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/stream
 )
 
 # Source subdirectory
diff --git a/library/stream/example/client/CMakeLists.txt b/library/stream/example/client/CMakeLists.txt
index 98c1640d..432423e7 100644
--- a/library/stream/example/client/CMakeLists.txt
+++ b/library/stream/example/client/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_stream_example_client)
 # Public include headers
 target_include_directories(minecpp_stream_example_client
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/stream_example_client
 )
 
 # Source subdirectory
diff --git a/library/stream/example/server/CMakeLists.txt b/library/stream/example/server/CMakeLists.txt
index f4167fba..9f181aff 100644
--- a/library/stream/example/server/CMakeLists.txt
+++ b/library/stream/example/server/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_stream_example_server)
 # Public include headers
 target_include_directories(minecpp_stream_example_server
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/stream_example_server
 )
 
 # Source subdirectory
diff --git a/library/stream/src/Client.cpp b/library/stream/src/Client.cpp
index 6e13af94..1cc00ba3 100644
--- a/library/stream/src/Client.cpp
+++ b/library/stream/src/Client.cpp
@@ -1,4 +1,4 @@
-#include "Client.h"
+#include <minecpp/stream/Client.h>
 
 #include <boost/endian.hpp>
 #include <enet/enet.h>
diff --git a/library/stream/src/Host.cpp b/library/stream/src/Host.cpp
index 9f753266..55262e00 100644
--- a/library/stream/src/Host.cpp
+++ b/library/stream/src/Host.cpp
@@ -1,4 +1,4 @@
-#include "Host.h"
+#include <minecpp/stream/Host.h>
 
 #include "minecpp/container/BasicBuffer.hpp"
 
diff --git a/library/stream/src/Peer.cpp b/library/stream/src/Peer.cpp
index b17d95df..2d39843f 100644
--- a/library/stream/src/Peer.cpp
+++ b/library/stream/src/Peer.cpp
@@ -1,5 +1,5 @@
-#include "Peer.h"
-#include "Host.h"
+#include <minecpp/stream/Peer.h>
+#include <minecpp/stream/Host.h>
 
 #include "minecpp/container/BasicBuffer.hpp"
 
diff --git a/library/stream/src/Server.cpp b/library/stream/src/Server.cpp
index 2ae22203..80d00b74 100644
--- a/library/stream/src/Server.cpp
+++ b/library/stream/src/Server.cpp
@@ -1,4 +1,4 @@
-#include "Server.h"
+#include <minecpp/stream/Server.h>
 
 #include <enet/enet.h>
 
diff --git a/library/util/CMakeLists.txt b/library/util/CMakeLists.txt
index e1ec80f7..2763126b 100755
--- a/library/util/CMakeLists.txt
+++ b/library/util/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_utils STATIC)
 # Public include headers
 target_include_directories(minecpp_utils
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/util
 )
 
 # Source subdirectory
diff --git a/library/util/src/Context.cpp b/library/util/src/Context.cpp
index 0a72a323..7359e071 100644
--- a/library/util/src/Context.cpp
+++ b/library/util/src/Context.cpp
@@ -1,4 +1,4 @@
-#include "Context.h"
+#include <minecpp/util/Context.h>
 
 #include <atomic>
 
diff --git a/library/util/src/Threading.cpp b/library/util/src/Threading.cpp
index 04e80ded..909929ec 100644
--- a/library/util/src/Threading.cpp
+++ b/library/util/src/Threading.cpp
@@ -1,4 +1,4 @@
-#include "Threading.h"
+#include <minecpp/util/Threading.h>
 
 #ifdef unix
 #include <pthread.h>
diff --git a/library/util/test/CMakeLists.txt b/library/util/test/CMakeLists.txt
index 3027906b..4eaa8cbc 100644
--- a/library/util/test/CMakeLists.txt
+++ b/library/util/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_utils_test)
 # Public include headers
 target_include_directories(minecpp_utils_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/util_test
 )
 
 # Source subdirectory
diff --git a/library/world/CMakeLists.txt b/library/world/CMakeLists.txt
index 19301633..3756f9b4 100755
--- a/library/world/CMakeLists.txt
+++ b/library/world/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_world STATIC)
 # Public include headers
 target_include_directories(minecpp_world
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/world
 )
 
 # Source subdirectory
diff --git a/library/world/src/ChunkSerializer.cpp b/library/world/src/ChunkSerializer.cpp
index 2d245e9a..f1afc18d 100644
--- a/library/world/src/ChunkSerializer.cpp
+++ b/library/world/src/ChunkSerializer.cpp
@@ -1,7 +1,6 @@
-#include "ChunkSerializer.h"
-
-#include "Chunk.h"
-#include "Section.h"
+#include <minecpp/world/ChunkSerializer.h>
+#include <minecpp/world/Chunk.h>
+#include <minecpp/world/Section.h>
 
 #include "minecpp/math/Vector2.h"
 
diff --git a/library/world/src/Section.cpp b/library/world/src/Section.cpp
index 59895ca0..cebd78dd 100644
--- a/library/world/src/Section.cpp
+++ b/library/world/src/Section.cpp
@@ -1,7 +1,7 @@
-#include "Section.h"
+#include <minecpp/world/Section.h>
 
-#include "BlockState.h"
-#include "Util.h"
+#include <minecpp/world/BlockState.h>
+#include <minecpp/world/Util.h>
 
 #include "minecpp/util/Packed.h"
 
diff --git a/library/world/test/CMakeLists.txt b/library/world/test/CMakeLists.txt
index dc8f875c..946e22f6 100755
--- a/library/world/test/CMakeLists.txt
+++ b/library/world/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_world_test)
 # Public include headers
 target_include_directories(minecpp_world_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/world_test
 )
 
 # Source subdirectory
diff --git a/meta/cmake-generate-target.sh b/meta/cmake-generate-target.sh
index d234592a..32abbf9e 100755
--- a/meta/cmake-generate-target.sh
+++ b/meta/cmake-generate-target.sh
@@ -61,7 +61,6 @@ function generate_cmake_target() {
   else
     echo "target_include_directories($targetname"
     echo "  PUBLIC \${CMAKE_CURRENT_SOURCE_DIR}/include"
-    echo "  PRIVATE \${CMAKE_CURRENT_SOURCE_DIR}/include/$include_path"
     echo ")"
     echo ""
     echo "# Source subdirectory"
diff --git a/service/engine/CMakeLists.txt b/service/engine/CMakeLists.txt
index 62e74d30..f3555ad8 100755
--- a/service/engine/CMakeLists.txt
+++ b/service/engine/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_engine)
 # Public include headers
 target_include_directories(minecpp_engine
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/engine
 )
 
 # Source subdirectory
diff --git a/service/engine/api/CMakeLists.txt b/service/engine/api/CMakeLists.txt
index 7b8f8ef2..4ef7ce9f 100755
--- a/service/engine/api/CMakeLists.txt
+++ b/service/engine/api/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_engine_api STATIC)
 # Public include headers
 target_include_directories(minecpp_engine_api
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/service/engine
 )
 
 # Source subdirectory
diff --git a/service/engine/api/src/Api.cpp b/service/engine/api/src/Api.cpp
index 8d7cb804..c663eaeb 100755
--- a/service/engine/api/src/Api.cpp
+++ b/service/engine/api/src/Api.cpp
@@ -1,4 +1,4 @@
-#include "Api.h"
+#include <minecpp/service/engine/Api.h>
 
 #include "minecpp/container/BasicBuffer.hpp"
 
diff --git a/service/front/CMakeLists.txt b/service/front/CMakeLists.txt
index 5ebd6eda..19938490 100755
--- a/service/front/CMakeLists.txt
+++ b/service/front/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_front)
 # Public include headers
 target_include_directories(minecpp_front
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/front
 )
 
 # Source subdirectory
diff --git a/service/storage/CMakeLists.txt b/service/storage/CMakeLists.txt
index 6c9d9e7d..3aaf75ce 100755
--- a/service/storage/CMakeLists.txt
+++ b/service/storage/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_storage)
 # Public include headers
 target_include_directories(minecpp_storage
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/storage
 )
 
 # Source subdirectory
diff --git a/service/storage/api/CMakeLists.txt b/service/storage/api/CMakeLists.txt
index b7dd0e75..6787264d 100755
--- a/service/storage/api/CMakeLists.txt
+++ b/service/storage/api/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_storage_api STATIC)
 # Public include headers
 target_include_directories(minecpp_storage_api
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/service/storage
 )
 
 # Source subdirectory
diff --git a/service/storage/example/api_test/CMakeLists.txt b/service/storage/example/api_test/CMakeLists.txt
index 455764b8..b0c58ce4 100755
--- a/service/storage/example/api_test/CMakeLists.txt
+++ b/service/storage/example/api_test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_storage_example_api_test)
 # Public include headers
 target_include_directories(minecpp_storage_example_api_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/storage_example_api_test
 )
 
 # Source subdirectory
diff --git a/service/storage/example/fdb_request/CMakeLists.txt b/service/storage/example/fdb_request/CMakeLists.txt
index e3fb684e..33d1a136 100755
--- a/service/storage/example/fdb_request/CMakeLists.txt
+++ b/service/storage/example/fdb_request/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_storage_fdb_request)
 # Public include headers
 target_include_directories(minecpp_storage_fdb_request
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/storage_example_fdb_request
 )
 
 # Source subdirectory
diff --git a/tool/chunk_extractor/CMakeLists.txt b/tool/chunk_extractor/CMakeLists.txt
index 8dacf255..98ab758a 100755
--- a/tool/chunk_extractor/CMakeLists.txt
+++ b/tool/chunk_extractor/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_chunk_extractor)
 # Public include headers
 target_include_directories(minecpp_chunk_extractor
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/chunk_extractor
 )
 
 # Source subdirectory
diff --git a/tool/chunk_viewer/CMakeLists.txt b/tool/chunk_viewer/CMakeLists.txt
index 3d0454c3..3282b6dc 100755
--- a/tool/chunk_viewer/CMakeLists.txt
+++ b/tool/chunk_viewer/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_chunk_viewer)
 # Public include headers
 target_include_directories(minecpp_chunk_viewer
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/chunk_viewer
 )
 
 # Source subdirectory
diff --git a/tool/nbt_viewer/CMakeLists.txt b/tool/nbt_viewer/CMakeLists.txt
index 9f2357ec..42f4e33d 100755
--- a/tool/nbt_viewer/CMakeLists.txt
+++ b/tool/nbt_viewer/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_nbt_viewer)
 # Public include headers
 target_include_directories(minecpp_nbt_viewer
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/nbt_viewer
 )
 
 # Source subdirectory
diff --git a/tool/nbtscheme/CMakeLists.txt b/tool/nbtscheme/CMakeLists.txt
index 3fa44d38..ca3ce5ea 100755
--- a/tool/nbtscheme/CMakeLists.txt
+++ b/tool/nbtscheme/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_nbtscheme)
 # Public include headers
 target_include_directories(minecpp_nbtscheme
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/nbtscheme
 )
 
 # Source subdirectory
diff --git a/tool/recipes/CMakeLists.txt b/tool/recipes/CMakeLists.txt
index d1c8d86c..d6e49a3f 100755
--- a/tool/recipes/CMakeLists.txt
+++ b/tool/recipes/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_recipes)
 # Public include headers
 target_include_directories(minecpp_recipes
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/recipes
 )
 
 # Source subdirectory
diff --git a/tool/schema_compiler/CMakeLists.txt b/tool/schema_compiler/CMakeLists.txt
index 4cc94958..d5eb6b17 100644
--- a/tool/schema_compiler/CMakeLists.txt
+++ b/tool/schema_compiler/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_schema_compiler)
 # Public include headers
 target_include_directories(minecpp_schema_compiler
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/schema_compiler
 )
 
 # Source subdirectory
diff --git a/tool/schema_compiler/example/nbt_generator/CMakeLists.txt b/tool/schema_compiler/example/nbt_generator/CMakeLists.txt
index baf106de..303511bc 100644
--- a/tool/schema_compiler/example/nbt_generator/CMakeLists.txt
+++ b/tool/schema_compiler/example/nbt_generator/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_schema_compiler_example_nbt_generator)
 # Public include headers
 target_include_directories(minecpp_schema_compiler_example_nbt_generator
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/schema_compiler_example_nbt_generator
 )
 
 # Source subdirectory
diff --git a/tool/schema_compiler/example/net_generator/CMakeLists.txt b/tool/schema_compiler/example/net_generator/CMakeLists.txt
index 2fd47ed8..10cd5141 100644
--- a/tool/schema_compiler/example/net_generator/CMakeLists.txt
+++ b/tool/schema_compiler/example/net_generator/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_schema_compiler_example_net_generator)
 # Public include headers
 target_include_directories(minecpp_schema_compiler_example_net_generator
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/schema_compiler_example_net_generator
 )
 
 # Source subdirectory
diff --git a/tool/snbt_parser/CMakeLists.txt b/tool/snbt_parser/CMakeLists.txt
index 451fc3ed..8013505d 100755
--- a/tool/snbt_parser/CMakeLists.txt
+++ b/tool/snbt_parser/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_tool_snbt_parser)
 # Public include headers
 target_include_directories(minecpp_tool_snbt_parser
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/snbt_parser
 )
 
 # Source subdirectory
diff --git a/tool/trace_tool/CMakeLists.txt b/tool/trace_tool/CMakeLists.txt
index 3195ef34..a9ed3cce 100644
--- a/tool/trace_tool/CMakeLists.txt
+++ b/tool/trace_tool/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_trace_tool)
 # Public include headers
 target_include_directories(minecpp_trace_tool
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/trace_tool
 )
 
 # Source subdirectory
diff --git a/tool/trace_tool/src/Main.cpp b/tool/trace_tool/src/Main.cpp
index 2c07dc2d..8664caf4 100644
--- a/tool/trace_tool/src/Main.cpp
+++ b/tool/trace_tool/src/Main.cpp
@@ -6,6 +6,7 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <iomanip> // for std::put_time
 
 using minecpp::nbt::CompoundContent;