diff --git a/Modules/_bisectmodule.c b/Modules/_bisectmodule.c
index 60f4dc69dc0..9e0fd336419 100644
--- a/Modules/_bisectmodule.c
+++ b/Modules/_bisectmodule.c
@@ -7,7 +7,6 @@ Converted to C by Dmitry Vasiliev (dima at hlabs.spb.ru).
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallMethod()
 
diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c
index 97bd44b4ac9..eeefe603499 100644
--- a/Modules/_bz2module.c
+++ b/Modules/_bz2module.c
@@ -1,7 +1,5 @@
 /* _bz2 - Low-level Python interface to libbzip2. */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "structmember.h"         // PyMemberDef
 
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
index 4dfd134f1cb..c31c1b6d6f2 100644
--- a/Modules/_codecsmodule.c
+++ b/Modules/_codecsmodule.c
@@ -30,7 +30,6 @@ Copyright (c) Corporation for National Research Initiatives.
 
    ------------------------------------------------------------------------ */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_codecs.h"        // _PyCodec_Lookup()
 
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 840d0df85e9..a9d8a2b9cb4 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -101,7 +101,6 @@ bytes(cdata)
 #ifndef Py_BUILD_CORE_BUILTIN
 #  define Py_BUILD_CORE_MODULE 1
 #endif
-#define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
 // windows.h must be included before pycore internal headers
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 5691a419a32..1f5afa6fcd8 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -104,8 +104,6 @@ static const char PyCursesVersion[] = "2.2";
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_long.h"          // _PyLong_GetZero()
 #include "pycore_structseq.h"     // _PyStructSequence_NewType()
diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c
index 9908174c94c..5be444d53e8 100644
--- a/Modules/_dbmmodule.c
+++ b/Modules/_dbmmodule.c
@@ -2,7 +2,6 @@
 /* DBM module using dictionary interface */
 
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #include <sys/types.h>
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 2a0eac4d2f8..48280690a70 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -11,8 +11,6 @@
  *--------------------------------------------------------------------
  */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "structmember.h"         // PyMemberDef
 #include "expat.h"
diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c
index 4dbb5741b2e..bedbdc08142 100644
--- a/Modules/_gdbmmodule.c
+++ b/Modules/_gdbmmodule.c
@@ -3,7 +3,6 @@
 /* Author: Anthony Baxter, after dbmmodule.c */
 /* Doc strings: Mitch Chapman */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "gdbm.h"
 
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index 259db809b86..011cb765ed8 100644
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -22,8 +22,6 @@
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_hashtable.h"
 #include "hashlib.h"
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
index 7b06c1bee5a..1a7920eebe0 100644
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -7,7 +7,6 @@
     Mostly written by Amaury Forgeot d'Arc
 */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "_iomodule.h"
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index f30d54a5e11..25376f82042 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -7,7 +7,6 @@
     Written by Amaury Forgeot d'Arc and Antoine Pitrou
 */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 #include "pycore_object.h"
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 005c9ffe56f..1a5b61301de 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -1,6 +1,5 @@
 /* Author: Daniel Stutzbach */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_fileutils.h"     // _Py_BEGIN_SUPPRESS_IPH
 #include "pycore_object.h"        // _PyObject_GC_UNTRACK()
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
index 5cd679c68b1..729a708a3fc 100644
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -8,7 +8,6 @@
 */
 
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallMethod()
 #include "pycore_long.h"          // _PyLong_GetOne()
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
index d4028451754..1960002d405 100644
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -1,4 +1,3 @@
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include <stddef.h>               // offsetof()
 #include "pycore_object.h"
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index c8e6792657c..f704875280d 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -6,7 +6,6 @@
     Written by Amaury Forgeot d'Arc and Antoine Pitrou
 */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallMethod()
 #include "pycore_codecs.h"        // _PyCodecInfo_GetIncrementalDecoder()
diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c
index 15f3053957d..452b12c138f 100644
--- a/Modules/_io/winconsoleio.c
+++ b/Modules/_io/winconsoleio.c
@@ -6,7 +6,6 @@
     Written by Steve Dower
 */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_fileutils.h"     // _Py_BEGIN_SUPPRESS_IPH
 #include "pycore_object.h"        // _PyObject_GC_UNTRACK()
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
index 1ada7305117..970530facd0 100644
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -9,7 +9,6 @@ This software comes with no warranty. Use at your own risk.
 
 ******************************************************************/
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_fileutils.h"
 
diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c
index e34fbad230d..ba0987ee0ab 100644
--- a/Modules/_lzmamodule.c
+++ b/Modules/_lzmamodule.c
@@ -5,8 +5,6 @@
 
 */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "structmember.h"         // PyMemberDef
 
diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
index dfc2a8e0799..47257fd5d9f 100644
--- a/Modules/_multiprocessing/multiprocessing.h
+++ b/Modules/_multiprocessing/multiprocessing.h
@@ -1,8 +1,6 @@
 #ifndef MULTIPROCESSING_H
 #define MULTIPROCESSING_H
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "structmember.h"
 #include "pythread.h"
diff --git a/Modules/_multiprocessing/posixshmem.c b/Modules/_multiprocessing/posixshmem.c
index 88c93fe3137..debef3267f7 100644
--- a/Modules/_multiprocessing/posixshmem.c
+++ b/Modules/_multiprocessing/posixshmem.c
@@ -2,8 +2,6 @@
 posixshmem - A Python extension that provides shm_open() and shm_unlink()
 */
 
-#define PY_SSIZE_T_CLEAN
-
 #include <Python.h>
 
 // for shm_open() and shm_unlink()
diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
index 1df92065a58..7a748ee3ea0 100644
--- a/Modules/_sqlite/connection.h
+++ b/Modules/_sqlite/connection.h
@@ -23,7 +23,6 @@
 
 #ifndef PYSQLITE_CONNECTION_H
 #define PYSQLITE_CONNECTION_H
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pythread.h"
 #include "structmember.h"
diff --git a/Modules/_sqlite/cursor.h b/Modules/_sqlite/cursor.h
index 0bcdddc3e29..42f817af7c5 100644
--- a/Modules/_sqlite/cursor.h
+++ b/Modules/_sqlite/cursor.h
@@ -23,7 +23,6 @@
 
 #ifndef PYSQLITE_CURSOR_H
 #define PYSQLITE_CURSOR_H
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #include "statement.h"
diff --git a/Modules/_sqlite/microprotocols.h b/Modules/_sqlite/microprotocols.h
index 6bde9d01f45..8a8c33525ee 100644
--- a/Modules/_sqlite/microprotocols.h
+++ b/Modules/_sqlite/microprotocols.h
@@ -26,7 +26,6 @@
 #ifndef PSYCOPG_MICROPROTOCOLS_H
 #define PSYCOPG_MICROPROTOCOLS_H 1
 
-#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 
 /** exported functions **/
diff --git a/Modules/_sqlite/module.h b/Modules/_sqlite/module.h
index daa22091d38..a4ca45cf632 100644
--- a/Modules/_sqlite/module.h
+++ b/Modules/_sqlite/module.h
@@ -23,7 +23,6 @@
 
 #ifndef PYSQLITE_MODULE_H
 #define PYSQLITE_MODULE_H
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #define LEGACY_TRANSACTION_CONTROL -1
diff --git a/Modules/_sqlite/row.h b/Modules/_sqlite/row.h
index b5190981758..d42b781e493 100644
--- a/Modules/_sqlite/row.h
+++ b/Modules/_sqlite/row.h
@@ -23,7 +23,6 @@
 
 #ifndef PYSQLITE_ROW_H
 #define PYSQLITE_ROW_H
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 typedef struct _Row
diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
index 11a6464b1a1..b18f170ebb0 100644
--- a/Modules/_sqlite/statement.h
+++ b/Modules/_sqlite/statement.h
@@ -23,7 +23,6 @@
 
 #ifndef PYSQLITE_STATEMENT_H
 #define PYSQLITE_STATEMENT_H
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #include "connection.h"
diff --git a/Modules/_sqlite/util.h b/Modules/_sqlite/util.h
index a22bcd82d2a..68b1a8cb67a 100644
--- a/Modules/_sqlite/util.h
+++ b/Modules/_sqlite/util.h
@@ -23,7 +23,6 @@
 
 #ifndef PYSQLITE_UTIL_H
 #define PYSQLITE_UTIL_H
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pythread.h"
 #include "sqlite3.h"
