diff --git a/mozilla/content/html/style/src/nsComputedDOMStyle.cpp b/mozilla/content/html/style/src/nsComputedDOMStyle.cpp
index 0dbb68aa952..99af0ce8a0f 100644
--- a/mozilla/content/html/style/src/nsComputedDOMStyle.cpp
+++ b/mozilla/content/html/style/src/nsComputedDOMStyle.cpp
@@ -481,7 +481,7 @@ nsComputedDOMStyle::GetBorderWidth(nsString& aBorderWidth)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetBottom(nsIFrame *aFrame,
                               nsIDOMCSSPrimitiveValue*& aValue)
 {
@@ -579,7 +579,7 @@ nsComputedDOMStyle::GetDirection(nsString& aDirection)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetDisplay(nsIFrame *aFrame,
                                nsIDOMCSSPrimitiveValue*& aValue)
 {
@@ -728,7 +728,7 @@ nsComputedDOMStyle::GetHeight(nsIFrame *aFrame,
                              (void **)&aValue);
 }
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetLeft(nsIFrame *aFrame,
                             nsIDOMCSSPrimitiveValue*& aValue)
 {
@@ -1014,7 +1014,7 @@ nsComputedDOMStyle::GetRichness(nsString& aRichness)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetRight(nsIFrame *aFrame,
                              nsIDOMCSSPrimitiveValue*& aValue)
 {
@@ -1112,7 +1112,7 @@ nsComputedDOMStyle::GetTextTransform(nsString& aTextTransform)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetTop(nsIFrame *aFrame,
                            nsIDOMCSSPrimitiveValue*& aValue)
 {
diff --git a/mozilla/layout/html/style/src/Makefile.in b/mozilla/layout/html/style/src/Makefile.in
index ed4af1f4fee..9dd327962e0 100644
--- a/mozilla/layout/html/style/src/Makefile.in
+++ b/mozilla/layout/html/style/src/Makefile.in
@@ -52,6 +52,8 @@ CPPSRCS		= \
 		nsHTMLCSSStyleSheet.cpp \
 		nsHTMLValue.cpp \
 		nsStyleUtil.cpp \
+		nsComputedDOMStyle.cpp \
+		nsROCSSPrimitiveValue.cpp \
 		$(NULL)
 
 EXPORTS		= \
diff --git a/mozilla/layout/html/style/src/makefile.win b/mozilla/layout/html/style/src/makefile.win
index 5b0f950002e..b8e7f0acde9 100644
--- a/mozilla/layout/html/style/src/makefile.win
+++ b/mozilla/layout/html/style/src/makefile.win
@@ -69,6 +69,8 @@ CPPSRCS=				\
 	nsHTMLValue.cpp 		\
 	nsStyleUtil.cpp 		\
 	nsDOMCSSDeclaration.cpp		\
+	nsComputedDOMStyle.cpp		\
+	nsROCSSPrimitiveValue.cpp	\
 	$(NULL)
 
 CPP_OBJS =					\
@@ -92,6 +94,8 @@ CPP_OBJS =					\
 	.\$(OBJDIR)\nsHTMLValue.obj 		\
 	.\$(OBJDIR)\nsStyleUtil.obj 		\
 	.\$(OBJDIR)\nsDOMCSSDeclaration.obj 	\
+	.\$(OBJDIR)\nsComputedDOMStyle.obj 	\
+	.\$(OBJDIR)\nsROCSSPrimitiveValue.obj 	\
 	$(NULL)
 
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\netlib \
diff --git a/mozilla/layout/html/style/src/nsComputedDOMStyle.cpp b/mozilla/layout/html/style/src/nsComputedDOMStyle.cpp
index 0dbb68aa952..99af0ce8a0f 100644
--- a/mozilla/layout/html/style/src/nsComputedDOMStyle.cpp
+++ b/mozilla/layout/html/style/src/nsComputedDOMStyle.cpp
@@ -481,7 +481,7 @@ nsComputedDOMStyle::GetBorderWidth(nsString& aBorderWidth)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetBottom(nsIFrame *aFrame,
                               nsIDOMCSSPrimitiveValue*& aValue)
 {
@@ -579,7 +579,7 @@ nsComputedDOMStyle::GetDirection(nsString& aDirection)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetDisplay(nsIFrame *aFrame,
                                nsIDOMCSSPrimitiveValue*& aValue)
 {
@@ -728,7 +728,7 @@ nsComputedDOMStyle::GetHeight(nsIFrame *aFrame,
                              (void **)&aValue);
 }
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetLeft(nsIFrame *aFrame,
                             nsIDOMCSSPrimitiveValue*& aValue)
 {
@@ -1014,7 +1014,7 @@ nsComputedDOMStyle::GetRichness(nsString& aRichness)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetRight(nsIFrame *aFrame,
                              nsIDOMCSSPrimitiveValue*& aValue)
 {
@@ -1112,7 +1112,7 @@ nsComputedDOMStyle::GetTextTransform(nsString& aTextTransform)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetTop(nsIFrame *aFrame,
                            nsIDOMCSSPrimitiveValue*& aValue)
 {
diff --git a/mozilla/layout/style/nsComputedDOMStyle.cpp b/mozilla/layout/style/nsComputedDOMStyle.cpp
index 0dbb68aa952..99af0ce8a0f 100644
--- a/mozilla/layout/style/nsComputedDOMStyle.cpp
+++ b/mozilla/layout/style/nsComputedDOMStyle.cpp
@@ -481,7 +481,7 @@ nsComputedDOMStyle::GetBorderWidth(nsString& aBorderWidth)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetBottom(nsIFrame *aFrame,
                               nsIDOMCSSPrimitiveValue*& aValue)
 {
@@ -579,7 +579,7 @@ nsComputedDOMStyle::GetDirection(nsString& aDirection)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetDisplay(nsIFrame *aFrame,
                                nsIDOMCSSPrimitiveValue*& aValue)
 {
@@ -728,7 +728,7 @@ nsComputedDOMStyle::GetHeight(nsIFrame *aFrame,
                              (void **)&aValue);
 }
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetLeft(nsIFrame *aFrame,
                             nsIDOMCSSPrimitiveValue*& aValue)
 {
@@ -1014,7 +1014,7 @@ nsComputedDOMStyle::GetRichness(nsString& aRichness)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetRight(nsIFrame *aFrame,
                              nsIDOMCSSPrimitiveValue*& aValue)
 {
@@ -1112,7 +1112,7 @@ nsComputedDOMStyle::GetTextTransform(nsString& aTextTransform)
 }
 #endif
 
-NS_IMETHODIMP
+nsresult
 nsComputedDOMStyle::GetTop(nsIFrame *aFrame,
                            nsIDOMCSSPrimitiveValue*& aValue)
 {