--- ./Source/WTF/wtf/gobject/GRefPtr.h.orig	2022-09-06 01:44:06.000000000 +0200
+++ ./Source/WTF/wtf/gobject/GRefPtr.h	2022-09-06 01:44:18.000000000 +0200
@@ -28,9 +28,8 @@
 #include <wtf/RefPtr.h>
 #include <algorithm>
+#include <glib-object.h>
+#include <glib.h>
 
-extern "C" void g_object_unref(gpointer);
-extern "C" gpointer g_object_ref_sink(gpointer);
-
 namespace WTF {
 
 enum GRefPtrAdoptType { GRefPtrAdopt };
--- ./Source/WebKit/gtk/GNUmakefile.am.orig	2022-09-06 02:17:35.000000000 +0200
+++ ./Source/WebKit/gtk/GNUmakefile.am	2022-09-06 02:19:21.000000000 +0200
@@ -183,7 +183,7 @@
 webkitgtk_built_sources += \
 	DerivedSources/webkit/webkitenumtypes.cpp \
 	DerivedSources/webkit/webkitenumtypes.h \
-	DerivedSources/webkit/webkitmarshal.cpp \
+	DerivedSources/webkit/webkitmarshal.c \
 	DerivedSources/webkit/webkitmarshal.h \
 	$(webkitgtk_built_h_api)
 
@@ -346,15 +346,13 @@
 endif
 
 WEBKIT_MARSHAL_LIST = $(WebKit)/webkitmarshal.list
-$(GENSOURCES_WEBKIT)/webkitmarshal.cpp: stamp-webkitmarshal.cpp
+$(GENSOURCES_WEBKIT)/webkitmarshal.c: stamp-webkitmarshal.c
 	@true
 $(GENSOURCES_WEBKIT)/webkitmarshal.h: stamp-webkitmarshal.h
 	@true
 
-stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
-	$(AM_V_GEN) echo "extern \"C\" {" > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
-	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
-	echo '}' >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
+stamp-webkitmarshal.c: $(WEBKIT_MARSHAL_LIST)
+	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body > $(GENSOURCES_WEBKIT)/webkitmarshal.c && \
 	echo timestamp > $(@F)
 
 stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
@@ -414,7 +412,7 @@
 # Files that will be cleaned
 CLEANFILES += \
 	$(BUILT_SOURCES) \
-	$(top_builddir)/stamp-webkitmarshal.cpp \
+	$(top_builddir)/stamp-webkitmarshal.c \
 	$(top_builddir)/stamp-webkitmarshal.h \
 	$(top_builddir)/stamp-webkitenumtypes.cpp \
 	$(top_builddir)/stamp-webkitenumtypes.h \
--- ./Source/WebKit2/GNUmakefile.am.orig	2022-09-06 02:20:35.000000000 +0200
+++ ./Source/WebKit2/GNUmakefile.am	2022-09-06 02:21:21.000000000 +0200
@@ -490,15 +490,13 @@
 
 WEBKIT2_MARSHAL_LIST = $(WebKit2)/UIProcess/API/gtk/webkit2marshal.list
 
-$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitMarshal.cpp: stamp-webkit2marshal.cpp
+$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitMarshal.c: stamp-webkit2marshal.c
 	@true
 $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitMarshal.h: stamp-webkit2marshal.h
 	@true
 
-stamp-webkit2marshal.cpp: $(WEBKIT2_MARSHAL_LIST)
-	$(AM_V_GEN) echo "extern \"C\" {" > $(webkit2gtk_built_headers_dir)/WebKitMarshal.cpp && \
-	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT2_MARSHAL_LIST) --body >> $(webkit2gtk_built_headers_dir)/WebKitMarshal.cpp && \
-	echo '}' >> $(webkit2gtk_built_headers_dir)/WebKitMarshal.cpp && \
+stamp-webkit2marshal.c: $(WEBKIT2_MARSHAL_LIST)
+	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT2_MARSHAL_LIST) --body > $(webkit2gtk_built_headers_dir)/WebKitMarshal.c && \
 	echo timestamp > $(@F)
 
 stamp-webkit2marshal.h: $(WEBKIT2_MARSHAL_LIST)
@@ -508,7 +506,7 @@
 CLEANFILES += \
 	$(BUILT_SOURCES) \
 	$(top_builddir)/stamp-webkit2enumtypes \
-	$(top_builddir)/stamp-webkit2marshal.cpp \
+	$(top_builddir)/stamp-webkit2marshal.c \
 	$(top_builddir)/stamp-webkit2marshal.h \
 	$(top_builddir)/Programs/WebKitNetworkProcess \
 	$(top_builddir)/Programs/WebKitWebProcess
--- ./Source/WebKit2/GNUmakefile.list.am.orig	2022-09-06 02:29:31.000000000 +0200
+++ ./Source/WebKit2/GNUmakefile.list.am	2022-09-06 02:30:03.000000000 +0200
@@ -166,7 +166,7 @@
 webkit2gtk_built_sources += \
 	DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.cpp \
 	DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.h \
-	DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.cpp \
+	DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.c \
 	DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.h \
 	DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h
 
--- ./Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp.orig	2022-09-06 12:15:54.000000000 +0200
+++ ./Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp	2022-09-06 12:16:13.000000000 +0200
@@ -390,7 +390,7 @@
 
 GType webkitAccessibleHyperlinkGetType()
 {
-    static volatile gsize typeVolatile = 0;
+    static gsize typeVolatile = 0;
 
     if (g_once_init_enter(&typeVolatile)) {
         static const GTypeInfo tinfo = {
--- ./Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp.orig	2022-09-06 12:17:42.000000000 +0200
+++ ./Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp	2022-09-06 12:17:55.000000000 +0200
@@ -1015,7 +1015,7 @@
 GType
 webkitAccessibleGetType(void)
 {
-    static volatile gsize typeVolatile = 0;
+    static gsize typeVolatile = 0;
 
     if (g_once_init_enter(&typeVolatile)) {
         static const GTypeInfo tinfo = {