diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h
index b661010b..60d643b2 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h
@@ -8,8 +8,6 @@
 #include "WingServer.h"
 #include "WingComponent.h"
 #include "Engine/Blueprint.h"
-#include "Engine/SimpleConstructionScript.h"
-#include "Engine/SCS_Node.h"
 #include "Components/ActorComponent.h"
 #include "Kismet2/BlueprintEditorUtils.h"
 #include "ActorComponent_Add.generated.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h
index e9e8861b..63ec7dbd 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h
@@ -7,8 +7,6 @@
 #include "WingServer.h"
 #include "WingComponent.h"
 #include "Engine/Blueprint.h"
-#include "Engine/SimpleConstructionScript.h"
-#include "Engine/SCS_Node.h"
 #include "ActorComponent_Reparent.generated.h"
 
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Backup.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Backup.h
index a65c416c..64d999bd 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Backup.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Backup.h
@@ -3,7 +3,6 @@
 #include "CoreMinimal.h"
 #include "WingServer.h"
 #include "WingBasics.h"
-#include "WingUtils.h"
 #include "Misc/Paths.h"
 #include "Misc/PackageName.h"
 #include "HAL/FileManager.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Delete.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Delete.h
index 400ad4b4..d213bd04 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Delete.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Delete.h
@@ -3,9 +3,8 @@
 #include "CoreMinimal.h"
 #include "WingServer.h"
 #include "WingBasics.h"
-#include "WingUtils.h"
+#include "Misc/Paths.h"
 #include "Misc/PackageName.h"
-#include "AssetRegistry/AssetRegistryModule.h"
 #include "AssetRegistry/IAssetRegistry.h"
 #include "HAL/FileManager.h"
 #include "UObject/LinkerLoad.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Rename.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Rename.h
index 2522be76..806024c5 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Rename.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Rename.h
@@ -4,7 +4,7 @@
 #include "WingServer.h"
 #include "WingBasics.h"
 #include "WingFetcher.h"
-#include "WingUtils.h"
+#include "Misc/PackageName.h"
 #include "AssetToolsModule.h"
 #include "IAssetTools.h"
 #include "Asset_Rename.generated.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Restore.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Restore.h
index b6dae8fb..0af91ba4 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Restore.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Asset_Restore.h
@@ -3,7 +3,7 @@
 #include "CoreMinimal.h"
 #include "WingServer.h"
 #include "WingBasics.h"
-#include "WingUtils.h"
+#include "Misc/Paths.h"
 #include "Misc/PackageName.h"
 #include "FileHelpers.h"
 #include "HAL/FileManager.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h
index 3deccec9..20cd1f91 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h
@@ -2,7 +2,6 @@
 
 #include "CoreMinimal.h"
 #include "WingServer.h"
-#include "WingTypes.h"
 #include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
@@ -10,7 +9,6 @@
 #include "Animation/AnimBlueprint.h"
 #include "Animation/Skeleton.h"
 #include "WingComponent.h"
-#include "Kismet2/BlueprintEditorUtils.h"
 #include "AnimationGraph.h"
 #include "AnimationGraphSchema.h"
 #include "AnimationStateMachineSchema.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Dump.h
index 53165ca3..3a41e12a 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Dump.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Dump.h
@@ -5,7 +5,6 @@
 #include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingProperty.h"
-#include "WingUtils.h"
 #include "Details_Dump.generated.h"
 
 UCLASS()
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Commands.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Commands.h
index af1db71a..a3a7717b 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Commands.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Commands.h
@@ -2,10 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingBasics.h"
-#include "WingFetcher.h"
 #include "WingServer.h"
-#include "WingTypes.h"
-#include "WingProperty.h"
 #include "WingManual.h"
 #include "Documentation_Commands.generated.h"
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_CreateAssets.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_CreateAssets.h
index 86904c26..d26d33ec 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_CreateAssets.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_CreateAssets.h
@@ -2,10 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "WingBasics.h"
-#include "WingFetcher.h"
 #include "WingServer.h"
-#include "WingTypes.h"
-#include "WingProperty.h"
 #include "WingManual.h"
 #include "Documentation_CreateAssets.generated.h"
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Manual.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Manual.h
index 5541067a..7ce38f76 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Manual.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Documentation_Manual.h
@@ -3,6 +3,7 @@
 #include "CoreMinimal.h"
 #include "WingBasics.h"
 #include "WingManual.h"
