diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 827213d77..7b7d8bde7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20110913
 --------
 README.txt: Mention Mac command keys
+arch/carbon/conf.h, d1x-rebirth.xcodeproj/project.pbxproj: Define USE_TRACKER for Mac OS X, remove reference to deleted cfile.h
 
 20110912
 --------
diff --git a/arch/carbon/conf.h b/arch/carbon/conf.h
index ff7fec8b9..670fd1fb8 100644
--- a/arch/carbon/conf.h
+++ b/arch/carbon/conf.h
@@ -45,6 +45,7 @@
 /* Define if you want a network build */
 # define NETWORK
 # define USE_UDP
+# define USE_TRACKER
 //# define USE_IPX
 # define USE_TRACKER
 
diff --git a/d1x-rebirth.xcodeproj/project.pbxproj b/d1x-rebirth.xcodeproj/project.pbxproj
index 355743331..492b1106f 100755
--- a/d1x-rebirth.xcodeproj/project.pbxproj
+++ b/d1x-rebirth.xcodeproj/project.pbxproj
@@ -29,7 +29,6 @@
 		676AC1C70668A938007173EB /* byteswap.h in Headers */ = {isa = PBXBuildFile; fileRef = 6791CE4F0668852C00056A5A /* byteswap.h */; };
 		676AC1C80668A938007173EB /* rle.h in Headers */ = {isa = PBXBuildFile; fileRef = 6791CE500668852C00056A5A /* rle.h */; };
 		676AC1CA0668A938007173EB /* u_dpmi.h in Headers */ = {isa = PBXBuildFile; fileRef = 6791CF090668878F00056A5A /* u_dpmi.h */; };
-		676AC1CB0668A938007173EB /* cfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6791CF20066887CE00056A5A /* cfile.h */; };
 		676AC1CE0668A938007173EB /* fix.h in Headers */ = {isa = PBXBuildFile; fileRef = 6791CF420668881F00056A5A /* fix.h */; };
 		676AC1CF0668A938007173EB /* palette.h in Headers */ = {isa = PBXBuildFile; fileRef = 6791CF4E0668883900056A5A /* palette.h */; };
 		676AC1D00668A938007173EB /* pcx.h in Headers */ = {isa = PBXBuildFile; fileRef = 6791CF620668885500056A5A /* pcx.h */; };
@@ -147,7 +146,6 @@
 		676AC2770668A939007173EB /* 3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 6791CF8D066888DD00056A5A /* 3d.h */; };
 		676AC2780668A939007173EB /* args.h in Headers */ = {isa = PBXBuildFile; fileRef = 6791D00B066889CD00056A5A /* args.h */; };
 		676AC2790668A939007173EB /* byteswap.h in Headers */ = {isa = PBXBuildFile; fileRef = 6791CE4F0668852C00056A5A /* byteswap.h */; };
-		676AC27A0668A939007173EB /* cfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6791CF20066887CE00056A5A /* cfile.h */; };
 		676AC27E0668A939007173EB /* error.h in Headers */ = {isa = PBXBuildFile; fileRef = 67B44913066880C400DF26D8 /* error.h */; };
 		676AC2800668A939007173EB /* fix.h in Headers */ = {isa = PBXBuildFile; fileRef = 6791CF420668881F00056A5A /* fix.h */; };
 		676AC2810668A939007173EB /* gr.h in Headers */ = {isa = PBXBuildFile; fileRef = 67B44914066880C400DF26D8 /* gr.h */; };
