[clang-tidy] minor improvements in modernise-deprecated-headers check

[omtcyf0]

Summary

This patch introduces a minor list of changes as proposed by Richard Smith in the mailing list.

See original comments with an impact on the future check state below:

[comments.begin

+ {"complex.h", "ccomplex"},

It'd be better to convert this one to <complex>, or leave it alone.
<ccomplex> is an unnecessary wart.

(The contents of C++11's <complex.h> / <ccomplex> / <complex> (all of
which are identical) aren't comparable to C99's <complex.h>, so if
this was C++98 code using the C99 header, the code will be broken with
or without this transformation.)

+ {"iso646.h", "ciso646"},

Just delete #includes of this one. <ciso646> does nothing.

+ {"stdalign.h", "cstdalign"},
+ {"stdbool.h", "cstdbool"},

We should just delete these two includes. These headers do nothing in C++.

comments.end]

[alexfh]

+ {"iso646.h", "ciso646"},
Just delete #includes of this one. <ciso646> does nothing.

+ {"stdalign.h", "cstdalign"},
+ {"stdbool.h", "cstdbool"},
We should just delete these two includes. These headers do nothing in C++.

These don't seem to be addressed. Can you at least leave a FIXME in the code and in the test?

[omtcyf0]

@alexfh, why? I've deleted these headers both from sources and from testset, didn't I?

[alexfh]

In D17990#373177, @omtcyf0 wrote:

@alexfh, why? I've deleted these headers both from sources and from testset, didn't I?

I think, you misunderstood Richard's comment. The check should remove includes of these three headers from the code, since they have no effect in C++.

[alexfh]

clang-tidy/modernize/DeprecatedHeadersCheck.cpp

61

According to http://www.cplusplus.com/reference/cinttypes/, this header should be changed in C++11 mode only. See also http://llvm.org/PR26982

69

According to http://www.cplusplus.com/reference/cstdint/, this header is a part of C++11 standard, so we should move this to the list below.

docs/clang-tidy/checks/modernize-deprecated-headers.rst

45

Is this header actually "deprecated since C++11"?

61

Not sure if "deprecated" is the right word here. The wording seems to be slightly different: "This header simply includes <cmath> and <ccomplex>."

63

It's not exactly "deprecated". It has appeared in C++11 and is not particularly useful (just contains a couple of feature macros). Maybe we should just remove #includes of this header as well.

[omtcyf0]

Hope it looks better now.

[omtcyf0]

docs/clang-tidy/checks/modernize-deprecated-headers.rst

45

At least that's what cppreference tells me.

[alexfh]

clang-tidy/modernize/DeprecatedHeadersCheck.cpp

99

nit: "occurrence"

docs/clang-tidy/checks/modernize-deprecated-headers.rst

45

These checks don't have effect in C++:

Did you mean "headers"?

test/clang-tidy/modernize-deprecated-headers-cxx03.cpp

34

How about placing the check lines right after the corresponding includes? This way the test will be easier to read and won't require careful line offsets in the check lines.

[omtcyf0]

resolved small problems

[alexfh]

docs/clang-tidy/checks/modernize-deprecated-headers.rst

61

