Index: GNUmakefile.am
===================================================================
--- GNUmakefile.am	(revision 55146)
+++ GNUmakefile.am	(working copy)
@@ -162,6 +162,7 @@
 	-I$(srcdir)/JavaScriptCore/parser \
 	-I$(srcdir)/JavaScriptCore/wtf \
 	-I$(srcdir)/JavaScriptCore/wtf/gtk \
+	-I$(srcdir)/JavaScriptCore/wtf/gobject \
 	-I$(top_builddir)/DerivedSources
 
 nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
Index: WebKit/gtk/webkit/webkitwebview.cpp
===================================================================
--- WebKit/gtk/webkit/webkitwebview.cpp	(revision 55146)
+++ WebKit/gtk/webkit/webkitwebview.cpp	(working copy)
@@ -40,45 +40,45 @@
 #include "webkitwebhistoryitem.h"
 
 #include "AXObjectCache.h"
-#include "NotImplemented.h"
 #include "BackForwardList.h"
 #include "Cache.h"
-#include "CString.h"
 #include "ChromeClientGtk.h"
-#include "ContextMenu.h"
 #include "ContextMenuClientGtk.h"
 #include "ContextMenuController.h"
+#include "ContextMenu.h"
+#include "CString.h"
 #include "Cursor.h"
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "DragClientGtk.h"
+#include "EditorClientGtk.h"
 #include "Editor.h"
-#include "EditorClientGtk.h"
 #include "EventHandler.h"
 #include "FloatQuad.h"
 #include "FocusController.h"
+#include "FrameLoader.h"
 #include "FrameLoaderTypes.h"
+#include "FrameView.h"
+#include <glib/gi18n-lib.h>
+#include <GOwnPtr.h>
+#include "GraphicsContext.h"
 #include "HitTestRequest.h"
 #include "HitTestResult.h"
-#include <glib/gi18n-lib.h>
-#include "GraphicsContext.h"
 #include "IconDatabase.h"
 #include "InspectorClientGtk.h"
-#include "FrameLoader.h"
-#include "FrameView.h"
 #include "MouseEventWithHitTestResults.h"
+#include "NotImplemented.h"
 #include "PageCache.h"
 #include "Pasteboard.h"
+#include "PasteboardHelperGtk.h"
 #include "PasteboardHelper.h"
-#include "PasteboardHelperGtk.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformWheelEvent.h"
 #include "ProgressTracker.h"
+#include "RenderView.h"
 #include "ResourceHandle.h"
-#include "RenderView.h"
 #include "ScriptValue.h"
 #include "Scrollbar.h"
-#include <wtf/gtk/GOwnPtr.h>
 
 #include <gdk/gdkkeysyms.h>
 
Index: WebCore/platform/gtk/DataObjectGtk.h
===================================================================
--- WebCore/platform/gtk/DataObjectGtk.h	(revision 55146)
+++ WebCore/platform/gtk/DataObjectGtk.h	(working copy)
@@ -21,11 +21,11 @@
 
 #include "CString.h"
 #include "FileList.h"
+#include <GRefPtr.h>
 #include "KURL.h"
 #include "Range.h"
 #include "StringHash.h"
 #include <wtf/RefCounted.h>
-#include <wtf/gtk/GRefPtr.h>
 
 typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GdkDragContext GdkDragContext;
Index: WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
===================================================================
--- WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp	(revision 55146)
+++ WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp	(working copy)
@@ -47,13 +47,13 @@
 #include "WebKitWebSourceGStreamer.h"
 #include "Widget.h"
 
+#include <GOwnPtr.h>
 #include <gst/gst.h>
 #include <gst/interfaces/mixer.h>
 #include <gst/interfaces/xoverlay.h>
 #include <gst/video/video.h>
 #include <limits>
 #include <math.h>
-#include <wtf/gtk/GOwnPtr.h>
 
 // GstPlayFlags flags from playbin2. It is the policy of GStreamer to
 // not publicly expose element-specific enums. That's why this