Moved all internal headers to a single internal header.

.gitignore

@@ -22,3 +22,6 @@ build/
 test.py
 a.py
 vgcore*
+
+# Other Visual Studio stuff.
+pcbuild/

include/pyawaitable/_pyawaitable.h

@@ -0,0 +1,20 @@
+#ifndef PYAWAITABLE__PYAWAITABLE_H
+#define PYAWAITABLE__PYAWAITABLE_H
+
+#include <Python.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+#include "array.h"
+#include "awaitableobject.h"
+#include "backport.h"
+#include "genwrapper.h"
+#include "coro.h"
+#include "values.h"
+#include "with.h"
+
+#define PYAWAITABLE_BEING_BUILT
+#include <pyawaitable.h>
+
+#endif

include/pyawaitable/array.h

@@ -1,9 +1,6 @@
 #ifndef PYAWAITABLE_ARRAY_H
 #define PYAWAITABLE_ARRAY_H
 
-#include <Python.h>
-#include <stdlib.h>
-
 #define pyawaitable_array_DEFAULT_SIZE 16
 
 /*

include/pyawaitable/awaitableobject.h

@@ -1,11 +1,6 @@
 #ifndef PYAWAITABLE_AWAITABLE_H
 #define PYAWAITABLE_AWAITABLE_H
 
-#include <Python.h>
-#include <stdbool.h>
-
-#include <pyawaitable/array.h>
-
 typedef int (*awaitcallback)(PyObject *, PyObject *);
 typedef int (*awaitcallback_err)(PyObject *, PyObject *);
 typedef int (*defer_callback)(PyObject *);

include/pyawaitable/backport.h

@@ -1,9 +1,8 @@
 #ifndef PYAWAITABLE_BACKPORT_H
 #define PYAWAITABLE_BACKPORT_H
 
-#include <Python.h>
-
-#ifndef _PyObject_Vectorcall
+/* assume after Python 3.11 that PyObject_Vectorcall is always available even in the (stable) limited API. */
+#if !defined(_PyObject_Vectorcall) && PY_VERSION_HEX < 0x030C0000
 #define PYAWAITABLE_NEEDS_VECTORCALL
 PyObject *_PyObject_VectorcallBackport(
     PyObject *obj,

include/pyawaitable/coro.h

@@ -1,8 +1,6 @@
 #ifndef PYAWAITABLE_CORO_H
 #define PYAWAITABLE_CORO_H
 
-#include <Python.h>
-
 extern PyMethodDef pyawaitable_methods[];
 extern PyAsyncMethods pyawaitable_async_methods;
 

include/pyawaitable/genwrapper.h

@@ -1,9 +1,6 @@
 #ifndef PYAWAITABLE_GENWRAPPER_H
 #define PYAWAITABLE_GENWRAPPER_H
 
-#include <Python.h>
-#include <pyawaitable/awaitableobject.h>
-
 extern PyTypeObject _PyAwaitableGenWrapperType;
 
 typedef struct _GenWrapperObject

include/pyawaitable/values.h

@@ -1,8 +1,6 @@
 #ifndef PYAWAITABLE_VALUES_H
 #define PYAWAITABLE_VALUES_H
 
-#include <Python.h> // PyObject, Py_ssize_t
-
 #define SAVE(name) int name(PyObject * awaitable, Py_ssize_t nargs, ...)
 #define UNPACK(name) int name(PyObject * awaitable, ...)
 #define SET(name, tp)     \

include/pyawaitable/with.h

@@ -1,9 +1,6 @@
 #ifndef PYAWAITABLE_WITH_H
 #define PYAWAITABLE_WITH_H
 
-#include <Python.h> // PyObject
-#include <pyawaitable//awaitableobject.h> // awaitcallback, awaitcallback_err
-
 int
 pyawaitable_async_with_impl(
     PyObject *aw,

src/_pyawaitable/array.c

@@ -1,4 +1,4 @@
-#include <pyawaitable/array.h>
+#include <pyawaitable/_pyawaitable.h>
 
 static inline void
 call_deallocator_maybe(pyawaitable_array *array, Py_ssize_t index)

src/_pyawaitable/awaitable.c

@@ -1,11 +1,4 @@
-#include <Python.h>
-#include <stdlib.h>
-
-#include <pyawaitable/array.h>
-#include <pyawaitable/awaitableobject.h>
-#include <pyawaitable/backport.h>
-#include <pyawaitable/coro.h>
-#include <pyawaitable/genwrapper.h>
+#include <pyawaitable/_pyawaitable.h>
 
 PyDoc_STRVAR(
     awaitable_doc,

src/_pyawaitable/backport.c

@@ -1,5 +1,4 @@
-#include <Python.h>
-#include <pyawaitable/backport.h>
+#include <pyawaitable/_pyawaitable.h>
 
 #ifdef PYAWAITABLE_NEEDS_VECTORCALL
 PyObject *

src/_pyawaitable/coro.c

@@ -1,8 +1,4 @@
-#include <Python.h>
-#include <pyawaitable/backport.h>
-#include <pyawaitable/awaitableobject.h>
-#include <pyawaitable/genwrapper.h>
-#include <pyawaitable/coro.h>
+#include <pyawaitable/_pyawaitable.h>
 
 static PyObject *
 awaitable_send_with_arg(PyObject *self, PyObject *value)

src/_pyawaitable/genwrapper.c

@@ -1,8 +1,4 @@
-#include <Python.h>
-#include <pyawaitable/backport.h>
-#include <pyawaitable/awaitableobject.h>
-#include <pyawaitable/genwrapper.h>
-#include <stdlib.h>
+#include <pyawaitable/_pyawaitable.h>
 #define DONE(cb)                 \
         do { cb->done = true;    \
              Py_CLEAR(cb->coro); \

src/_pyawaitable/mod.c

@@ -1,9 +1,4 @@
-#include <pyawaitable.h>
-#include <pyawaitable/awaitableobject.h>
-#include <pyawaitable/coro.h>
-#include <pyawaitable/values.h>
-#include <pyawaitable/genwrapper.h>
-#include <pyawaitable/with.h>
+#include <pyawaitable/_pyawaitable.h>
 #define ADD_TYPE(tp)                                               \
         do                                                         \
         {                                                          \

src/_pyawaitable/values.c

@@ -1,10 +1,4 @@
-#include <Python.h>
-#include <stdarg.h>
-
-#include <pyawaitable/awaitableobject.h>
-#include <pyawaitable/backport.h>
-#include <pyawaitable/array.h>
-#include <pyawaitable/values.h>
+#include <pyawaitable/_pyawaitable.h>
 
 #define NOTHING
 

src/_pyawaitable/with.c

@@ -1,7 +1,4 @@
-#include <Python.h>
-#include <pyawaitable/backport.h>
-#include <pyawaitable/awaitableobject.h>
-#include <pyawaitable/values.h>
+#include <pyawaitable/_pyawaitable.h>
 
 static int
 async_with_inner(PyObject *aw, PyObject *res)

src/pyawaitable/pyawaitable.h

@@ -58,6 +58,7 @@ typedef struct _pyawaitable_abi
         defer_callback cb);
 } PyAwaitableABI;
 
+#ifndef PYAWAITABLE_BEING_BUILT
 #ifdef PYAWAITABLE_THIS_FILE_INIT
 PyAwaitableABI *pyawaitable_abi = NULL;
 #else
@@ -160,5 +161,6 @@ pyawaitable_vendor_init(PyObject *mod)
     );
     return -1;
 }
+#endif
 
 #endif