What about this comment? (was on the' <tgmath.h> -> <ctgmath>` line)

63

What about this comment? (was on the' <uchar.h> -> <cuchar>` line)

[omtcyf0]

@alexfh same applies to the other headers. All of them are marked as "deprecated" there.

Not sure if I should also mark <stdalign.h> and <stdbool.h> since they are in "has no effect in C++" section now, though.

[omtcyf0]

http://en.cppreference.com/w/cpp/header for reference

[alexfh]

Please update the tests according to the comment (https://reviews.llvm.org/D17990?id=62701#inline-186216).

docs/clang-tidy/checks/modernize-deprecated-headers.rst

43–49

nit: "the previous list."

[alexfh]

clang-tidy/modernize/DeprecatedHeadersCheck.cpp

39

nit: DeleteHeaders

39

Use llvm::StringSet

[omtcyf0]

Address comments Alex made.

[omtcyf0]

Address remaining comments.

[alexfh]

clang-tidy/modernize/DeprecatedHeadersCheck.cpp

76

It might not work on MSVC2013. You can try submitting this, but please watch the buildbots closely and have an alternative patch ready to fix the issue.

88

ditto

test/clang-tidy/modernize-deprecated-headers-cxx03.cpp

5

Please anchor the patterns to the start and end of line.

24

Please add a comment after the #include and add a CHECK-FIXES to ensure the whole #include directive is removed.

83

Add proper CHECK-FIXES here as well.

The same for the other test file.

[omtcyf0]

Address comments.

[alexfh]

LG

[aaron.ballman]

clang-tidy/modernize/DeprecatedHeadersCheck.cpp

79

This will definitely fail in MSVC 2013.

89

This one will work fine, but this pattern does not seem safe to me (same as above). StringSet::insert expects a StringRef. This vector (and all the std::string elements) will be destroyed at the end of the for loop, which means the StringSet will have dangling references.

[omtcyfz]

clang-tidy/modernize/DeprecatedHeadersCheck.cpp

79

See the left side of diff. It already is in source tree, buildbots never complained.

Thus, it won't.

docs/clang-tidy/checks/modernize-deprecated-headers.rst

61

at least http://en.cppreference.com/w/cpp/header says so...

[aaron.ballman]

clang-tidy/modernize/DeprecatedHeadersCheck.cpp

79

Ah shoot, I was misremembering a different case with a similar construct, except it was using std::make_pair, which caused deduction to fail. Le sigh.

[omtcyf0]

Address comments.

[alexfh]

clang-tidy/modernize/DeprecatedHeadersCheck.cpp

89

No danger of dangling references here, since StringMap copies keys. See StringMap comments and StringMapEntry::Create implementation.

So there's no need to store another copy of this data.

Kirill, please revert the latest change in this constructor.

[omtcyf0]

Revert changes.

[alexfh]

In D17990#511424, @omtcyf0 wrote:

Revert changes.

Thanks! If Aaron has no objections, good to go.

[omtcyf0]

In D17990#511429, @alexfh wrote:

In D17990#511424, @omtcyf0 wrote:

Revert changes.

Thanks! If Aaron has no objections, good to go.

Great! Thank you!

clang-tidy/modernize/DeprecatedHeadersCheck.cpp

 //===--- DeprecatedHeadersCheck.cpp - clang-tidy---------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "DeprecatedHeadersCheck.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Lex/PPCallbacks.h"
 #include "clang/Lex/Preprocessor.h"
 #include "llvm/ADT/StringMap.h"
 
+#include <set>
 #include <vector>
 
 namespace clang {
 namespace tidy {
 namespace modernize {
 
 namespace {
 class IncludeModernizePPCallbacks : public PPCallbacks {
 public:
   explicit IncludeModernizePPCallbacks(ClangTidyCheck &Check,
                                        LangOptions LangOpts);
 
   void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
                           StringRef FileName, bool IsAngled,
                           CharSourceRange FilenameRange, const FileEntry *File,
                           StringRef SearchPath, StringRef RelativePath,
                           const Module *Imported) override;
 
 private:
   ClangTidyCheck &Check;
   LangOptions LangOpts;
   llvm::StringMap<std::string> CStyledHeaderToCxx;
+  std::set<std::string> DeleteHeader;
 };
 } // namespace
 
 void DeprecatedHeadersCheck::registerPPCallbacks(CompilerInstance &Compiler) {
   if (this->getLangOpts().CPlusPlus) {
     Compiler.getPreprocessor().addPPCallbacks(
         ::llvm::make_unique<IncludeModernizePPCallbacks>(*this,
                                                          this->getLangOpts()));
   }
 }
 
 IncludeModernizePPCallbacks::IncludeModernizePPCallbacks(ClangTidyCheck &Check,
                                                          LangOptions LangOpts)
     : Check(Check), LangOpts(LangOpts) {
   for (const auto &KeyValue :
        std::vector<std::pair<llvm::StringRef, std::string>>(
-           {{"assert.h", "cassert"}, {"complex.h", "ccomplex"},
-            {"ctype.h", "cctype"},   {"errno.h", "cerrno"},
-            {"float.h", "cfloat"},   {"inttypes.h", "cinttypes"},
-            {"iso646.h", "ciso646"}, {"limits.h", "climits"},
-            {"locale.h", "clocale"}, {"math.h", "cmath"},
-            {"setjmp.h", "csetjmp"}, {"signal.h", "csignal"},
-            {"stdarg.h", "cstdarg"}, {"stddef.h", "cstddef"},
-            {"stdint.h", "cstdint"}, {"stdio.h", "cstdio"},
-            {"stdlib.h", "cstdlib"}, {"string.h", "cstring"},
-            {"time.h", "ctime"},     {"wchar.h", "cwchar"},
+           {{"assert.h", "cassert"},
+            {"complex.h", "complex"},
+            {"ctype.h", "cctype"},
+            {"errno.h", "cerrno"},
+            {"float.h", "cfloat"},
+            {"limits.h", "climits"},
+            {"locale.h", "clocale"},
+            {"math.h", "cmath"},
+            {"setjmp.h", "csetjmp"},
+            {"signal.h", "csignal"},
+            {"stdarg.h", "cstdarg"},
+            {"stddef.h", "cstddef"},
+            {"stdio.h", "cstdio"},
+            {"stdlib.h", "cstdlib"},
+            {"string.h", "cstring"},
+            {"time.h", "ctime"},
+            {"wchar.h", "cwchar"},
             {"wctype.h", "cwctype"}})) {
     CStyledHeaderToCxx.insert(KeyValue);
   }
   // Add C++ 11 headers.
   if (LangOpts.CPlusPlus11) {
     for (const auto &KeyValue :
          std::vector<std::pair<llvm::StringRef, std::string>>(
              {{"fenv.h", "cfenv"},
-              {"stdalign.h", "cstdalign"},
-              {"stdbool.h", "cstdbool"},
+              {"stdint.h", "cstdint"},
+              {"inttypes.h", "cinttypes"},
               {"tgmath.h", "ctgmath"},
               {"uchar.h", "cuchar"}})) {
       CStyledHeaderToCxx.insert(KeyValue);
     }
   }
+  DeleteHeader = {"stdalign.h", "stdbool.h", "iso646.h"};
 }
 
 void IncludeModernizePPCallbacks::InclusionDirective(
     SourceLocation HashLoc, const Token &IncludeTok, StringRef FileName,
     bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File,
     StringRef SearchPath, StringRef RelativePath, const Module *Imported) {
   // FIXME: Take care of library symbols from the global namespace.
   //
   // Reasonable options for the check:
   //
   // 1. Insert std prefix for every such symbol occurance.
   // 2. Insert `using namespace std;` to the beginning of TU.
   // 3. Do nothing and let the user deal with the migration himself.
   if (CStyledHeaderToCxx.count(FileName) != 0) {
     std::string Replacement =
         (llvm::Twine("<") + CStyledHeaderToCxx[FileName] + ">").str();
-    Check.diag(FilenameRange.getBegin(),
-               "inclusion of deprecated C++ header '%0'; consider using '%1' instead")
+    Check.diag(
+        FilenameRange.getBegin(),
         << FileName << CStyledHeaderToCxx[FileName]
         << FixItHint::CreateReplacement(FilenameRange.getAsRange(),
                                         Replacement);
+  } else if (DeleteHeader.count(FileName) != 0) {
+    Check.diag(FilenameRange.getBegin(),
+               "including '%0' has no effect in C++; consider removing it")
+        << FileName << FixItHint::CreateRemoval(FilenameRange.getAsRange());
   }
 }
 
 } // namespace modernize
 } // namespace tidy
 } // namespace clang

docs/clang-tidy/checks/modernize-deprecated-headers.rst

 .. title:: clang-tidy - modernize-deprecated-headers
 
 modernize-deprecated-headers
 ============================
 
 Some headers from C library were deprecated in C++ and are no longer welcome in
-C++ codebases. For more details refer to the C++ 14 Standard [depr.c.headers]
-section.
+C++ codebases. Some have no effect in C++. For more details refer to the C++ 14
+Standard [depr.c.headers] section.
 
-This check replaces C standard library headers with their C++ alternatives.
+This check replaces C standard library headers with their C++ alternatives and
+removes redundant ones.
 
 Improtant note: the Standard doesn't guarantee that the C++ headers declare all
 the same functions in the global namespace. The check in its current form can
 break the code that uses library symbols from the global namespace.
 
 * `<assert.h>`
 * `<complex.h>`
 * `<ctype.h>`
 * `<errno.h>`
 * `<fenv.h>`     // deprecated since C++11
 * `<float.h>`
 * `<inttypes.h>`
-* `<iso646.h>`
 * `<limits.h>`
 * `<locale.h>`
 * `<math.h>`
 * `<setjmp.h>`
 * `<signal.h>`
-* `<stdalign.h>` // deprecated since C++11
 * `<stdarg.h>`
-* `<stdbool.h>`  // deprecated since C++11
 * `<stddef.h>`
 * `<stdint.h>`
 * `<stdio.h>`
 * `<stdlib.h>`
 * `<string.h>`
 * `<tgmath.h>`   // deprecated since C++11
 * `<time.h>`
 * `<uchar.h>`    // deprecated since C++11
 * `<wchar.h>`
 * `<wctype.h>`
 
 If the specified standard is older than C++11 the check will only replace
 headers deprecated before C++11, otherwise -- every header that appeared in
-the list.
+previous list.
+
+These checks don't have effect in C++:
+
+* `<iso646.h>`
+* `<stdalign.h>`
+* `<stdbool.h>`

test/clang-tidy/modernize-deprecated-headers-cxx03.cpp

 // RUN: %check_clang_tidy %s modernize-deprecated-headers %t -- -extra-arg-before=-isystem%S/Inputs/modernize-deprecated-headers -- -std=c++03 -v
 
 #include <assert.h>
 #include <complex.h>
 #include <ctype.h>
 #include <errno.h>
 #include <float.h>
-#include <inttypes.h>
-#include <iso646.h>
 #include <limits.h>
 #include <locale.h>
 #include <math.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <wchar.h>
 #include <wctype.h>
 
-// Headers deprecated since C++11: expect no diagnostics.
-#include <fenv.h>
+// Headers that have no effect in C++; remove them
 #include <stdalign.h>
 #include <stdbool.h>
+#include <iso646.h>
+
+// Headers deprecated since C++11: expect no diagnostics.
+#include <fenv.h>
+#include <inttypes.h>
+#include <stdint.h>
 #include <tgmath.h>
 #include <uchar.h>
 
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'assert.h'; consider using 'cassert' instead [modernize-deprecated-headers]
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'complex.h'; consider using 'ccomplex' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'ctype.h'; consider using 'cctype' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'errno.h'; consider using 'cerrno' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'float.h'; consider using 'cfloat' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'inttypes.h'; consider using 'cinttypes' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'iso646.h'; consider using 'ciso646' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'limits.h'; consider using 'climits' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'locale.h'; consider using 'clocale' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'math.h'; consider using 'cmath' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'setjmp.h'; consider using 'csetjmp' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'signal.h'; consider using 'csignal' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdarg.h'; consider using 'cstdarg' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stddef.h'; consider using 'cstddef' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdint.h'; consider using 'cstdint' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdio.h'; consider using 'cstdio' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdlib.h'; consider using 'cstdlib' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'string.h'; consider using 'cstring' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'time.h'; consider using 'ctime' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'wchar.h'; consider using 'cwchar' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'wctype.h'; consider using 'cwctype' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'assert.h'; consider using 'cassert' instead [modernize-deprecated-headers]
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'complex.h'; consider using 'complex' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'ctype.h'; consider using 'cctype' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'errno.h'; consider using 'cerrno' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'float.h'; consider using 'cfloat' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'limits.h'; consider using 'climits' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'locale.h'; consider using 'clocale' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'math.h'; consider using 'cmath' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'setjmp.h'; consider using 'csetjmp' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'signal.h'; consider using 'csignal' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'stdarg.h'; consider using 'cstdarg' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'stddef.h'; consider using 'cstddef' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'stdio.h'; consider using 'cstdio' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'stdlib.h'; consider using 'cstdlib' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'string.h'; consider using 'cstring' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'time.h'; consider using 'ctime' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'wchar.h'; consider using 'cwchar' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'wctype.h'; consider using 'cwctype' instead
+
+
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: including 'stdalign.h' has no effect in C++; consider removing it
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: including 'stdbool.h' has no effect in C++; consider removing it
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: including 'iso646.h' has no effect in C++; consider removing it
 
 // CHECK-FIXES: #include <cassert>
-// CHECK-FIXES: #include <ccomplex>
+// CHECK-FIXES: #include <complex>
 // CHECK-FIXES: #include <cctype>
 // CHECK-FIXES: #include <cerrno>
 // CHECK-FIXES: #include <cfloat>
-// CHECK-FIXES: #include <cinttypes>
-// CHECK-FIXES: #include <ciso646>
 // CHECK-FIXES: #include <climits>
 // CHECK-FIXES: #include <clocale>
 // CHECK-FIXES: #include <cmath>
 // CHECK-FIXES: #include <csetjmp>
 // CHECK-FIXES: #include <csignal>
 // CHECK-FIXES: #include <cstdarg>
 // CHECK-FIXES: #include <cstddef>
-// CHECK-FIXES: #include <cstdint>
 // CHECK-FIXES: #include <cstdio>
 // CHECK-FIXES: #include <cstdlib>
 // CHECK-FIXES: #include <cstring>
 // CHECK-FIXES: #include <ctime>
 // CHECK-FIXES: #include <cwchar>
 // CHECK-FIXES: #include <cwctype>
 
 #include "assert.h"
 #include "complex.h"
 #include "ctype.h"
 #include "errno.h"
 #include "float.h"
-#include "inttypes.h"
-#include "iso646.h"
 #include "limits.h"
 #include "locale.h"
 #include "math.h"
 #include "setjmp.h"
 #include "signal.h"
 #include "stdarg.h"
 #include "stddef.h"
-#include "stdint.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "string.h"
 #include "time.h"
 #include "wchar.h"
 #include "wctype.h"
 
-// Headers deprecated since C++11; expect no diagnostics
-#include "fenv.h"
+// Headers that have no effect in C++; remove them
 #include "stdalign.h"
 #include "stdbool.h"
+#include "iso646.h"
+
+// Headers deprecated since C++11; expect no diagnostics
+#include "fenv.h"
+#include "inttypes.h"
+#include "stdint.h"
 #include "tgmath.h"
 #include "uchar.h"
 
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'assert.h'; consider using 'cassert' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'complex.h'; consider using 'ccomplex' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'ctype.h'; consider using 'cctype' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'errno.h'; consider using 'cerrno' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'float.h'; consider using 'cfloat' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'inttypes.h'; consider using 'cinttypes' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'iso646.h'; consider using 'ciso646' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'limits.h'; consider using 'climits' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'locale.h'; consider using 'clocale' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'math.h'; consider using 'cmath' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'setjmp.h'; consider using 'csetjmp' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'signal.h'; consider using 'csignal' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdarg.h'; consider using 'cstdarg' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stddef.h'; consider using 'cstddef' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdint.h'; consider using 'cstdint' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdio.h'; consider using 'cstdio' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdlib.h'; consider using 'cstdlib' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'string.h'; consider using 'cstring' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'time.h'; consider using 'ctime' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'wchar.h'; consider using 'cwchar' instead
-// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'wctype.h'; consider using 'cwctype' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'assert.h'; consider using 'cassert' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'complex.h'; consider using 'complex' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'ctype.h'; consider using 'cctype' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'errno.h'; consider using 'cerrno' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'float.h'; consider using 'cfloat' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'limits.h'; consider using 'climits' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'locale.h'; consider using 'clocale' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'math.h'; consider using 'cmath' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'setjmp.h'; consider using 'csetjmp' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'signal.h'; consider using 'csignal' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'stdarg.h'; consider using 'cstdarg' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'stddef.h'; consider using 'cstddef' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'stdio.h'; consider using 'cstdio' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'stdlib.h'; consider using 'cstdlib' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'string.h'; consider using 'cstring' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'time.h'; consider using 'ctime' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'wchar.h'; consider using 'cwchar' instead
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: inclusion of deprecated C++ header 'wctype.h'; consider using 'cwctype' instead
+
+
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: including 'stdalign.h' has no effect in C++; consider removing it
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: including 'stdbool.h' has no effect in C++; consider removing it
+// CHECK-MESSAGES: :[[@LINE-31]]:10: warning: including 'iso646.h' has no effect in C++; consider removing it
 
 // CHECK-FIXES: #include <cassert>
-// CHECK-FIXES: #include <ccomplex>
+// CHECK-FIXES: #include <complex>
 // CHECK-FIXES: #include <cctype>
 // CHECK-FIXES: #include <cerrno>
 // CHECK-FIXES: #include <cfloat>
-// CHECK-FIXES: #include <cinttypes>
-// CHECK-FIXES: #include <ciso646>
 // CHECK-FIXES: #include <climits>
 // CHECK-FIXES: #include <clocale>
 // CHECK-FIXES: #include <cmath>
 // CHECK-FIXES: #include <csetjmp>
 // CHECK-FIXES: #include <csignal>
 // CHECK-FIXES: #include <cstdarg>
 // CHECK-FIXES: #include <cstddef>
-// CHECK-FIXES: #include <cstdint>
 // CHECK-FIXES: #include <cstdio>
 // CHECK-FIXES: #include <cstdlib>
 // CHECK-FIXES: #include <cstring>
 // CHECK-FIXES: #include <ctime>
 // CHECK-FIXES: #include <cwchar>
 // CHECK-FIXES: #include <cwctype>

test/clang-tidy/modernize-deprecated-headers-cxx11.cpp

 // RUN: %check_clang_tidy %s modernize-deprecated-headers %t -- -extra-arg-before=-isystem%S/Inputs/modernize-deprecated-headers -- -std=c++11 -v
 
 #include <assert.h>
 #include <complex.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fenv.h>
 #include <float.h>
 #include <inttypes.h>
-#include <iso646.h>
 #include <limits.h>
 #include <locale.h>
 #include <math.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <stdalign.h>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <tgmath.h>
 #include <time.h>
 #include <uchar.h>
 #include <wchar.h>
 #include <wctype.h>
 
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'assert.h'; consider using 'cassert' instead [modernize-deprecated-headers]
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'complex.h'; consider using 'ccomplex' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'ctype.h'; consider using 'cctype' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'errno.h'; consider using 'cerrno' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'fenv.h'; consider using 'cfenv' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'float.h'; consider using 'cfloat' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'inttypes.h'; consider using 'cinttypes' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'iso646.h'; consider using 'ciso646' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'limits.h'; consider using 'climits' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'locale.h'; consider using 'clocale' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'math.h'; consider using 'cmath' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'setjmp.h'; consider using 'csetjmp' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'signal.h'; consider using 'csignal' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stdalign.h'; consider using 'cstdalign' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stdarg.h'; consider using 'cstdarg' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stdbool.h'; consider using 'cstdbool' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stddef.h'; consider using 'cstddef' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stdint.h'; consider using 'cstdint' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stdio.h'; consider using 'cstdio' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stdlib.h'; consider using 'cstdlib' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'string.h'; consider using 'cstring' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'tgmath.h'; consider using 'ctgmath' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'time.h'; consider using 'ctime' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'uchar.h'; consider using 'cuchar' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'wchar.h'; consider using 'cwchar' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'wctype.h'; consider using 'cwctype' instead
+// Headers that have no effect in C++; remove them
+#include <stdalign.h>
+#include <stdbool.h>
+#include <iso646.h>
+
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'assert.h'; consider using 'cassert' instead [modernize-deprecated-headers]
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'complex.h'; consider using 'complex' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'ctype.h'; consider using 'cctype' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'errno.h'; consider using 'cerrno' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'fenv.h'; consider using 'cfenv' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'float.h'; consider using 'cfloat' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'inttypes.h'; consider using 'cinttypes' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'limits.h'; consider using 'climits' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'locale.h'; consider using 'clocale' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'math.h'; consider using 'cmath' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'setjmp.h'; consider using 'csetjmp' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'signal.h'; consider using 'csignal' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdarg.h'; consider using 'cstdarg' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stddef.h'; consider using 'cstddef' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdint.h'; consider using 'cstdint' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdio.h'; consider using 'cstdio' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdlib.h'; consider using 'cstdlib' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'string.h'; consider using 'cstring' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'tgmath.h'; consider using 'ctgmath' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'time.h'; consider using 'ctime' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'uchar.h'; consider using 'cuchar' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'wchar.h'; consider using 'cwchar' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'wctype.h'; consider using 'cwctype' instead
+
+
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: including 'stdalign.h' has no effect in C++; consider removing it
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: including 'stdbool.h' has no effect in C++; consider removing it
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: including 'iso646.h' has no effect in C++; consider removing it
 
 // CHECK-FIXES: #include <cassert>
-// CHECK-FIXES: #include <ccomplex>
+// CHECK-FIXES: #include <complex>
 // CHECK-FIXES: #include <cctype>
 // CHECK-FIXES: #include <cerrno>
 // CHECK-FIXES: #include <cfenv>
 // CHECK-FIXES: #include <cfloat>
 // CHECK-FIXES: #include <cinttypes>
-// CHECK-FIXES: #include <ciso646>
 // CHECK-FIXES: #include <climits>
 // CHECK-FIXES: #include <clocale>
 // CHECK-FIXES: #include <cmath>
 // CHECK-FIXES: #include <csetjmp>
 // CHECK-FIXES: #include <csignal>
-// CHECK-FIXES: #include <cstdalign>
 // CHECK-FIXES: #include <cstdarg>
-// CHECK-FIXES: #include <cstdbool>
 // CHECK-FIXES: #include <cstddef>
 // CHECK-FIXES: #include <cstdint>
 // CHECK-FIXES: #include <cstdio>
 // CHECK-FIXES: #include <cstdlib>
 // CHECK-FIXES: #include <cstring>
 // CHECK-FIXES: #include <ctgmath>
 // CHECK-FIXES: #include <ctime>
 // CHECK-FIXES: #include <cuchar>
 // CHECK-FIXES: #include <cwchar>
 // CHECK-FIXES: #include <cwctype>
 
 #include "assert.h"
 #include "complex.h"
 #include "ctype.h"
 #include "errno.h"
 #include "fenv.h"
 #include "float.h"
 #include "inttypes.h"
-#include "iso646.h"
 #include "limits.h"
 #include "locale.h"
 #include "math.h"
 #include "setjmp.h"
 #include "signal.h"
-#include "stdalign.h"
 #include "stdarg.h"
-#include "stdbool.h"
 #include "stddef.h"
 #include "stdint.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "string.h"
 #include "tgmath.h"
 #include "time.h"
 #include "uchar.h"
 #include "wchar.h"
 #include "wctype.h"
 
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'assert.h'; consider using 'cassert' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'complex.h'; consider using 'ccomplex' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'ctype.h'; consider using 'cctype' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'errno.h'; consider using 'cerrno' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'fenv.h'; consider using 'cfenv' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'float.h'; consider using 'cfloat' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'inttypes.h'; consider using 'cinttypes' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'iso646.h'; consider using 'ciso646' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'limits.h'; consider using 'climits' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'locale.h'; consider using 'clocale' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'math.h'; consider using 'cmath' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'setjmp.h'; consider using 'csetjmp' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'signal.h'; consider using 'csignal' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stdalign.h'; consider using 'cstdalign' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stdarg.h'; consider using 'cstdarg' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stdbool.h'; consider using 'cstdbool' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stddef.h'; consider using 'cstddef' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stdint.h'; consider using 'cstdint' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stdio.h'; consider using 'cstdio' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'stdlib.h'; consider using 'cstdlib' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'string.h'; consider using 'cstring' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'tgmath.h'; consider using 'ctgmath' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'time.h'; consider using 'ctime' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'uchar.h'; consider using 'cuchar' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'wchar.h'; consider using 'cwchar' instead
-// CHECK-MESSAGES: :[[@LINE-27]]:10: warning: inclusion of deprecated C++ header 'wctype.h'; consider using 'cwctype' instead
+// Headers that have no effect in C++; remove them
+#include "stdalign.h"
+#include "stdbool.h"
+#include "iso646.h"
+
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'assert.h'; consider using 'cassert' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'complex.h'; consider using 'complex' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'ctype.h'; consider using 'cctype' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'errno.h'; consider using 'cerrno' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'fenv.h'; consider using 'cfenv' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'float.h'; consider using 'cfloat' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'inttypes.h'; consider using 'cinttypes' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'limits.h'; consider using 'climits' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'locale.h'; consider using 'clocale' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'math.h'; consider using 'cmath' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'setjmp.h'; consider using 'csetjmp' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'signal.h'; consider using 'csignal' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdarg.h'; consider using 'cstdarg' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stddef.h'; consider using 'cstddef' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdint.h'; consider using 'cstdint' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdio.h'; consider using 'cstdio' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'stdlib.h'; consider using 'cstdlib' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'string.h'; consider using 'cstring' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'tgmath.h'; consider using 'ctgmath' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'time.h'; consider using 'ctime' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'uchar.h'; consider using 'cuchar' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'wchar.h'; consider using 'cwchar' instead
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: inclusion of deprecated C++ header 'wctype.h'; consider using 'cwctype' instead
+
+
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: including 'stdalign.h' has no effect in C++; consider removing it
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: including 'stdbool.h' has no effect in C++; consider removing it
+// CHECK-MESSAGES: :[[@LINE-29]]:10: warning: including 'iso646.h' has no effect in C++; consider removing it
 
 // CHECK-FIXES: #include <cassert>
-// CHECK-FIXES: #include <ccomplex>
+// CHECK-FIXES: #include <complex>
 // CHECK-FIXES: #include <cctype>
 // CHECK-FIXES: #include <cerrno>
 // CHECK-FIXES: #include <cfenv>
 // CHECK-FIXES: #include <cfloat>
 // CHECK-FIXES: #include <cinttypes>
-// CHECK-FIXES: #include <ciso646>
 // CHECK-FIXES: #include <climits>
 // CHECK-FIXES: #include <clocale>
 // CHECK-FIXES: #include <cmath>
 // CHECK-FIXES: #include <csetjmp>
 // CHECK-FIXES: #include <csignal>
-// CHECK-FIXES: #include <cstdalign>
 // CHECK-FIXES: #include <cstdarg>
-// CHECK-FIXES: #include <cstdbool>
 // CHECK-FIXES: #include <cstddef>
 // CHECK-FIXES: #include <cstdint>
 // CHECK-FIXES: #include <cstdio>
 // CHECK-FIXES: #include <cstdlib>
 // CHECK-FIXES: #include <cstring>
 // CHECK-FIXES: #include <ctgmath>
 // CHECK-FIXES: #include <ctime>
 // CHECK-FIXES: #include <cuchar>
 // CHECK-FIXES: #include <cwchar>
 // CHECK-FIXES: #include <cwctype>