+#include "WingServer.h"
 #include "Documentation_Manual.generated.h"
 
 UCLASS()
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Add.h
index 9b036325..6172329b 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Add.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Add.h
@@ -5,6 +5,7 @@
 #include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
+#include "WingVariables.h"
 #include "Engine/Blueprint.h"
 #include "EdGraphSchema_K2.h"
 #include "Kismet2/BlueprintEditorUtils.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Add.h
index 574f5afb..29b7af7a 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Add.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Add.h
@@ -9,8 +9,6 @@
 #include "WingGraphActions.h"
 #include "WingGraphExport.h"
 #include "EdGraph/EdGraph.h"
-#include "EdGraph/EdGraphNode.h"
-#include "EdGraph/EdGraphSchema.h"
 #include "GraphNode_Add.generated.h"
 
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SearchTypes.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SearchTypes.h
index aa6e393d..c043d96c 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SearchTypes.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SearchTypes.h
@@ -4,10 +4,8 @@
 #include "WingServer.h"
 #include "WingBasics.h"
 #include "WingFetcher.h"
-#include "WingUtils.h"
 #include "WingGraphActions.h"
 #include "EdGraph/EdGraph.h"
-#include "EdGraph/EdGraphSchema.h"
 #include "GraphNode_SearchTypes.generated.h"
 
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetPositions.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetPositions.h
index e5f7ae8b..d4b398af 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetPositions.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetPositions.h
@@ -5,8 +5,7 @@
 #include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingProperty.h"
-#include "WingUtils.h"
-#include "Engine/Blueprint.h"
+#include "EdGraph/EdGraph.h"
 #include "EdGraph/EdGraphNode.h"
 #include "GraphNode_SetPositions.generated.h"
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h
index a763d9cc..a8647469 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h
@@ -6,10 +6,9 @@
 #include "WingFetcher.h"
 #include "WingProperty.h"
 #include "WingUtils.h"
-#include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
+#include "EdGraph/EdGraphSchema.h"
 #include "EdGraph/EdGraphPin.h"
-#include "EdGraphSchema_K2.h"
 #include "GraphPin_Connect.generated.h"
 
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h
index bf80481d..d292c11f 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h
@@ -6,7 +6,6 @@
 #include "WingFetcher.h"
 #include "WingProperty.h"
 #include "WingUtils.h"
-#include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
 #include "EdGraph/EdGraphPin.h"
 #include "GraphPin_Disconnect.generated.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Graph_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Graph_Dump.h
index beecaae4..63642d1b 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Graph_Dump.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Graph_Dump.h
@@ -4,12 +4,8 @@
 #include "WingBasics.h"
 #include "WingServer.h"
 #include "WingFetcher.h"
-#include "WingUtils.h"
 #include "WingGraphExport.h"
-#include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
-#include "Materials/Material.h"
-#include "MaterialGraph/MaterialGraph.h"
 #include "Graph_Dump.generated.h"
 
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_ClearParameter.h b/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_ClearParameter.h
index fab9dc1e..1437a397 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_ClearParameter.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_ClearParameter.h
@@ -4,10 +4,8 @@
 #include "WingServer.h"
 #include "WingBasics.h"
 #include "WingFetcher.h"
-#include "WingUtils.h"
 #include "WingParameterEditor.h"
 #include "Materials/MaterialInstanceConstant.h"
-#include "MaterialTypes.h"
 #include "MaterialInstance_ClearParameter.generated.h"
 
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_DumpParameters.h b/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_DumpParameters.h
index 96ee14ab..ded82529 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_DumpParameters.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_DumpParameters.h
@@ -4,10 +4,8 @@
 #include "WingServer.h"
 #include "WingBasics.h"
 #include "WingFetcher.h"
-#include "WingUtils.h"
 #include "WingParameterEditor.h"
 #include "Materials/MaterialInstanceConstant.h"