diff --git a/Modules/_sre/sre.c b/Modules/_sre/sre.c
index 328e4be2fb5..3f11916f9e1 100644
--- a/Modules/_sre/sre.c
+++ b/Modules/_sre/sre.c
@@ -38,8 +38,6 @@
 static const char copyright[] =
     " SRE 2.2.2 Copyright (c) 1997-2002 by Secret Labs AB ";
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_long.h"          // _PyLong_GetZero()
 #include "pycore_moduleobject.h"  // _PyModule_GetState()
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 4254fde0f51..df1496925f6 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -25,8 +25,6 @@
 #endif
 #define OPENSSL_NO_DEPRECATED 1
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_weakref.h"       // _PyWeakref_GET_REF()
 
diff --git a/Modules/_stat.c b/Modules/_stat.c
index 4218799103b..9747d848cba 100644
--- a/Modules/_stat.c
+++ b/Modules/_stat.c
@@ -11,7 +11,6 @@
  *
  */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #ifdef __cplusplus
diff --git a/Modules/_struct.c b/Modules/_struct.c
index 4f9478bd980..0a6f076aac0 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -7,8 +7,6 @@
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_moduleobject.h"  // _PyModule_GetState()
 #include "structmember.h"         // PyMemberDef
diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c
index 63ed4dc6ca8..5101834cfe1 100644
--- a/Modules/_testbuffer.c
+++ b/Modules/_testbuffer.c
@@ -1,9 +1,6 @@
 /* C Extension module to test all aspects of PEP-3118.
    Written by Stefan Krah. */
 
-
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 
 
diff --git a/Modules/_testcapi/float.c b/Modules/_testcapi/float.c
index 33cbda83a81..cff53fb950f 100644
--- a/Modules/_testcapi/float.c
+++ b/Modules/_testcapi/float.c
@@ -1,5 +1,3 @@
-#define PY_SSIZE_T_CLEAN
-
 #include "parts.h"
 #include "clinic/float.c.h"
 
diff --git a/Modules/_testcapi/getargs.c b/Modules/_testcapi/getargs.c
index a473c41f60a..10a1c1dd052 100644
--- a/Modules/_testcapi/getargs.c
+++ b/Modules/_testcapi/getargs.c
@@ -3,8 +3,6 @@
  * APIs that parse and build arguments.
  */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "parts.h"
 
 static PyObject *
diff --git a/Modules/_testcapi/structmember.c b/Modules/_testcapi/structmember.c
index 0fb872a4328..8522dc962ef 100644
--- a/Modules/_testcapi/structmember.c
+++ b/Modules/_testcapi/structmember.c
@@ -1,4 +1,3 @@
-#define PY_SSIZE_T_CLEAN
 #include "parts.h"
 #include <stddef.h>   // for offsetof()
 
diff --git a/Modules/_testcapi/unicode.c b/Modules/_testcapi/unicode.c
index 73929eaffc6..367d2af1413 100644
--- a/Modules/_testcapi/unicode.c
+++ b/Modules/_testcapi/unicode.c
@@ -1,6 +1,5 @@
 #include <stddef.h>               // ptrdiff_t
 
