diff --git a/lib/Conversion/DistToStandard/DistToStandard.cpp b/lib/Conversion/DistToStandard/DistToStandard.cpp
index abedf7d81..a9b0b417c 100644
--- a/lib/Conversion/DistToStandard/DistToStandard.cpp
+++ b/lib/Conversion/DistToStandard/DistToStandard.cpp
@@ -40,10 +40,7 @@
 
 #include <array>
 #include <cstdlib>
-#include <iostream>
 #include <optional>
-#include <sstream>
-#include <string>
 
 namespace imex {
 #define GEN_PASS_DEF_CONVERTDISTTOSTANDARD
diff --git a/lib/Conversion/GPUXToLLVM/GPUXToLLVMPass.cpp b/lib/Conversion/GPUXToLLVM/GPUXToLLVMPass.cpp
index fd61d6f6c..563842bab 100644
--- a/lib/Conversion/GPUXToLLVM/GPUXToLLVMPass.cpp
+++ b/lib/Conversion/GPUXToLLVM/GPUXToLLVMPass.cpp
@@ -32,12 +32,10 @@
 #include "mlir/Conversion/AsyncToLLVM/AsyncToLLVM.h"
 #include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h"
 #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h"
-#include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h"
 #include "mlir/Conversion/LLVMCommon/ConversionTarget.h"
 #include "mlir/Conversion/LLVMCommon/Pattern.h"
 #include "mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h"
 #include "mlir/Conversion/VectorToLLVM/ConvertVectorToLLVM.h"
-#include "mlir/Dialect/Async/IR/Async.h"
 #include "mlir/Dialect/GPU/IR/GPUDialect.h"
 #include "mlir/Dialect/GPU/Transforms/Passes.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
@@ -48,7 +46,6 @@
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/Casting.h"
-#include "llvm/Support/Error.h"
 #include "llvm/Support/FormatVariadic.h"
 
 #include "mlir/Pass/Pass.h"
diff --git a/lib/Conversion/MathToVC/MathToVC.cpp b/lib/Conversion/MathToVC/MathToVC.cpp
index 0e0121c91..a073fa4ec 100644
--- a/lib/Conversion/MathToVC/MathToVC.cpp
+++ b/lib/Conversion/MathToVC/MathToVC.cpp
@@ -19,13 +19,9 @@
 #include "mlir/Conversion/LLVMCommon/TypeConverter.h"
 #include "mlir/Dialect/Arith/IR/Arith.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/Dialect/Math/IR/Math.h"
-#include "mlir/IR/BuiltinDialect.h"
-#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Value.h"
-#include "mlir/IR/ValueRange.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Pass/PassManager.h"
 #include "mlir/Transforms/DialectConversion.h"
diff --git a/lib/Conversion/NDArrayToLinalg/NDArrayToLinalg.cpp b/lib/Conversion/NDArrayToLinalg/NDArrayToLinalg.cpp
index 85c1a9b6f..620427c46 100644
--- a/lib/Conversion/NDArrayToLinalg/NDArrayToLinalg.cpp
+++ b/lib/Conversion/NDArrayToLinalg/NDArrayToLinalg.cpp
@@ -47,7 +47,6 @@
 #include <mlir/Dialect/Tosa/IR/TosaOps.h>
 #include <mlir/Pass/Pass.h>
 
-#include <iostream>
 #include <optional>
 
 namespace imex {
diff --git a/lib/Conversion/XeGPUToVC/LSCPatterns.cpp b/lib/Conversion/XeGPUToVC/LSCPatterns.cpp
index 4c81c523b..5a9c24c2b 100644
--- a/lib/Conversion/XeGPUToVC/LSCPatterns.cpp
+++ b/lib/Conversion/XeGPUToVC/LSCPatterns.cpp
@@ -16,25 +16,15 @@
 #include <imex/Conversion/XeGPUToVC/XeGPUToVC.h>
 
 #include "mlir/Dialect/Arith/IR/Arith.h"
-#include "mlir/Dialect/Math/IR/Math.h"
-#include "mlir/Dialect/SCF/IR/SCF.h"
-#include "mlir/Dialect/SPIRV/IR/SPIRVAttributes.h"
-#include "mlir/Dialect/SPIRV/IR/SPIRVEnums.h"
-#include "mlir/IR/BuiltinDialect.h"
-#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Value.h"
 #include "mlir/IR/ValueRange.h"
-#include "mlir/Pass/Pass.h"
 #include "mlir/Pass/PassManager.h"
 
-#include "mlir/Conversion/LLVMCommon/TypeConverter.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 
 #include "mlir/Transforms/DialectConversion.h"
-#include "llvm/Support/Casting.h"
 #include "llvm/Support/FormatVariadic.h"
 
 #include "LscIntrinsicEnums.h"
diff --git a/lib/Conversion/XeGPUToVC/XeGPUToVC.cpp b/lib/Conversion/XeGPUToVC/XeGPUToVC.cpp
index 19ea6d699..6c5200137 100644
--- a/lib/Conversion/XeGPUToVC/XeGPUToVC.cpp
+++ b/lib/Conversion/XeGPUToVC/XeGPUToVC.cpp
@@ -20,7 +20,6 @@
 #include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/Dialect/SPIRV/IR/SPIRVAttributes.h"
 #include "mlir/Dialect/SPIRV/IR/SPIRVEnums.h"
-#include "mlir/IR/BuiltinDialect.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Value.h"
@@ -30,7 +29,6 @@
 
 #include "mlir/Conversion/LLVMCommon/TypeConverter.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/Utils/StaticValueUtils.h"
 
@@ -39,7 +37,6 @@
 #include "mlir/Transforms/DialectConversion.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/Casting.h"
-#include "llvm/Support/FormatVariadic.h"
 
 namespace imex {
 #define GEN_PASS_DEF_CONVERTXEGPUTOVC
diff --git a/lib/Conversion/XeTileToXeGPU/XeTileOpConversion.cpp b/lib/Conversion/XeTileToXeGPU/XeTileOpConversion.cpp
index aa9c48b99..6b5b4db3b 100644
--- a/lib/Conversion/XeTileToXeGPU/XeTileOpConversion.cpp
+++ b/lib/Conversion/XeTileToXeGPU/XeTileOpConversion.cpp
@@ -14,8 +14,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "XeTileOpConversion.h"
-#include "ArithOpConversion.h"
-#include "SCFOpConversion.h"
 #include "imex/Utils/XeArch.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/IR/BuiltinTypes.h"
diff --git a/lib/Dialect/NDArray/IR/CreateOp.cpp b/lib/Dialect/NDArray/IR/CreateOp.cpp
index 65479708e..13998b218 100644
--- a/lib/Dialect/NDArray/IR/CreateOp.cpp
+++ b/lib/Dialect/NDArray/IR/CreateOp.cpp
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 #include <imex/Dialect/NDArray/IR/NDArrayOps.h>
-#include <iostream>
 
 namespace {
 /// Pattern to rewrite a create op with constant arguments.
diff --git a/lib/Dialect/NDArray/IR/LinSpaceOp.cpp b/lib/Dialect/NDArray/IR/LinSpaceOp.cpp
index 3e16afcc6..b252b2053 100644
--- a/lib/Dialect/NDArray/IR/LinSpaceOp.cpp
+++ b/lib/Dialect/NDArray/IR/LinSpaceOp.cpp
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 #include <imex/Dialect/NDArray/IR/NDArrayOps.h>
-#include <iostream>
 
 namespace {
 /// Pattern to rewrite a create op with constant arguments.
diff --git a/lib/Dialect/NDArray/Transforms/AddGPURegions.cpp b/lib/Dialect/NDArray/Transforms/AddGPURegions.cpp
index 6b35ec04b..f03c240e1 100644
--- a/lib/Dialect/NDArray/Transforms/AddGPURegions.cpp
+++ b/lib/Dialect/NDArray/Transforms/AddGPURegions.cpp
@@ -23,8 +23,6 @@
 #include <mlir/IR/PatternMatch.h>
 #include <mlir/Rewrite/FrozenRewritePatternSet.h>
 
-#include <iostream>
-
 namespace imex {
 #define GEN_PASS_DEF_ADDGPUREGIONS
 #include <imex/Dialect/NDArray/Transforms/Passes.h.inc>
diff --git a/lib/Dialect/NDArray/Transforms/NDArrayDist.cpp b/lib/Dialect/NDArray/Transforms/NDArrayDist.cpp
index 23e45f956..4f7f893b4 100644
--- a/lib/Dialect/NDArray/Transforms/NDArrayDist.cpp
+++ b/lib/Dialect/NDArray/Transforms/NDArrayDist.cpp
@@ -37,8 +37,6 @@
 #include <mlir/IR/PatternMatch.h>
 #include <mlir/Rewrite/FrozenRewritePatternSet.h>
 
-#include <iostream>
-
 namespace imex {
 #define GEN_PASS_DEF_NDARRAYDIST
 #include <imex/Dialect/NDArray/Transforms/Passes.h.inc>
diff --git a/lib/Dialect/XeTile/IR/XeTileDialect.cpp b/lib/Dialect/XeTile/IR/XeTileDialect.cpp
index 229d8ad59..e3f46895a 100644
--- a/lib/Dialect/XeTile/IR/XeTileDialect.cpp
+++ b/lib/Dialect/XeTile/IR/XeTileDialect.cpp
@@ -2,10 +2,8 @@
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Diagnostics.h"
-#include "mlir/IR/ValueRange.h"
 #include "mlir/Support/LogicalResult.h"
 #include "llvm/Support/Casting.h"
-#include "llvm/Support/raw_ostream.h"
 #include <cstdint>
 #include <imex/Dialect/XeTile/IR/XeTileOps.h>
 #include <llvm/ADT/TypeSwitch.h>
diff --git a/lib/Dialect/XeTile/IR/XeTileOps.cpp b/lib/Dialect/XeTile/IR/XeTileOps.cpp
index 22c03b467..78afb899f 100644
--- a/lib/Dialect/XeTile/IR/XeTileOps.cpp
+++ b/lib/Dialect/XeTile/IR/XeTileOps.cpp
@@ -17,14 +17,12 @@
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Diagnostics.h"
 #include "mlir/IR/OpDefinition.h"
-#include "mlir/IR/OpImplementation.h"
 #include "mlir/IR/OperationSupport.h"
 #include "mlir/IR/TypeUtilities.h"
 #include "mlir/IR/ValueRange.h"
 #include "mlir/Support/LogicalResult.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/Support/Casting.h"
-#include "llvm/Support/Error.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cassert>
 #include <cstdint>
diff --git a/lib/Dialect/XeTile/Transforms/Blocking.cpp b/lib/Dialect/XeTile/Transforms/Blocking.cpp
index dd54e00de..ffc152d69 100644
--- a/lib/Dialect/XeTile/Transforms/Blocking.cpp
+++ b/lib/Dialect/XeTile/Transforms/Blocking.cpp
@@ -41,14 +41,11 @@
 #include <llvm/ADT/SmallVector.h>
 #include <llvm/Support/Debug.h>
 
-#include <algorithm>
 #include <optional>
-#include <set>
 #include <tuple>
 
 #include "imex/Dialect/XeTile/Transforms/BlockingAnalysis.h"
 #include "imex/Dialect/XeTile/Transforms/Passes.h"
-#include "imex/Utils/DebugUtils.h"
 #include "imex/Utils/XeArch.h"
 
 #define DEBUG_TYPE "xetile-blocking"
diff --git a/lib/Dialect/XeTile/Transforms/Canonicalization.cpp b/lib/Dialect/XeTile/Transforms/Canonicalization.cpp
index 5b9d23133..32ac30a36 100644
--- a/lib/Dialect/XeTile/Transforms/Canonicalization.cpp
+++ b/lib/Dialect/XeTile/Transforms/Canonicalization.cpp
@@ -21,7 +21,6 @@
 #include "imex/Dialect/XeTile/IR/XeTileOps.h"
 #include "imex/Dialect/XeTile/Transforms/Passes.h"
 #include "mlir/Dialect/Arith/IR/Arith.h"
-#include "mlir/Dialect/GPU/IR/GPUDialect.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/Dialect/Vector/IR/VectorOps.h"
@@ -30,7 +29,6 @@
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/BuiltinOps.h"
-#include "mlir/IR/BuiltinTypeInterfaces.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/PatternMatch.h"
@@ -41,11 +39,8 @@
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/SmallVectorExtras.h"
 #include "llvm/Support/Casting.h"
-#include "llvm/Support/raw_ostream.h"
 
 #include <algorithm>
 #include <cassert>
diff --git a/lib/Dialect/XeTile/Transforms/InitDuplicate.cpp b/lib/Dialect/XeTile/Transforms/InitDuplicate.cpp
index 86615ec8f..1614ef598 100644
--- a/lib/Dialect/XeTile/Transforms/InitDuplicate.cpp
+++ b/lib/Dialect/XeTile/Transforms/InitDuplicate.cpp
@@ -35,10 +35,7 @@
 #include <llvm/ADT/SetVector.h>
 #include <llvm/Support/Debug.h>
 
-#include <optional>
-
 #include "imex/Dialect/XeTile/Transforms/Passes.h"
-#include "imex/Utils/DebugUtils.h"
 
 using namespace mlir;
 using namespace imex;
diff --git a/lib/Dialect/XeTile/Transforms/WgToSg.cpp b/lib/Dialect/XeTile/Transforms/WgToSg.cpp
index 15330a1d0..6d0ecadc5 100644
--- a/lib/Dialect/XeTile/Transforms/WgToSg.cpp
+++ b/lib/Dialect/XeTile/Transforms/WgToSg.cpp
@@ -36,18 +36,12 @@
 #include <llvm/ADT/SetVector.h>
 #include <llvm/Support/Debug.h>
 
-#include <algorithm>
 #include <cassert>
-#include <optional>
 
 #include "imex/Dialect/XeTile/Transforms/Passes.h"
-#include "imex/Utils/DebugUtils.h"
-#include "imex/Utils/XeArch.h"
 #include <imex/Conversion/XeTileToXeGPU/XeTileToXeGPU.h>
 #include <imex/Conversion/XeTileToXeGPU/XeTileToXeGPUConversion.h>
 
-#include <iostream>
-
 using namespace mlir;
 using namespace imex;
 namespace imex {
diff --git a/lib/ExecutionEngine/ImexRunnerUtils.cpp b/lib/ExecutionEngine/ImexRunnerUtils.cpp
index ccc983d6b..91fe921e8 100644
--- a/lib/ExecutionEngine/ImexRunnerUtils.cpp
+++ b/lib/ExecutionEngine/ImexRunnerUtils.cpp
@@ -18,7 +18,6 @@
 #include <cstring>
 #include <iostream>
 #include <random>
-#include <string>
 
 // NOLINTBEGIN(*-identifier-naming)
 
diff --git a/lib/ExecutionEngine/LEVELZERORUNTIME/LevelZeroRuntimeWrappers.cpp b/lib/ExecutionEngine/LEVELZERORUNTIME/LevelZeroRuntimeWrappers.cpp
index b10732b67..53bf03f2d 100644
--- a/lib/ExecutionEngine/LEVELZERORUNTIME/LevelZeroRuntimeWrappers.cpp
+++ b/lib/ExecutionEngine/LEVELZERORUNTIME/LevelZeroRuntimeWrappers.cpp
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <algorithm>
-#include <array>
 #include <atomic>
 #include <cassert>
 #include <cfloat>
@@ -22,10 +20,8 @@
 #include <cstdlib>
 #include <cstring>
 #include <map>
-#include <memory>
 #include <mutex>
 #include <stdexcept>
-#include <tuple>
 #include <vector>
 
 #include <level_zero/ze_api.h>
diff --git a/lib/ExecutionEngine/SYCLRUNTIME/SyclRuntimeWrappers.cpp b/lib/ExecutionEngine/SYCLRUNTIME/SyclRuntimeWrappers.cpp
index 6441f4b21..ca81a8599 100644
--- a/lib/ExecutionEngine/SYCLRUNTIME/SyclRuntimeWrappers.cpp
+++ b/lib/ExecutionEngine/SYCLRUNTIME/SyclRuntimeWrappers.cpp
@@ -12,17 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "llvm/Support/raw_ostream.h"
-#include <algorithm>
-#include <array>
-#include <atomic>
 #include <cassert>
 #include <cfloat>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <stdexcept>
-#include <tuple>
 #include <vector>
 
 #include <level_zero/ze_api.h>
diff --git a/lib/Transforms/AddOuterParallelLoop.cpp b/lib/Transforms/AddOuterParallelLoop.cpp
index 1e4b1465c..679a62e64 100644
--- a/lib/Transforms/AddOuterParallelLoop.cpp
+++ b/lib/Transforms/AddOuterParallelLoop.cpp
@@ -17,7 +17,6 @@
 #include "imex/Transforms/Passes.h"
 #include "mlir/Dialect/Arith/IR/Arith.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/Dialect/GPU/IR/GPUDialect.h"
 #include "mlir/Dialect/SCF/IR/SCF.h"
 #include "llvm/ADT/SetVector.h"
 
diff --git a/lib/Transforms/BF16ToGPU.cpp b/lib/Transforms/BF16ToGPU.cpp
index c0f50c8f6..f1bbc8641 100644
--- a/lib/Transforms/BF16ToGPU.cpp
+++ b/lib/Transforms/BF16ToGPU.cpp
@@ -20,7 +20,6 @@
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/GPU/IR/GPUDialect.h"
 #include "mlir/Dialect/SCF/IR/SCF.h"
-#include "mlir/IR/IRMapping.h"
 #include "mlir/IR/TypeUtilities.h"
 #include <mlir/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.h>
 #include <mlir/Dialect/MemRef/IR/MemRef.h>
diff --git a/lib/Transforms/CastIndex.cpp b/lib/Transforms/CastIndex.cpp
index 98591fdd1..b40125593 100644
--- a/lib/Transforms/CastIndex.cpp
+++ b/lib/Transforms/CastIndex.cpp
@@ -18,7 +18,6 @@
 #include "mlir/Dialect/Index/IR/IndexDialect.h"
 #include "mlir/Dialect/Index/IR/IndexOps.h"
 #include "mlir/IR/BuiltinOps.h"
-#include "mlir/IR/IRMapping.h"
 #include "mlir/IR/TypeUtilities.h"
 
 namespace imex {
diff --git a/lib/Transforms/EmulateNonNativeBF16.cpp b/lib/Transforms/EmulateNonNativeBF16.cpp
index 8ce374af8..742a3db91 100644
--- a/lib/Transforms/EmulateNonNativeBF16.cpp
+++ b/lib/Transforms/EmulateNonNativeBF16.cpp
@@ -19,16 +19,12 @@
 
 #include "imex/Transforms/Passes.h"
 #include "mlir/Dialect/Arith/IR/Arith.h"
-#include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/GPU/IR/GPUDialect.h"
-#include "mlir/IR/IRMapping.h"
 #include "mlir/IR/TypeUtilities.h"
 #include <mlir/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.h>
 #include <mlir/Dialect/MemRef/IR/MemRef.h>
 
-#include <algorithm>
 #include <unordered_set>
-#include <vector>
 
 namespace imex {
 #define GEN_PASS_DEF_EMULATENONNATIVEBF16
diff --git a/lib/Transforms/HoistTranspose.cpp b/lib/Transforms/HoistTranspose.cpp
index 0cf7abf69..3ae770244 100644
--- a/lib/Transforms/HoistTranspose.cpp
+++ b/lib/Transforms/HoistTranspose.cpp
@@ -27,8 +27,6 @@
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/SmallVectorExtras.h"
-#include "llvm/Support/raw_ostream.h"
 
 #include <cassert>
 #include <memory>
diff --git a/lib/Transforms/LowerMemRefCopy.cpp b/lib/Transforms/LowerMemRefCopy.cpp
index 24519cf22..0f27d1e80 100644
--- a/lib/Transforms/LowerMemRefCopy.cpp
+++ b/lib/Transforms/LowerMemRefCopy.cpp
@@ -16,12 +16,10 @@
 #include "imex/Transforms/Passes.h"
 
 #include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/Linalg/Utils/Utils.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/IR/Dominance.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/Support/LogicalResult.h"
 
 namespace imex {
 #define GEN_PASS_DEF_LOWERMEMREFCOPY
diff --git a/lib/Transforms/OptimizeTranspose.cpp b/lib/Transforms/OptimizeTranspose.cpp
index b019b93c9..36ce34d16 100644
--- a/lib/Transforms/OptimizeTranspose.cpp
+++ b/lib/Transforms/OptimizeTranspose.cpp
@@ -14,7 +14,6 @@
 
 #include "imex/Utils/XeArch.h"
 #include "mlir/Dialect/GPU/IR/GPUDialect.h"
-#include "mlir/Dialect/Utils/StaticValueUtils.h"
 #include "mlir/Dialect/Vector/IR/VectorOps.h"
 #include "mlir/Dialect/Vector/Transforms/LoweringPatterns.h"
 #include "mlir/Dialect/Vector/Transforms/VectorRewritePatterns.h"
diff --git a/lib/Transforms/RemoveSingleElemVector.cpp b/lib/Transforms/RemoveSingleElemVector.cpp
index 9e771f0ed..29ef2475e 100644
--- a/lib/Transforms/RemoveSingleElemVector.cpp
+++ b/lib/Transforms/RemoveSingleElemVector.cpp
@@ -21,13 +21,8 @@
 #include "mlir/Support/LogicalResult.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/Transforms/Utils/AddDiscriminators.h"
 
 #include "imex/Transforms/Passes.h"
-#include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-
-#include <cstdint>
-#include <numeric>
 
 namespace imex {
 #define GEN_PASS_DEF_REMOVESINGLEELEMVECTOR
diff --git a/lib/Transforms/SerializeSPIRV.cpp b/lib/Transforms/SerializeSPIRV.cpp
index ec2f353be..8ca61200c 100644
--- a/lib/Transforms/SerializeSPIRV.cpp
+++ b/lib/Transforms/SerializeSPIRV.cpp
@@ -16,7 +16,6 @@
 #include "imex/Transforms/Passes.h"
 #include "imex/Utils/GPUSerialize.h"
 #include "mlir/Dialect/GPU/IR/GPUDialect.h"
-#include "mlir/Dialect/GPU/Transforms/Passes.h"
 #include "mlir/Dialect/SPIRV/IR/SPIRVDialect.h"
 #include "mlir/Dialect/SPIRV/IR/SPIRVOps.h"
 #include "mlir/Target/SPIRV/Serialization.h"
diff --git a/lib/Transforms/SetSPIRVAbiAttribute.cpp b/lib/Transforms/SetSPIRVAbiAttribute.cpp
index 49a571cdb..ad50a22bc 100644
--- a/lib/Transforms/SetSPIRVAbiAttribute.cpp
+++ b/lib/Transforms/SetSPIRVAbiAttribute.cpp
@@ -16,7 +16,6 @@
 
 #include <imex/Transforms/Passes.h>
 
-#include "llvm/ADT/SmallVector.h"
 #include <mlir/Dialect/GPU/Transforms/Passes.h>
 #include <mlir/Dialect/MemRef/IR/MemRef.h>
 #include <mlir/Dialect/SPIRV/IR/SPIRVDialect.h>
diff --git a/lib/Transforms/VectorLinearize.cpp b/lib/Transforms/VectorLinearize.cpp
index 8542c4165..ffa005dc2 100644
--- a/lib/Transforms/VectorLinearize.cpp
+++ b/lib/Transforms/VectorLinearize.cpp
@@ -15,13 +15,11 @@
 #include "mlir/Dialect/Vector/IR/VectorOps.h"
 #include "mlir/Dialect/Vector/Transforms/LoweringPatterns.h"
 #include "mlir/Dialect/Vector/Transforms/VectorRewritePatterns.h"
-#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Support/LogicalResult.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/Transforms/Utils/AddDiscriminators.h"
 
 #include "imex/Transforms/Passes.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
diff --git a/lib/Transforms/VnniTransformation.cpp b/lib/Transforms/VnniTransformation.cpp
index 7148602d0..af90a4a13 100644
--- a/lib/Transforms/VnniTransformation.cpp
+++ b/lib/Transforms/VnniTransformation.cpp
@@ -20,9 +20,7 @@
 #include <mlir/IR/BuiltinTypes.h>
 
 #include "imex/Transforms/Passes.h"
-#include "imex/Utils/DebugUtils.h"
 
-#include <numeric>
 #include <optional>
 
 namespace imex {
diff --git a/lib/Utils/PassUtils.cpp b/lib/Utils/PassUtils.cpp
index f0256325d..8e9b91d9e 100644
--- a/lib/Utils/PassUtils.cpp
+++ b/lib/Utils/PassUtils.cpp
@@ -23,8 +23,6 @@
 #include <mlir/IR/OpImplementation.h>
 #include <mlir/Pass/Pass.h>
 
-#include <iostream>
-
 namespace imex {
 
 /// @return new index ::mlir::Value with given Value
diff --git a/lib/Utils/XeCommon.cpp b/lib/Utils/XeCommon.cpp
index c701d9155..24923c5cb 100644
--- a/lib/Utils/XeCommon.cpp
+++ b/lib/Utils/XeCommon.cpp
@@ -18,7 +18,6 @@
 #include <unordered_set>
 
 #include "imex/Dialect/XeTile/IR/XeTileOps.h"
-#include "imex/Utils/DebugUtils.h"
 #include "imex/Utils/XeCommon.h"
 #include "llvm/Support/FormatVariadic.h"
 
diff --git a/tools/imex-cpu-runner/imex-cpu-runner.cpp b/tools/imex-cpu-runner/imex-cpu-runner.cpp
index 04740bd9c..090bbc939 100644
--- a/tools/imex-cpu-runner/imex-cpu-runner.cpp
+++ b/tools/imex-cpu-runner/imex-cpu-runner.cpp
@@ -29,9 +29,7 @@
 // This file is copied from upstream mlir-cpu-runner
 // https://github.com/llvm/llvm-project/blob/main/mlir/tools/mlir-cpu-runner/mlir-cpu-runner.cpp
 
-#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/ExecutionEngine/JitRunner.h"
-#include "mlir/ExecutionEngine/OptUtils.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/Target/LLVMIR/Dialect/All.h"
 
diff --git a/tools/l0-fp64-checker/l0-fp64-checker.cpp b/tools/l0-fp64-checker/l0-fp64-checker.cpp
index f7fb06d85..0344c935b 100644
--- a/tools/l0-fp64-checker/l0-fp64-checker.cpp
+++ b/tools/l0-fp64-checker/l0-fp64-checker.cpp
@@ -13,8 +13,8 @@
 
 #include <level_zero/ze_api.h>
 
+#include <cstdlib>
 #include <cstring>
-#include <iostream>
 #include <vector>
 
 #define VALIDATECALL(zeCall)                                                   \