From ecb64effeb58909d70511eda65820c25d991b9a1 Mon Sep 17 00:00:00 2001
From: ASDAlexander77 <duzhar@googlemail.com>
Date: Mon, 13 Jul 2026 17:59:35 +0100
Subject: [PATCH] Refactor header includes and clean up unused headers in
 MLIRGen files

---
 tslang/lib/TypeScript/MLIRGen.cpp            |  1 +
 tslang/lib/TypeScript/MLIRGenExpressions.cpp |  5 +++++
 tslang/lib/TypeScript/MLIRGenImpl.h          | 13 -------------
 tslang/lib/TypeScript/MLIRGenModule.cpp      | 14 ++++++++++++++
 tslang/lib/TypeScript/MLIRGenStatements.cpp  |  7 +++++++
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/tslang/lib/TypeScript/MLIRGen.cpp b/tslang/lib/TypeScript/MLIRGen.cpp
index 0dd5e26d..7b87b47a 100644
--- a/tslang/lib/TypeScript/MLIRGen.cpp
+++ b/tslang/lib/TypeScript/MLIRGen.cpp
@@ -1,5 +1,6 @@
 #include "MLIRGenImpl.h"
 
+
 // TODO: optimize of amount of calls to detect return types and if it is was calculated before then do not run it all
 // the time
 static CompileOptions *compileOptionsPtr = nullptr;
diff --git a/tslang/lib/TypeScript/MLIRGenExpressions.cpp b/tslang/lib/TypeScript/MLIRGenExpressions.cpp
index 47d4340b..6b96e82e 100644
--- a/tslang/lib/TypeScript/MLIRGenExpressions.cpp
+++ b/tslang/lib/TypeScript/MLIRGenExpressions.cpp
@@ -2,6 +2,11 @@
 
 #include "MLIRGenImpl.h"
 
+#include "mlir/Dialect/Async/IR/Async.h"
+
+#undef DEBUG_TYPE
+#define DEBUG_TYPE "mlir"
+
 namespace typescript
 {
 namespace mlirgen
diff --git a/tslang/lib/TypeScript/MLIRGenImpl.h b/tslang/lib/TypeScript/MLIRGenImpl.h
index 65b89516..0deaffd3 100644
--- a/tslang/lib/TypeScript/MLIRGenImpl.h
+++ b/tslang/lib/TypeScript/MLIRGenImpl.h
@@ -15,7 +15,6 @@
 #include "TypeScript/TypeScriptDialect.h"
 #include "TypeScript/TypeScriptOps.h"
 #include "TypeScript/DiagnosticHelper.h"
-#include "TypeScript/ObjDumper.h"
 
 #include "TypeScript/MLIRLogic/MLIRCodeLogic.h"
 #include "TypeScript/MLIRLogic/MLIRGenContext.h"
@@ -24,7 +23,6 @@
 #include "TypeScript/MLIRLogic/MLIRTypeHelper.h"
 #include "TypeScript/MLIRLogic/MLIRValueGuard.h"
 #include "TypeScript/MLIRLogic/MLIRDebugInfoHelper.h"
-#include "TypeScript/MLIRLogic/MLIRRTTIHelperVC.h"
 #include "TypeScript/MLIRLogic/MLIRPrinter.h"
 #include "TypeScript/MLIRLogic/MLIRDeclarationPrinter.h"
 #include "TypeScript/MLIRLogic/TypeOfOpHelper.h"
@@ -47,15 +45,11 @@
 #include "mlir/IR/Diagnostics.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/Types.h"
-#include "mlir/IR/Verifier.h"
 
 #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
-#include "mlir/Dialect/DLTI/DLTI.h"
-#include "mlir/IR/Diagnostics.h"
 #ifdef ENABLE_ASYNC
-#include "mlir/Dialect/Async/IR/Async.h"
 #endif
 
 #include "llvm/ADT/STLExtras.h"
@@ -64,21 +58,14 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/Path.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/DynamicLibrary.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/raw_ostream.h"
-#include "mlir/Support/FileUtilities.h"
-#include "llvm/Support/ToolOutputFile.h"
 //#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/Support/WithColor.h"
 
 #include "TypeScript/MLIRLogic/MLIRGenContextDefines.h"
 
 #include <algorithm>
 #include <iterator>
-#include <numeric>
-#include <set>
 #include <type_traits>
 
 #define DEBUG_TYPE "mlir"
diff --git a/tslang/lib/TypeScript/MLIRGenModule.cpp b/tslang/lib/TypeScript/MLIRGenModule.cpp
index 8fbf6e34..c5e6b30c 100644
--- a/tslang/lib/TypeScript/MLIRGenModule.cpp
+++ b/tslang/lib/TypeScript/MLIRGenModule.cpp
@@ -1,7 +1,21 @@
 // Module, discovery, include/import driver methods of MLIRGenImpl (see MLIRGenImpl.h).
 
+#include "TypeScript/ObjDumper.h"
+
 #include "MLIRGenImpl.h"
 
+
+
+#include "mlir/IR/Verifier.h"
+#include "mlir/Dialect/DLTI/DLTI.h"
+#include "mlir/Support/FileUtilities.h"
+
+#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/DynamicLibrary.h"
+#include "llvm/Support/ToolOutputFile.h"
+
+#include <set>
+
 namespace typescript
 {
 namespace mlirgen
diff --git a/tslang/lib/TypeScript/MLIRGenStatements.cpp b/tslang/lib/TypeScript/MLIRGenStatements.cpp
index dcd32286..a74b01f3 100644
--- a/tslang/lib/TypeScript/MLIRGenStatements.cpp
+++ b/tslang/lib/TypeScript/MLIRGenStatements.cpp
@@ -2,6 +2,13 @@
 
 #include "MLIRGenImpl.h"
 
+#include "TypeScript/MLIRLogic/MLIRRTTIHelperVC.h"
+
+#include "mlir/Dialect/Async/IR/Async.h"
+
+#undef DEBUG_TYPE
+#define DEBUG_TYPE "mlir"
+
 namespace typescript
 {
 namespace mlirgen