Index: clang-tools-extra/trunk/clang-query/QueryParser.h
===================================================================
--- clang-tools-extra/trunk/clang-query/QueryParser.h
+++ clang-tools-extra/trunk/clang-query/QueryParser.h
@@ -13,7 +13,7 @@
 #include "Query.h"
 #include "QuerySession.h"
 #include "llvm/LineEditor/LineEditor.h"
-#include <stddef.h>
+#include <cstddef>
 
 namespace clang {
 namespace query {
@@ -69,4 +69,4 @@
 } // namespace query
 } // namespace clang
 
-#endif
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_QUERY_QUERY_PARSER_H
Index: clang-tools-extra/trunk/clang-rename/RenamingAction.cpp
===================================================================
--- clang-tools-extra/trunk/clang-rename/RenamingAction.cpp
+++ clang-tools-extra/trunk/clang-rename/RenamingAction.cpp
@@ -24,9 +24,6 @@
 #include "clang/Tooling/CommonOptionsParser.h"
 #include "clang/Tooling/Refactoring.h"
 #include "clang/Tooling/Tooling.h"
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string>
 #include <vector>
 
@@ -86,5 +83,5 @@
                                                 Replaces, PrintLocations);
 }
 
-}
-}
+} // namespace rename
+} // namespace clang
Index: clang-tools-extra/trunk/clang-rename/USRFindingAction.cpp
===================================================================
--- clang-tools-extra/trunk/clang-rename/USRFindingAction.cpp
+++ clang-tools-extra/trunk/clang-rename/USRFindingAction.cpp
@@ -25,9 +25,6 @@
 #include "clang/Tooling/CommonOptionsParser.h"
 #include "clang/Tooling/Refactoring.h"
 #include "clang/Tooling/Tooling.h"
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string>
 #include <vector>
 
Index: clang-tools-extra/trunk/clang-rename/tool/ClangRename.cpp
===================================================================
--- clang-tools-extra/trunk/clang-rename/tool/ClangRename.cpp
+++ clang-tools-extra/trunk/clang-rename/tool/ClangRename.cpp
@@ -35,12 +35,8 @@
 #include "clang/Tooling/Tooling.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/Support/Host.h"
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <string>
-#include <time.h>
-#include <vector>
 
 using namespace llvm;
 
Index: clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp
===================================================================
--- clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp
+++ clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp
@@ -1,24 +1,22 @@
-//===--- PPCallbacksTracker.cpp - Preprocessor tracker -*--*-------------===//
+//===--- PPCallbacksTracker.cpp - Preprocessor tracker -*--*---------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===--------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===//
 ///
 /// \file
 /// \brief Implementations for preprocessor tracking.
 ///
 /// See the header for details.
 ///
-//===--------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===//
 
 #include "PPCallbacksTracker.h"
 #include "clang/Lex/MacroArgs.h"
 #include "llvm/Support/raw_ostream.h"
-#include <stdarg.h>
-#include <stdio.h>
 
 // Utility functions.
 
Index: clang-tools-extra/trunk/unittests/clang-rename/USRLocFindingTest.cpp
===================================================================
--- clang-tools-extra/trunk/unittests/clang-rename/USRLocFindingTest.cpp
+++ clang-tools-extra/trunk/unittests/clang-rename/USRLocFindingTest.cpp
@@ -3,7 +3,6 @@
 #include "gtest/gtest.h"
 #include <map>
 #include <set>
-#include <stdio.h>
 #include <vector>
 
 namespace clang {
@@ -79,6 +78,6 @@
   testOffsetGroups(VarTest, VarTestOffsets);
 }
 
-}
-}
-}
+} // namespace test
+} // namespace rename
+} // namespace clang