diff --git a/libcxx/include/stdio.h b/libcxx/include/stdio.h
index d1e57b08f5da4..d8e22a7f16976 100644
--- a/libcxx/include/stdio.h
+++ b/libcxx/include/stdio.h
@@ -120,7 +120,7 @@ void perror(const char* s);
 #      undef putchar
 #      undef getchar
 
-#    endif
-#  endif // defined(__cplusplus) && __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
+#    endif // __cplusplus
+#  endif   // _LIBCPP_STDIO_H
 
-#endif // _LIBCPP_STDIO_H
+#endif // defined(__cplusplus) && __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
diff --git a/libcxx/include/stdlib.h b/libcxx/include/stdlib.h
index e32b7b7d751b3..a17fc0da220cc 100644
--- a/libcxx/include/stdlib.h
+++ b/libcxx/include/stdlib.h
@@ -149,6 +149,6 @@ inline _LIBCPP_HIDE_FROM_ABI lldiv_t div(long long __x, long long __y) _NOEXCEPT
 #      endif // _LIBCPP_MSVCRT
 } // extern "C++"
 #    endif   // __cplusplus
-#  endif     // defined(__cplusplus) && __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
+#  endif     // _LIBCPP_STDLIB_H
 
-#endif // _LIBCPP_STDLIB_H
+#endif // defined(__cplusplus) && __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
diff --git a/libcxx/include/wchar.h b/libcxx/include/wchar.h
index 436027b7842ae..5e6dc1663e327 100644
--- a/libcxx/include/wchar.h
+++ b/libcxx/include/wchar.h
@@ -206,6 +206,6 @@ size_t wcsnrtombs(
 } // extern "C"
 #      endif // __cplusplus && (_LIBCPP_MSVCRT || __MVS__)
 #    endif   // _LIBCPP_HAS_WIDE_CHARACTERS
-#  endif     // defined(__cplusplus) && __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
+#  endif     // _LIBCPP_WCHAR_H
 
-#endif // _LIBCPP_WCHAR_H
+#endif // defined(__cplusplus) && __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)