-#include "MaterialTypes.h"
 #include "MaterialInstance_DumpParameters.generated.h"
 
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_SetParameter.h b/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_SetParameter.h
index ff550070..72b561ca 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_SetParameter.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/MaterialInstance_SetParameter.h
@@ -4,10 +4,8 @@
 #include "WingServer.h"
 #include "WingBasics.h"
 #include "WingFetcher.h"
-#include "WingUtils.h"
 #include "WingParameterEditor.h"
 #include "Materials/MaterialInstanceConstant.h"
-#include "MaterialTypes.h"
 #include "MaterialInstance_SetParameter.generated.h"
 
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Material_DumpParameters.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Material_DumpParameters.h
index 4744d60c..c548da66 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/Material_DumpParameters.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Material_DumpParameters.h
@@ -4,9 +4,8 @@
 #include "WingBasics.h"
 #include "WingFetcher.h"
 #include "WingServer.h"
-#include "WingUtils.h"
 #include "WingParameterEditor.h"
-#include "MaterialTypes.h"
+#include "Materials/Material.h"
 #include "Material_DumpParameters.generated.h"
 
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/TypeName_Search.h b/Plugins/UEWingman/Source/UEWingman/Handlers/TypeName_Search.h
index b9dde991..dd592ac3 100644
--- a/Plugins/UEWingman/Source/UEWingman/Handlers/TypeName_Search.h
+++ b/Plugins/UEWingman/Source/UEWingman/Handlers/TypeName_Search.h
@@ -4,12 +4,6 @@
 #include "WingServer.h"
 #include "WingBasics.h"
 #include "WingTypes.h"
-#include "EdGraphSchema_K2.h"
-#include "GameFramework/Actor.h"
-#include "Components/ActorComponent.h"
-#include "Blueprint/UserWidget.h"
-#include "GameFramework/Pawn.h"
-#include "Engine/DataAsset.h"
 #include "TypeName_Search.generated.h"
 
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp
index 4f7267fd..8672011a 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp
@@ -1,5 +1,4 @@
 #include "WingComponent.h"
-#include "WingServer.h"
 #include "WingTypes.h"
 #include "WingUtils.h"
 #include "Engine/Blueprint.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingFactories.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingFactories.cpp
index 8eb43802..e395cca8 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingFactories.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingFactories.cpp
@@ -1,6 +1,5 @@
 #include "WingFactories.h"
 #include "WingServer.h"
-#include "WingUtils.h"
 #include "PackageTools.h"
 #include "WingProperty.h"
 #include "AssetRegistry/AssetRegistryModule.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp
index fef762ed..9211d072 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp
@@ -18,7 +18,6 @@
 #include "WidgetBlueprint.h"
 #include "Blueprint/WidgetTree.h"
 #include "Components/Widget.h"
-#include "WingServer.h"
 #include "WingManual.h"
 
 WingFetcher::WalkFunc WingFetcher::GetWalker(const FString& Step)
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingGraphActions.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingGraphActions.cpp
index 4e767052..74f1d446 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingGraphActions.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingGraphActions.cpp
@@ -4,7 +4,6 @@
 #include "BlueprintNodeSpawner.h"
 #include "EdGraphSchema_K2.h"
 #include "WingUtils.h"
