diff --git a/src/engine/logging/log.cpp b/src/engine/logging/log.cpp
index f722170..da2e773 100644
--- a/src/engine/logging/log.cpp
+++ b/src/engine/logging/log.cpp
@@ -10,7 +10,7 @@
 #include <string>
 #include <string_view>
 
-namespace log {
+namespace logging {
 
 // Pattern: time | level | thread | logger | msg
 static constexpr const char *kPattern =
@@ -88,4 +88,4 @@ std::shared_ptr<spdlog::logger> get(std::string_view name) {
   return logger;
 }
 
-} // namespace log
+} // namespace logging
diff --git a/src/engine/logging/log.hpp b/src/engine/logging/log.hpp
index 8483b39..6aeb59e 100644
--- a/src/engine/logging/log.hpp
+++ b/src/engine/logging/log.hpp
@@ -4,16 +4,16 @@
 #include <spdlog/logger.h>
 #include <string_view>
 
-namespace log {
+namespace logging {
 
 void init();
 void shutdown();
 
 std::shared_ptr<spdlog::logger> &engine();
 std::shared_ptr<spdlog::logger> get(std::string_view name);
-} // namespace log
+} // namespace logging
 
-#define LOG_TU_LOGGER() (::log::engine())
+#define LOG_TU_LOGGER() (::logging::engine())
 
 #define LOGT(...) (LOG_TU_LOGGER())->trace(__VA_ARGS__)
 #define LOGD(...) (LOG_TU_LOGGER())->debug(__VA_ARGS__)
diff --git a/src/main.cpp b/src/main.cpp
index a2f5af2..9b33ebc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -67,7 +67,7 @@ static void pushCubeGrid(std::vector<DrawItem> &out, MeshHandle mesh,
 }
 
 int main() {
-  log::init();
+  logging::init();
   LOGI("Engine starting...");
 
   EngineApp app;
diff --git a/src/render/resources/material_system.hpp b/src/render/resources/material_system.hpp
index 517d741..3044444 100644
--- a/src/render/resources/material_system.hpp
+++ b/src/render/resources/material_system.hpp
@@ -12,9 +12,9 @@
 #include <glm/ext/vector_float3.hpp>
 #include <glm/ext/vector_float4.hpp>
 #include <optional>
+#include <string>
 #include <vector>
 #include <vulkan/vulkan_core.h>
-
 struct TextureHandle {
   uint32_t id = UINT32_MAX;