diff --git a/runtime/compiler/CMakeLists.txt b/runtime/compiler/CMakeLists.txt
index c817349d71d..833fd1ce50d 100644
--- a/runtime/compiler/CMakeLists.txt
+++ b/runtime/compiler/CMakeLists.txt
@@ -165,9 +165,9 @@ endif()
 set(REMOVED_OMR_FILES
 	${omr_SOURCE_DIR}/compiler/codegen/CCData.cpp
 	${omr_SOURCE_DIR}/compiler/control/CompileMethod.cpp
-	${omr_SOURCE_DIR}/compiler/env/FEBase.cpp
 	${omr_SOURCE_DIR}/compiler/optimizer/FEInliner.cpp
-	${omr_SOURCE_DIR}/compiler/env/JitConfig.cpp
+	${omr_SOURCE_DIR}/compiler/env/OMRJitConfig.cpp
+	${omr_SOURCE_DIR}/compiler/env/OMRFrontEnd.cpp
 	${omr_SOURCE_DIR}/compiler/env/PersistentAllocator.cpp
 	${omr_SOURCE_DIR}/compiler/env/SystemSegmentProvider.cpp
 	${omr_SOURCE_DIR}/compiler/infra/OMRMonitor.cpp
diff --git a/runtime/compiler/x/env/J9CPU.cpp b/runtime/compiler/x/env/J9CPU.cpp
index 8ec60a73e53..75f7d7c2305 100644
--- a/runtime/compiler/x/env/J9CPU.cpp
+++ b/runtime/compiler/x/env/J9CPU.cpp
@@ -25,7 +25,6 @@
 #include "env/CPU.hpp"
 #include "env/VMJ9.h"
 #include "x/runtime/X86Runtime.hpp"
-#include "env/JitConfig.hpp"
 #include "codegen/CodeGenerator.hpp"
 #if defined(J9VM_OPT_JITSERVER)
 #include "control/CompilationRuntime.hpp"
@@ -33,10 +32,6 @@
 #include "runtime/JITClientSession.hpp"
 #endif /* defined(J9VM_OPT_JITSERVER) */
 
-// This is a workaround to avoid J9_PROJECT_SPECIFIC macros in x/env/OMRCPU.cpp
-// Without this definition, we get an undefined symbol of JITConfig::instance() at runtime
-TR::JitConfig * TR::JitConfig::instance() { return NULL; }
-
 TR::CPU
 J9::X86::CPU::detectRelocatable(OMRPortLibrary * const omrPortLib)
    {