-#include "Kismet2/BlueprintEditorUtils.h"
 
 FWingGraphAction::FWingGraphAction(TSharedPtr<FEdGraphSchemaAction> &iAction, UEdGraph *iGraph)
 {
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingGraphExport.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingGraphExport.cpp
index df339492..4cb0f175 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingGraphExport.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingGraphExport.cpp
@@ -1,17 +1,14 @@
 #include "WingGraphExport.h"
 #include "WingTypes.h"
 #include "WingUtils.h"
-#include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
 #include "EdGraph/EdGraphNode.h"
 #include "EdGraph/EdGraphPin.h"
 #include "EdGraphSchema_K2.h"
 #include "EdGraphNode_Comment.h"
 #include "K2Node_CallFunction.h"
-#include "K2Node_FunctionEntry.h"
 #include "WingVariables.h"
 #include "MaterialGraph/MaterialGraphNode.h"
-#include "Kismet2/BlueprintEditorUtils.h"
 
 WingGraphExport::WingGraphExport(UEdGraph* InGraph, bool Locals, bool Details)
 	: Graph(InGraph), ShowLocals(Locals), ShowDetails(Details)
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingModule.h b/Plugins/UEWingman/Source/UEWingman/Private/WingModule.h
index ef30e2d8..9be62c7a 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingModule.h
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingModule.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "CoreMinimal.h"
 #include "Modules/ModuleInterface.h"
 
 class FWingModule : public IModuleInterface
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingNotifier.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingNotifier.cpp
index 66bf9ef2..8c76c2bf 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingNotifier.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingNotifier.cpp
@@ -9,7 +9,6 @@
 #include "BlueprintEditor.h"
 #include "MaterialEditingLibrary.h"
 #include "Subsystems/AssetEditorSubsystem.h"
-#include "Engine/Blueprint.h"
 #include "WingHacks.h"
 
 void FWingNotifier::AddTouchedObject(UObject* Obj)
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp
index 5b0f6599..99e872ed 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp
@@ -2,10 +2,8 @@
 #include "WingComponent.h"
 #include "WingUtils.h"
 #include "WingBasics.h"
-#include "WingServer.h"
 #include "WingTypes.h"
 #include "Engine/Blueprint.h"
-#include "Engine/SCS_Node.h"
 #include "MaterialGraph/MaterialGraphNode.h"
 #include "Components/Widget.h"
 #include "Components/PanelSlot.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingServer.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingServer.cpp
index b52e8aaf..202be799 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingServer.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingServer.cpp
@@ -5,23 +5,15 @@
 #include "WingLogCapture.h"
 #include "WingUtils.h"
 #include "UObject/StrongObjectPtr.h"
-#include "Materials/MaterialExpression.h"
 #include "AssetRegistry/AssetRegistryModule.h"
 #include "AssetRegistry/IAssetRegistry.h"
 #include "Engine/Blueprint.h"
-#include "Engine/World.h"
-#include "Engine/Level.h"
-#include "Engine/LevelScriptBlueprint.h"
 #include "EdGraph/EdGraph.h"
 #include "EdGraph/EdGraphNode.h"
 #include "EdGraph/EdGraphPin.h"
 #include "EdGraphSchema_K2.h"
 #include "K2Node.h"
 #include "K2Node_CallFunction.h"
-#include "K2Node_Event.h"
-#include "K2Node_CustomEvent.h"
-#include "K2Node_FunctionEntry.h"
-#include "K2Node_EditablePinBase.h"
 #include "K2Node_VariableGet.h"
 #include "K2Node_VariableSet.h"
 #include "K2Node_BreakStruct.h"
@@ -32,57 +24,17 @@
 #include "K2Node_IfThenElse.h"
 #include "Kismet2/BlueprintEditorUtils.h"
 #include "Kismet2/KismetEditorUtilities.h"
-#include "Dom/JsonValue.h"
 #include "Serialization/JsonReader.h"
-#include "Serialization/JsonWriter.h"
 #include "Serialization/JsonSerializer.h"
-#include "Interfaces/IPv4/IPv4Address.h"
-#include "Interfaces/IPv4/IPv4Endpoint.h"
 #include "SocketSubsystem.h"
 #include "Sockets.h"
 #include "Async/Async.h"
-#include "UObject/SavePackage.h"
 #include "Misc/Paths.h"
 #include "Misc/FileHelper.h"
 #include "Misc/Guid.h"
-#include "AssetToolsModule.h"
-#include "IAssetTools.h"
 #include "UObject/UObjectIterator.h"
 #include "Misc/PackageName.h"
-#include "UObject/LinkerLoad.h"
-#include "Engine/UserDefinedEnum.h"
 #include "Editor.h"
-#include "Materials/Material.h"
-#include "Materials/MaterialInstanceConstant.h"
-#include "Materials/MaterialFunction.h"
-#include "Materials/MaterialExpressionScalarParameter.h"
-#include "Materials/MaterialExpressionVectorParameter.h"
-#include "Materials/MaterialExpressionTextureObjectParameter.h"
-#include "Materials/MaterialExpressionTextureSampleParameter2D.h"
-#include "Materials/MaterialExpressionStaticSwitchParameter.h"
-#include "Materials/MaterialExpressionConstant.h"
-#include "Materials/MaterialExpressionConstant2Vector.h"
-#include "Materials/MaterialExpressionConstant3Vector.h"
-#include "Materials/MaterialExpressionConstant4Vector.h"
-#include "Materials/MaterialExpressionTextureSample.h"
-#include "Materials/MaterialExpressionTextureCoordinate.h"
-#include "Materials/MaterialExpressionComponentMask.h"
-#include "Materials/MaterialExpressionCustom.h"
-#include "Materials/MaterialExpressionAppendVector.h"
-#include "Materials/MaterialExpressionAdd.h"
-#include "Materials/MaterialExpressionMultiply.h"
-#include "Materials/MaterialExpressionLinearInterpolate.h"
-#include "Materials/MaterialExpressionClamp.h"
-#include "Materials/MaterialExpressionOneMinus.h"
-#include "Materials/MaterialExpressionPower.h"
-#include "Materials/MaterialExpressionTime.h"
-#include "Materials/MaterialExpressionWorldPosition.h"
-#include "Materials/MaterialExpressionFunctionInput.h"
-#include "Materials/MaterialExpressionFunctionOutput.h"
-#include "Materials/MaterialExpressionMaterialFunctionCall.h"
-#include "MaterialGraph/MaterialGraph.h"
-#include "MaterialGraph/MaterialGraphNode.h"
-#include "MaterialGraph/MaterialGraphSchema.h"
 
 // Animation Blueprint support
 #include "Animation/AnimBlueprint.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingToolMenu.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingToolMenu.cpp
index 61345fef..874f429e 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingToolMenu.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingToolMenu.cpp
@@ -5,7 +5,6 @@
 #include "ToolMenuContext.h"
 #include "ToolMenus.h"
 #include "WingUtils.h"
-#include "EdGraph/EdGraphSchema.h"
 #include "EdGraphSchema_K2.h"
 #include "Framework/Commands/UIAction.h"
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingVariables.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingVariables.cpp
index a49ca259..70a0e46f 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingVariables.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingVariables.cpp
@@ -1,5 +1,4 @@
 #include "WingVariables.h"
-#include "WingServer.h"
 #include "WingTypes.h"
 #include "WingUtils.h"
 #include "WingProperty.h"
@@ -8,7 +7,6 @@
 #include "K2Node_FunctionEntry.h"
 #include "K2Node_FunctionResult.h"
 #include "K2Node_CustomEvent.h"
-#include "K2Node_Tunnel.h"
 #include "K2Node_EditablePinBase.h"
 #include "Kismet2/BlueprintEditorUtils.h"
 #include "Kismet2/KismetEditorUtilities.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingWidgets.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingWidgets.cpp
index fcbbe1e4..4bdb89e1 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingWidgets.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingWidgets.cpp
@@ -1,15 +1,11 @@
 #include "WingWidgets.h"
-#include "WingServer.h"
 #include "WingUtils.h"
-#include "Blueprint/WidgetTree.h"
 #include "WidgetBlueprint.h"
 #include "Components/Widget.h"
 #include "Components/PanelWidget.h"
 #include "Components/PanelSlot.h"
-#include "Blueprint/UserWidget.h"
 #include "UObject/UObjectIterator.h"
 #include "AssetRegistry/AssetData.h"
-#include "AssetRegistry/AssetRegistryModule.h"
 #include "AssetRegistry/IAssetRegistry.h"
 
 FString WingWidgets::WidgetMenuString(UClass* WidgetClass)
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h b/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h
index 3286a9da..e6898236 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h
@@ -8,6 +8,7 @@
 
 class UEdGraphNode;
 class UEdGraphPin;
+class UBlueprint;
 
 ////////////////////////////////////////////////////////////
 //
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingFetcher.h b/Plugins/UEWingman/Source/UEWingman/Public/WingFetcher.h
index b8288e64..0d6f7929 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingFetcher.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingFetcher.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "UObject/StrongObjectPtr.h"
-#include "WingUtils.h"
+#include "WingBasics.h"
 
 struct FWalker;
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingGraphActions.h b/Plugins/UEWingman/Source/UEWingman/Public/WingGraphActions.h
index ef2e378d..4a8ee37f 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingGraphActions.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingGraphActions.h
@@ -1,9 +1,10 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "EdGraph/EdGraph.h"
 
 class UBlueprintNodeSpawner;
+class UEdGraph;
+class UEdGraphNode;
 struct FEdGraphSchemaAction;
 
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingGraphExport.h b/Plugins/UEWingman/Source/UEWingman/Public/WingGraphExport.h
index f3e5f0d0..00681308 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingGraphExport.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingGraphExport.h
@@ -2,11 +2,11 @@
 
 #include "CoreMinimal.h"
 #include "WingProperty.h"
-#include "Engine/Blueprint.h"
-#include "EdGraph/EdGraph.h"
-#include "EdGraph/EdGraphNode.h"
 #include "EdGraph/EdGraphPin.h"
 
+class UEdGraph;
+class UEdGraphNode;
+
 class WingGraphExport
 {
 public:
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingParameterEditor.h b/Plugins/UEWingman/Source/UEWingman/Public/WingParameterEditor.h
index 883022f4..4b9f6794 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingParameterEditor.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingParameterEditor.h
@@ -2,11 +2,12 @@
 
 #include "CoreMinimal.h"
 #include "Materials/Material.h"
-#include "WingTokenizer.h"
 #include "Materials/MaterialInstanceConstant.h"
 #include "WingBasics.h"
 #include "WingParameterEditor.generated.h"
 
+struct WingTokenizer;
+
 USTRUCT()
 struct FWingFontAndPage
 {
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingProperty.h b/Plugins/UEWingman/Source/UEWingman/Public/WingProperty.h
index a79dca02..e167748f 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingProperty.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingProperty.h
@@ -2,7 +2,6 @@
 
 #include "CoreMinimal.h"
 #include "WingBasics.h"
-#include "WingUtils.h"
 
 // A resolved property: the FProperty descriptor plus a pointer to
 // the value's storage.
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingServer.h b/Plugins/UEWingman/Source/UEWingman/Public/WingServer.h
index 28ca3b94..3abce335 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingServer.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingServer.h
@@ -5,8 +5,6 @@
 #include "Tickable.h"
 #include "TickableEditorObject.h"
 #include "Async/Future.h"
-#include "Dom/JsonObject.h"
-#include "WingUtils.h"
 #include "WingNotifier.h"
 #include "WingLogCapture.h"
 #include "WingBasics.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingTokenizer.h b/Plugins/UEWingman/Source/UEWingman/Public/WingTokenizer.h
index 6a7f933d..a56ba842 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingTokenizer.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingTokenizer.h
@@ -1,6 +1,5 @@
 #pragma once
 #include "CoreMinimal.h"
-#include "WingBasics.h"
 
 // -----------------------------------------------------------------
 //
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingTypes.h b/Plugins/UEWingman/Source/UEWingman/Public/WingTypes.h
index 5a6946fd..d70cd5be 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingTypes.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingTypes.h
@@ -6,6 +6,7 @@
 #include "WingBasics.h"
 #include "WingTypes.generated.h"
 
+struct FAssetData;
 struct WingTokenizer;
 
 // ---------------------------------------------------------------------------
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h b/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h
index 6879225d..c762a679 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h
@@ -1,10 +1,8 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Dom/JsonObject.h"
 #include "EdGraph/EdGraph.h"
 #include "EdGraph/EdGraphPin.h"
-#include "Materials/MaterialInstanceConstant.h"
 #include "Materials/MaterialExpression.h"
 #include "MaterialTypes.h"
 #include "Components/ActorComponent.h"
@@ -13,31 +11,30 @@
 #include "Engine/Blueprint.h"
 #include "K2Node_EditablePinBase.h"
 #include "Components/Widget.h"
-#include "WingComponent.h"
 #include "WingVariables.h"
 #include "WingBasics.h"
 
 struct FEdGraphSchemaAction;
 class UAnimationStateMachineGraph;
+class UAnimSequence;
 class UAnimStateNode;
 class UAnimStateTransitionNode;
+class UBlendSpace;
 class IPropertyHandle;
 class UScriptStruct;
 class UEnum;
 class IAssetEditorInstance;
+class UMaterial;
+class UMaterialFunction;
+class UMaterialInstance;
+class UStaticMesh;
+class USkeletalMesh;
+class UTexture;
+class UWorld;
 struct FBPInterfaceDescription;
 struct FWingProperty;
 class IPropertyHandle;
 
-#include "Engine/World.h"
-#include "Materials/Material.h"
-#include "Engine/StaticMesh.h"
-#include "Engine/SkeletalMesh.h"
-#include "Animation/AnimSequence.h"
-#include "Animation/BlendSpace.h"
-#include "Engine/Texture.h"
-#include "Materials/MaterialFunction.h"
-
 // Stateless utility functions used by MCP handlers and the MCP server.
 // This is effectively a namespace — all methods are static.
 class WingUtils
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h b/Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h
index 83865fbe..7606c6fc 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h
@@ -2,10 +2,12 @@
 
 #include "CoreMinimal.h"
 #include "EdGraph/EdGraphPin.h"
-#include "Engine/Blueprint.h"
 #include "WingBasics.h"
 
+struct FBPVariableDescription;
 struct WingTokenizer;
+class UBlueprint;
+class UEdGraph;
 class UK2Node_CustomEvent;
 class UK2Node_EditablePinBase;
 class UK2Node_FunctionEntry;
@@ -186,4 +188,3 @@ private:
 
     bool ErrorNoBackingStore(WingOut Errors);
 };
-
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h b/Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h
index e9a30976..7c6636d3 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Components/Widget.h"
 #include "WingBasics.h"
 
+class UWidget;
 class UWidgetTree;
 struct FAssetData;
 
diff --git a/tools/clangd-diag-files.py b/tools/clangd-diag-files.py
new file mode 100644
index 00000000..cf8ecc7e
--- /dev/null
+++ b/tools/clangd-diag-files.py
@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+"""Run clangd diagnostics on an explicit list of C++ source files.
+
+Usage:
+    python3 tools/clangd-diag-files.py <file> [<file> ...]
+"""
+
+import subprocess
+import sys
+from pathlib import Path
+
+
+def find_project_root():
+    """Walk up from this script's directory to find the project root."""
+    d = Path(__file__).resolve().parent.parent
+    if (d / "build.py").exists():
+        return d
+    return Path.cwd()
+
+
+def run_diagnostics(root, rel_path):
+    """Run clangd-query.py diagnostics on a single file. Returns output lines."""
+    result = subprocess.run(
+        [sys.executable, "tools/clangd-query.py", "diagnostics", str(rel_path)],
+        cwd=root,
+        capture_output=True,
+        text=True,
+        timeout=120,
+    )
+    output = result.stdout.strip()
+    if result.returncode != 0 and result.stderr.strip():
+        if output:
+            output += "\n"
+        output += result.stderr.strip()
+    return output
+
+
+def normalize_path(root, raw_path):
+    """Normalize a user-provided path to a project-relative path."""
+    path = Path(raw_path)
+    if path.is_absolute():
+        path = path.resolve().relative_to(root.resolve())
+    return path
+
+
+def main():
+    if len(sys.argv) < 2:
+        print("Usage: python3 tools/clangd-diag-files.py <file> [<file> ...]", file=sys.stderr)
+        return 2
+
+    root = find_project_root()
+    files = [normalize_path(root, arg) for arg in sys.argv[1:]]
+
+    total_issues = 0
+    files_with_issues = 0
+
+    for i, rel_path in enumerate(files):
+        label = f"[{i + 1}/{len(files)}] {rel_path}"
+        print(f"{label} ... ", end="", flush=True)
+
+        try:
+            output = run_diagnostics(root, rel_path)
+        except subprocess.TimeoutExpired:
+            print("TIMEOUT")
+            continue
+
+        if not output or "No problems found" in output or output.strip() == "No diagnostics.":
+            print("ok")
+            continue
+
+        lines = [line for line in output.splitlines() if line.strip()]
+        count = len(lines)
+        total_issues += count
+        files_with_issues += 1
+        print(f"{count} issue(s)")
+        for line in lines:
+            print(f"  {line}")
+
+    print(f"\nDone. {total_issues} issue(s) in {files_with_issues} file(s) out of {len(files)} checked.")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())