diff --git a/dfhack/python/DF_API.cpp b/dfhack/python/DF_API.cpp
index d8b59f607..9e4c7be06 100644
--- a/dfhack/python/DF_API.cpp
+++ b/dfhack/python/DF_API.cpp
@@ -29,8 +29,8 @@ distribution.
 #include <string>
 #include "DFTypes.h"
 #include "DFHackAPI.h"
-#include "MemInfo.cpp"
-#include "Position.cpp"
+#include "DF_MemInfo.cpp"
+#include "DF_Position.cpp"
 
 using namespace std;
 using namespace DFHack;
diff --git a/dfhack/python/MemInfo.cpp b/dfhack/python/DF_MemInfo.cpp
similarity index 100%
rename from dfhack/python/MemInfo.cpp
rename to dfhack/python/DF_MemInfo.cpp
diff --git a/dfhack/python/Position.cpp b/dfhack/python/DF_Position.cpp
similarity index 100%
rename from dfhack/python/Position.cpp
rename to dfhack/python/DF_Position.cpp
diff --git a/dfhack/python/pydfhack.cpp b/dfhack/python/pydfhack.cpp
index 4dbfa514a..7fef20d62 100644
--- a/dfhack/python/pydfhack.cpp
+++ b/dfhack/python/pydfhack.cpp
@@ -23,7 +23,7 @@ distribution.
 */
 
 #include "Python.h"
-#include "MemInfo.cpp"
+#include "DF_MemInfo.cpp"
 #include "DF_API.cpp"
 
 #ifndef PyMODINIT_FUNC
diff --git a/dfhack/python/setup.py b/dfhack/python/setup.py
index aeddb72e5..f42072986 100644
--- a/dfhack/python/setup.py
+++ b/dfhack/python/setup.py
@@ -2,7 +2,7 @@
 from distutils.core import setup, Extension
 
 e = Extension("pydfhack", 
-		sources=["MemInfo.cpp", "DF_API.cpp", "pydfhack.cpp"],
+		sources=["DF_MemInfo.cpp", "DF_API.cpp", "pydfhack.cpp"],
         include_dirs=["..\\", "..\\include", "..\\depends\\md5", "..\\depends\\tinyxml"],
 		library_dirs=["..\\..\\output"],
 		libraries=["libdfhack"],