Further cleanup guided by include-what-you-use 0.12 based on clang version 9.0.1-11.

Author: rwgk

include/pybind11/cast.h

@@ -11,14 +11,21 @@
 #pragma once
 
 #include "pytypes.h"
+#include "detail/common.h"
+#include "detail/descr.h"
 #include "detail/type_caster_base.h"
 #include "detail/typeid.h"
-#include "detail/descr.h"
-#include "detail/internals.h"
 #include <array>
-#include <limits>
+#include <cstring>
+#include <functional>
+#include <iosfwd>
+#include <iterator>
+#include <memory>
+#include <string>
 #include <tuple>
 #include <type_traits>
+#include <utility>
+#include <vector>
 
 #if defined(PYBIND11_CPP17)
 #  if defined(__has_include)
@@ -284,7 +291,7 @@ template <> class type_caster<bool> {
         if (!src) return false;
         else if (src.ptr() == Py_True) { value = true; return true; }
         else if (src.ptr() == Py_False) { value = false; return true; }
-        else if (convert || !strcmp("numpy.bool_", Py_TYPE(src.ptr())->tp_name)) {
+        else if (convert || !std::strcmp("numpy.bool_", Py_TYPE(src.ptr())->tp_name)) {
             // (allow non-implicit conversion for numpy booleans)
 
             Py_ssize_t res = -1;

include/pybind11/detail/type_caster_base.h

@@ -14,12 +14,14 @@
 #include "descr.h"
 #include "internals.h"
 #include "typeid.h"
-#include <cstring>
+#include <cstdint>
+#include <iterator>
 #include <new>
 #include <string>
+#include <type_traits>
 #include <typeindex>
 #include <typeinfo>
-#include <type_traits>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
@@ -245,7 +247,7 @@ struct value_and_holder {
         else if (v)
             inst->nonsimple.status[index] |= instance::status_holder_constructed;
         else
-            inst->nonsimple.status[index] &= (uint8_t) ~instance::status_holder_constructed;
+            inst->nonsimple.status[index] &= (std::uint8_t) ~instance::status_holder_constructed;
     }
     bool instance_registered() const {
         return inst->simple_layout
@@ -258,7 +260,7 @@ struct value_and_holder {
         else if (v)
             inst->nonsimple.status[index] |= instance::status_instance_registered;
         else
-            inst->nonsimple.status[index] &= (uint8_t) ~instance::status_instance_registered;
+            inst->nonsimple.status[index] &= (std::uint8_t) ~instance::status_instance_registered;
     }
 };
 
@@ -390,7 +392,7 @@ PYBIND11_NOINLINE inline void instance::allocate_layout() {
         if (!nonsimple.values_and_holders) throw std::bad_alloc();
         std::memset(nonsimple.values_and_holders, 0, space * sizeof(void *));
 #endif
-        nonsimple.status = reinterpret_cast<uint8_t *>(&nonsimple.values_and_holders[flags_at]);
+        nonsimple.status = reinterpret_cast<std::uint8_t *>(&nonsimple.values_and_holders[flags_at]);
     }
     owned = true;
 }