diff --git a/Include/Python.h b/Include/Python.h
index 57f71d41d8d477..76ead9e5765ec8 100644
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -82,7 +82,6 @@
#error "PYMALLOC_DEBUG requires WITH_PYMALLOC"
#endif
#include "pymath.h"
-#include "pytime.h"
#include "pymem.h"
#include "object.h"
@@ -128,6 +127,7 @@
#include "structseq.h"
#include "namespaceobject.h"
#include "picklebufobject.h"
+#include "cpython/pytime.h"
#include "codecs.h"
#include "pyerrors.h"
diff --git a/Include/pytime.h b/Include/cpython/pytime.h
similarity index 99%
rename from Include/pytime.h
rename to Include/cpython/pytime.h
index 944170f7d0c4c3..56607d199ed542 100644
--- a/Include/pytime.h
+++ b/Include/cpython/pytime.h
@@ -2,9 +2,6 @@
#ifndef Py_PYTIME_H
#define Py_PYTIME_H
-#include "pyconfig.h" /* include for defines */
-#include "object.h"
-
/**************************************************************************
Symbols and macros to supply platform-independent interfaces to time related
functions and constants
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 5c93b0b3fa9c60..144824eb040192 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1062,7 +1062,6 @@ PYTHON_HEADERS= \
$(srcdir)/Include/pystrtod.h \
$(srcdir)/Include/pythonrun.h \
$(srcdir)/Include/pythread.h \
- $(srcdir)/Include/pytime.h \
$(srcdir)/Include/rangeobject.h \
$(srcdir)/Include/setobject.h \
$(srcdir)/Include/sliceobject.h \
@@ -1103,6 +1102,7 @@ PYTHON_HEADERS= \
$(srcdir)/Include/cpython/pymem.h \
$(srcdir)/Include/cpython/pystate.h \
$(srcdir)/Include/cpython/pythonrun.h \
+ $(srcdir)/Include/cpython/pytime.h \
$(srcdir)/Include/cpython/sysmodule.h \
$(srcdir)/Include/cpython/traceback.h \
$(srcdir)/Include/cpython/tupleobject.h \
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index fdbba6a7afc29d..f0d56994908233 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -31,7 +31,6 @@
#include "pycore_pyerrors.h"
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "pydtrace.h"
-#include "pytime.h" // _PyTime_GetMonotonicClock()
typedef struct _gc_runtime_state GCState;
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index fd27dea9daec71..bfca4bbae9f3e0 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -147,6 +147,7 @@
+
@@ -245,7 +246,6 @@
-
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index 75a653dcbdab29..1505a4779b391a 100644
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -204,9 +204,6 @@
Include
-
- Include
-
Include
@@ -447,6 +444,9 @@
Include\cpython
+
+ Include\cpython
+
Include\cpython