diff --git a/stdlib/public/common/MirrorCommon.py b/stdlib/public/common/MirrorCommon.py
index 24644a9f08c61..63e749d206bca 100644
--- a/stdlib/public/common/MirrorCommon.py
+++ b/stdlib/public/common/MirrorCommon.py
@@ -1,17 +1,20 @@
-#//===--- MirrorCommon.py -------------------------------------*- python -*-===//
-#//
-#// This source file is part of the Swift.org open source project
-#//
-#// Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
-#// Licensed under Apache License v2.0 with Runtime Library Exception
-#//
-#// See http://swift.org/LICENSE.txt for license information
-#// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-#//
-#//===----------------------------------------------------------------------===//
+# MirrorCommon.py -*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# -----------------------------------------------------------------------------
+#
 # This file contains utility functions that are used by the gyb template files
 # that generate Mirrors for the Swift Standard Library.
 # If you edit this, make sure to also accordingly tweak the actual template files.
+#
+# -----------------------------------------------------------------------------
 
 def getDisposition(disp=None):
   if disp is None:
diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
index ba0172da4b5cc..e6e44a222ecc0 100644
--- a/test/Unit/lit.cfg
+++ b/test/Unit/lit.cfg
@@ -1,6 +1,12 @@
-# -*- Python -*-
-
-# Configuration file for the 'lit' test runner.
+# test/Unit/lit.cfg - Configuration for the 'lit' test runner. -*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 import os
 
diff --git a/test/lit.cfg b/test/lit.cfg
index 0c500bf956478..5a741f3eb3d1e 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -1,14 +1,14 @@
-##===--- lit.cfg ---------------------------------------------*- Python -*-===##
-##
-## This source file is part of the Swift.org open source project
-##
-## Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
-## Licensed under Apache License v2.0 with Runtime Library Exception
-##
-## See http://swift.org/LICENSE.txt for license information
-## See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-##
-##===----------------------------------------------------------------------===##
+# swift/test/lit.cfg - Configuration for the 'lit' test runner -*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# -----------------------------------------------------------------------------
 #
 # This is a configuration file for the 'lit' test runner.
 #
@@ -16,7 +16,7 @@
 #
 # Update docs/Testing.rst when changing this file.
 #
-##===----------------------------------------------------------------------===##
+# -----------------------------------------------------------------------------
 
 import os
 import platform
diff --git a/tools/SourceKit/bindings/python/sourcekitd/__init__.py b/tools/SourceKit/bindings/python/sourcekitd/__init__.py
index 959ea2b6bafe3..21aed3177d3b1 100644
--- a/tools/SourceKit/bindings/python/sourcekitd/__init__.py
+++ b/tools/SourceKit/bindings/python/sourcekitd/__init__.py
@@ -1,4 +1,4 @@
-#===- __init__.py - sourcekitd Python Bindings ---------------*- python -*--===#
+# __init__.py - sourcekitd Python Bindings -*- python -*-
 #
 # This source file is part of the Swift.org open source project
 #
