Index: metadata.common
===================================================================
--- a/metadata.common
+++ b/metadata.common
@@ -23,8 +23,6 @@
 document_end = include.postload.js
 
 [mapping]
-ext/common.js = chrome/ext/common.js
-ext/background.js = chrome/ext/background.js
 ext/content.js = chrome/ext/content.js
 ext/popup.js = chrome/ext/popup.js
 notification.html = chrome/notification.html
@@ -73,6 +71,8 @@
   lib/stats.js
   lib/whitelisting.js
   --arg module=true source_repo=https://hg.adblockplus.org/adblockplus/
+ext/common.js = ext/common.js chrome/ext/common.js
+ext/background.js = ext/background.js chrome/ext/background.js --arg brace_style=expand
 
 qunit/tests/adblockplus.js = adblockplustests/chrome/content/tests/domainRestrictions.js
   adblockplustests/chrome/content/tests/filterClasses.js