diff --git a/Source/JavaScriptCore/bytecode/DeferredCompilationCallback.cpp b/Source/JavaScriptCore/bytecode/DeferredCompilationCallback.cpp
index 67ff2b2ffd927..f879fbc479335 100644
--- a/Source/JavaScriptCore/bytecode/DeferredCompilationCallback.cpp
+++ b/Source/JavaScriptCore/bytecode/DeferredCompilationCallback.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "DeferredCompilationCallback.h"
 
+#include "StrongInlines.h"
+
 namespace JSC {
 
 DeferredCompilationCallback::DeferredCompilationCallback() = default;
diff --git a/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp b/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp
index 492bac685f228..8f901f638b93f 100644
--- a/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp
+++ b/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp
@@ -29,6 +29,7 @@
 #if ENABLE(DFG_JIT)
 
 #include "CodeBlock.h"
+#include "CodeBlockInlines.h"
 #include "DFGCommon.h"
 #include <wtf/TZoneMallocInlines.h>
 
diff --git a/Source/JavaScriptCore/heap/BlockDirectory.cpp b/Source/JavaScriptCore/heap/BlockDirectory.cpp
index 2e5bf80bb5ce4..baeef2d509c6d 100644
--- a/Source/JavaScriptCore/heap/BlockDirectory.cpp
+++ b/Source/JavaScriptCore/heap/BlockDirectory.cpp
@@ -28,6 +28,7 @@
 
 #include "BlockDirectoryInlines.h"
 #include "Heap.h"
+#include "HeapInlines.h"
 #include "MarkedSpaceInlines.h"
 #include "SubspaceInlines.h"
 #include "SuperSampler.h"
diff --git a/Source/JavaScriptCore/parser/SourceTaintedOrigin.cpp b/Source/JavaScriptCore/parser/SourceTaintedOrigin.cpp
index 52923690182a1..47a83a9e69e71 100644
--- a/Source/JavaScriptCore/parser/SourceTaintedOrigin.cpp
+++ b/Source/JavaScriptCore/parser/SourceTaintedOrigin.cpp
@@ -27,6 +27,7 @@
 #include "SourceTaintedOrigin.h"
 
 #include "CodeBlock.h"
+#include "JSCellInlines.h"
 #include "StackVisitor.h"
 #include "VM.h"
 
diff --git a/Source/JavaScriptCore/runtime/ExceptionScope.cpp b/Source/JavaScriptCore/runtime/ExceptionScope.cpp
index 89af72bab77da..fe22f6895aecf 100644
--- a/Source/JavaScriptCore/runtime/ExceptionScope.cpp
+++ b/Source/JavaScriptCore/runtime/ExceptionScope.cpp
@@ -28,6 +28,7 @@
 
 #include "ErrorInstance.h"
 #include "Exception.h"
+#include "JSCJSValueInlines.h"
 #include <wtf/StackTrace.h>
 #include <wtf/StringPrintStream.h>
 #include <wtf/Threading.h>
diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
index bd2055ca29505..e24d6c96d8989 100644
--- a/Source/cmake/OptionsCommon.cmake
+++ b/Source/cmake/OptionsCommon.cmake
@@ -204,7 +204,7 @@ if (DEBUG_FISSION)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gsplit-dwarf")
     if (LD_SUPPORTS_GDB_INDEX)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index")
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gdb-index")
     endif ()
     if (WTF_CPU_ARM)
         string(REPLACE "-fdebug-types-section" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})