diff --git a/folly/lang/CustomizationPoint.h b/folly/lang/CustomizationPoint.h
index f48d4ca1213..3474dc518bf 100644
--- a/folly/lang/CustomizationPoint.h
+++ b/folly/lang/CustomizationPoint.h
@@ -50,7 +50,7 @@
 namespace folly {
 
 // Using 'auto' for non-type template parameters is only possible from C++17
-#if __cplusplus >= 201703L
+#if FOLLY_CPLUSPLUS >= 201703L
 
 //  cpo_t<CPO>
 //
@@ -71,6 +71,6 @@ namespace folly {
 template <const auto& Tag>
 using cpo_t = std::decay_t<decltype(Tag)>;
 
-#endif // __cplusplus >= 201703L
+#endif // FOLLY_CPLUSPLUS >= 201703L
 
 } // namespace folly
diff --git a/folly/synchronization/AtomicNotification-inl.h b/folly/synchronization/AtomicNotification-inl.h
index d41710a2d12..23abfae8a72 100644
--- a/folly/synchronization/AtomicNotification-inl.h
+++ b/folly/synchronization/AtomicNotification-inl.h
@@ -118,7 +118,6 @@ void atomic_notify_all_impl(const Atom<Integer, Args...>* atomic) {
   });
 }
 
-
 template <typename Integer>
 void tag_invoke(
     atomic_wait_fn, const std::atomic<Integer>* atomic, Integer expected) {
diff --git a/folly/synchronization/AtomicNotification.h b/folly/synchronization/AtomicNotification.h
index 16e79ac9b9a..2448aef0e49 100644
--- a/folly/synchronization/AtomicNotification.h
+++ b/folly/synchronization/AtomicNotification.h
@@ -59,7 +59,7 @@ struct atomic_wait_fn {
 constexpr inline auto atomic_wait =
     detail::atomic_notification::atomic_wait_fn{};
 
-// mimic: std::atomic_wait_until, p1135r0
+//  mimic: std::atomic_wait_until, p1135r0
 namespace detail {
 namespace atomic_notification {
 struct atomic_wait_until_fn {