@@ -416,7 +414,7 @@
 /* Begin PBXFileReference section */
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		179E6E9A11F37B2400175C54 /* hmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hmp.h; sourceTree = "<group>"; };
-		179E6E9D11F37B3400175C54 /* hmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hmp.c; path = misc/hmp.c; sourceTree = SOURCE_ROOT; };
+		179E6E9D11F37B3400175C54 /* hmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hmp.c; sourceTree = "<group>"; };
 		17DFA6AF10C1A29500674D11 /* net_udp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = net_udp.c; sourceTree = "<group>"; };
 		17DFA6B210C1A2A300674D11 /* net_udp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = net_udp.h; sourceTree = "<group>"; };
 		670E3796066C50C30085B671 /* CHANGELOG.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CHANGELOG.txt; sourceTree = "<group>"; };
@@ -432,7 +430,6 @@
 		6791CE4F0668852C00056A5A /* byteswap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = byteswap.h; sourceTree = "<group>"; };
 		6791CE500668852C00056A5A /* rle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = rle.h; sourceTree = "<group>"; };
 		6791CF090668878F00056A5A /* u_dpmi.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = u_dpmi.h; sourceTree = "<group>"; };
-		6791CF20066887CE00056A5A /* cfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cfile.h; sourceTree = "<group>"; };
 		6791CF420668881F00056A5A /* fix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = fix.h; sourceTree = "<group>"; };
 		6791CF4E0668883900056A5A /* palette.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = palette.h; sourceTree = "<group>"; };
 		6791CF620668885500056A5A /* pcx.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = pcx.h; sourceTree = "<group>"; };
@@ -1221,6 +1218,7 @@
 				EBEEB29B0D2B378B00FF39B4 /* compare.c */,
 				EB92BEA40CDD6A570045A32C /* dl_list.c */,
 				67B4486A06687E1000DF26D8 /* error.c */,
+				179E6E9D11F37B3400175C54 /* hmp.c */,
 				EBAC98F90D42497F0017D4BC /* ignorecase.c */,
 				EB1405B912100883002B1CC6 /* physfsx.c */,
 				67B4487206687E1000DF26D8 /* strio.c */,
@@ -1249,7 +1247,6 @@
 				6791CF8D066888DD00056A5A /* 3d.h */,
 				6791D00B066889CD00056A5A /* args.h */,
 				6791CE4F0668852C00056A5A /* byteswap.h */,
-				6791CF20066887CE00056A5A /* cfile.h */,
 				EB9181090DABA47B0010CB39 /* console.h */,
 				EB92BE680CDD69830045A32C /* dl_list.h */,
 				67B44913066880C400DF26D8 /* error.h */,
@@ -1258,7 +1255,6 @@
 				67B44914066880C400DF26D8 /* gr.h */,
 				67B44915066880C400DF26D8 /* grdef.h */,
 				179E6E9A11F37B2400175C54 /* hmp.h */,
-				179E6E9D11F37B3400175C54 /* hmp.c */,
 				6791D0BD06688AE800056A5A /* iff.h */,
 				EBAC994E0D4250320017D4BC /* ignorecase.h */,
 				EB3319F00D5334B600C799B0 /* internal.h */,
@@ -1491,7 +1487,6 @@
 				676AC1C70668A938007173EB /* byteswap.h in Headers */,
 				676AC1C80668A938007173EB /* rle.h in Headers */,
 				676AC1CA0668A938007173EB /* u_dpmi.h in Headers */,
-				676AC1CB0668A938007173EB /* cfile.h in Headers */,
 				676AC1CE0668A938007173EB /* fix.h in Headers */,
 				676AC1CF0668A938007173EB /* palette.h in Headers */,
 				676AC1D00668A938007173EB /* pcx.h in Headers */,
@@ -1529,7 +1524,6 @@
 				676AC2770668A939007173EB /* 3d.h in Headers */,
 				676AC2780668A939007173EB /* args.h in Headers */,
 				676AC2790668A939007173EB /* byteswap.h in Headers */,
-				676AC27A0668A939007173EB /* cfile.h in Headers */,
 				676AC27E0668A939007173EB /* error.h in Headers */,
 				676AC2800668A939007173EB /* fix.h in Headers */,
 				676AC2810668A939007173EB /* gr.h in Headers */,