From 39cc7cd14bdf2902ef6db3cf8388ba9b4965d2ee Mon Sep 17 00:00:00 2001
From: jyelon <jyelon@gmail.com>
Date: Wed, 8 Apr 2026 03:14:08 -0400
Subject: [PATCH] Next batch of IWYU cleanup

---
 .../UEWingman/Source/UEWingman/Private/WingCommandlet.cpp   | 1 +
 .../UEWingman/Source/UEWingman/Private/WingComponent.cpp    | 1 +
 .../UEWingman/Source/UEWingman/Private/WingGraphExport.cpp  | 1 +
 Plugins/UEWingman/Source/UEWingman/Private/WingManual.cpp   | 1 +
 .../Source/UEWingman/Private/WingParameterEditor.cpp        | 1 +
 Plugins/UEWingman/Source/UEWingman/Private/WingToolMenu.cpp | 3 ++-
 Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h      | 3 ++-
 Plugins/UEWingman/Source/UEWingman/Public/WingCommandlet.h  | 1 -
 Plugins/UEWingman/Source/UEWingman/Public/WingComponent.h   | 4 +++-
 Plugins/UEWingman/Source/UEWingman/Public/WingFetcher.h     | 2 --
 Plugins/UEWingman/Source/UEWingman/Public/WingGraphExport.h | 2 +-
 Plugins/UEWingman/Source/UEWingman/Public/WingManual.h      | 6 ++++--
 .../UEWingman/Source/UEWingman/Public/WingParameterEditor.h | 5 +++--
 Plugins/UEWingman/Source/UEWingman/Public/WingServer.h      | 1 -
 Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h       | 4 ++--
 Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h   | 1 +
 Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h     | 3 ++-
 17 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingCommandlet.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingCommandlet.cpp
index 0a2cc722..14f03c0c 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingCommandlet.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingCommandlet.cpp
@@ -1,4 +1,5 @@
 #include "WingCommandlet.h"
+#include "CoreMinimal.h"
 #include "WingServer.h"
 #include "Containers/Ticker.h"
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp
index 8672011a..c7457c32 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp
@@ -1,6 +1,7 @@
 #include "WingComponent.h"
 #include "WingTypes.h"
 #include "WingUtils.h"
+#include "WingBasics.h"
 #include "Engine/Blueprint.h"
 #include "Engine/SCS_Node.h"
 #include "Engine/SimpleConstructionScript.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingGraphExport.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingGraphExport.cpp
index 4cb0f175..7454c79b 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingGraphExport.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingGraphExport.cpp
@@ -1,4 +1,5 @@
 #include "WingGraphExport.h"
+#include "WingProperty.h"
 #include "WingTypes.h"
 #include "WingUtils.h"
 #include "EdGraph/EdGraph.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingManual.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingManual.cpp
index 526b7678..c9aa6cfb 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingManual.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingManual.cpp
@@ -2,6 +2,7 @@
 #include "WingServer.h"
 #include "WingBasics.h"
 #include "WingTypes.h"
