diff --git a/CMakeLists.txt b/CMakeLists.txt
index dabbdc9e281c5d289aa8fdc722880beb862d87aa..0ff13222d0d94c6d3cac66f7046dc5316208ab3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/empty.cpp "")
 add_library(lava.core STATIC
         ${CMAKE_CURRENT_BINARY_DIR}/empty.cpp
         ${LIBLAVA_DIR}/core/data.hpp
+        ${LIBLAVA_DIR}/core/def.hpp
         ${LIBLAVA_DIR}/core/id.hpp
         ${LIBLAVA_DIR}/core/math.hpp
         ${LIBLAVA_DIR}/core/time.hpp
diff --git a/liblava/base/debug_utils.hpp b/liblava/base/debug_utils.hpp
index 52565a35f61d88669f370133fe62adcb2a852b80..e75428b99f8fa6824865b77883e554a783c4a717 100644
--- a/liblava/base/debug_utils.hpp
+++ b/liblava/base/debug_utils.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <liblava/base/base.hpp>
-#include <liblava/def.hpp>
+#include <liblava/core/def.hpp>
 
 namespace lava {
 
diff --git a/liblava/core.hpp b/liblava/core.hpp
index f1bd43fcad9f6048ad0474ad3d6c08f793a21173..f9678e4c321be54a18728fb20fbe3335880d12f9 100644
--- a/liblava/core.hpp
+++ b/liblava/core.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <liblava/core/data.hpp>
+#include <liblava/core/def.hpp>
 #include <liblava/core/id.hpp>
 #include <liblava/core/math.hpp>
 #include <liblava/core/time.hpp>
diff --git a/liblava/def.hpp b/liblava/core/def.hpp
similarity index 91%
rename from liblava/def.hpp
rename to liblava/core/def.hpp
index 0c5f7a0dca951d6fa94a5985587bf649c6ec1278..164512fac6c39be86c617247a017cdc568dadf51 100644
--- a/liblava/def.hpp
+++ b/liblava/core/def.hpp
@@ -1,4 +1,4 @@
-// file      : liblava/def.hpp
+// file      : liblava/core/def.hpp
 // copyright : Copyright (c) 2018-present, Lava Block OÜ
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/liblava/core/types.hpp b/liblava/core/types.hpp
index 31e1a209d1fe4f6c585155bc02dbb1e5b2550910..1a82ea568835489ee02b13e27dfeca7e26259b41 100644
--- a/liblava/core/types.hpp
+++ b/liblava/core/types.hpp
@@ -7,7 +7,7 @@
 #include <cassert>
 #include <cstdint>
 #include <functional>
-#include <liblava/def.hpp>
+#include <liblava/core/def.hpp>
 #include <map>
 #include <string>
 #include <string_view>