diff --git a/browser/base/content/openLocation.xul b/browser/base/content/openLocation.xul
index 993ff02999bd..9f89406d965f 100644
--- a/browser/base/content/openLocation.xul
+++ b/browser/base/content/openLocation.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-
 #
 #  The contents of this file are subject to the Netscape Public
 #  License Version 1.1 (the "License"); you may not use this file
@@ -23,7 +22,6 @@
 #    Ben Goodger <ben@netscape.com>
 #    Michael Lowe <michael.lowe@bigfoot.com> 
 #
-
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
 <!DOCTYPE dialog [
diff --git a/browser/base/content/pageReport.js b/browser/base/content/pageReport.js
index 3b13ef621d02..9b80b68f3672 100644
--- a/browser/base/content/pageReport.js
+++ b/browser/base/content/pageReport.js
@@ -1,24 +1,23 @@
-/* The contents of this file are subject to the Netscape Public
-  License Version 1.1 (the "License"); you may not use this file
-  except in compliance with the License. You may obtain a copy of
-  the License at http://www.mozilla.org/NPL/
-  
-  Software distributed under the License is distributed on an "AS
-  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  implied. See the License for the specific language governing
-  rights and limitations under the License.
-  
-  The Original Code is Mozilla Communicator client code, released
-  March 31, 1998.
-  
-  The Initial Developer of the Original Code is Netscape
-  Communications Corporation. Portions created by Netscape are
-  Copyright (C) 1998-1999 Netscape Communications Corporation. All
-  Rights Reserved.
-  
-  Contributor(s): 
-    David Hyatt (hyatt@apple.com)
-*/
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1998-1999 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s): 
+#   David Hyatt (hyatt@apple.com)
 
 var gSiteBox;
 var gUnblockButton;
diff --git a/browser/base/content/pageReport.xul b/browser/base/content/pageReport.xul
index b4fd7a445a9e..1385f1f275b1 100644
--- a/browser/base/content/pageReport.xul
+++ b/browser/base/content/pageReport.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-
 #
 #  The contents of this file are subject to the Netscape Public
 #  License Version 1.1 (the "License"); you may not use this file
diff --git a/browser/base/content/pageReportFirstTime.xul b/browser/base/content/pageReportFirstTime.xul
index ef15461d3155..5c666c3682f3 100644
--- a/browser/base/content/pageReportFirstTime.xul
+++ b/browser/base/content/pageReportFirstTime.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-
 #  The contents of this file are subject to the Netscape Public
 #  License Version 1.1 (the "License"); you may not use this file
 #  except in compliance with the License. You may obtain a copy of
diff --git a/browser/components/bookmarks/content/bookmarksToolbar.xml b/browser/components/bookmarks/content/bookmarksToolbar.xml
index b1908efa8f42..e8e07d9eace9 100644
--- a/browser/components/bookmarks/content/bookmarksToolbar.xml
+++ b/browser/components/bookmarks/content/bookmarksToolbar.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>  
-
 # -*- Mode: HTML; indent-tabs-mode: nil; -*-
 # Version: NPL 1.1/GPL 2.0/LGPL 2.1
 # 
@@ -35,7 +34,6 @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the NPL, the GPL or the LGPL.
 
-
 <!DOCTYPE window [
   <!ENTITY % bookmarksDTD SYSTEM "chrome://browser/locale/bookmarks/bookmarks.dtd" >
   %bookmarksDTD;
diff --git a/browser/components/prefwindow/content/pref-advanced.xul b/browser/components/prefwindow/content/pref-advanced.xul
index a351cbf457c2..880963c011e7 100644
--- a/browser/components/prefwindow/content/pref-advanced.xul
+++ b/browser/components/prefwindow/content/pref-advanced.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
 # except in compliance with the License. You may obtain a copy of