diff --git a/Include/internal/pycore_exceptions.h b/Include/internal/pycore_exceptions.h
@@ -33,6 +33,10 @@ struct _Py_exc_state {
 
 extern void _PyExc_ClearExceptionGroupType(PyInterpreterState *);
 
+struct static_exception {
+    PyTypeObject *exc;
+    const char *name;
+};
 
 #ifdef __cplusplus
 }

diff --git a/Include/internal/pycore_interp_structs.h b/Include/internal/pycore_interp_structs.h
@@ -535,12 +535,15 @@ struct _py_func_state {
 
 /* For now we hard-code this to a value for which we are confident
    all the static builtin types will fit (for all builds).
-   If you add a new static type to the standard library, you may have to
+   If you add a new static type or exception to the standard library, you must
    update one of these numbers.
    */
-#define _Py_NUM_MANAGED_PREINITIALIZED_TYPES 122
+#define _Py_NUM_MANAGED_PREINITIALIZED_TYPES 121
+#define _Py_NUM_MANAGED_STATIC_EXTRA_TYPES 14
+#define _Py_NUM_STATIC_EXCEPTIONS 69
 #define _Py_MAX_MANAGED_STATIC_BUILTIN_TYPES \
-    (_Py_NUM_MANAGED_PREINITIALIZED_TYPES + 83)
+    (_Py_NUM_MANAGED_PREINITIALIZED_TYPES + _Py_NUM_STATIC_EXCEPTIONS \
+     + _Py_NUM_MANAGED_STATIC_EXTRA_TYPES)
 #define _Py_MAX_MANAGED_STATIC_EXT_TYPES 10
 #define _Py_MAX_MANAGED_STATIC_TYPES \
     (_Py_MAX_MANAGED_STATIC_BUILTIN_TYPES + _Py_MAX_MANAGED_STATIC_EXT_TYPES)

@@ -4452,11 +4452,7 @@ SimpleExtendsException(PyExc_Warning, ResourceWarning,
 #endif
 #endif /* MS_WINDOWS */
 
-struct static_exception {
-    PyTypeObject *exc;
-    const char *name;
-};
-
+// _Py_NUM_STATIC_EXCEPTIONS must be updated if this array is modified
 static struct static_exception static_exceptions[] = {
 #define ITEM(NAME) {&_PyExc_##NAME, #NAME}
     // Level 1
@@ -4551,10 +4547,19 @@ static struct static_exception static_exceptions[] = {
 #undef ITEM
 };
 
+#ifdef Py_DEBUG
+// Export for count_static_types()
+size_t _Py_num_static_exceptions = Py_ARRAY_LENGTH(static_exceptions);
+struct static_exception *_Py_static_exceptions = static_exceptions;
+#endif
+
 
 int
 _PyExc_InitTypes(PyInterpreterState *interp)
 {
+    // If this assertion fails, _Py_NUM_STATIC_EXCEPTIONS must be updated
+    assert(_Py_NUM_STATIC_EXCEPTIONS == Py_ARRAY_LENGTH(static_exceptions));
+
     for (size_t i=0; i < Py_ARRAY_LENGTH(static_exceptions); i++) {
         PyTypeObject *exc = static_exceptions[i].exc;
         if (_PyStaticType_InitBuiltin(interp, exc) < 0) {

@@ -2528,7 +2528,9 @@ extern PyTypeObject _PyMemoryIter_Type;
 extern PyTypeObject _PyPositionsIterator;
 extern PyTypeObject _Py_GenericAliasIterType;
 
-static PyTypeObject* static_types[_Py_NUM_MANAGED_PREINITIALIZED_TYPES] = {
+// _Py_NUM_MANAGED_PREINITIALIZED_TYPES must be updated if this array
+// is modified
+static PyTypeObject* static_types[] = {
     // The two most important base types: must be initialized first and
     // deallocated last.
     &PyBaseObject_Type,
@@ -2667,10 +2669,20 @@ static PyTypeObject* static_types[_Py_NUM_MANAGED_PREINITIALIZED_TYPES] = {
     &PyODict_Type,        // base=&PyDict_Type
 };
 
+#ifdef Py_DEBUG
+// Export for count_static_types()
+size_t _Py_num_static_types = Py_ARRAY_LENGTH(static_types);
+PyTypeObject **_Py_static_types = static_types;
+#endif
+
 
 PyStatus
 _PyTypes_InitTypes(PyInterpreterState *interp)
 {
+    // If this assertion fails, _Py_NUM_MANAGED_PREINITIALIZED_TYPES must
+    // be updated
+    assert(_Py_NUM_MANAGED_PREINITIALIZED_TYPES == Py_ARRAY_LENGTH(static_types));
+
     // All other static types (unless initialized elsewhere)
     for (size_t i=0; i < Py_ARRAY_LENGTH(static_types); i++) {
         PyTypeObject *type = static_types[i];

@@ -31,6 +31,17 @@
 
 #include <stddef.h>               // ptrdiff_t
 
+
+// Forward declaration
+static PyObject *
+object_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static PyObject *
+type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds);
+#ifdef Py_DEBUG
+static void count_static_types(PyTypeObject *type);
+#endif
+
+
 /*[clinic input]
 class type "PyTypeObject *" "&PyType_Type"
 class object "PyObject *" "&PyBaseObject_Type"
@@ -4164,10 +4175,6 @@ _PyType_CalculateMetaclass(PyTypeObject *metatype, PyObject *bases)
 }
 
 
-// Forward declaration
-static PyObject *
-type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds);
-
 typedef struct {
     PyTypeObject *metatype;
     PyObject *args;
@@ -7258,10 +7265,6 @@ PyTypeObject PyType_Type = {
    (IOW, if __new__() is overridden or __init__() is not overridden).
 */
 
-/* Forward */
-static PyObject *
-object_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
-
 static int
 excess_args(PyObject *args, PyObject *kwds)
 {
@@ -9589,6 +9592,12 @@ init_static_type(PyInterpreterState *interp, PyTypeObject *self,
             assert(next_version_tag != 0);
             _PyType_SetVersion(self, next_version_tag);
         }
+
+#ifdef Py_DEBUG
+        if (isbuiltin) {
+            count_static_types(self);
+        }
+#endif
     }
     else {
         assert(!initial);
@@ -13005,3 +13014,50 @@ PyTypeObject PySuper_Type = {
     PyObject_GC_Del,                            /* tp_free */
     .tp_vectorcall = super_vectorcall,
 };
+
+
+#ifdef Py_DEBUG
+extern size_t _Py_num_static_types;
+extern PyTypeObject **_Py_static_types;
+
+extern size_t _Py_num_static_exceptions;
+extern struct static_exception *_Py_static_exceptions;
+
+static size_t num_static_extra_types = 0;
+static PyTypeObject* static_extra_types[_Py_NUM_MANAGED_STATIC_EXTRA_TYPES] = {0};
+
+// Maintain a list of "static extra types" to make sure that
+// _Py_NUM_MANAGED_STATIC_EXTRA_TYPES macro is up to date
+static void
+count_static_types(PyTypeObject *type)
+{
+        int found = 0;
+        for (size_t i=0; i < _Py_num_static_types; i++) {
+            if (type == _Py_static_types[i]) {
+                found = 1;
+                break;
+            }
+        }
+        for (size_t i=0; i < _Py_num_static_exceptions; i++) {
+            if (type == _Py_static_exceptions[i].exc) {
+                found = 1;
+                break;
+            }
+        }
+        if (!found) {
+            for (size_t i=0; i < num_static_extra_types; i++) {
+                if (type == static_extra_types[i]) {
+                    found = 1;
+                    break;
+                }
+            }
+            if (!found) {
+                // If this assertion fails, _Py_NUM_MANAGED_STATIC_EXTRA_TYPES
+                // must be updated
+                assert(num_static_extra_types < Py_ARRAY_LENGTH(static_extra_types));
+                static_extra_types[num_static_extra_types] = type;
+                num_static_extra_types++;
+            }
+        }
+}
+#endif
@@ -790,6 +790,10 @@ Objects/dictobject.c	-	PyFrozenDict_Type	-
 Modules/_testcapi/unicode.c	test_py_identifier	PyId_hello	-
 Modules/_testcapi/unicode.c	test_py_identifier	to_bytes_id	-
 Modules/_testcapi/unicode.c	test_py_identifier	real_id	-
+Objects/exceptions.c	-	_Py_num_static_exceptions	-
+Objects/exceptions.c	-	_Py_static_exceptions	-
+Objects/object.c	-	_Py_num_static_types	-
+Objects/object.c	-	_Py_static_types	-
 
 ## False positives
 Python/specialize.c	-	_Py_InitCleanup	-