diff --git a/src/detail/conversions/from_json.hpp b/src/detail/conversions/from_json.hpp
index 64668814d9..f7eede2195 100644
--- a/src/detail/conversions/from_json.hpp
+++ b/src/detail/conversions/from_json.hpp
@@ -1,12 +1,13 @@
 #ifndef NLOHMANN_JSON_DETAIL_CONVERSIONS_FROM_JSON_HPP
 #define NLOHMANN_JSON_DETAIL_CONVERSIONS_FROM_JSON_HPP
 
-#include <algorithm> // transform
-#include <array> // array
+#include <algorithm>    // transform
+#include <array>        // array
+#include <ciso646>      // and, not
 #include <forward_list> // forward_list
-#include <iterator> // inserter, front_inserter, end
-#include <string> // string
-#include <tuple> // tuple, make_tuple
+#include <iterator>     // inserter, front_inserter, end
+#include <string>       // string
+#include <tuple>        // tuple, make_tuple
 #include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
 #include <utility> // pair, declval
 
diff --git a/src/detail/conversions/to_json.hpp b/src/detail/conversions/to_json.hpp
index 2855513575..a5ec6beda2 100644
--- a/src/detail/conversions/to_json.hpp
+++ b/src/detail/conversions/to_json.hpp
@@ -1,11 +1,12 @@
 #ifndef NLOHMANN_JSON_DETAIL_CONVERSIONS_TO_JSON_HPP
 #define NLOHMANN_JSON_DETAIL_CONVERSIONS_TO_JSON_HPP
 
+#include <ciso646>  // or, and, not
 #include <iterator> // begin, end
+#include <tuple>    // tuple, get<tuple>
 #include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
-#include <vector> // vector
-#include <tuple> // tuple, get<tuple>
 #include <utility> // move, forward, declval, pair
+#include <vector>  // vector
 
 #include "detail/meta.hpp"
 #include "detail/value_t.hpp"
diff --git a/src/detail/iterators/iter_impl.hpp b/src/detail/iterators/iter_impl.hpp
index 80dd89c248..a306d4cd44 100644
--- a/src/detail/iterators/iter_impl.hpp
+++ b/src/detail/iterators/iter_impl.hpp
@@ -1,6 +1,7 @@
 #ifndef NLOHMANN_JSON_DETAIL_ITERATORS_ITER_IMPL_HPP
 #define NLOHMANN_JSON_DETAIL_ITERATORS_ITER_IMPL_HPP
 
+#include <ciso646> // not
 #include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
 #include <type_traits> // conditional, is_const, remove_const
 
diff --git a/src/detail/iterators/primitive_iterator.hpp b/src/detail/iterators/primitive_iterator.hpp
index 8a72e6f298..c0fd7b7d02 100644
--- a/src/detail/iterators/primitive_iterator.hpp
+++ b/src/detail/iterators/primitive_iterator.hpp
@@ -1,9 +1,10 @@
 #ifndef NLOHMANN_JSON_DETAIL_ITERATORS_PRIMITIVE_ITERATOR_HPP
 #define NLOHMANN_JSON_DETAIL_ITERATORS_PRIMITIVE_ITERATOR_HPP
 
+#include <ciso646> // not
 #include <cstddef> // ptrdiff_t
+#include <limits>  // numeric_limits
 #include <ostream> // ostream
-#include <limits> // numeric_limits
 
 namespace nlohmann
 {
diff --git a/src/detail/macro_scope.hpp b/src/detail/macro_scope.hpp
index 3146ac1eea..23edad5605 100644
--- a/src/detail/macro_scope.hpp
+++ b/src/detail/macro_scope.hpp
@@ -1,6 +1,8 @@
 #ifndef NLOHMANN_JSON_MACRO_SCOPE_HPP
 #define NLOHMANN_JSON_MACRO_SCOPE_HPP
 
+#include <ciso646> // not
+
 // This file contains all internal macro definitions
 // You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
 
diff --git a/src/detail/meta.hpp b/src/detail/meta.hpp
index fe6fb9721e..8883cbd108 100644
--- a/src/detail/meta.hpp
+++ b/src/detail/meta.hpp
@@ -1,6 +1,7 @@
 #ifndef NLOHMANN_JSON_DETAIL_META_HPP
 #define NLOHMANN_JSON_DETAIL_META_HPP
 
+#include <ciso646> // not
 #include <cstddef> // size_t
 #include <limits> // numeric_limits
 #include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
diff --git a/src/detail/serializer.hpp b/src/detail/serializer.hpp
index 3b886c453a..9690e4b657 100644
--- a/src/detail/serializer.hpp
+++ b/src/detail/serializer.hpp
@@ -1,17 +1,18 @@
 #ifndef NLOHMANN_JSON_DETAIL_SERIALIZER_HPP
 #define NLOHMANN_JSON_DETAIL_SERIALIZER_HPP
 
-#include <algorithm> // reverse, remove, fill, find, none_of
-#include <array> // array
-#include <cassert> // assert
-#include <clocale> // localeconv, lconv
-#include <cmath> // labs, isfinite, isnan, signbit
-#include <cstddef> // size_t, ptrdiff_t
-#include <cstdint> // uint8_t
-#include <cstdio> // snprintf
-#include <iterator> // next
-#include <limits> // numeric_limits
-#include <string> // string
+#include <algorithm>   // reverse, remove, fill, find, none_of
+#include <array>       // array
+#include <cassert>     // assert
+#include <ciso646>     // and, or
+#include <clocale>     // localeconv, lconv
+#include <cmath>       // labs, isfinite, isnan, signbit
+#include <cstddef>     // size_t, ptrdiff_t
+#include <cstdint>     // uint8_t
+#include <cstdio>      // snprintf
+#include <iterator>    // next
+#include <limits>      // numeric_limits
+#include <string>      // string
 #include <type_traits> // is_same
 
 #include "detail/macro_scope.hpp"
diff --git a/src/detail/value_t.hpp b/src/detail/value_t.hpp
index 4db1618388..f4f4d67023 100644
--- a/src/detail/value_t.hpp
+++ b/src/detail/value_t.hpp
@@ -1,6 +1,7 @@
 #ifndef NLOHMANN_JSON_DETAIL_VALUE_T_HPP
 #define NLOHMANN_JSON_DETAIL_VALUE_T_HPP
 
+#include <ciso646> // and
 #include <cstdint> // uint8_t
 
 namespace nlohmann
diff --git a/src/json.hpp b/src/json.hpp
index 7d39dc5bc0..42e882846d 100644
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -30,7 +30,7 @@ SOFTWARE.
 #define NLOHMANN_JSON_HPP
 
 #include <algorithm> // all_of, find, for_each
-#include <cassert> // assert
+#include <cassert>   // assert
 #include <ciso646> // and, not, or
 #include <cstddef> // nullptr_t, ptrdiff_t, size_t
 #include <functional> // hash, less