diff --git a/Editor/Include/Editor/QmlEngine.h b/Editor/Include/Editor/QmlEngine.h
index 2be9529e2..b4184d95a 100644
--- a/Editor/Include/Editor/QmlEngine.h
+++ b/Editor/Include/Editor/QmlEngine.h
@@ -9,6 +9,7 @@
 #include <QFileSystemWatcher>
 
 #include <Core/Paths.h>
+#include <Common/Memory.h>
 #include <Editor/Widget/QmlWidget.h>
 
 namespace Editor {
diff --git a/Editor/Src/Main.cpp b/Editor/Src/Main.cpp
index ebacd61b4..fc58154b5 100644
--- a/Editor/Src/Main.cpp
+++ b/Editor/Src/Main.cpp
@@ -3,6 +3,8 @@
 //
 
 #include <QApplication>
+
+#include <Core/Cmdline.h>
 #include <Editor/Core.h>
 #include <Editor/QmlEngine.h>
 #include <Editor/Widget/Launcher.h>
diff --git a/Editor/Src/QmlEngine.cpp b/Editor/Src/QmlEngine.cpp
index 048db827d..bf219f560 100644
--- a/Editor/Src/QmlEngine.cpp
+++ b/Editor/Src/QmlEngine.cpp
@@ -5,8 +5,10 @@
 #include <QQmlEngine>
 
 #include <Editor/QmlEngine.h>
+#include <Core/Cmdline.h>
 #include <Core/Paths.h>
 #include <Common/FileSystem.h>
+#include <Common/String.h>
 
 namespace Editor {
     static ::Core::CmdlineArgValue<bool> caQmlHotReload(
diff --git a/Engine/Source/Common/Include/Common/Container.h b/Engine/Source/Common/Include/Common/Container.h
index d72084976..7a1301808 100644
--- a/Engine/Source/Common/Include/Common/Container.h
+++ b/Engine/Source/Common/Include/Common/Container.h
@@ -17,6 +17,7 @@
 #include <Common/Debug.h>
 #include <Common/Concepts.h>
 #include <Common/Math/Common.h>
+#include <Common/Utility.h>
 
 namespace Common {
     class VectorUtils {
diff --git a/Engine/Source/Common/Test/DelegateTest.cpp b/Engine/Source/Common/Test/DelegateTest.cpp
index 91403895b..3778a144f 100644
--- a/Engine/Source/Common/Test/DelegateTest.cpp
+++ b/Engine/Source/Common/Test/DelegateTest.cpp
@@ -3,6 +3,7 @@
 //
 
 #include <Common/Delegate.h>
+#include <gtest/gtest.h>
 
 static int counter = 0;
 
@@ -29,7 +30,7 @@ TEST(DelegateTest, BasicTest)
 {
     Receiver receiver;
 
-    Delegate<int, bool> event;
+    Common::Delegate<int, bool> event;
     ASSERT_EQ(event.BindStatic<&StaticReceiver>(), 0);
     ASSERT_EQ(event.BindMember<&Receiver::Receive>(receiver), 1);
     ASSERT_EQ(event.BindLambda([](int a, bool b) -> void {
diff --git a/Engine/Source/Core/Src/Log.cpp b/Engine/Source/Core/Src/Log.cpp
index 2ea179a22..625e9c8c9 100644
--- a/Engine/Source/Core/Src/Log.cpp
+++ b/Engine/Source/Core/Src/Log.cpp
@@ -3,6 +3,7 @@
 //
 
 #include <Core/Log.h>
+#include <Common/FileSystem.h>
 #include <Common/IO.h>
 
 namespace Core {
diff --git a/Engine/Source/Core/Src/Paths.cpp b/Engine/Source/Core/Src/Paths.cpp
index 5a9bfd301..6b81740be 100644
--- a/Engine/Source/Core/Src/Paths.cpp
+++ b/Engine/Source/Core/Src/Paths.cpp
@@ -2,6 +2,7 @@
 // Created by johnk on 2023/7/31.
 //
 
+#include <Common/Debug.h>
 #include <Core/Paths.h>
 
 namespace Core {
diff --git a/Engine/Source/Render/Include/Render/Renderer.h b/Engine/Source/Render/Include/Render/Renderer.h
index da5b6dbe0..167ea0067 100644
--- a/Engine/Source/Render/Include/Render/Renderer.h
+++ b/Engine/Source/Render/Include/Render/Renderer.h
@@ -7,6 +7,12 @@
 #include <Render/Scene.h>
 #include <Render/View.h>
 
+namespace RHI {
+    class Texture;
+    class Semaphore;
+    class Fence;
+}
+
 namespace Render {
     class Renderer {
     public:
diff --git a/Engine/Source/Runtime/Test/WorldTest.cpp b/Engine/Source/Runtime/Test/WorldTest.cpp
index e50cfdbeb..690d09ffa 100644
--- a/Engine/Source/Runtime/Test/WorldTest.cpp
+++ b/Engine/Source/Runtime/Test/WorldTest.cpp
@@ -41,8 +41,8 @@ Position::Position(float inX, float inY)
 
 bool Position::operator==(const Position& inRhs) const
 {
-    return CompareNumber(x, inRhs.x)
-        && CompareNumber(y, inRhs.y);
+    return Common::CompareNumber(x, inRhs.x)
+        && Common::CompareNumber(y, inRhs.y);
 }
 
 Velocity::Velocity()
@@ -59,8 +59,8 @@ Velocity::Velocity(float inX, float inY)
 
 bool Velocity::operator==(const Velocity& inRhs) const
 {
-    return CompareNumber(x, inRhs.x)
-        && CompareNumber(y, inRhs.y);
+    return Common::CompareNumber(x, inRhs.x)
+        && Common::CompareNumber(y, inRhs.y);
 }
 
 BasicTest_MotionSystem::BasicTest_MotionSystem(ECRegistry& inRegistry)