1 files changed, 10 insertions, 7 deletions
diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build
index 08f87d56a3..1b6658c283 100644
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -37,12 +37,10 @@ EXPORTS.mozilla += [
     'PluginPRLibrary.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsJSNPRuntime.cpp',
-    'nsNPAPIPlugin.cpp',
     'nsNPAPIPluginInstance.cpp',
     'nsNPAPIPluginStreamListener.cpp',
-    'nsPluginHost.cpp',
     'nsPluginInstanceOwner.cpp',
     'nsPluginModule.cpp',
     'nsPluginStreamListenerPeer.cpp',
@@ -50,19 +48,24 @@ SOURCES += [
     'PluginPRLibrary.cpp',
 ]
 
+SOURCES += [
+    'nsNPAPIPlugin.cpp', # Conflict with X11 headers
+    'nsPluginHost.cpp',  # Conflict with NS_NPAPIPLUGIN_CALLBACK
+]
+
 if CONFIG['OS_ARCH'] == 'WINNT':
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsPluginDirServiceProvider.cpp',
         'nsPluginNativeWindowWin.cpp',
         'nsPluginsDirWin.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsPluginNativeWindow.cpp',
         'nsPluginsDirDarwin.cpp',
     ]
 else:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsPluginsDirUnix.cpp',
     ]
     if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
@@ -71,7 +74,7 @@ else:
             'nsPluginNativeWindowGtk.cpp',
         ]
     else:
-        SOURCES += [
+        UNIFIED_SOURCES += [
             'nsPluginNativeWindow.cpp',
         ]