diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 70b64ea3a04..e61e280d060 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -221,10 +221,6 @@ SOURCE=..\..\Objects\boolobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Objects\bufferobject.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Objects\cellobject.c
 # End Source File
 # Begin Source File
diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index b84d22bd3f9..bb32bc514b7 100644
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -366,7 +366,6 @@ SRC.PYTHON=	$(addprefix $(TOP), \
 SRC.OBJECT=	$(addprefix $(TOP), \
 		Objects/abstract.c \
 		Objects/boolobject.c \
-		Objects/bufferobject.c \
 		Objects/cellobject.c \
 		Objects/classobject.c \
 		Objects/cobject.c \
diff --git a/PC/os2emx/python25.def b/PC/os2emx/python25.def
index bb3d64f30ce..55242ea71b8 100644
--- a/PC/os2emx/python25.def
+++ b/PC/os2emx/python25.def
@@ -181,14 +181,6 @@ EXPORTS
   "_Py_ZeroStruct"
   "_Py_TrueStruct"
 
-; From python25_s.lib(bufferobject)
-  "PyBuffer_FromObject"
-  "PyBuffer_FromReadWriteObject"
-  "PyBuffer_FromMemory"
-  "PyBuffer_FromReadWriteMemory"
-  "PyBuffer_New"
-  "PyBuffer_Type"
-
 ; From python25_s.lib(cellobject)
   "PyCell_New"
   "PyCell_Get"
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 07e2050cc6c..802bed32cb3 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -442,9 +442,6 @@
 		<File
 			RelativePath="..\Objects\boolobject.c">
 		</File>
-		<File
-			RelativePath="..\Objects\bufferobject.c">
-		</File>
 		<File
 			RelativePath="..\Objects\bytesobject.c">
 		</File>
diff --git a/PCbuild8/pythoncore/pythoncore.vcproj b/PCbuild8/pythoncore/pythoncore.vcproj
index 52240d1a2e1..c49105eb1ef 100644
--- a/PCbuild8/pythoncore/pythoncore.vcproj
+++ b/PCbuild8/pythoncore/pythoncore.vcproj
@@ -787,10 +787,6 @@
 				RelativePath="..\..\Objects\boolobject.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\Objects\bufferobject.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\Objects\bytesobject.c"
 				>
@@ -977,10 +973,6 @@
 				RelativePath="..\..\Include\boolobject.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\Include\bufferobject.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\Include\cellobject.h"
 				>