diff --git a/src/bakatools/base.h b/src/bakatools/base.h
new file mode 100644
index 0000000..1574c7a
--- /dev/null
+++ b/src/bakatools/base.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#define BK_BIT_SHIFT(x) (1 << x)
+#define BK_STRINGIFY(x) #x
\ No newline at end of file
diff --git a/src/bakatools/file_system/dir_entry.cpp b/src/bakatools/file_system/dir_entry.cpp
index cf53e2f..b8c7b02 100644
--- a/src/bakatools/file_system/dir_entry.cpp
+++ b/src/bakatools/file_system/dir_entry.cpp
@@ -27,9 +27,9 @@ namespace Bk
         return ent.file_size();
     }
 
-    Bk::TimePoint<Bk::FileClock, Bk::Second> DirEntry::last_write()
+    TimePoint<FileClock, Second> DirEntry::last_write()
     {
-        return Bk::TimePoint<Bk::FileClock, Bk::Second>(ent.last_write_time());
+        return TimePoint<FileClock, Second>(ent.last_write_time());
     }
 
     bool DirEntry::exists()
diff --git a/src/bakatools/file_system/dir_entry.h b/src/bakatools/file_system/dir_entry.h
index c1c91af..4347a22 100644
--- a/src/bakatools/file_system/dir_entry.h
+++ b/src/bakatools/file_system/dir_entry.h
@@ -34,7 +34,7 @@ namespace Bk
             std::string name();
 
             uintmax_t size();
-            Bk::TimePoint<Bk::FileClock, Bk::Second> last_write();
+            TimePoint<FileClock, Second> last_write();
             bool exists();
             FilePerms perms();
             uintmax_t hard_links();
diff --git a/src/bakatools/logging/assert.h b/src/bakatools/logging/assert.h
index b480bea..78b03ac 100644
--- a/src/bakatools/logging/assert.h
+++ b/src/bakatools/logging/assert.h
@@ -7,8 +7,6 @@ This file contains the assert macros. CORE macros musn't be used by the applicat
 #include "log.h"
 #include <bakatools/string/format.h>
 
-#define BK_STRINGIFY(x) #x
-
 #ifdef BK_DEBUG
     #if defined(BK_PLATFORM_WINDOWS)
         #define BK_DEBUGBREAK() __debugbreak()
diff --git a/src/bakatoolspch.h b/src/bakatoolspch.h
index e7b655f..12801fd 100644
--- a/src/bakatoolspch.h
+++ b/src/bakatoolspch.h
@@ -14,4 +14,6 @@
 #include <memory>
 #include <fstream>
 #include <filesystem>
-#include <chrono>
\ No newline at end of file
+#include <chrono>
+
+#include <bakatools/base.h>
\ No newline at end of file