diff --git a/libcxx/include/__bits b/libcxx/include/__bits
index b34766a85cbb..b565a782358c 100644
--- a/libcxx/include/__bits
+++ b/libcxx/include/__bits
@@ -142,4 +142,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP__BITS
+#endif // _LIBCPP___BITS
diff --git a/libcxx/include/__node_handle b/libcxx/include/__node_handle
index be1fe17a8728..cf78a34e581d 100644
--- a/libcxx/include/__node_handle
+++ b/libcxx/include/__node_handle
@@ -205,4 +205,4 @@ struct _LIBCPP_TEMPLATE_VIS __insert_return_type
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 
-#endif
+#endif  // _LIBCPP___NODE_HANDLE
diff --git a/libcxx/include/experimental/__config b/libcxx/include/experimental/__config
index 375dc3743fcf..f85426d050d1 100644
--- a/libcxx/include/experimental/__config
+++ b/libcxx/include/experimental/__config
@@ -32,10 +32,6 @@
 #define _LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS }
 #define _VSTD_LFTS_PMR _VSTD_LFTS::pmr
 
-#define _LIBCPP_BEGIN_NAMESPACE_CHRONO_LFTS _LIBCPP_BEGIN_NAMESPACE_STD        \
-  namespace chrono { namespace experimental { inline namespace fundamentals_v1 {
-#define _LIBCPP_END_NAMESPACE_CHRONO_LFTS _LIBCPP_END_NAMESPACE_STD } } }
-
 #if defined(_LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM)
 #   define _LIBCPP_DEPRECATED_EXPERIMENTAL_FILESYSTEM /* nothing */
 #else
diff --git a/libcxx/include/unordered_map b/libcxx/include/unordered_map
index c631ed0897d4..8b0bea3b5c1c 100644
--- a/libcxx/include/unordered_map
+++ b/libcxx/include/unordered_map
@@ -1780,7 +1780,7 @@ unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::operator[](const key_type& __k)
     return __r.first->second;
 }
 
-#endif // _LIBCPP_CXX03_MODE
+#endif // _LIBCPP_CXX03_LANG
 
 template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
 _Tp&
diff --git a/libcxx/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp b/libcxx/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp
index 89ddd3351d16..cad0bd8b304e 100644
--- a/libcxx/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp
+++ b/libcxx/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp
@@ -12,7 +12,7 @@
 // class auto_ptr;
 //
 //  In C++17, auto_ptr has been removed.
-//  However, for backwards compatibility, if _LIBCPP_NO_REMOVE_AUTOPTR
+//  However, for backwards compatibility, if _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
 //  is defined before including <memory>, then auto_ptr will be restored.
 
 // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
diff --git a/libcxx/test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp b/libcxx/test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp
index c1b06eb3a008..b27b9a3f5ace 100644
--- a/libcxx/test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp
+++ b/libcxx/test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp
@@ -33,7 +33,7 @@ int main(int, char**)
         assert(l.front() == 2);
         assert(l.back() == 0);
     }
-#ifdef __LIBCPP_MOVE
+#if TEST_STD_VER >= 11
     {
         std::list<DefaultOnly> l(10);
         l.resize(5);
@@ -46,8 +46,6 @@ int main(int, char**)
         assert(l.size() == 20);
         assert(std::distance(l.begin(), l.end()) == 20);
     }
-#endif // __LIBCPP_MOVE
-#if TEST_STD_VER >= 11
     {
         std::list<int, min_allocator<int>> l(5, 2);
         l.resize(2);
@@ -63,7 +61,6 @@ int main(int, char**)
         assert(l.front() == 2);
         assert(l.back() == 0);
     }
-#ifdef __LIBCPP_MOVE
     {
         std::list<DefaultOnly, min_allocator<DefaultOnly>> l(10);
         l.resize(5);
@@ -76,8 +73,7 @@ int main(int, char**)
         assert(l.size() == 20);
         assert(std::distance(l.begin(), l.end()) == 20);
     }
-#endif // __LIBCPP_MOVE
 #endif
 
-  return 0;
+    return 0;
 }