diff --git a/libcxx/test/depr/depr.auto.ptr/auto.ptr/A.h b/libcxx/test/depr/depr.auto.ptr/auto.ptr/A.h
index c235d0ce4d6b..d4f0aef1c31f 100644
--- a/libcxx/test/depr/depr.auto.ptr/auto.ptr/A.h
+++ b/libcxx/test/depr/depr.auto.ptr/auto.ptr/A.h
@@ -27,4 +27,4 @@ public:
 
 int A::count = 0;
 
-#endif
+#endif  // A_H
diff --git a/libcxx/test/depr/depr.auto.ptr/auto.ptr/AB.h b/libcxx/test/depr/depr.auto.ptr/auto.ptr/AB.h
index 5a7e0988e9d5..b8ea6ddb8d06 100644
--- a/libcxx/test/depr/depr.auto.ptr/auto.ptr/AB.h
+++ b/libcxx/test/depr/depr.auto.ptr/auto.ptr/AB.h
@@ -38,4 +38,4 @@ public:
 
 int B::count = 0;
 
-#endif
+#endif  // AB_H
diff --git a/libcxx/test/depr/depr.auto.ptr/auto.ptr/element_type.pass.cpp b/libcxx/test/depr/depr.auto.ptr/auto.ptr/element_type.pass.cpp
index f78d3e136642..d71f0fa36872 100644
--- a/libcxx/test/depr/depr.auto.ptr/auto.ptr/element_type.pass.cpp
+++ b/libcxx/test/depr/depr.auto.ptr/auto.ptr/element_type.pass.cpp
@@ -11,8 +11,8 @@
 
 // template <class X>
 // class auto_ptr
-// { 
-// public: 
+// {
+// public:
 //   typedef X element_type;
 //   ...
 // };
diff --git a/libcxx/test/depr/depr.c.headers/complex.h.pass.cpp b/libcxx/test/depr/depr.c.headers/complex.h.pass.cpp
index d7098474dfd1..caa82e72b32a 100644
--- a/libcxx/test/depr/depr.c.headers/complex.h.pass.cpp
+++ b/libcxx/test/depr/depr.c.headers/complex.h.pass.cpp
@@ -9,7 +9,6 @@
 
 // <complex.h>
 
-
 #include <complex.h>
 
 #ifndef _LIBCPP_VERSION
diff --git a/libcxx/test/depr/depr.c.headers/float_h.pass.cpp b/libcxx/test/depr/depr.c.headers/float_h.pass.cpp
index 333b6c1936e4..6762bac9bcd2 100644
--- a/libcxx/test/depr/depr.c.headers/float_h.pass.cpp
+++ b/libcxx/test/depr/depr.c.headers/float_h.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test <float.h>
 
 #include <float.h>
diff --git a/libcxx/test/depr/depr.c.headers/limits_h.pass.cpp b/libcxx/test/depr/depr.c.headers/limits_h.pass.cpp
index 232573a63a64..c5405f7e8710 100644
--- a/libcxx/test/depr/depr.c.headers/limits_h.pass.cpp
+++ b/libcxx/test/depr/depr.c.headers/limits_h.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test limits.h
 
 #include <limits.h>
diff --git a/libcxx/test/depr/depr.ios.members/io_state.pass.cpp b/libcxx/test/depr/depr.ios.members/io_state.pass.cpp
index bff799086778..00655a2fd21b 100644
--- a/libcxx/test/depr/depr.ios.members/io_state.pass.cpp
+++ b/libcxx/test/depr/depr.ios.members/io_state.pass.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // <ios>
-// 
+//
 // class ios_base
 // {
 // public:
diff --git a/libcxx/test/depr/depr.ios.members/open_mode.pass.cpp b/libcxx/test/depr/depr.ios.members/open_mode.pass.cpp
index 8b5e6f205d3e..779c5ed73531 100644
--- a/libcxx/test/depr/depr.ios.members/open_mode.pass.cpp
+++ b/libcxx/test/depr/depr.ios.members/open_mode.pass.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // <ios>
-// 
+//
 // class ios_base
 // {
 // public:
diff --git a/libcxx/test/depr/depr.ios.members/seek_dir.pass.cpp b/libcxx/test/depr/depr.ios.members/seek_dir.pass.cpp
index 01d68a28fc4c..e6418542e41e 100644
--- a/libcxx/test/depr/depr.ios.members/seek_dir.pass.cpp
+++ b/libcxx/test/depr/depr.ios.members/seek_dir.pass.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // <ios>
-// 
+//
 // class ios_base
 // {
 // public:
diff --git a/libcxx/test/depr/depr.ios.members/streamoff.pass.cpp b/libcxx/test/depr/depr.ios.members/streamoff.pass.cpp
index 35fbbbb9ec74..7ac2f8e891fa 100644
--- a/libcxx/test/depr/depr.ios.members/streamoff.pass.cpp
+++ b/libcxx/test/depr/depr.ios.members/streamoff.pass.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // <ios>
-// 
+//
 // class ios_base
 // {
 // public:
diff --git a/libcxx/test/depr/depr.ios.members/streampos.pass.cpp b/libcxx/test/depr/depr.ios.members/streampos.pass.cpp
index 473fa9151f0d..fcc59146f5bc 100644
--- a/libcxx/test/depr/depr.ios.members/streampos.pass.cpp
+++ b/libcxx/test/depr/depr.ios.members/streampos.pass.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // <ios>
-// 
+//
 // class ios_base
 // {
 // public:
diff --git a/libcxx/test/depr/depr.lib.binders/depr.lib.bind.1st/bind1st.pass.cpp b/libcxx/test/depr/depr.lib.binders/depr.lib.bind.1st/bind1st.pass.cpp
index 82ad63c0b731..5265b0c171e6 100644
--- a/libcxx/test/depr/depr.lib.binders/depr.lib.bind.1st/bind1st.pass.cpp
+++ b/libcxx/test/depr/depr.lib.binders/depr.lib.bind.1st/bind1st.pass.cpp
@@ -9,7 +9,7 @@
 
 // <functional>
 
-// template <class Fn, class T> 
+// template <class Fn, class T>
 //   binder1st<Fn>
 //   bind1st(const Fn& fn, const T& x);
 
diff --git a/libcxx/test/depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd.pass.cpp b/libcxx/test/depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd.pass.cpp
index dde3c2121925..8c4399b43516 100644
--- a/libcxx/test/depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd.pass.cpp
+++ b/libcxx/test/depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd.pass.cpp
@@ -9,7 +9,7 @@
 
 // <functional>
 
-// template <class Fn, class T> 
+// template <class Fn, class T>
 //   binder2nd<Fn>
 //   bind2nd(const Fn& op, const T& x);
 
diff --git a/libcxx/test/depr/depr.lib.binders/depr.lib.binder.1st/binder1st.pass.cpp b/libcxx/test/depr/depr.lib.binders/depr.lib.binder.1st/binder1st.pass.cpp
index 658937c627a8..62da8173d684 100644
--- a/libcxx/test/depr/depr.lib.binders/depr.lib.binder.1st/binder1st.pass.cpp
+++ b/libcxx/test/depr/depr.lib.binders/depr.lib.binder.1st/binder1st.pass.cpp
@@ -9,18 +9,18 @@
 
 // <functional>
 
-// template <class Fn> 
-// class binder1st 
+// template <class Fn>
+// class binder1st
 //   : public unary_function<typename Fn::second_argument_type, typename Fn::result_type>
-// { 
+// {
 // protected:
-//   Fn op; 
+//   Fn op;
 //   typename Fn::first_argument_type value;
-// public: 
-//   binder2nd(const Fn& x, const typename Fn::second_argument_type& y); 
-// 
-//   typename Fn::result_type operator()(const typename Fn::first_argument_type& x) const; 
-//   typename Fn::result_type operator()(typename Fn::first_argument_type& x) const; 
+// public:
+//   binder2nd(const Fn& x, const typename Fn::second_argument_type& y);
+//
+//   typename Fn::result_type operator()(const typename Fn::first_argument_type& x) const;
+//   typename Fn::result_type operator()(typename Fn::first_argument_type& x) const;
 // };
 
 #include <functional>
diff --git a/libcxx/test/depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd.pass.cpp b/libcxx/test/depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd.pass.cpp
index 43d3984bc8e0..7f4fa792b594 100644
--- a/libcxx/test/depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd.pass.cpp
+++ b/libcxx/test/depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd.pass.cpp
@@ -9,18 +9,18 @@
 
 // <functional>
 
-// template <class Fn> 
-// class binder2nd 
+// template <class Fn>
+// class binder2nd
 //   : public unary_function<typename Fn::first_argument_type, typename Fn::result_type>
-// { 
-// protected: 
-//   Fn op; 
-//   typename Fn::second_argument_type value; 
-// public: 
-//   binder2nd(const Fn& x, const typename Fn::second_argument_type& y); 
-// 
-//   typename Fn::result_type operator()(const typename Fn::first_argument_type& x) const; 
-//   typename Fn::result_type operator()(typename Fn::first_argument_type& x) const; 
+// {
+// protected:
+//   Fn op;
+//   typename Fn::second_argument_type value;
+// public:
+//   binder2nd(const Fn& x, const typename Fn::second_argument_type& y);
+//
+//   typename Fn::result_type operator()(const typename Fn::first_argument_type& x) const;
+//   typename Fn::result_type operator()(typename Fn::first_argument_type& x) const;
 // };
 
 #include <functional>
diff --git a/libcxx/test/depr/depr.lib.binders/test_func.h b/libcxx/test/depr/depr.lib.binders/test_func.h
index 1460215d9380..1940e5f723cb 100644
--- a/libcxx/test/depr/depr.lib.binders/test_func.h
+++ b/libcxx/test/depr/depr.lib.binders/test_func.h
@@ -30,4 +30,4 @@ public:
         {return x*y;}
 };
 
-#endif
+#endif  // TEST_FUNC_H
diff --git a/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekoff.pass.cpp b/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekoff.pass.cpp
index d70d392c37e9..1dcb1eb90688 100644
--- a/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekoff.pass.cpp
+++ b/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekoff.pass.cpp
@@ -11,7 +11,7 @@
 
 // class strstreambuf
 
-// pos_type seekoff(off_type off, ios_base::seekdir way, 
+// pos_type seekoff(off_type off, ios_base::seekdir way,
 //                  ios_base::openmode which = ios_base::in | ios_base::out);
 
 #include <strstream>