diff --git a/content/html/style/public/MANIFEST b/content/html/style/public/MANIFEST
index 6ff3781d5f7..e69de29bb2d 100644
--- a/content/html/style/public/MANIFEST
+++ b/content/html/style/public/MANIFEST
@@ -1,10 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist:content directory
-#
-nsIComputedDOMStyle.h
-nsICSSLoader.h
-nsICSSLoaderObserver.h
-nsICSSParser.h
-nsICSSPseudoComparator.h
-nsICSSStyleSheet.h
-nsIMediaList.h
diff --git a/content/html/style/public/Makefile.in b/content/html/style/public/Makefile.in
index 1a85323076a..306ebfc3e46 100644
--- a/content/html/style/public/Makefile.in
+++ b/content/html/style/public/Makefile.in
@@ -36,6 +36,7 @@ EXPORTS = \
nsICSSLoaderObserver.h \
nsIComputedDOMStyle.h \
nsIMediaList.h \
+ nsStyleUtil.h \
$(NULL)
include $(topsrcdir)/config/rules.mk
diff --git a/content/html/style/src/Makefile.in b/content/html/style/src/Makefile.in
index 8a30e449fce..e1752185095 100644
--- a/content/html/style/src/Makefile.in
+++ b/content/html/style/src/Makefile.in
@@ -47,6 +47,7 @@ REQUIRES = xpcom \
xpconnect \
view \
intl \
+ pref \
$(NULL)
CPPSRCS = \
@@ -71,6 +72,7 @@ CPPSRCS = \
nsDOMCSSValueList.cpp \
nsDOMCSSRect.cpp \
nsDOMCSSRGBColor.cpp \
+ nsStyleUtil.cpp \
$(NULL)
EXPORTS = \
diff --git a/content/macbuild/content.xml b/content/macbuild/content.xml
index 1e7bec53f56..b629ea336ef 100644
--- a/content/macbuild/content.xml
+++ b/content/macbuild/content.xml
@@ -1799,6 +1799,13 @@
Text
Debug
+
+ Name
+ nsStyleUtil.cpp
+ MacOS
+ Text
+ Debug
+
Name
nsXBLPrototypeHandler.cpp
@@ -3080,6 +3087,11 @@
nsROCSSPrimitiveValue.cpp
MacOS
+
+ Name
+ nsStyleUtil.cpp
+ MacOS
+
Name
nsXBLPrototypeHandler.cpp
@@ -5288,6 +5300,13 @@
Text
Debug
+
+ Name
+ nsStyleUtil.cpp
+ MacOS
+ Text
+ Debug
+
Name
nsXBLPrototypeHandler.cpp
@@ -6569,6 +6588,11 @@
nsROCSSPrimitiveValue.cpp
MacOS
+
+ Name
+ nsStyleUtil.cpp
+ MacOS
+
Name
nsXBLPrototypeHandler.cpp
@@ -7830,6 +7854,12 @@
nsROCSSPrimitiveValue.cpp
MacOS
+
+ content.shlb
+ Name
+ nsStyleUtil.cpp
+ MacOS
+
content.shlb
Name
diff --git a/content/macbuild/contentshared.xml b/content/macbuild/contentshared.xml
index 282b9ee0086..d10003b9506 100644
--- a/content/macbuild/contentshared.xml
+++ b/content/macbuild/contentshared.xml
@@ -932,13 +932,6 @@
Text
-
- Name
- nsStyleUtil.cpp
- MacOS
- Text
-
-
Name
nsTextFragment.cpp
@@ -1027,11 +1020,6 @@
nsLayoutAtoms.cpp
MacOS
-
- Name
- nsStyleUtil.cpp
- MacOS
-
Name
nsTextFragment.cpp
@@ -1953,13 +1941,6 @@
Text
-
- Name
- nsStyleUtil.cpp
- MacOS
- Text
-
-
Name
nsTextFragment.cpp
@@ -2048,11 +2029,6 @@
nsLayoutAtoms.cpp
MacOS
-
- Name
- nsStyleUtil.cpp
- MacOS
-
Name
nsTextFragment.cpp
@@ -2146,12 +2122,6 @@
nsStyleCoord.cpp
MacOS
-
- contentsharedDebug.o
- Name
- nsStyleUtil.cpp
- MacOS
-
contentsharedDebug.o
Name
diff --git a/content/shared/public/MANIFEST b/content/shared/public/MANIFEST
index 6eaf4e911dd..1194a2362fe 100644
--- a/content/shared/public/MANIFEST
+++ b/content/shared/public/MANIFEST
@@ -18,7 +18,6 @@ nsLayoutAtoms.h
nsRuleNode.h
nsRuleWalker.h
nsStyleCoord.h
-nsStyleUtil.h
nsStyleStruct.h
nsStyleStructList.h
nsTextFragment.h
diff --git a/content/shared/public/Makefile.in b/content/shared/public/Makefile.in
index ef4b1c0e50f..ce75c44eadb 100644
--- a/content/shared/public/Makefile.in
+++ b/content/shared/public/Makefile.in
@@ -45,7 +45,6 @@ nsLayoutAtoms.h \
nsRuleNode.h \
nsRuleWalker.h \
nsStyleCoord.h \
-nsStyleUtil.h \
nsStyleStruct.h \
nsStyleStructList.h \
nsTextFragment.h \
diff --git a/content/shared/src/Makefile.in b/content/shared/src/Makefile.in
index cddc020bd2c..dc6e8df0028 100644
--- a/content/shared/src/Makefile.in
+++ b/content/shared/src/Makefile.in
@@ -36,7 +36,6 @@ REQUIRES = xpcom \
locale \
dom \
webshell \
- pref \
necko \
htmlparser \
unicharutil \
@@ -52,7 +51,6 @@ CPPSRCS = \
nsHTMLValue.cpp \
nsImageMapUtils.cpp \
nsLayoutAtoms.cpp \
- nsStyleUtil.cpp \
nsTextFragment.cpp \
nsXULAtoms.cpp \
nsXBLAtoms.cpp \