+#include "WingUtils.h"
 
 void WingManual::PrintHandlerPrototype(const FWingHandlerConfig& Handler)
 {
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingParameterEditor.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingParameterEditor.cpp
index ebefdcf7..e7ab90fe 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingParameterEditor.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingParameterEditor.cpp
@@ -1,4 +1,5 @@
 #include "WingParameterEditor.h"
+#include "Materials/MaterialInstanceConstant.h"
 #include "WingUtils.h"
 #include "WingTokenizer.h"
 #include "WingProperty.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Private/WingToolMenu.cpp b/Plugins/UEWingman/Source/UEWingman/Private/WingToolMenu.cpp
index 874f429e..6234bbdd 100644
--- a/Plugins/UEWingman/Source/UEWingman/Private/WingToolMenu.cpp
+++ b/Plugins/UEWingman/Source/UEWingman/Private/WingToolMenu.cpp
@@ -3,7 +3,8 @@
 #include "ToolMenuEntry.h"
 #include "ToolMenuDelegates.h"
 #include "ToolMenuContext.h"
-#include "ToolMenus.h"
+#include "ToolMenu.h"
+#include "ToolMenuSection.h"
 #include "WingUtils.h"
 #include "EdGraphSchema_K2.h"
 #include "Framework/Commands/UIAction.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h b/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h
index e6898236..8d0d39cd 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h
@@ -3,12 +3,13 @@
 #include "CoreMinimal.h"
 #include "UObject/Object.h"
 #include "UObject/StrongObjectPtr.h"
-#include "Dom/JsonObject.h"
 #include "WingBasics.generated.h"
 
 class UEdGraphNode;
 class UEdGraphPin;
 class UBlueprint;
+class FJsonObject;
+class FJsonValue;
 
 ////////////////////////////////////////////////////////////
 //
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingCommandlet.h b/Plugins/UEWingman/Source/UEWingman/Public/WingCommandlet.h
index e73d5ea0..37ba2ba9 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingCommandlet.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingCommandlet.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "CoreMinimal.h"
 #include "Commandlets/Commandlet.h"
 #include "WingCommandlet.generated.h"
 
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingComponent.h b/Plugins/UEWingman/Source/UEWingman/Public/WingComponent.h
index a192119e..59bafaf4 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingComponent.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingComponent.h
@@ -1,12 +1,14 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingBasics.h"
 
 class UBlueprint;
 class USCS_Node;
 class UActorComponent;
 class USimpleConstructionScript;
+class UClass;
+class UWingComponentReference;
+class WingOut;
 
 
 struct UWingComponent
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingFetcher.h b/Plugins/UEWingman/Source/UEWingman/Public/WingFetcher.h
index 0d6f7929..cdefe929 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingFetcher.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingFetcher.h
@@ -4,8 +4,6 @@
 #include "UObject/StrongObjectPtr.h"
 #include "WingBasics.h"
 
-struct FWalker;
-
 // WingFetcher: Load an Asset and find an object within it.
 // To find an object, you use a path.  This is typical:
 //
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingGraphExport.h b/Plugins/UEWingman/Source/UEWingman/Public/WingGraphExport.h
index 00681308..f84f5b0f 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingGraphExport.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingGraphExport.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "WingProperty.h"
 #include "EdGraph/EdGraphPin.h"
 
 class UEdGraph;
 class UEdGraphNode;
+struct FWingProperty;
 
 class WingGraphExport
 {
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingManual.h b/Plugins/UEWingman/Source/UEWingman/Public/WingManual.h
index 29d09444..a878eaf7 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingManual.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingManual.h
@@ -1,6 +1,8 @@
 #pragma once
-#include "Containers/Set.h"
-#include "WingBasics.h"
+#include "CoreMinimal.h"
+
+struct FWingHandlerConfig;
+enum class EWingHandlerKind;
 
 class WingManual
 {
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingParameterEditor.h b/Plugins/UEWingman/Source/UEWingman/Public/WingParameterEditor.h
index 4b9f6794..16df79ea 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingParameterEditor.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingParameterEditor.h
@@ -1,11 +1,12 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Materials/Material.h"
-#include "Materials/MaterialInstanceConstant.h"
+#include "MaterialTypes.h"
 #include "WingBasics.h"
 #include "WingParameterEditor.generated.h"
 
+class UMaterialInterface;
+class UMaterialInstanceConstant;
 struct WingTokenizer;
 
 USTRUCT()
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingServer.h b/Plugins/UEWingman/Source/UEWingman/Public/WingServer.h
index 3abce335..33fef135 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingServer.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingServer.h
@@ -2,7 +2,6 @@
 
 #include "CoreMinimal.h"
 #include "EditorSubsystem.h"
-#include "Tickable.h"
 #include "TickableEditorObject.h"
 #include "Async/Future.h"
 #include "WingNotifier.h"
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h b/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h
index c762a679..d882e9bb 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h
@@ -2,11 +2,10 @@
 
 #include "CoreMinimal.h"
 #include "EdGraph/EdGraph.h"
+#include "EdGraph/EdGraphNode.h"
 #include "EdGraph/EdGraphPin.h"
 #include "Materials/MaterialExpression.h"
-#include "MaterialTypes.h"
 #include "Components/ActorComponent.h"
-#include "Engine/SCS_Node.h"
 #include "Engine/MemberReference.h"
 #include "Engine/Blueprint.h"
 #include "K2Node_EditablePinBase.h"
@@ -20,6 +19,7 @@ class UAnimSequence;
 class UAnimStateNode;
 class UAnimStateTransitionNode;
 class UBlendSpace;
+class USCS_Node;
 class IPropertyHandle;
 class UScriptStruct;
 class UEnum;
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h b/Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h
index 7606c6fc..d2dc6075 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h
@@ -6,6 +6,7 @@
 
 struct FBPVariableDescription;
 struct WingTokenizer;
+class UObject;
 class UBlueprint;
 class UEdGraph;
 class UK2Node_CustomEvent;
diff --git a/Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h b/Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h
index 7c6636d3..97d4b8f2 100644
--- a/Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h
+++ b/Plugins/UEWingman/Source/UEWingman/Public/WingWidgets.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "UObject/SoftObjectPtr.h"
 #include "WingBasics.h"
 
+class UClass;
 class UWidget;
-class UWidgetTree;
 struct FAssetData;