diff --git a/AST/DeclSerialization.cpp b/AST/DeclSerialization.cpp
index cb91846a027554211fd81252307ead3d1b702b43..26b36c2994d7885766cbcade7ee81636b3233351 100644
--- a/AST/DeclSerialization.cpp
+++ b/AST/DeclSerialization.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines methods that implement bitcode serialization for Decls.
+//  This file defines methods that implement bitcode serialization for Decls.
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/AST/TypeSerialization.cpp b/AST/TypeSerialization.cpp
index e1e8ef095e71d32e3f983d700db338089acaa227..55c0a48a00ddc27c5f7a4def580480a7d38ec499 100644
--- a/AST/TypeSerialization.cpp
+++ b/AST/TypeSerialization.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines methods that implement bitcode serialization for Types.
+//  This file defines methods that implement bitcode serialization for Types.
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/Analysis/CFRefCount.cpp b/Analysis/CFRefCount.cpp
index 188ce7084ce1834c7f9ebed261306581fd6ee5ba..fce9b44448b15cfe181fb28cf2de0426ae0341aa 100644
--- a/Analysis/CFRefCount.cpp
+++ b/Analysis/CFRefCount.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines the methods for CFRefCount, which implements
+//  This file defines the methods for CFRefCount, which implements
 //  a reference count checker for Core Foundation (Mac OS X).
 //
 //===----------------------------------------------------------------------===//
diff --git a/Analysis/CFRefCount.h b/Analysis/CFRefCount.h
index efc1d679eca2ece1b74090b377b67ecb850df1e2..4a9b0d1d2220be77fb8fa6feb6b2c949b496ca6c 100644
--- a/Analysis/CFRefCount.h
+++ b/Analysis/CFRefCount.h
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines CFRefCount, which defines the transfer functions
+//  This file defines CFRefCount, which defines the transfer functions
 //  to implement the Core Foundation reference count checker.
 //
 //===----------------------------------------------------------------------===//
diff --git a/Analysis/DeadStores.cpp b/Analysis/DeadStores.cpp
index 4475d495fbfa41e81a91c449f07b2fb6915e80b5..0c0548443224245361f8e3e6f82d691ffa19a32d 100644
--- a/Analysis/DeadStores.cpp
+++ b/Analysis/DeadStores.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines a DeadStores, a flow-sensitive checker that looks for
+//  This file defines a DeadStores, a flow-sensitive checker that looks for
 //  stores to variables that are no longer live.
 //
 //===----------------------------------------------------------------------===//
diff --git a/Analysis/GRSimpleVals.cpp b/Analysis/GRSimpleVals.cpp
index c00800c1416fb8df9bacedf1d63ac48e0501423b..af8ea2f4bbb08a8edc9b141e0eca731985483d74 100644
--- a/Analysis/GRSimpleVals.cpp
+++ b/Analysis/GRSimpleVals.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines GRSimpleVals, a sub-class of GRTransferFuncs that
+//  This file defines GRSimpleVals, a sub-class of GRTransferFuncs that
 //  provides transfer functions for performing simple value tracking with
 //  limited support for symbolics.
 //
diff --git a/Analysis/GRSimpleVals.h b/Analysis/GRSimpleVals.h
index c947afdb57626b462117eef00d32692aff35572d..8cee7426828c682d135112fcd782fd3e14a2d726 100644
--- a/Analysis/GRSimpleVals.h
+++ b/Analysis/GRSimpleVals.h
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines GRSimpleVals, a sub-class of GRTransferFuncs that
+//  This file defines GRSimpleVals, a sub-class of GRTransferFuncs that
 //  provides transfer functions for performing simple value tracking with
 //  limited support for symbolics.
 //
diff --git a/Analysis/RValues.cpp b/Analysis/RValues.cpp
index 36ea2df0e8b8d7389b1eb4923204f9746fd83d6c..7c1275b2a712a20f9d94043d3a978f345d5b9af6 100644
--- a/Analysis/RValues.cpp
+++ b/Analysis/RValues.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines RVal, LVal, and NonLVal, classes that represent
+//  This file defines RVal, LVal, and NonLVal, classes that represent
 //  abstract r-values for use with path-sensitive value tracking.
 //
 //===----------------------------------------------------------------------===//
diff --git a/Analysis/SymbolManager.cpp b/Analysis/SymbolManager.cpp
index dd71dc9d04d1d05974f5e71294cc8e57b98fe122..95fbbb937a5facb7ea10df9089681ef5d587fb8a 100644
--- a/Analysis/SymbolManager.cpp
+++ b/Analysis/SymbolManager.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines SymbolManager, a class that manages symbolic values
+//  This file defines SymbolManager, a class that manages symbolic values
 //  created for use by GRExprEngine and related classes.
 //
 //===----------------------------------------------------------------------===//
