diff --git a/runtime/compiler/codegen/J9CodeGenerator.hpp b/runtime/compiler/codegen/J9CodeGenerator.hpp
index 19dabea9572..3a1cd844c8b 100644
--- a/runtime/compiler/codegen/J9CodeGenerator.hpp
+++ b/runtime/compiler/codegen/J9CodeGenerator.hpp
@@ -47,7 +47,6 @@ namespace J9 { typedef J9::CodeGenerator CodeGeneratorConnector; }
 #include "control/Recompilation.hpp"
 #include "control/RecompilationInfo.hpp"
 #include "optimizer/Dominators.hpp"
-#include "cs2/arrayof.h"
 
 class NVVMIRBuffer;
 class TR_BitVector;
diff --git a/runtime/compiler/infra/J9Cfg.cpp b/runtime/compiler/infra/J9Cfg.cpp
index 974d3b958b4..12f2acb69d6 100644
--- a/runtime/compiler/infra/J9Cfg.cpp
+++ b/runtime/compiler/infra/J9Cfg.cpp
@@ -30,9 +30,6 @@
 #include "control/Options_inlines.hpp"
 #include "control/Recompilation.hpp"
 #include "control/RecompilationInfo.hpp"
-#include "cs2/arrayof.h"
-#include "cs2/bitvectr.h"
-#include "cs2/listof.h"
 #include "env/TRMemory.hpp"
 #include "env/PersistentInfo.hpp"
 #include "env/VMJ9.h"
diff --git a/runtime/compiler/infra/J9Cfg.hpp b/runtime/compiler/infra/J9Cfg.hpp
index b7700a93466..aec0e930e21 100644
--- a/runtime/compiler/infra/J9Cfg.hpp
+++ b/runtime/compiler/infra/J9Cfg.hpp
@@ -36,7 +36,6 @@ namespace J9 { typedef J9::CFG CFGConnector; }
 
 #include <stddef.h>
 #include <stdint.h>
-#include "cs2/listof.h"
 #include "env/TRMemory.hpp"
 #include "il/Node.hpp"
 #include "infra/Assert.hpp"
diff --git a/runtime/compiler/optimizer/EscapeAnalysis.cpp b/runtime/compiler/optimizer/EscapeAnalysis.cpp
index 9ef08de330e..8bdd4c72d88 100644
--- a/runtime/compiler/optimizer/EscapeAnalysis.cpp
+++ b/runtime/compiler/optimizer/EscapeAnalysis.cpp
@@ -44,7 +44,6 @@
 #include "control/Options_inlines.hpp"
 #include "control/Recompilation.hpp"
 #include "control/RecompilationInfo.hpp"
-#include "cs2/bitvectr.h"
 #include "env/CompilerEnv.hpp"
 #include "env/ObjectModel.hpp"
 #include "env/TRMemory.hpp"
diff --git a/runtime/compiler/optimizer/IdiomRecognition.cpp b/runtime/compiler/optimizer/IdiomRecognition.cpp
index 028320ddc8f..1c68d440ab7 100644
--- a/runtime/compiler/optimizer/IdiomRecognition.cpp
+++ b/runtime/compiler/optimizer/IdiomRecognition.cpp
@@ -35,7 +35,6 @@
 #include "control/Options_inlines.hpp"
 #include "control/Recompilation.hpp"
 #include "control/RecompilationInfo.hpp"
-#include "cs2/bitvectr.h"
 #include "env/CompilerEnv.hpp"
 #include "env/StackMemoryRegion.hpp"
 #include "env/TRMemory.hpp"
diff --git a/runtime/compiler/optimizer/IdiomTransformations.cpp b/runtime/compiler/optimizer/IdiomTransformations.cpp
index 003dce81814..57ea9775b0c 100644
--- a/runtime/compiler/optimizer/IdiomTransformations.cpp
+++ b/runtime/compiler/optimizer/IdiomTransformations.cpp
@@ -31,7 +31,6 @@
 #include "compile/SymbolReferenceTable.hpp"
 #include "control/Options.hpp"
 #include "control/Options_inlines.hpp"
