diff --git a/example/src/main.cpp b/example/src/main.cpp
index 5d45195..744a73d 100644
--- a/example/src/main.cpp
+++ b/example/src/main.cpp
@@ -1,13 +1,13 @@
 #include <iostream>
 
 #include "mirage.h"
-#include "window/mwindow.h"
 #include "font/font_system.h"
 #include "style/mirage_style.h"
-#include "widget/widget_new.h"
 #include "widget/compound_widget/mbutton.h"
 #include "widget/leaf_widget/mtext_block.h"
 #include "widget/panel_widget/mbox.h"
+#include "widget/widget_new.h"
+#include "window/mwindow.h"
 
 #include "utf8.h"
 #include "misc/log_util.h"
diff --git a/src/mirage_app/CMakeLists.txt b/src/mirage_app/CMakeLists.txt
index 2fe3872..74cb1d4 100644
--- a/src/mirage_app/CMakeLists.txt
+++ b/src/mirage_app/CMakeLists.txt
@@ -1,8 +1,8 @@
 project(mirage_app)
 
 set(SRC_FILES)
-retrieve_files(${CMAKE_CURRENT_SOURCE_DIR} SRC_FILES)
+retrieve_files(${CMAKE_CURRENT_SOURCE_DIR}/src SRC_FILES)
 add_library(${PROJECT_NAME} STATIC ${SRC_FILES})
 
-target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
 target_link_libraries(${PROJECT_NAME} PUBLIC mirage_core mirage_widget mirage_render)
diff --git a/src/mirage_app/mirage.cpp b/src/mirage_app/src/mirage.cpp
similarity index 100%
rename from src/mirage_app/mirage.cpp
rename to src/mirage_app/src/mirage.cpp
diff --git a/src/mirage_app/mirage.h b/src/mirage_app/src/mirage.h
similarity index 100%
rename from src/mirage_app/mirage.h
rename to src/mirage_app/src/mirage.h
diff --git a/src/mirage_render/src/font/atlas/font_atlas.h b/src/mirage_render/src/font/atlas/font_atlas.h
index 67c8f7c..d78b18f 100644
--- a/src/mirage_render/src/font/atlas/font_atlas.h
+++ b/src/mirage_render/src/font/atlas/font_atlas.h
@@ -2,6 +2,7 @@
 #include <memory>
 #include <unordered_map>
 
+#include "interface/font_interface.h"
 #include "texture/atlas/texture2d_atlas.h"
 
 class font_face_interface;
diff --git a/src/mirage_widget/src/widget/mpanel_widget.h b/src/mirage_widget/src/widget/mpanel_widget.h
index a955ddc..da67ffd 100644
--- a/src/mirage_widget/src/widget/mpanel_widget.h
+++ b/src/mirage_widget/src/widget/mpanel_widget.h
@@ -125,7 +125,7 @@ public:
 	}
 
 	auto operator[](auto... in_slot) {
-		for (const auto& slot: { in_slot... }) { add_slot(slot); }
+		for (const auto& slot : { in_slot... }) { add_slot(slot); }
 		return this->shared_from_this();
 	}
 private:
diff --git a/src/mirage_widget/src/widget/slot_util.h b/src/mirage_widget/src/widget/slot_util.h
index 4b88240..6d9a788 100644
--- a/src/mirage_widget/src/widget/slot_util.h
+++ b/src/mirage_widget/src/widget/slot_util.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <optional>
 
-#define SLOT_ME() auto& me() { return static_cast<T&>(*this) }
+#define SLOT_ME() (auto& me() { return static_cast<T&>(*this) })
 
 #define SLOT_ATTRIBUTE(type, name) \
 	public: \
diff --git a/src/mirage_widget/src/widget/widget_new.h b/src/mirage_widget/src/widget/widget_new.h
index 1bb2fd9..19bc659 100644
--- a/src/mirage_widget/src/widget/widget_new.h
+++ b/src/mirage_widget/src/widget/widget_new.h
@@ -28,7 +28,7 @@ struct mwidget_decl {
 	mwidget_decl& operator=(const mwidget_decl&) = delete;
 
 	template<typename ...Args>
-	auto operator[](Args&&... in_args) {
+	[[nodiscard]] auto operator[](Args&&... in_args) {
 		return std::static_pointer_cast<WidgetType>((*widget_)[std::forward<Args>(in_args)...]);
 	}
 	auto& setup(const construct_args& in_args) {