diff --git a/Analysis/ValueManager.cpp b/Analysis/ValueManager.cpp
index a02f3e45efd32a4ddeacad012bacbf5a4bf01523..34b55de21bac3fad898d3cba3b13a6e3c860e882 100644
--- a/Analysis/ValueManager.cpp
+++ b/Analysis/ValueManager.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines ValueManager, a class that manages the lifetime of APSInt
+//  This file defines ValueManager, a class that manages the lifetime of APSInt
 //  objects and symbolic constraints used by GRExprEngine and related classes.
 //
 //===----------------------------------------------------------------------===//
diff --git a/Analysis/ValueState.cpp b/Analysis/ValueState.cpp
index f47e14bb70874ff4bb21c27eb67db730c99d9255..ef6fc1798c51e3f1a71794aeae513d28bcc847b6 100644
--- a/Analysis/ValueState.cpp
+++ b/Analysis/ValueState.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines SymbolID, ExprBindKey, and ValueState*
+//  This file defines SymbolID, ExprBindKey, and ValueState*
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/include/clang/Analysis/Analyses/GRSimpleVals.h b/include/clang/Analysis/Analyses/GRSimpleVals.h
index 62e10e943b01c9a57b58a0d587695fab9a57ee95..81de2ac2e9d8e3d84b38ba17fb2857f47d8d9e4d 100644
--- a/include/clang/Analysis/Analyses/GRSimpleVals.h
+++ b/include/clang/Analysis/Analyses/GRSimpleVals.h
@@ -9,7 +9,7 @@
 //
 //               Constant Propagation via Graph Reachability
 //
-//  This files defines the interface to use the 'GRSimpleVals' path-sensitive
+//  This file defines the interface to use the 'GRSimpleVals' path-sensitive
 //  constant-propagation analysis.
 //
 //===----------------------------------------------------------------------===//
diff --git a/include/clang/Analysis/PathSensitive/GRTransferFuncs.h b/include/clang/Analysis/PathSensitive/GRTransferFuncs.h
index ea8a79347167dcffe1d8a4b92d64a87471ed6219..f2a0b522cb14d186f2c959df0d76935a5790df52 100644
--- a/include/clang/Analysis/PathSensitive/GRTransferFuncs.h
+++ b/include/clang/Analysis/PathSensitive/GRTransferFuncs.h
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines GRTransferFuncs, which provides a base-class that
+//  This file defines GRTransferFuncs, which provides a base-class that
 //  defines an interface for transfer functions used by GRExprEngine.
 //
 //===----------------------------------------------------------------------===//
diff --git a/include/clang/Analysis/PathSensitive/RValues.h b/include/clang/Analysis/PathSensitive/RValues.h
index 124d141bccceb14882dc5abce80988798e691fdb..54f50f875eb2d4b5240ead80bb3ba69282216d24 100644
--- a/include/clang/Analysis/PathSensitive/RValues.h
+++ b/include/clang/Analysis/PathSensitive/RValues.h
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines RVal, LVal, and NonLVal, classes that represent
+//  This file defines RVal, LVal, and NonLVal, classes that represent
 //  abstract r-values for use with path-sensitive value tracking.
 //
 //===----------------------------------------------------------------------===//
diff --git a/include/clang/Analysis/PathSensitive/SymbolManager.h b/include/clang/Analysis/PathSensitive/SymbolManager.h
index a67afed11fcde4df33258b96409ceec21b1fc170..125100aebb53f99bfd4ee7d42781c9bfb460083f 100644
--- a/include/clang/Analysis/PathSensitive/SymbolManager.h
+++ b/include/clang/Analysis/PathSensitive/SymbolManager.h
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines SymbolManager, a class that manages symbolic values
+//  This file defines SymbolManager, a class that manages symbolic values
 //  created for use by GRExprEngine and related classes.
 //
 //===----------------------------------------------------------------------===//
diff --git a/include/clang/Analysis/PathSensitive/ValueManager.h b/include/clang/Analysis/PathSensitive/ValueManager.h
index fb5cd418ed31b5175b2afc9962e13c0622cac17c..eba0c8b15b96e77eefa2a08afd43a39d9f46e6e4 100644
--- a/include/clang/Analysis/PathSensitive/ValueManager.h
+++ b/include/clang/Analysis/PathSensitive/ValueManager.h
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines ValueManager, a class that manages the lifetime of APSInt
+//  This file defines ValueManager, a class that manages the lifetime of APSInt
 //  objects and symbolic constraints used by GRExprEngine and related classes.
 //
 //===----------------------------------------------------------------------===//
diff --git a/include/clang/Analysis/PathSensitive/ValueState.h b/include/clang/Analysis/PathSensitive/ValueState.h
index 7a6cf5163383cc4d1c4f62d23c7077ae742d6895..e2fe97eb9007ee6fb89efda3d81a8d511e7d0ecd 100644
--- a/include/clang/Analysis/PathSensitive/ValueState.h
+++ b/include/clang/Analysis/PathSensitive/ValueState.h
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This files defines SymbolID, ExprBindKey, and ValueState*
+//  This file defines SymbolID, ExprBindKey, and ValueState*
 //
 //===----------------------------------------------------------------------===//