-#include "cs2/bitvectr.h"
 #include "env/CompilerEnv.hpp"
 #include "env/TRMemory.hpp"
 #include "env/jittypes.h"
diff --git a/runtime/compiler/optimizer/J9SimplifierHandlers.cpp b/runtime/compiler/optimizer/J9SimplifierHandlers.cpp
index a4577d9b7aa..1835ad26571 100644
--- a/runtime/compiler/optimizer/J9SimplifierHandlers.cpp
+++ b/runtime/compiler/optimizer/J9SimplifierHandlers.cpp
@@ -41,8 +41,6 @@
 #include "compile/SymbolReferenceTable.hpp"
 #include "control/Options.hpp"
 #include "control/Options_inlines.hpp"
-#include "cs2/bitvectr.h"
-#include "cs2/hashtab.h"
 #include "env/IO.hpp"
 #include "env/ObjectModel.hpp"
 #include "env/TRMemory.hpp"
diff --git a/runtime/compiler/optimizer/MonitorElimination.cpp b/runtime/compiler/optimizer/MonitorElimination.cpp
index 30ec98a4c53..cbc1fd8be6d 100644
--- a/runtime/compiler/optimizer/MonitorElimination.cpp
+++ b/runtime/compiler/optimizer/MonitorElimination.cpp
@@ -35,7 +35,6 @@
 #include "control/Options.hpp"
 #include "control/Options_inlines.hpp"
 #include "cs2/arrayof.h"
-#include "cs2/bitvectr.h"
 #include "env/StackMemoryRegion.hpp"
 #include "env/TRMemory.hpp"
 #include "env/VMJ9.h"
diff --git a/runtime/compiler/optimizer/SPMDParallelizer.cpp b/runtime/compiler/optimizer/SPMDParallelizer.cpp
index d05f8d9c4a7..8385c873fce 100644
--- a/runtime/compiler/optimizer/SPMDParallelizer.cpp
+++ b/runtime/compiler/optimizer/SPMDParallelizer.cpp
@@ -38,7 +38,6 @@
 #include "control/Options_inlines.hpp"
 #include "cs2/allocator.h"
 #include "cs2/arrayof.h"
-#include "cs2/bitvectr.h"
 #include "cs2/sparsrbit.h"
 #include "env/StackMemoryRegion.hpp"
 #include "env/TRMemory.hpp"
diff --git a/runtime/compiler/optimizer/SequentialStoreSimplifier.cpp b/runtime/compiler/optimizer/SequentialStoreSimplifier.cpp
index 147833540b2..2e1ce0970f8 100644
--- a/runtime/compiler/optimizer/SequentialStoreSimplifier.cpp
+++ b/runtime/compiler/optimizer/SequentialStoreSimplifier.cpp
@@ -34,7 +34,6 @@
 #include "compile/SymbolReferenceTable.hpp"
 #include "control/Options.hpp"
 #include "control/Options_inlines.hpp"
-#include "cs2/bitvectr.h"
 #include "cs2/sparsrbit.h"
 #include "env/CompilerEnv.hpp"
 #include "env/StackMemoryRegion.hpp"
diff --git a/runtime/compiler/z/codegen/J9MemoryReference.cpp b/runtime/compiler/z/codegen/J9MemoryReference.cpp
index fe199ed0799..82cbeb7ba85 100644
--- a/runtime/compiler/z/codegen/J9MemoryReference.cpp
+++ b/runtime/compiler/z/codegen/J9MemoryReference.cpp
@@ -61,7 +61,6 @@
 #include "compile/SymbolReferenceTable.hpp"
 #include "control/Options.hpp"
 #include "control/Options_inlines.hpp"
-#include "cs2/sparsrbit.h"
 #include "env/CompilerEnv.hpp"
 #include "env/ObjectModel.hpp"
 #include "env/StackMemoryRegion.hpp"