diff --git a/accessible/src/base/NotificationController.cpp b/accessible/src/base/NotificationController.cpp
index 8c9f8e7fa1a9e46fe4752313f0509c6a4cc80f3f..fc34c5b5423e844b997d618d8bd0b6d84dc474cc 100644
--- a/accessible/src/base/NotificationController.cpp
+++ b/accessible/src/base/NotificationController.cpp
@@ -15,10 +15,6 @@
 using namespace mozilla;
 using namespace mozilla::a11y;
 
-// Defines the number of selection add/remove events in the queue when they
-// aren't packed into single selection within event.
-const unsigned int kSelChangeCountToPack = 5;
-
 ////////////////////////////////////////////////////////////////////////////////
 // NotificationCollector
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/accessible/src/base/moz.build b/accessible/src/base/moz.build
index b9089a4db1aa1d9eb9f4e4959be2d6ccd1dd6bd9..96a0e826c88566874d2b82773f9195b2e297e9b3 100644
--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -29,7 +29,7 @@ if CONFIG['MOZ_DEBUG']:
         'Logging.h',
     ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AccCollector.cpp',
     'AccEvent.cpp',
     'AccGroupInfo.cpp',
@@ -56,7 +56,7 @@ SOURCES += [
 ]
 
 if a11y_log:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'Logging.cpp',
     ]
 
diff --git a/accessible/src/generic/moz.build b/accessible/src/generic/moz.build
index 2149a5c3879f37119c2b828dff79a16412e433e2..ad0233042d1da6ca647758743814922ab030df4a 100644
--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@@ -12,7 +12,7 @@ EXPORTS.mozilla.a11y += [
     'HyperTextAccessible.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'Accessible.cpp',
     'ApplicationAccessible.cpp',
     'ARIAGridAccessible.cpp',
diff --git a/accessible/src/html/moz.build b/accessible/src/html/moz.build
index ca13704ae2447e89b61f37108901c4b265b5526e..22e296096e7259732688957f4c072528f52cadb8 100644
--- a/accessible/src/html/moz.build
+++ b/accessible/src/html/moz.build
@@ -6,7 +6,7 @@
 
 MODULE = 'accessibility'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'HTMLCanvasAccessible.cpp',
     'HTMLElementAccessibles.cpp',
     'HTMLFormControlAccessible.cpp',
diff --git a/accessible/src/mac/moz.build b/accessible/src/mac/moz.build
index 0444daa4f3e079cee943f8776cde5a92370bd79a..ac8ac82358d4a69431576a1a16573039eec2e16f 100644
--- a/accessible/src/mac/moz.build
+++ b/accessible/src/mac/moz.build
@@ -17,7 +17,7 @@ EXPORTS.mozilla.a11y += [
 
 LIBRARY_NAME = 'accessibility_toolkit_s'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'AccessibleWrap.mm',
     'DocAccessibleWrap.mm',
     'MacUtils.mm',
diff --git a/accessible/src/xpcom/moz.build b/accessible/src/xpcom/moz.build
index b7bca6d0c097636edb7a2eb16e9a8c620c0cdc03..b971ee74ded0db198e3d15d8b9d401db7b357dd2 100644
--- a/accessible/src/xpcom/moz.build
+++ b/accessible/src/xpcom/moz.build
@@ -11,7 +11,7 @@ EXPORTS += [
     'xpcAccessibleSelectable.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsAccessibleRelation.cpp',
     'xpcAccessibleHyperText.cpp',
     'xpcAccessibleSelectable.cpp',
diff --git a/accessible/src/xul/moz.build b/accessible/src/xul/moz.build
index 323404d5a9558bb499201a94589bb4a49090568b..90cfa22d9e82cd5516b338544cd5ecb16a5126e9 100644
--- a/accessible/src/xul/moz.build
+++ b/accessible/src/xul/moz.build
@@ -6,7 +6,7 @@
 
 MODULE = 'accessibility'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'XULAlertAccessible.cpp',
     'XULColorPickerAccessible.cpp',
     'XULComboboxAccessible.cpp',