-#define PY_SSIZE_T_CLEAN
 #include "parts.h"
 
 static struct PyModuleDef *_testcapimodule = NULL;  // set at initialization
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 398450d804f..ce1131743eb 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -17,8 +17,6 @@
 /* Always enable assertions */
 #undef NDEBUG
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "frameobject.h"          // PyFrame_New
 #include "marshal.h"              // PyMarshal_WriteLongToFile
diff --git a/Modules/_testclinic.c b/Modules/_testclinic.c
index 6ff55a2755c..26cdb4371ca 100644
--- a/Modules/_testclinic.c
+++ b/Modules/_testclinic.c
@@ -5,8 +5,6 @@
 /* Always enable assertions */
 #undef NDEBUG
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 
 
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
index 2e0609dcae5..971b8efb5fd 100644
--- a/Modules/_testinternalcapi.c
+++ b/Modules/_testinternalcapi.c
@@ -9,8 +9,6 @@
 /* Always enable assertions */
 #undef NDEBUG
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "frameobject.h"
 #include "interpreteridobject.h"  // _PyInterpreterID_LookUp()
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 97e5b2f738a..76af803bd6e 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -21,7 +21,6 @@ Copyright (C) 1994 Steen Lumholt.
 
 */
 
-#define PY_SSIZE_T_CLEAN
 #ifndef Py_BUILD_CORE_BUILTIN
 #  define Py_BUILD_CORE_MODULE 1
 #endif
diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c
index ed3b2fedfd4..2f5be1c5144 100644
--- a/Modules/_uuidmodule.c
+++ b/Modules/_uuidmodule.c
@@ -3,8 +3,6 @@
  * DCE compatible Universally Unique Identifier library.
  */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #if defined(HAVE_UUID_H)
   // AIX, FreeBSD, libuuid with pkgconf
diff --git a/Modules/_xxtestfuzz/_xxtestfuzz.c b/Modules/_xxtestfuzz/_xxtestfuzz.c
index e0694de6719..a2dbabce71e 100644
--- a/Modules/_xxtestfuzz/_xxtestfuzz.c
+++ b/Modules/_xxtestfuzz/_xxtestfuzz.c
@@ -1,4 +1,3 @@
-#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <stdlib.h>
 #include <inttypes.h>
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 15f7766a8dd..f43a2346797 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -7,7 +7,6 @@
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallMethod()
 #include "pycore_moduleobject.h"  // _PyModule_GetState()
diff --git a/Modules/binascii.c b/Modules/binascii.c
index 356947d43e4..cf9328795c2 100644
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -57,8 +57,6 @@
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_long.h"          // _PyLong_DigitValue
 #include "pycore_strhex.h"        // _Py_strhex_bytes_with_sep()
diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h
index 36bc7024df9..48cdcfb3ad3 100644
--- a/Modules/cjkcodecs/cjkcodecs.h
+++ b/Modules/cjkcodecs/cjkcodecs.h
@@ -7,7 +7,6 @@
 #ifndef _CJKCODECS_H_
 #define _CJKCODECS_H_
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "multibytecodec.h"
 
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 1070a751ffe..cf437d09f1f 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -4,7 +4,6 @@
  * Written by Hye-Shik Chang <perky@FreeBSD.org>
  */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "structmember.h"         // PyMemberDef
 #include "multibytecodec.h"
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
index 6ca0b62bc5d..e530621fd26 100644
--- a/Modules/fcntlmodule.c
+++ b/Modules/fcntlmodule.c
@@ -1,8 +1,5 @@
-
 /* fcntl module */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 
 #ifdef HAVE_SYS_FILE_H
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index ae63bae79d5..13ff253f560 100644
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -1,4 +1,3 @@
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 #include "pycore_long.h"          // _PyLong_GetZero()
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index 6bde9939eaa..fef27123a32 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -22,7 +22,6 @@
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include "pycore_bytesobject.h"   // _PyBytes_Find()
 #include "pycore_fileutils.h"     // _Py_stat_struct
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index d73886f14cb..b9f42476e6b 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -7,8 +7,6 @@
    of the compiler used.  Different compilers define their own feature
    test macro, e.g. '_MSC_VER'. */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 
 #ifdef __VXWORKS__
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 3add8023352..1d3f34b857a 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -105,7 +105,6 @@ Local naming conventions:
 # pragma weak inet_aton
 #endif
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_fileutils.h"     // _Py_set_inheritable()
 #include "pycore_moduleobject.h"  // _PyModule_GetState
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index 7be4d83c6f0..b6e50528a23 100644
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -16,8 +16,6 @@
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_ucnhash.h"       // _PyUnicode_Name_CAPI
 #include "structmember.h"         // PyMemberDef
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index 534d065765f..c0f6b96f51b 100644
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -3,8 +3,6 @@
 
 /* Windows users:  read Python's PCbuild\readme.txt */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "structmember.h"         // PyMemberDef
 #include "zlib.h"
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 944ec65b64f..18a24a369a6 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -1,6 +1,5 @@
 /* PyByteArray (bytearray) implementation */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_abstract.h"      // _PyIndex_Check()
 #include "pycore_bytes_methods.h"
diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c
index 33aa9c3db6e..c1bc6383df3 100644
--- a/Objects/bytes_methods.c
+++ b/Objects/bytes_methods.c
@@ -1,4 +1,3 @@
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_abstract.h"   // _PyIndex_Check()
 #include "pycore_bytes_methods.h"
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index bf54ec1d51d..477bc4d31e8 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -1,7 +1,5 @@
 /* bytes object implementation */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_abstract.h"      // _PyIndex_Check()
 #include "pycore_bytesobject.h"   // _PyBytes_Find(), _PyBytes_Repeat()
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 2bfa07ea312..85cf2cca165 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -4,7 +4,6 @@
  * Thanks go to Tim Peters and Michael Hudson for debugging.
  */
 
-#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <stdbool.h>
 #include "pycore_abstract.h"      // _PyObject_RealIsSubclass()
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index e99e155f2b8..6d980a1b379 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -1,6 +1,5 @@
 /* File object implementation (what's left of it -- see io.py) */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 #include "pycore_runtime.h"       // _PyRuntime
diff --git a/Objects/picklebufobject.c b/Objects/picklebufobject.c
index aaa852cfbb0..ca83a0a0806 100644
--- a/Objects/picklebufobject.c
+++ b/Objects/picklebufobject.c
@@ -1,6 +1,5 @@
 /* PickleBuffer object implementation */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include <stddef.h>
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 74def5ada51..79402714f23 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -38,7 +38,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_abstract.h"      // _PyIndex_Check()
 #include "pycore_atomic_funcs.h"  // _Py_atomic_size_get()
diff --git a/PC/winreg.c b/PC/winreg.c
index 279d48f792b..aa2055c7e61 100644
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -12,7 +12,6 @@
 
 */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_object.h"        // _PyObject_Init()
 #include "pycore_moduleobject.h"
diff --git a/Parser/pegen.h b/Parser/pegen.h
index fe13d10e6b8..5f29285951e 100644
--- a/Parser/pegen.h
+++ b/Parser/pegen.h
@@ -1,7 +1,6 @@
 #ifndef PEGEN_H
 #define PEGEN_H
 
-#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <pycore_ast.h>
 #include <pycore_token.h>
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 6bdf371a7ad..f19198600fa 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -1,7 +1,6 @@
 
 /* Tokenizer implementation */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 
diff --git a/Python/marshal.c b/Python/marshal.c
index 7cfc7cc0030..517220a4463 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -6,8 +6,6 @@
    Version 3 of this protocol properly supports circular links
    and sharing. */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 #include "pycore_code.h"          // _PyCode_New()