diff --git a/security/nss/tests/memleak/memleak.sh b/security/nss/tests/memleak/memleak.sh
index 433ca90d3583..174a1521096c 100644
--- a/security/nss/tests/memleak/memleak.sh
+++ b/security/nss/tests/memleak/memleak.sh
@@ -13,7 +13,7 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The original code is the Network Security Services (NSS)
+# The Original Code is the Network Security Services (NSS)
#
# The Initial Developer of the Original Code is
# Sun Microsystems, Inc.
diff --git a/themes/classic/global/mac/datetimepicker.css b/themes/classic/global/mac/datetimepicker.css
index bccfe58163b0..df6a225334ab 100644
--- a/themes/classic/global/mac/datetimepicker.css
+++ b/themes/classic/global/mac/datetimepicker.css
@@ -11,6 +11,8 @@
* for the specific language governing rights and limitations under the
* License.
*
+ * The Original Code is mozilla.org code.
+ *
* The Initial Developer of the Original Code is the Mozilla Corporation
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
diff --git a/themes/classic/global/win/datetimepicker.css b/themes/classic/global/win/datetimepicker.css
index 6a323f561a98..ebe17ff62e25 100644
--- a/themes/classic/global/win/datetimepicker.css
+++ b/themes/classic/global/win/datetimepicker.css
@@ -11,6 +11,8 @@
* for the specific language governing rights and limitations under the
* License.
*
+ * The Original Code is mozilla.org code.
+ *
* The Initial Developer of the Original Code is the Mozilla Corporation
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
diff --git a/themes/modern/global/datetimepicker.css b/themes/modern/global/datetimepicker.css
index 7c28664c5289..b8386dfb898e 100644
--- a/themes/modern/global/datetimepicker.css
+++ b/themes/modern/global/datetimepicker.css
@@ -11,6 +11,8 @@
* for the specific language governing rights and limitations under the
* License.
*
+ * The Original Code is mozilla.org code.
+ *
* The Initial Developer of the Original Code is the Mozilla Corporation
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
diff --git a/toolkit/system/dbus/Makefile.in b/toolkit/system/dbus/Makefile.in
index 3396cda37d07..0aaa314a2a92 100644
--- a/toolkit/system/dbus/Makefile.in
+++ b/toolkit/system/dbus/Makefile.in
@@ -1,25 +1,23 @@
-# ###### BEGIN LICENSE BLOCK ######
-# Version: NPL 1.1/GPL 2.0/LGPL 2.1
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
+# The contents of this file are subject to the Mozilla 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/MPL/
#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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.
+# 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 Novell code.
#
-# The Initial Developer of the Original Code is Novell, Inc.
+# The Initial Developer of the Original Code is
+# Novell, Inc.
# Portions created by the Initial Developer are Copyright (C) 2006
# the Initial Developer. All Rights Reserved.
#
-# Original Author: Robert O'Callahan (rocallahan@novell.com)
-#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
@@ -28,13 +26,13 @@
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the NPL, indicate your
+# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# 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.
+# the terms of any one of the MPL, the GPL or the LGPL.
#
-# ###### END LICENSE BLOCK ######
+# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
diff --git a/toolkit/themes/pinstripe/global/datetimepicker.css b/toolkit/themes/pinstripe/global/datetimepicker.css
index b01a9d601f45..827b68856043 100644
--- a/toolkit/themes/pinstripe/global/datetimepicker.css
+++ b/toolkit/themes/pinstripe/global/datetimepicker.css
@@ -11,6 +11,8 @@
* for the specific language governing rights and limitations under the
* License.
*
+ * The Original Code is mozilla.org code.
+ *
* The Initial Developer of the Original Code is the Mozilla Corporation
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
diff --git a/toolkit/themes/winstripe/global/datetimepicker.css b/toolkit/themes/winstripe/global/datetimepicker.css
index 65f360cbefbf..eec51ea07091 100644
--- a/toolkit/themes/winstripe/global/datetimepicker.css
+++ b/toolkit/themes/winstripe/global/datetimepicker.css
@@ -11,6 +11,8 @@
* for the specific language governing rights and limitations under the
* License.
*
+ * The Original Code is mozilla.org code.
+ *
* The Initial Developer of the Original Code is the Mozilla Corporation
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
diff --git a/xpcom/base/nsCycleCollectionParticipant.cpp b/xpcom/base/nsCycleCollectionParticipant.cpp
index e1fd085ddff1..bc76cfb5ba10 100644
--- a/xpcom/base/nsCycleCollectionParticipant.cpp
+++ b/xpcom/base/nsCycleCollectionParticipant.cpp
@@ -14,6 +14,11 @@
*
* The Original Code is mozilla.org code.
*
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
diff --git a/xpcom/base/nsCycleCollectionParticipant.h b/xpcom/base/nsCycleCollectionParticipant.h
index ec7dc28985f7..276802ef03a0 100644
--- a/xpcom/base/nsCycleCollectionParticipant.h
+++ b/xpcom/base/nsCycleCollectionParticipant.h
@@ -14,6 +14,11 @@
*
* The Original Code is mozilla.org code.
*
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
index 1cd3fce8da26..f397244c673a 100644
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -14,6 +14,11 @@
*
* The Original Code is mozilla.org code.
*
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
diff --git a/xpcom/base/nsCycleCollector.h b/xpcom/base/nsCycleCollector.h
index 0619455ea38a..43f602e5afb1 100644
--- a/xpcom/base/nsCycleCollector.h
+++ b/xpcom/base/nsCycleCollector.h
@@ -14,6 +14,11 @@
*
* The Original Code is mozilla.org code.
*
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
diff --git a/xpcom/glue/nsXPTCUtils.h b/xpcom/glue/nsXPTCUtils.h
index 5710c209742a..18b8fe117e94 100644
--- a/xpcom/glue/nsXPTCUtils.h
+++ b/xpcom/glue/nsXPTCUtils.h
@@ -15,12 +15,11 @@
*
* The Initial Developer of the Original Code is
* the Mozilla Foundation .
- *
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
- * Benjamin Smedberg - New code
+ * Benjamin Smedberg - New code
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
diff --git a/xpcom/reflect/xptcall/public/xptcall.h b/xpcom/reflect/xptcall/public/xptcall.h
index 810d071d1461..14973db5a4b9 100644
--- a/xpcom/reflect/xptcall/public/xptcall.h
+++ b/xpcom/reflect/xptcall/public/xptcall.h
@@ -20,11 +20,11 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
- * Benjamin Smedberg
+ * Benjamin Smedberg
*
* Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to