@@ -7,8 +7,6 @@
 #
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-#
-#===------------------------------------------------------------------------===#
 
 r"""
 sourcekitd framework bindings
diff --git a/tools/SourceKit/bindings/python/sourcekitd/capi.py b/tools/SourceKit/bindings/python/sourcekitd/capi.py
index bc743c9c928ad..e1281eef9d35c 100644
--- a/tools/SourceKit/bindings/python/sourcekitd/capi.py
+++ b/tools/SourceKit/bindings/python/sourcekitd/capi.py
@@ -1,4 +1,4 @@
-#===- capi.py - sourcekitd Python Bindings -------------------*- python -*--===#
+# capi.py - sourcekitd Python Bindings -*- python -*-
 #
 # This source file is part of the Swift.org open source project
 #
@@ -7,8 +7,6 @@
 #
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-#
-#===------------------------------------------------------------------------===#
 
 from ctypes import (
     CFUNCTYPE,
diff --git a/tools/SourceKit/bindings/python/sourcekitd/request.py b/tools/SourceKit/bindings/python/sourcekitd/request.py
index 2b60cd8fc9b91..15463b3d824be 100644
--- a/tools/SourceKit/bindings/python/sourcekitd/request.py
+++ b/tools/SourceKit/bindings/python/sourcekitd/request.py
@@ -1,4 +1,4 @@
-#===- request.py - sourcekitd Python Bindings ----------------*- python -*--===#
+# request.py - sourcekitd Python Bindings -*- python -*-
 #
 # This source file is part of the Swift.org open source project
 #
@@ -7,8 +7,6 @@
 #
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-#
-#===------------------------------------------------------------------------===#
 
 import capi
 
diff --git a/utils/SwiftBuildSupport.py b/utils/SwiftBuildSupport.py
index cf7fc5ad452a6..80f955e92d252 100644
--- a/utils/SwiftBuildSupport.py
+++ b/utils/SwiftBuildSupport.py
@@ -1,4 +1,4 @@
-#===--- SwiftBuildSupport.py - Utilities for Swift build scripts -----------===#
+# utils/SwiftBuildSupport.py - Utilities for Swift build scripts -*- python -*-
 #
 # This source file is part of the Swift.org open source project
 #
@@ -7,8 +7,6 @@
 #
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-#
-#===------------------------------------------------------------------------===#
 
 from __future__ import print_function
 
diff --git a/utils/apply-fixit-edits.py b/utils/apply-fixit-edits.py
index 35ae1748c692a..0b374ec16d0fe 100755
--- a/utils/apply-fixit-edits.py
+++ b/utils/apply-fixit-edits.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-
-#===--- apply-fixit-edits.py - Tool for applying edits from .remap files ---===#
+# utils/apply-fixit-edits.py - Apply edits from .remap files -*- python -*-
 #
 # This source file is part of the Swift.org open source project
 #
@@ -9,8 +8,6 @@
 #
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-#
-#===------------------------------------------------------------------------===#
 
 from __future__ import print_function
 
diff --git a/utils/build-script b/utils/build-script
index 72cb48b78bb8c..53c72a407cd82 100755
--- a/utils/build-script
+++ b/utils/build-script
@@ -1,15 +1,13 @@
 #!/usr/bin/env python
-#===--- build-script - The ultimate tool for building Swift ----------------===#
+# utils/build-script - The ultimate tool for building Swift -*- python -*-
 #
-## This source file is part of the Swift.org open source project
-##
-## Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
-## Licensed under Apache License v2.0 with Runtime Library Exception
-##
-## See http://swift.org/LICENSE.txt for license information
-## See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+# This source file is part of the Swift.org open source project
 #
-#===------------------------------------------------------------------------===#
+# Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 from __future__ import print_function
 
diff --git a/utils/sil-opt-verify-all-modules.py b/utils/sil-opt-verify-all-modules.py
index 29b2b8565855a..5d96041b55413 100755
--- a/utils/sil-opt-verify-all-modules.py
+++ b/utils/sil-opt-verify-all-modules.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#===------------------------------------------------------------------------===#
+# utils/sil-opt-verify-all-modules.py - Verifies Swift modules -*- python -*-
 #
 # This source file is part of the Swift.org open source project
 #
@@ -8,8 +8,6 @@
 #
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-#
-#===------------------------------------------------------------------------===#
 
 from __future__ import print_function
 
diff --git a/utils/update-checkout b/utils/update-checkout
index ffaef40f242e6..03e5da5b17763 100755
--- a/utils/update-checkout
+++ b/utils/update-checkout
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#===--- update-checkout - Utility to update your local checkouts -----------===#
+# utils/update-checkout - Utility to update your local checkouts -*- python -*-
 #
 # This source file is part of the Swift.org open source project
 #
@@ -8,8 +8,6 @@
 #
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-#
-#===------------------------------------------------------------------------===#
 
 from __future__ import print_function