diff --git a/AST/DeclSerialization.cpp b/AST/DeclSerialization.cpp
index cb91846..26b36c2 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 e1e8ef0..55c0a48 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 188ce70..fce9b44 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 efc1d67..4a9b0d1 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 4475d49..0c05484 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 c00800c..af8ea2f 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 c947afd..8cee742 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 36ea2df..7c1275b 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 dd71dc9..95fbbb9 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 a02f3e4..34b55de 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 f47e14b..ef6fc17 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 62e10e9..81de2ac 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 ea8a793..f2a0b52 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 124d141..54f50f8 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 a67afed..125100a 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 fb5cd41..eba0c8b 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 7a6cf51..e2fe97e 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*
 //
 //===----------------------------------------------------------------------===//