diff --git a/Include/abstract.h b/Include/abstract.h
index 9eaab6b2e05..9e06fbbb749 100644
--- a/Include/abstract.h
+++ b/Include/abstract.h
@@ -863,7 +863,7 @@ PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_ABSTRACTOBJECT_H
-#  include  "cpython/abstract.h"
+#  include "cpython/abstract.h"
 #  undef Py_CPYTHON_ABSTRACTOBJECT_H
 #endif
 
diff --git a/Include/bytearrayobject.h b/Include/bytearrayobject.h
index 1a834474dde..ae2bde1c303 100644
--- a/Include/bytearrayobject.h
+++ b/Include/bytearrayobject.h
@@ -34,7 +34,7 @@ PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_BYTEARRAYOBJECT_H
-#  include  "cpython/bytearrayobject.h"
+#  include "cpython/bytearrayobject.h"
 #  undef Py_CPYTHON_BYTEARRAYOBJECT_H
 #endif
 
diff --git a/Include/bytesobject.h b/Include/bytesobject.h
index bcb1a5942c6..4c4dc40d705 100644
--- a/Include/bytesobject.h
+++ b/Include/bytesobject.h
@@ -59,7 +59,7 @@ PyAPI_FUNC(int) PyBytes_AsStringAndSize(
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_BYTESOBJECT_H
-#  include  "cpython/bytesobject.h"
+#  include "cpython/bytesobject.h"
 #  undef Py_CPYTHON_BYTESOBJECT_H
 #endif
 
diff --git a/Include/ceval.h b/Include/ceval.h
index 0f687666e2b..cf8c5b17be5 100644
--- a/Include/ceval.h
+++ b/Include/ceval.h
@@ -148,7 +148,7 @@ PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_CEVAL_H
-#  include  "cpython/ceval.h"
+#  include "cpython/ceval.h"
 #  undef Py_CPYTHON_CEVAL_H
 #endif
 
diff --git a/Include/code.h b/Include/code.h
index b9e23eb8165..2dea3c26105 100644
--- a/Include/code.h
+++ b/Include/code.h
@@ -10,7 +10,7 @@ typedef struct PyCodeObject PyCodeObject;
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_CODE_H
-#  include  "cpython/code.h"
+#  include "cpython/code.h"
 #  undef Py_CPYTHON_CODE_H
 #endif
 
diff --git a/Include/dictobject.h b/Include/dictobject.h
index da5a36ba07f..a6233d8ae25 100644
--- a/Include/dictobject.h
+++ b/Include/dictobject.h
@@ -87,7 +87,7 @@ PyAPI_DATA(PyTypeObject) PyDictRevIterValue_Type;
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_DICTOBJECT_H
-#  include  "cpython/dictobject.h"
+#  include "cpython/dictobject.h"
 #  undef Py_CPYTHON_DICTOBJECT_H
 #endif
 
diff --git a/Include/fileobject.h b/Include/fileobject.h
index 6ec2994aa85..4c983e7b5da 100644
--- a/Include/fileobject.h
+++ b/Include/fileobject.h
@@ -39,7 +39,7 @@ PyAPI_DATA(int) Py_UTF8Mode;
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_FILEOBJECT_H
-#  include  "cpython/fileobject.h"
+#  include "cpython/fileobject.h"
 #  undef Py_CPYTHON_FILEOBJECT_H
 #endif
 
diff --git a/Include/fileutils.h b/Include/fileutils.h
index 16f3b635dee..ba5acc84fcb 100644
--- a/Include/fileutils.h
+++ b/Include/fileutils.h
@@ -16,7 +16,7 @@ PyAPI_FUNC(char*) Py_EncodeLocale(
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_FILEUTILS_H
-#  include  "cpython/fileutils.h"
+#  include "cpython/fileutils.h"
 #  undef Py_CPYTHON_FILEUTILS_H
 #endif
 
diff --git a/Include/frameobject.h b/Include/frameobject.h
index c118af1201a..adb628f6314 100644
--- a/Include/frameobject.h
+++ b/Include/frameobject.h
@@ -10,7 +10,7 @@ extern "C" {
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_FRAMEOBJECT_H
-#  include  "cpython/frameobject.h"
+#  include "cpython/frameobject.h"
 #  undef Py_CPYTHON_FRAMEOBJECT_H
 #endif
 
diff --git a/Include/import.h b/Include/import.h
index aeef3efd0bc..a87677bb10c 100644
--- a/Include/import.h
+++ b/Include/import.h
@@ -88,7 +88,7 @@ PyAPI_FUNC(int) PyImport_AppendInittab(
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_IMPORT_H
-#  include  "cpython/import.h"
+#  include "cpython/import.h"
 #  undef Py_CPYTHON_IMPORT_H
 #endif
 
diff --git a/Include/interpreteridobject.h b/Include/interpreteridobject.h
index e744fcdc9ff..8432632f339 100644
--- a/Include/interpreteridobject.h
+++ b/Include/interpreteridobject.h
@@ -7,7 +7,7 @@ extern "C" {
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_INTERPRETERIDOBJECT_H
-#  include  "cpython/interpreteridobject.h"
+#  include "cpython/interpreteridobject.h"
 #  undef Py_CPYTHON_INTERPRETERIDOBJECT_H
 #endif
 
diff --git a/Include/listobject.h b/Include/listobject.h
index 2a8a25525d1..eff42c188f1 100644
--- a/Include/listobject.h
+++ b/Include/listobject.h
@@ -42,7 +42,7 @@ PyAPI_FUNC(PyObject *) PyList_AsTuple(PyObject *);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_LISTOBJECT_H
-#  include  "cpython/listobject.h"
+#  include "cpython/listobject.h"
 #  undef Py_CPYTHON_LISTOBJECT_H
 #endif
 
diff --git a/Include/methodobject.h b/Include/methodobject.h
index 9ffe8e1a3dd..1be5873a305 100644
--- a/Include/methodobject.h
+++ b/Include/methodobject.h
@@ -103,11 +103,9 @@ PyAPI_FUNC(PyObject *) PyCMethod_New(PyMethodDef *, PyObject *,
 
 
 #ifndef Py_LIMITED_API
-
-#define Py_CPYTHON_METHODOBJECT_H
-#include  "cpython/methodobject.h"
-#undef Py_CPYTHON_METHODOBJECT_H
-
+#  define Py_CPYTHON_METHODOBJECT_H
+#  include "cpython/methodobject.h"
+#  undef Py_CPYTHON_METHODOBJECT_H
 #endif
 
 #ifdef __cplusplus
diff --git a/Include/object.h b/Include/object.h
index 7f050b80aaf..33df303a44e 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -724,7 +724,7 @@ times.
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_OBJECT_H
-#  include  "cpython/object.h"
+#  include "cpython/object.h"
 #  undef Py_CPYTHON_OBJECT_H
 #endif
 
diff --git a/Include/objimpl.h b/Include/objimpl.h
index 450befad679..9b98c112ac2 100644
--- a/Include/objimpl.h
+++ b/Include/objimpl.h
@@ -205,7 +205,7 @@ PyAPI_FUNC(int) PyObject_GC_IsFinalized(PyObject *);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_OBJIMPL_H
-#  include  "cpython/objimpl.h"
+#  include "cpython/objimpl.h"
 #  undef Py_CPYTHON_OBJIMPL_H
 #endif
 
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index f5d1c711577..c6c443a2d7d 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -314,7 +314,7 @@ PyAPI_FUNC(int) PyOS_vsnprintf(char *str, size_t size, const char  *format, va_l
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_ERRORS_H
-#  include  "cpython/pyerrors.h"
+#  include "cpython/pyerrors.h"
 #  undef Py_CPYTHON_ERRORS_H
 #endif
 
diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
index 9b2dd0868eb..4aecda235ab 100644
--- a/Include/pylifecycle.h
+++ b/Include/pylifecycle.h
@@ -64,7 +64,7 @@ PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_PYLIFECYCLE_H
-#  include  "cpython/pylifecycle.h"
+#  include "cpython/pylifecycle.h"
 #  undef Py_CPYTHON_PYLIFECYCLE_H
 #endif
 
diff --git a/Include/pymem.h b/Include/pymem.h
index 66cdb0d2973..c15ad10dfcf 100644
--- a/Include/pymem.h
+++ b/Include/pymem.h
@@ -93,7 +93,7 @@ PyAPI_FUNC(void) PyMem_Free(void *ptr);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_PYMEM_H
-#  include  "cpython/pymem.h"
+#  include "cpython/pymem.h"
 #  undef Py_CPYTHON_PYMEM_H
 #endif
 
diff --git a/Include/pystate.h b/Include/pystate.h
index d81f42a3efe..b6ee0ede81d 100644
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -132,7 +132,7 @@ PyAPI_FUNC(PyThreadState *) PyGILState_GetThisThreadState(void);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_PYSTATE_H
-#  include  "cpython/pystate.h"
+#  include "cpython/pystate.h"
 #  undef Py_CPYTHON_PYSTATE_H
 #endif
 
diff --git a/Include/pythonrun.h b/Include/pythonrun.h
index b0a2fc3002d..02715775581 100644
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -34,7 +34,7 @@ PyAPI_FUNC(int) PyOS_CheckStack(void);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_PYTHONRUN_H
-#  include  "cpython/pythonrun.h"
+#  include "cpython/pythonrun.h"
 #  undef Py_CPYTHON_PYTHONRUN_H
 #endif
 
diff --git a/Include/sysmodule.h b/Include/sysmodule.h
index 8c8f7c42594..3463c622309 100644
--- a/Include/sysmodule.h
+++ b/Include/sysmodule.h
@@ -31,7 +31,7 @@ PyAPI_FUNC(PyObject *) PySys_GetXOptions(void);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_SYSMODULE_H
-#  include  "cpython/sysmodule.h"
+#  include "cpython/sysmodule.h"
 #  undef Py_CPYTHON_SYSMODULE_H
 #endif
 
diff --git a/Include/traceback.h b/Include/traceback.h
index 781e5a6eec4..2dfa2ada4f2 100644
--- a/Include/traceback.h
+++ b/Include/traceback.h
@@ -16,7 +16,7 @@ PyAPI_DATA(PyTypeObject) PyTraceBack_Type;
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_TRACEBACK_H
-#  include  "cpython/traceback.h"
+#  include "cpython/traceback.h"
 #  undef Py_CPYTHON_TRACEBACK_H
 #endif
 
diff --git a/Include/tupleobject.h b/Include/tupleobject.h
index e796a320192..dc68e3fc5c6 100644
--- a/Include/tupleobject.h
+++ b/Include/tupleobject.h
@@ -36,7 +36,7 @@ PyAPI_FUNC(PyObject *) PyTuple_Pack(Py_ssize_t, ...);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_TUPLEOBJECT_H
-#  include  "cpython/tupleobject.h"
+#  include "cpython/tupleobject.h"
 #  undef Py_CPYTHON_TUPLEOBJECT_H
 #endif
 
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index c65b9228298..abce967caff 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -1043,7 +1043,7 @@ PyAPI_FUNC(int) PyUnicode_IsIdentifier(PyObject *s);
 
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_UNICODEOBJECT_H
-#  include  "cpython/unicodeobject.h"
+#  include "cpython/unicodeobject.h"
 #  undef Py_CPYTHON_UNICODEOBJECT_H
 #endif