diff --git a/layout/html/style/src/Makefile b/layout/html/style/src/Makefile
index 0703e2fe35ca..815a5d7e422f 100644
--- a/layout/html/style/src/Makefile
+++ b/layout/html/style/src/Makefile
@@ -26,7 +26,6 @@ DEFINES += -D_IMPL_NS_HTML
 # Note the sophisticated alphabetical ordering :-|
 CPPSRCS =				\
 	nsCSSKeywords.cpp		\
-	nsCSSLayout.cpp			\
 	nsCSSDeclaration.cpp		\
 	nsCSSParser.cpp			\
 	nsCSSProps.cpp			\
@@ -35,7 +34,7 @@ CPPSRCS =				\
 	nsCSSScanner.cpp		\
 	nsCSSStyleRule.cpp		\
 	nsCSSStyleSheet.cpp		\
-	nsCSSValue.cpp		\
+	nsCSSValue.cpp			\
 	nsDOMCSSDeclaration.cpp         \
 	nsHTMLAttributes.cpp		\
 	nsHTMLStyleSheet.cpp		\
diff --git a/layout/html/style/src/makefile.win b/layout/html/style/src/makefile.win
index ac88b18855c4..98d3c9c770b8 100644
--- a/layout/html/style/src/makefile.win
+++ b/layout/html/style/src/makefile.win
@@ -23,26 +23,55 @@ REQUIRES=xpcom raptor dom js
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-EXPORTS=nsCSSProps.h nsCSSPropIDs.h nsCSSValue.h nsICSSStyleSheet.h nsICSSStyleRule.h \
-		nsICSSDeclaration.h nsHTMLValue.h nsIHTMLCSSStyleSheet.h \
-	        nsDOMCSSDeclaration.h
+EXPORTS =			\
+	nsCSSProps.h 		\
+	nsCSSPropIDs.h 		\
+	nsCSSValue.h 		\
+	nsICSSStyleSheet.h 	\
+	nsICSSStyleRule.h 	\
+	nsICSSDeclaration.h 	\
+	nsHTMLValue.h 		\
+	nsIHTMLCSSStyleSheet.h 	\
+	nsDOMCSSDeclaration.h 	\
+	$(NULL)
 
-CPPSRCS=nsCSSKeywords.cpp nsCSSLayout.cpp nsCSSDeclaration.cpp \
-    nsCSSParser.cpp nsCSSProps.cpp nsCSSProps2.cpp nsCSSRendering.cpp \
-	nsCSSScanner.cpp nsCSSStyleRule.cpp nsCSSStyleSheet.cpp nsCSSValue.cpp nsHTMLAttributes.cpp \
-    nsHTMLStyleSheet.cpp nsHTMLCSSStyleSheet.cpp nsHTMLValue.cpp \
-	nsStyleUtil.cpp nsDOMCSSDeclaration.cpp
+CPPSRCS=				\
+	nsCSSKeywords.cpp 		\
+	nsCSSDeclaration.cpp 		\
+	nsCSSParser.cpp 		\
+	nsCSSProps.cpp			\
+	nsCSSProps2.cpp 		\
+	nsCSSRendering.cpp 		\
+	nsCSSScanner.cpp 		\
+	nsCSSStyleRule.cpp 		\
+	nsCSSStyleSheet.cpp 		\
+	nsCSSValue.cpp			\
+	nsHTMLAttributes.cpp 		\
+	nsHTMLStyleSheet.cpp 		\
+	nsHTMLCSSStyleSheet.cpp		\
+	nsHTMLValue.cpp 		\
+	nsStyleUtil.cpp 		\
+	nsDOMCSSDeclaration.cpp		\
+	$(NULL)
 
-CPP_OBJS=.\$(OBJDIR)\nsCSSKeywords.obj .\$(OBJDIR)\nsCSSLayout.obj \
-    .\$(OBJDIR)\nsCSSDeclaration.obj .\$(OBJDIR)\nsCSSParser.obj \
-    .\$(OBJDIR)\nsCSSProps.obj .\$(OBJDIR)\nsCSSProps2.obj \
-	.\$(OBJDIR)\nsCSSRendering.obj \
-    .\$(OBJDIR)\nsCSSScanner.obj .\$(OBJDIR)\nsCSSStyleRule.obj \
-    .\$(OBJDIR)\nsCSSStyleSheet.obj .\$(OBJDIR)\nsCSSValue.obj \
-    .\$(OBJDIR)\nsHTMLAttributes.obj \
-    .\$(OBJDIR)\nsHTMLStyleSheet.obj .\$(OBJDIR)\nsHTMLCSSStyleSheet.obj \
-    .\$(OBJDIR)\nsHTMLValue.obj .\$(OBJDIR)\nsStyleUtil.obj \
-    .\$(OBJDIR)\nsDOMCSSDeclaration.obj
+CPP_OBJS =					\
+	.\$(OBJDIR)\nsCSSKeywords.obj 		\
+	.\$(OBJDIR)\nsCSSDeclaration.obj 	\
+	.\$(OBJDIR)\nsCSSParser.obj 		\
+	.\$(OBJDIR)\nsCSSProps.obj 		\
+	.\$(OBJDIR)\nsCSSProps2.obj 		\
+	.\$(OBJDIR)\nsCSSRendering.obj 		\
+	.\$(OBJDIR)\nsCSSScanner.obj 		\
+	.\$(OBJDIR)\nsCSSStyleRule.obj 		\
+	.\$(OBJDIR)\nsCSSStyleSheet.obj 	\
+	.\$(OBJDIR)\nsCSSValue.obj 		\
+	.\$(OBJDIR)\nsHTMLAttributes.obj 	\
+	.\$(OBJDIR)\nsHTMLStyleSheet.obj 	\
+	.\$(OBJDIR)\nsHTMLCSSStyleSheet.obj 	\
+	.\$(OBJDIR)\nsHTMLValue.obj 		\
+	.\$(OBJDIR)\nsStyleUtil.obj 		\
+	.\$(OBJDIR)\nsDOMCSSDeclaration.obj 	\
+	$(NULL)
 
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\netlib \
   -I..\..\..\base\src \