--- Source/WebCore/bridge/npruntime_internal-orig.h	2013-07-19 00:04:01.000000000 -0700
+++ Source/WebCore/bridge/npruntime_internal.h	2013-08-12 16:04:17.000000000 -0700
@@ -29,7 +29,7 @@
 #include "npfunctions.h"
 #include "npruntime.h"
 
-#ifdef XP_UNIX
+#if PLATFORM(X11)
     #include <X11/Xresource.h>
 
     #undef None
--- Source/WebCore/plugins/PluginView-orig.cpp	2013-07-19 00:04:11.000000000 -0700
+++ Source/WebCore/plugins/PluginView.cpp	2013-08-12 17:48:20.000000000 -0700
@@ -865,7 +865,7 @@
     , m_contextRef(0)
     , m_fakeWindow(0)
 #endif
-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
+#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API)
     , m_hasPendingGeometryChange(true)
     , m_drawable(0)
     , m_visual(0)
--- Source/WebCore/plugins/PluginView-orig.h	2013-07-19 00:04:11.000000000 -0700
+++ Source/WebCore/plugins/PluginView.h	2013-08-12 16:09:21.000000000 -0700
@@ -427,7 +427,7 @@
         Point mousePosForPlugin(MouseEvent* event = 0) const;
 #endif
 
-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
+#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API)
         bool m_hasPendingGeometryChange;
         Pixmap m_drawable;
         Visual* m_visual;