diff --git a/stepmania/PBProject/stepmania.pbproj/project.pbxproj b/stepmania/PBProject/stepmania.pbproj/project.pbxproj
index 74bc0e8f8b..07e678f917 100755
--- a/stepmania/PBProject/stepmania.pbproj/project.pbxproj
+++ b/stepmania/PBProject/stepmania.pbproj/project.pbxproj
@@ -295,504 +295,504 @@
 //AA3
 //AA4
 		AA082DFF0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = algebra.cpp;
 			path = ../crypto51/algebra.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E000653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = algebra.h;
 			path = ../crypto51/algebra.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E010653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = algparam.cpp;
 			path = ../crypto51/algparam.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E020653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = algparam.h;
 			path = ../crypto51/algparam.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E030653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = argnames.h;
 			path = ../crypto51/argnames.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E040653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = asn.cpp;
 			path = ../crypto51/asn.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E050653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = asn.h;
 			path = ../crypto51/asn.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E0A0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = config.h;
 			path = ../crypto51/config.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E0B0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = cryptlib.cpp;
 			path = ../crypto51/cryptlib.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E0C0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = cryptlib.h;
 			path = ../crypto51/cryptlib.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E130653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = files.cpp;
 			path = ../crypto51/files.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E140653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = files.h;
 			path = ../crypto51/files.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E150653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = filters.cpp;
 			path = ../crypto51/filters.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E160653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = filters.h;
 			path = ../crypto51/filters.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E190653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = fltrimpl.h;
 			path = ../crypto51/fltrimpl.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E1C0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = integer.cpp;
 			path = ../crypto51/integer.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E1D0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = integer.h;
 			path = ../crypto51/integer.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E1E0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = iterhash.cpp;
 			path = ../crypto51/iterhash.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E1F0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = iterhash.h;
 			path = ../crypto51/iterhash.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E220653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = mdc.h;
 			path = ../crypto51/mdc.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E230653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = misc.cpp;
 			path = ../crypto51/misc.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E240653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = misc.h;
 			path = ../crypto51/misc.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E250653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = modarith.h;
 			path = ../crypto51/modarith.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E260653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = modes.cpp;
 			path = ../crypto51/modes.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E270653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = modes.h;
 			path = ../crypto51/modes.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E280653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = mqueue.cpp;
 			path = ../crypto51/mqueue.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E290653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = mqueue.h;
 			path = ../crypto51/mqueue.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E2A0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = nbtheory.cpp;
 			path = ../crypto51/nbtheory.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E2B0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = nbtheory.h;
 			path = ../crypto51/nbtheory.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E2C0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = oaep.cpp;
 			path = ../crypto51/oaep.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E2D0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = oaep.h;
 			path = ../crypto51/oaep.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E2E0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = oids.h;
 			path = ../crypto51/oids.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E2F0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = osrng.cpp;
 			path = ../crypto51/osrng.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E300653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = osrng.h;
 			path = ../crypto51/osrng.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E310653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = pch.h;
 			path = ../crypto51/pch.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E320653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = pkcspad.cpp;
 			path = ../crypto51/pkcspad.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E330653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = pkcspad.h;
 			path = ../crypto51/pkcspad.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E380653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = pubkey.cpp;
 			path = ../crypto51/pubkey.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E390653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = pubkey.h;
 			path = ../crypto51/pubkey.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E3A0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = queue.cpp;
 			path = ../crypto51/queue.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E3B0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = queue.h;
 			path = ../crypto51/queue.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E3C0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = randpool.cpp;
 			path = ../crypto51/randpool.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E3D0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = randpool.h;
 			path = ../crypto51/randpool.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E3E0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = rng.h;
 			path = ../crypto51/rng.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E3F0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = rsa.cpp;
 			path = ../crypto51/rsa.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E400653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = rsa.h;
 			path = ../crypto51/rsa.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E410653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = secblock.h;
 			path = ../crypto51/secblock.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E420653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = seckey.h;
 			path = ../crypto51/seckey.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E430653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = sha.cpp;
 			path = ../crypto51/sha.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E440653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = sha.h;
 			path = ../crypto51/sha.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E450653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = simple.h;
 			path = ../crypto51/simple.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E460653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = smartptr.h;
 			path = ../crypto51/smartptr.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E470653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = strciphr.cpp;
 			path = ../crypto51/strciphr.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E480653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = strciphr.h;
 			path = ../crypto51/strciphr.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E490653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = test.cpp;
 			path = ../crypto51/test.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E4B0653BF58001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = words.h;
 			path = ../crypto51/words.h;
 			refType = 4;
@@ -1123,17 +1123,17 @@
 			};
 		};
 		AA082E9D0653C7E6001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CryptHelpers.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA082E9E0653C7E6001A3A80 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CryptHelpers.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -1151,18 +1151,18 @@
 			};
 		};
 		AA0A3DE6060513A00044E6B1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSetTime.cpp;
 			path = ../src/ScreenSetTime.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA0A3DE7060513A00044E6B1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSetTime.h;
 			path = ../src/ScreenSetTime.h;
 			refType = 4;
@@ -1181,9 +1181,9 @@
 			};
 		};
 		AA0E393304DA8EE700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ProTimingDisplay.cpp;
 			path = ../src/ProTimingDisplay.cpp;
 			refType = 4;
@@ -1192,9 +1192,9 @@
 			usesTabs = 0;
 		};
 		AA0E393404DA8EE700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ProTimingDisplay.h;
 			path = ../src/ProTimingDisplay.h;
 			refType = 4;
@@ -1203,9 +1203,9 @@
 			usesTabs = 0;
 		};
 		AA0FA06B05AD38D300DA0695 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = libresample.h;
 			path = include/libresample.h;
 			refType = 4;
@@ -1218,9 +1218,9 @@
 			};
 		};
 		AA14ED0F0509F40000E3FAD7 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MovieTexture_FFMpeg.cpp;
 			path = MovieTexture/MovieTexture_FFMpeg.cpp;
 			refType = 4;
@@ -1229,9 +1229,9 @@
 			usesTabs = 0;
 		};
 		AA14ED100509F40000E3FAD7 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MovieTexture_FFMpeg.h;
 			path = MovieTexture/MovieTexture_FFMpeg.h;
 			refType = 4;
@@ -1240,9 +1240,9 @@
 			usesTabs = 0;
 		};
 		AA157B31051677F000D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Util.h;
 			path = Installer/Util.h;
 			refType = 4;
@@ -1251,9 +1251,9 @@
 			usesTabs = 0;
 		};
 		AA157B32051677F000D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Util.cpp;
 			path = Installer/Util.cpp;
 			refType = 4;
@@ -1269,9 +1269,9 @@
 			remoteInfo = libresample.a;
 		};
 		AA1C653A050C00CF0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Processor.h;
 			path = Installer/Processor.h;
 			refType = 4;
@@ -1280,9 +1280,9 @@
 			usesTabs = 0;
 		};
 		AA1C653B050C00CF0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Processor.cpp;
 			path = Installer/Processor.cpp;
 			refType = 4;
@@ -1291,9 +1291,9 @@
 			usesTabs = 0;
 		};
 		AA1C654B050D212D0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
 			name = main.c;
 			path = Installer/main.c;
 			refType = 4;
@@ -1320,9 +1320,9 @@
 			sourceTree = "<group>";
 		};
 		AA1C6552050D23200073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenProfileOptions.cpp;
 			path = ../src/ScreenProfileOptions.cpp;
 			refType = 4;
@@ -1331,9 +1331,9 @@
 			usesTabs = 0;
 		};
 		AA1C6553050D23200073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenProfileOptions.h;
 			path = ../src/ScreenProfileOptions.h;
 			refType = 4;
@@ -1342,9 +1342,9 @@
 			usesTabs = 0;
 		};
 		AA1C6556050D234B0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ProfileManager.cpp;
 			path = ../src/ProfileManager.cpp;
 			refType = 4;
@@ -1353,9 +1353,9 @@
 			usesTabs = 0;
 		};
 		AA1C6557050D234B0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ProfileManager.h;
 			path = ../src/ProfileManager.h;
 			refType = 4;
@@ -1364,9 +1364,9 @@
 			usesTabs = 0;
 		};
 		AA1C655F050D2ABC0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = InstallerWindowController.h;
 			path = Installer/InstallerWindowController.h;
 			refType = 4;
@@ -1375,9 +1375,9 @@
 			usesTabs = 0;
 		};
 		AA1C6560050D2ABC0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.objc;
 			name = InstallerWindowController.m;
 			path = Installer/InstallerWindowController.m;
 			refType = 4;
@@ -1386,9 +1386,9 @@
 			usesTabs = 0;
 		};
 		AA1C6565050D2D0D0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Helper.h;
 			path = Installer/Helper.h;
 			refType = 4;
@@ -1397,9 +1397,9 @@
 			usesTabs = 0;
 		};
 		AA1C6566050D2D0D0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.objcpp;
 			name = Helper.mm;
 			path = Installer/Helper.mm;
 			refType = 4;
@@ -1408,9 +1408,9 @@
 			usesTabs = 0;
 		};
 		AA1C659C050FD1E00073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NetGameState.h;
 			path = ../src/NetGameState.h;
 			refType = 4;
@@ -1419,9 +1419,9 @@
 			usesTabs = 0;
 		};
 		AA1C659D050FD1E00073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NetworkInput.h;
 			path = ../src/NetworkInput.h;
 			refType = 4;
@@ -1430,9 +1430,9 @@
 			usesTabs = 0;
 		};
 		AA1C659E050FD1E00073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NetworkManager.cpp;
 			path = ../src/NetworkManager.cpp;
 			refType = 4;
@@ -1441,9 +1441,9 @@
 			usesTabs = 0;
 		};
 		AA1C659F050FD1E00073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NetworkManager.h;
 			path = ../src/NetworkManager.h;
 			refType = 4;
@@ -1452,9 +1452,9 @@
 			usesTabs = 0;
 		};
 		AA1C65A4050FD21F0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSoundReader_Vorbisfile.cpp;
 			path = ../src/RageSoundReader_Vorbisfile.cpp;
 			refType = 4;
@@ -1463,9 +1463,9 @@
 			usesTabs = 0;
 		};
 		AA1C65A5050FD21F0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSoundReader_Vorbisfile.h;
 			path = ../src/RageSoundReader_Vorbisfile.h;
 			refType = 4;
@@ -1474,9 +1474,9 @@
 			usesTabs = 0;
 		};
 		AA1C65A6050FD21F0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSoundReader_WAV.cpp;
 			path = ../src/RageSoundReader_WAV.cpp;
 			refType = 4;
@@ -1485,9 +1485,9 @@
 			usesTabs = 0;
 		};
 		AA1C65A7050FD21F0073A143 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSoundReader_WAV.h;
 			path = ../src/RageSoundReader_WAV.h;
 			refType = 4;
@@ -1496,17 +1496,17 @@
 			usesTabs = 0;
 		};
 		AA1CD941060AE571003702C4 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = RageSoundDriver_Generic_Software.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA1CD942060AE571003702C4 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = RageSoundDriver_Generic_Software.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -1524,10 +1524,10 @@
 			};
 		};
 		AA1DC47204A485E900D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ActorUtil.h;
 			path = ../src/ActorUtil.h;
 			refType = 4;
@@ -1536,10 +1536,10 @@
 			usesTabs = 0;
 		};
 		AA1DC47404A4861700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSelectMaster.cpp;
 			path = ../src/ScreenSelectMaster.cpp;
 			refType = 4;
@@ -1548,10 +1548,10 @@
 			usesTabs = 0;
 		};
 		AA1DC47504A4861700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSelectMaster.h;
 			path = ../src/ScreenSelectMaster.h;
 			refType = 4;
@@ -1560,10 +1560,10 @@
 			usesTabs = 0;
 		};
 		AA1DC47804A4866B00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ActorCollision.h;
 			path = ../src/ActorCollision.h;
 			refType = 4;
@@ -1572,10 +1572,10 @@
 			usesTabs = 0;
 		};
 		AA1DCB6004A4872700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = Game.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -1583,10 +1583,10 @@
 			usesTabs = 0;
 		};
 		AA1DCB6104A4872700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = glext.h;
 			path = ../src/glext.h;
 			refType = 4;
@@ -1595,10 +1595,10 @@
 			usesTabs = 0;
 		};
 		AA1DCB6304A4872700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MenuInput.h;
 			path = ../src/MenuInput.h;
 			refType = 4;
@@ -1607,10 +1607,10 @@
 			usesTabs = 0;
 		};
 		AA1DCB6504A4872700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = ModeChoice.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -1654,18 +1654,18 @@
 			sourceTree = "<absolute>";
 		};
 		AA2344DC05C3B53500C8E1AE = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = SongCreditDisplay.cpp;
 			path = ../src/SongCreditDisplay.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA2344DD05C3B53500C8E1AE = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = SongCreditDisplay.h;
 			path = ../src/SongCreditDisplay.h;
 			refType = 4;
@@ -1684,9 +1684,9 @@
 			};
 		};
 		AA251B7505841FCE00027ACB = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageFileDriverZip.cpp;
 			path = ../src/RageFileDriverZip.cpp;
 			refType = 4;
@@ -1695,9 +1695,9 @@
 			usesTabs = 0;
 		};
 		AA251B7605841FCE00027ACB = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageFileDriverZip.h;
 			path = ../src/RageFileDriverZip.h;
 			refType = 4;
@@ -1718,9 +1718,9 @@
 			};
 		};
 		AA25200D0587225500027ACB = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = Style.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -1733,9 +1733,9 @@
 			};
 		};
 		AA272BF704C7B37A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = InputHandler_DirectInput.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -1743,9 +1743,9 @@
 			usesTabs = 0;
 		};
 		AA272BF804C7B37A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = InputHandler_DirectInput.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -1753,9 +1753,9 @@
 			usesTabs = 0;
 		};
 		AA272BF904C7B37A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = InputHandler_DirectInputHelper.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -1763,9 +1763,9 @@
 			usesTabs = 0;
 		};
 		AA272BFA04C7B37A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = InputHandler_DirectInputHelper.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -1773,9 +1773,9 @@
 			usesTabs = 0;
 		};
 		AA272BFB04CB779F00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = ModeChoice.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -1783,9 +1783,9 @@
 			usesTabs = 0;
 		};
 		AA272C3004CD757100D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageFile.cpp;
 			path = ../src/RageFile.cpp;
 			refType = 4;
@@ -1794,9 +1794,9 @@
 			usesTabs = 0;
 		};
 		AA272C3104CD757100D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageFile.h;
 			path = ../src/RageFile.h;
 			refType = 4;
@@ -1817,9 +1817,9 @@
 			};
 		};
 		AA28B47A058F2F5D0097C109 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MemoryCardManager.cpp;
 			path = ../src/MemoryCardManager.cpp;
 			refType = 4;
@@ -1827,9 +1827,9 @@
 			usesTabs = 0;
 		};
 		AA28B47B058F2F5D0097C109 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MemoryCardManager.h;
 			path = ../src/MemoryCardManager.h;
 			refType = 4;
@@ -5781,17 +5781,17 @@
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		AA34EC770611A500003E5955 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CAHelpers.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA34EC780611A500003E5955 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CAHelpers.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -5869,17 +5869,17 @@
 			};
 		};
 		AA34ED1F0611FB83003E5955 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CAConditionalMacros.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA34ED200611FB83003E5955 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = FormatConverterClient.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -5897,17 +5897,17 @@
 			};
 		};
 		AA34ED270611FE33003E5955 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CAAutoDisposer.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA34ED280611FE33003E5955 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CADebugMacros.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -5925,9 +5925,9 @@
 			};
 		};
 		AA3F283B04BE6DDC00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ArchHooks.cpp;
 			path = ArchHooks/ArchHooks.cpp;
 			refType = 4;
@@ -6132,9 +6132,9 @@
 			};
 		};
 		AA4B59EE0573AA5B005FB5DB = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.objc;
 			name = SDLMain.m;
 			path = "SDL-1.2.6/src/main/macosx/SDLMain.m";
 			refType = 4;
@@ -6150,9 +6150,9 @@
 			};
 		};
 		AA4B5CC40573AD81005FB5DB = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = wchar.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -6231,9 +6231,9 @@
 			sourceTree = "<group>";
 		};
 		AA4F38C004E2D0B700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NoteDataUtil.cpp;
 			path = ../src/NoteDataUtil.cpp;
 			refType = 4;
@@ -6242,9 +6242,9 @@
 			usesTabs = 0;
 		};
 		AA4F38C104E2D0B700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NoteDataUtil.h;
 			path = ../src/NoteDataUtil.h;
 			refType = 4;
@@ -6253,18 +6253,18 @@
 			usesTabs = 0;
 		};
 		AA50201D05D6D7B200ACEFD0 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Profile.cpp;
 			path = ../src/Profile.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA50201E05D6D7B200ACEFD0 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Profile.h;
 			path = ../src/Profile.h;
 			refType = 4;
@@ -6303,9 +6303,9 @@
 			sourceTree = "<group>";
 		};
 		AA507E64050BA55B00F96139 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = InstallerFile.h;
 			path = Installer/InstallerFile.h;
 			refType = 4;
@@ -6314,9 +6314,9 @@
 			usesTabs = 0;
 		};
 		AA507E65050BA55B00F96139 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = InstallerFile.cpp;
 			path = Installer/InstallerFile.cpp;
 			refType = 4;
@@ -6325,9 +6325,9 @@
 			usesTabs = 0;
 		};
 		AA507E68050BC69000F96139 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = BuildInstaller.cpp;
 			path = Installer/BuildInstaller.cpp;
 			refType = 4;
@@ -6336,9 +6336,9 @@
 			usesTabs = 0;
 		};
 		AA52E9BD04DBBCF400D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = ver.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -6346,9 +6346,9 @@
 			usesTabs = 0;
 		};
 		AA53D28405277DAF00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenOptionsMaster.cpp;
 			path = ../src/ScreenOptionsMaster.cpp;
 			refType = 4;
@@ -6357,9 +6357,9 @@
 			usesTabs = 0;
 		};
 		AA53D28505277DAF00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenOptionsMaster.h;
 			path = ../src/ScreenOptionsMaster.h;
 			refType = 4;
@@ -6368,9 +6368,9 @@
 			usesTabs = 0;
 		};
 		AA53D28605277DAF00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenOptionsMasterPrefs.cpp;
 			path = ../src/ScreenOptionsMasterPrefs.cpp;
 			refType = 4;
@@ -6379,9 +6379,9 @@
 			usesTabs = 0;
 		};
 		AA53D28705277DAF00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenOptionsMasterPrefs.h;
 			path = ../src/ScreenOptionsMasterPrefs.h;
 			refType = 4;
@@ -6390,9 +6390,9 @@
 			usesTabs = 0;
 		};
 		AA53D28805277DAF00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenReloadSongs.cpp;
 			path = ../src/ScreenReloadSongs.cpp;
 			refType = 4;
@@ -6401,9 +6401,9 @@
 			usesTabs = 0;
 		};
 		AA53D28905277DAF00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenReloadSongs.h;
 			path = ../src/ScreenReloadSongs.h;
 			refType = 4;
@@ -6412,18 +6412,18 @@
 			usesTabs = 0;
 		};
 		AA56E5B805FBF36E006B24C7 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenAward.cpp;
 			path = ../src/ScreenAward.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA56E5B905FBF36E006B24C7 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenAward.h;
 			path = ../src/ScreenAward.h;
 			refType = 4;
@@ -6866,49 +6866,49 @@
 			};
 		};
 		AA5C73F70637A5F000AFB891 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CourseUtil.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA5C73F80637A5F000AFB891 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CourseUtil.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA5C73F90637A5F000AFB891 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = SongUtil.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA5C73FA0637A5F000AFB891 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = SongUtil.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA5C73FB0637A5F000AFB891 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = StepsUtil.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA5C73FC0637A5F000AFB891 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = StepsUtil.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -7450,9 +7450,9 @@
 			shellScript = scripts/increment_version.sh;
 		};
 		AA6DAF0805300B3D00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScoreDisplayPercentage.cpp;
 			path = ../src/ScoreDisplayPercentage.cpp;
 			refType = 4;
@@ -7461,9 +7461,9 @@
 			usesTabs = 0;
 		};
 		AA6DAF0905300B3D00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScoreDisplayPercentage.h;
 			path = ../src/ScoreDisplayPercentage.h;
 			refType = 4;
@@ -7622,10 +7622,10 @@
 			sourceTree = "<group>";
 		};
 		AA6E000A047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Screen.cpp;
 			path = ../src/Screen.cpp;
 			refType = 4;
@@ -7634,10 +7634,10 @@
 			usesTabs = 0;
 		};
 		AA6E000B047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Screen.h;
 			path = ../src/Screen.h;
 			refType = 4;
@@ -7646,10 +7646,10 @@
 			usesTabs = 0;
 		};
 		AA6E000C047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenAlbums.cpp;
 			path = ../src/ScreenAlbums.cpp;
 			refType = 4;
@@ -7658,10 +7658,10 @@
 			usesTabs = 0;
 		};
 		AA6E000D047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenAlbums.h;
 			path = ../src/ScreenAlbums.h;
 			refType = 4;
@@ -7670,10 +7670,10 @@
 			usesTabs = 0;
 		};
 		AA6E0010047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenAttract.cpp;
 			path = ../src/ScreenAttract.cpp;
 			refType = 4;
@@ -7682,10 +7682,10 @@
 			usesTabs = 0;
 		};
 		AA6E0011047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenAttract.h;
 			path = ../src/ScreenAttract.h;
 			refType = 4;
@@ -7694,10 +7694,10 @@
 			usesTabs = 0;
 		};
 		AA6E0016047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenCaution.cpp;
 			path = ../src/ScreenCaution.cpp;
 			refType = 4;
@@ -7706,10 +7706,10 @@
 			usesTabs = 0;
 		};
 		AA6E0017047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenCaution.h;
 			path = ../src/ScreenCaution.h;
 			refType = 4;
@@ -7718,10 +7718,10 @@
 			usesTabs = 0;
 		};
 		AA6E0018047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenCompany.h;
 			path = ../src/ScreenCompany.h;
 			refType = 4;
@@ -7730,10 +7730,10 @@
 			usesTabs = 0;
 		};
 		AA6E0019047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenCredits.cpp;
 			path = ../src/ScreenCredits.cpp;
 			refType = 4;
@@ -7742,10 +7742,10 @@
 			usesTabs = 0;
 		};
 		AA6E001A047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenCredits.h;
 			path = ../src/ScreenCredits.h;
 			refType = 4;
@@ -7754,10 +7754,10 @@
 			usesTabs = 0;
 		};
 		AA6E001B047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenDemonstration.cpp;
 			path = ../src/ScreenDemonstration.cpp;
 			refType = 4;
@@ -7766,10 +7766,10 @@
 			usesTabs = 0;
 		};
 		AA6E001C047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenDemonstration.h;
 			path = ../src/ScreenDemonstration.h;
 			refType = 4;
@@ -7778,10 +7778,10 @@
 			usesTabs = 0;
 		};
 		AA6E001D047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenEdit.cpp;
 			path = ../src/ScreenEdit.cpp;
 			refType = 4;
@@ -7790,10 +7790,10 @@
 			usesTabs = 0;
 		};
 		AA6E001E047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenEdit.h;
 			path = ../src/ScreenEdit.h;
 			refType = 4;
@@ -7802,10 +7802,10 @@
 			usesTabs = 0;
 		};
 		AA6E001F047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenEditMenu.cpp;
 			path = ../src/ScreenEditMenu.cpp;
 			refType = 4;
@@ -7814,10 +7814,10 @@
 			usesTabs = 0;
 		};
 		AA6E0020047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenEditMenu.h;
 			path = ../src/ScreenEditMenu.h;
 			refType = 4;
@@ -7826,10 +7826,10 @@
 			usesTabs = 0;
 		};
 		AA6E0021047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenEvaluation.cpp;
 			path = ../src/ScreenEvaluation.cpp;
 			refType = 4;
@@ -7838,10 +7838,10 @@
 			usesTabs = 0;
 		};
 		AA6E0022047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenEvaluation.h;
 			path = ../src/ScreenEvaluation.h;
 			refType = 4;
@@ -7850,10 +7850,10 @@
 			usesTabs = 0;
 		};
 		AA6E0023047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenEz2SelectMusic.cpp;
 			path = ../src/ScreenEz2SelectMusic.cpp;
 			refType = 4;
@@ -7862,10 +7862,10 @@
 			usesTabs = 0;
 		};
 		AA6E0024047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenEz2SelectMusic.h;
 			path = ../src/ScreenEz2SelectMusic.h;
 			refType = 4;
@@ -7874,10 +7874,10 @@
 			usesTabs = 0;
 		};
 		AA6E0025047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenEz2SelectPlayer.cpp;
 			path = ../src/ScreenEz2SelectPlayer.cpp;
 			refType = 4;
@@ -7886,10 +7886,10 @@
 			usesTabs = 0;
 		};
 		AA6E0026047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenEz2SelectPlayer.h;
 			path = ../src/ScreenEz2SelectPlayer.h;
 			refType = 4;
@@ -7898,10 +7898,10 @@
 			usesTabs = 0;
 		};
 		AA6E0027047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenGameOver.cpp;
 			path = ../src/ScreenGameOver.cpp;
 			refType = 4;
@@ -7910,10 +7910,10 @@
 			usesTabs = 0;
 		};
 		AA6E0028047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenGameOver.h;
 			path = ../src/ScreenGameOver.h;
 			refType = 4;
@@ -7922,10 +7922,10 @@
 			usesTabs = 0;
 		};
 		AA6E0029047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenGameplay.cpp;
 			path = ../src/ScreenGameplay.cpp;
 			refType = 4;
@@ -7934,10 +7934,10 @@
 			usesTabs = 0;
 		};
 		AA6E002A047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenGameplay.h;
 			path = ../src/ScreenGameplay.h;
 			refType = 4;
@@ -7946,10 +7946,10 @@
 			usesTabs = 0;
 		};
 		AA6E002D047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenGraphicOptions.cpp;
 			path = ../src/ScreenGraphicOptions.cpp;
 			refType = 4;
@@ -7958,10 +7958,10 @@
 			usesTabs = 0;
 		};
 		AA6E002E047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenGraphicOptions.h;
 			path = ../src/ScreenGraphicOptions.h;
 			refType = 4;
@@ -7970,10 +7970,10 @@
 			usesTabs = 0;
 		};
 		AA6E002F047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenHowToPlay.cpp;
 			path = ../src/ScreenHowToPlay.cpp;
 			refType = 4;
@@ -7982,10 +7982,10 @@
 			usesTabs = 0;
 		};
 		AA6E0030047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenHowToPlay.h;
 			path = ../src/ScreenHowToPlay.h;
 			refType = 4;
@@ -7994,10 +7994,10 @@
 			usesTabs = 0;
 		};
 		AA6E0033047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenInstructions.cpp;
 			path = ../src/ScreenInstructions.cpp;
 			refType = 4;
@@ -8006,10 +8006,10 @@
 			usesTabs = 0;
 		};
 		AA6E0034047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenInstructions.h;
 			path = ../src/ScreenInstructions.h;
 			refType = 4;
@@ -8018,10 +8018,10 @@
 			usesTabs = 0;
 		};
 		AA6E0035047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenIntroMovie.cpp;
 			path = ../src/ScreenIntroMovie.cpp;
 			refType = 4;
@@ -8030,10 +8030,10 @@
 			usesTabs = 0;
 		};
 		AA6E0036047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenIntroMovie.h;
 			path = ../src/ScreenIntroMovie.h;
 			refType = 4;
@@ -8042,10 +8042,10 @@
 			usesTabs = 0;
 		};
 		AA6E0037047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenJukebox.cpp;
 			path = ../src/ScreenJukebox.cpp;
 			refType = 4;
@@ -8054,10 +8054,10 @@
 			usesTabs = 0;
 		};
 		AA6E0038047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenJukebox.h;
 			path = ../src/ScreenJukebox.h;
 			refType = 4;
@@ -8066,10 +8066,10 @@
 			usesTabs = 0;
 		};
 		AA6E0039047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenJukeboxMenu.cpp;
 			path = ../src/ScreenJukeboxMenu.cpp;
 			refType = 4;
@@ -8078,10 +8078,10 @@
 			usesTabs = 0;
 		};
 		AA6E003A047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenJukeboxMenu.h;
 			path = ../src/ScreenJukeboxMenu.h;
 			refType = 4;
@@ -8090,10 +8090,10 @@
 			usesTabs = 0;
 		};
 		AA6E003B047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenLogo.cpp;
 			path = ../src/ScreenLogo.cpp;
 			refType = 4;
@@ -8102,10 +8102,10 @@
 			usesTabs = 0;
 		};
 		AA6E003C047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenLogo.h;
 			path = ../src/ScreenLogo.h;
 			refType = 4;
@@ -8114,10 +8114,10 @@
 			usesTabs = 0;
 		};
 		AA6E003F047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenManager.cpp;
 			path = ../src/ScreenManager.cpp;
 			refType = 4;
@@ -8126,10 +8126,10 @@
 			usesTabs = 0;
 		};
 		AA6E0040047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenManager.h;
 			path = ../src/ScreenManager.h;
 			refType = 4;
@@ -8138,10 +8138,10 @@
 			usesTabs = 0;
 		};
 		AA6E0041047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenMapControllers.cpp;
 			path = ../src/ScreenMapControllers.cpp;
 			refType = 4;
@@ -8150,10 +8150,10 @@
 			usesTabs = 0;
 		};
 		AA6E0042047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenMapControllers.h;
 			path = ../src/ScreenMapControllers.h;
 			refType = 4;
@@ -8162,10 +8162,10 @@
 			usesTabs = 0;
 		};
 		AA6E0044047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenMessage.h;
 			path = ../src/ScreenMessage.h;
 			refType = 4;
@@ -8174,10 +8174,10 @@
 			usesTabs = 0;
 		};
 		AA6E0045047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenMiniMenu.cpp;
 			path = ../src/ScreenMiniMenu.cpp;
 			refType = 4;
@@ -8186,10 +8186,10 @@
 			usesTabs = 0;
 		};
 		AA6E0046047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenMiniMenu.h;
 			path = ../src/ScreenMiniMenu.h;
 			refType = 4;
@@ -8198,10 +8198,10 @@
 			usesTabs = 0;
 		};
 		AA6E0047047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenMusicScroll.cpp;
 			path = ../src/ScreenMusicScroll.cpp;
 			refType = 4;
@@ -8210,10 +8210,10 @@
 			usesTabs = 0;
 		};
 		AA6E0048047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenMusicScroll.h;
 			path = ../src/ScreenMusicScroll.h;
 			refType = 4;
@@ -8222,10 +8222,10 @@
 			usesTabs = 0;
 		};
 		AA6E0049047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenNameEntry.cpp;
 			path = ../src/ScreenNameEntry.cpp;
 			refType = 4;
@@ -8234,10 +8234,10 @@
 			usesTabs = 0;
 		};
 		AA6E004A047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenNameEntry.h;
 			path = ../src/ScreenNameEntry.h;
 			refType = 4;
@@ -8246,10 +8246,10 @@
 			usesTabs = 0;
 		};
 		AA6E004B047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenOptions.cpp;
 			path = ../src/ScreenOptions.cpp;
 			refType = 4;
@@ -8258,10 +8258,10 @@
 			usesTabs = 0;
 		};
 		AA6E004C047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenOptions.h;
 			path = ../src/ScreenOptions.h;
 			refType = 4;
@@ -8270,10 +8270,10 @@
 			usesTabs = 0;
 		};
 		AA6E004F047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenPlayerOptions.cpp;
 			path = ../src/ScreenPlayerOptions.cpp;
 			refType = 4;
@@ -8282,10 +8282,10 @@
 			usesTabs = 0;
 		};
 		AA6E0050047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenPlayerOptions.h;
 			path = ../src/ScreenPlayerOptions.h;
 			refType = 4;
@@ -8294,10 +8294,10 @@
 			usesTabs = 0;
 		};
 		AA6E0051047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenPrompt.cpp;
 			path = ../src/ScreenPrompt.cpp;
 			refType = 4;
@@ -8306,10 +8306,10 @@
 			usesTabs = 0;
 		};
 		AA6E0052047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenPrompt.h;
 			path = ../src/ScreenPrompt.h;
 			refType = 4;
@@ -8318,10 +8318,10 @@
 			usesTabs = 0;
 		};
 		AA6E0053047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenRanking.cpp;
 			path = ../src/ScreenRanking.cpp;
 			refType = 4;
@@ -8330,10 +8330,10 @@
 			usesTabs = 0;
 		};
 		AA6E0054047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenRanking.h;
 			path = ../src/ScreenRanking.h;
 			refType = 4;
@@ -8342,10 +8342,10 @@
 			usesTabs = 0;
 		};
 		AA6E0057047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSandbox.cpp;
 			path = ../src/ScreenSandbox.cpp;
 			refType = 4;
@@ -8354,10 +8354,10 @@
 			usesTabs = 0;
 		};
 		AA6E0058047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSandbox.h;
 			path = ../src/ScreenSandbox.h;
 			refType = 4;
@@ -8366,10 +8366,10 @@
 			usesTabs = 0;
 		};
 		AA6E0059047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSelect.cpp;
 			path = ../src/ScreenSelect.cpp;
 			refType = 4;
@@ -8378,10 +8378,10 @@
 			usesTabs = 0;
 		};
 		AA6E005A047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSelect.h;
 			path = ../src/ScreenSelect.h;
 			refType = 4;
@@ -8390,10 +8390,10 @@
 			usesTabs = 0;
 		};
 		AA6E005B047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSelectCharacter.cpp;
 			path = ../src/ScreenSelectCharacter.cpp;
 			refType = 4;
@@ -8402,10 +8402,10 @@
 			usesTabs = 0;
 		};
 		AA6E005C047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSelectCharacter.h;
 			path = ../src/ScreenSelectCharacter.h;
 			refType = 4;
@@ -8414,10 +8414,10 @@
 			usesTabs = 0;
 		};
 		AA6E005D047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSelectCourse.cpp;
 			path = ../src/ScreenSelectCourse.cpp;
 			refType = 4;
@@ -8426,10 +8426,10 @@
 			usesTabs = 0;
 		};
 		AA6E005E047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSelectCourse.h;
 			path = ../src/ScreenSelectCourse.h;
 			refType = 4;
@@ -8438,10 +8438,10 @@
 			usesTabs = 0;
 		};
 		AA6E005F047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSelectDifficulty.cpp;
 			path = ../src/ScreenSelectDifficulty.cpp;
 			refType = 4;
@@ -8450,10 +8450,10 @@
 			usesTabs = 0;
 		};
 		AA6E0060047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSelectDifficulty.h;
 			path = ../src/ScreenSelectDifficulty.h;
 			refType = 4;
@@ -8462,10 +8462,10 @@
 			usesTabs = 0;
 		};
 		AA6E0061047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSelectDifficultyEX.cpp;
 			path = ../src/ScreenSelectDifficultyEX.cpp;
 			refType = 4;
@@ -8474,10 +8474,10 @@
 			usesTabs = 0;
 		};
 		AA6E0062047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSelectDifficultyEX.h;
 			path = ../src/ScreenSelectDifficultyEX.h;
 			refType = 4;
@@ -8486,10 +8486,10 @@
 			usesTabs = 0;
 		};
 		AA6E0065047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSelectGroup.cpp;
 			path = ../src/ScreenSelectGroup.cpp;
 			refType = 4;
@@ -8498,10 +8498,10 @@
 			usesTabs = 0;
 		};
 		AA6E0066047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSelectGroup.h;
 			path = ../src/ScreenSelectGroup.h;
 			refType = 4;
@@ -8510,10 +8510,10 @@
 			usesTabs = 0;
 		};
 		AA6E0067047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSelectMode.cpp;
 			path = ../src/ScreenSelectMode.cpp;
 			refType = 4;
@@ -8522,10 +8522,10 @@
 			usesTabs = 0;
 		};
 		AA6E0068047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSelectMode.h;
 			path = ../src/ScreenSelectMode.h;
 			refType = 4;
@@ -8534,10 +8534,10 @@
 			usesTabs = 0;
 		};
 		AA6E0069047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSelectMusic.cpp;
 			path = ../src/ScreenSelectMusic.cpp;
 			refType = 4;
@@ -8546,10 +8546,10 @@
 			usesTabs = 0;
 		};
 		AA6E006A047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSelectMusic.h;
 			path = ../src/ScreenSelectMusic.h;
 			refType = 4;
@@ -8558,10 +8558,10 @@
 			usesTabs = 0;
 		};
 		AA6E006B047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSelectStyle.cpp;
 			path = ../src/ScreenSelectStyle.cpp;
 			refType = 4;
@@ -8570,10 +8570,10 @@
 			usesTabs = 0;
 		};
 		AA6E006C047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSelectStyle.h;
 			path = ../src/ScreenSelectStyle.h;
 			refType = 4;
@@ -8582,10 +8582,10 @@
 			usesTabs = 0;
 		};
 		AA6E006F047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenSongOptions.cpp;
 			path = ../src/ScreenSongOptions.cpp;
 			refType = 4;
@@ -8594,10 +8594,10 @@
 			usesTabs = 0;
 		};
 		AA6E0070047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenSongOptions.h;
 			path = ../src/ScreenSongOptions.h;
 			refType = 4;
@@ -8606,10 +8606,10 @@
 			usesTabs = 0;
 		};
 		AA6E0073047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenStage.cpp;
 			path = ../src/ScreenStage.cpp;
 			refType = 4;
@@ -8618,10 +8618,10 @@
 			usesTabs = 0;
 		};
 		AA6E0074047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenStage.h;
 			path = ../src/ScreenStage.h;
 			refType = 4;
@@ -8630,10 +8630,10 @@
 			usesTabs = 0;
 		};
 		AA6E0075047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenStyleSplash.cpp;
 			path = ../src/ScreenStyleSplash.cpp;
 			refType = 4;
@@ -8642,10 +8642,10 @@
 			usesTabs = 0;
 		};
 		AA6E0076047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenStyleSplash.h;
 			path = ../src/ScreenStyleSplash.h;
 			refType = 4;
@@ -8654,10 +8654,10 @@
 			usesTabs = 0;
 		};
 		AA6E0077047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenTest.cpp;
 			path = ../src/ScreenTest.cpp;
 			refType = 4;
@@ -8666,10 +8666,10 @@
 			usesTabs = 0;
 		};
 		AA6E0078047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenTest.h;
 			path = ../src/ScreenTest.h;
 			refType = 4;
@@ -8678,10 +8678,10 @@
 			usesTabs = 0;
 		};
 		AA6E0079047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenTestFonts.cpp;
 			path = ../src/ScreenTestFonts.cpp;
 			refType = 4;
@@ -8690,10 +8690,10 @@
 			usesTabs = 0;
 		};
 		AA6E007A047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenTestFonts.h;
 			path = ../src/ScreenTestFonts.h;
 			refType = 4;
@@ -8702,10 +8702,10 @@
 			usesTabs = 0;
 		};
 		AA6E007B047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenTestSound.cpp;
 			path = ../src/ScreenTestSound.cpp;
 			refType = 4;
@@ -8714,10 +8714,10 @@
 			usesTabs = 0;
 		};
 		AA6E007C047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenTestSound.h;
 			path = ../src/ScreenTestSound.h;
 			refType = 4;
@@ -8726,10 +8726,10 @@
 			usesTabs = 0;
 		};
 		AA6E007D047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenTextEntry.cpp;
 			path = ../src/ScreenTextEntry.cpp;
 			refType = 4;
@@ -8738,10 +8738,10 @@
 			usesTabs = 0;
 		};
 		AA6E007E047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenTextEntry.h;
 			path = ../src/ScreenTextEntry.h;
 			refType = 4;
@@ -8750,10 +8750,10 @@
 			usesTabs = 0;
 		};
 		AA6E007F047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenTitleMenu.cpp;
 			path = ../src/ScreenTitleMenu.cpp;
 			refType = 4;
@@ -8762,10 +8762,10 @@
 			usesTabs = 0;
 		};
 		AA6E0080047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenTitleMenu.h;
 			path = ../src/ScreenTitleMenu.h;
 			refType = 4;
@@ -8774,10 +8774,10 @@
 			usesTabs = 0;
 		};
 		AA6E0081047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenUnlock.cpp;
 			path = ../src/ScreenUnlock.cpp;
 			refType = 4;
@@ -8786,10 +8786,10 @@
 			usesTabs = 0;
 		};
 		AA6E0082047711F3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenUnlock.h;
 			path = ../src/ScreenUnlock.h;
 			refType = 4;
@@ -8860,10 +8860,10 @@
 			sourceTree = "<group>";
 		};
 		AA6E00FF0477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = AnnouncerManager.cpp;
 			path = ../src/AnnouncerManager.cpp;
 			refType = 4;
@@ -8872,10 +8872,10 @@
 			usesTabs = 0;
 		};
 		AA6E01000477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = AnnouncerManager.h;
 			path = ../src/AnnouncerManager.h;
 			refType = 4;
@@ -8884,10 +8884,10 @@
 			usesTabs = 0;
 		};
 		AA6E01010477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = GameManager.cpp;
 			path = ../src/GameManager.cpp;
 			refType = 4;
@@ -8896,10 +8896,10 @@
 			usesTabs = 0;
 		};
 		AA6E01020477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = GameManager.h;
 			path = ../src/GameManager.h;
 			refType = 4;
@@ -8908,10 +8908,10 @@
 			usesTabs = 0;
 		};
 		AA6E01030477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = GameState.cpp;
 			path = ../src/GameState.cpp;
 			refType = 4;
@@ -8920,10 +8920,10 @@
 			usesTabs = 0;
 		};
 		AA6E01040477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = GameState.h;
 			path = ../src/GameState.h;
 			refType = 4;
@@ -8932,10 +8932,10 @@
 			usesTabs = 0;
 		};
 		AA6E01050477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = InputFilter.cpp;
 			path = ../src/InputFilter.cpp;
 			refType = 4;
@@ -8944,10 +8944,10 @@
 			usesTabs = 0;
 		};
 		AA6E01060477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = InputFilter.h;
 			path = ../src/InputFilter.h;
 			refType = 4;
@@ -8956,10 +8956,10 @@
 			usesTabs = 0;
 		};
 		AA6E01070477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = InputMapper.cpp;
 			path = ../src/InputMapper.cpp;
 			refType = 4;
@@ -8968,10 +8968,10 @@
 			usesTabs = 0;
 		};
 		AA6E01080477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = InputMapper.h;
 			path = ../src/InputMapper.h;
 			refType = 4;
@@ -8980,10 +8980,10 @@
 			usesTabs = 0;
 		};
 		AA6E01090477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = InputQueue.cpp;
 			path = ../src/InputQueue.cpp;
 			refType = 4;
@@ -8992,10 +8992,10 @@
 			usesTabs = 0;
 		};
 		AA6E010A0477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = InputQueue.h;
 			path = ../src/InputQueue.h;
 			refType = 4;
@@ -9004,10 +9004,10 @@
 			usesTabs = 0;
 		};
 		AA6E010B0477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NoteSkinManager.cpp;
 			path = ../src/NoteSkinManager.cpp;
 			refType = 4;
@@ -9016,10 +9016,10 @@
 			usesTabs = 0;
 		};
 		AA6E010C0477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NoteSkinManager.h;
 			path = ../src/NoteSkinManager.h;
 			refType = 4;
@@ -9028,10 +9028,10 @@
 			usesTabs = 0;
 		};
 		AA6E010D0477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = PrefsManager.cpp;
 			path = ../src/PrefsManager.cpp;
 			refType = 4;
@@ -9040,10 +9040,10 @@
 			usesTabs = 0;
 		};
 		AA6E010E0477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = PrefsManager.h;
 			path = ../src/PrefsManager.h;
 			refType = 4;
@@ -9052,10 +9052,10 @@
 			usesTabs = 0;
 		};
 		AA6E010F0477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = SongManager.cpp;
 			path = ../src/SongManager.cpp;
 			refType = 4;
@@ -9064,10 +9064,10 @@
 			usesTabs = 0;
 		};
 		AA6E01100477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = SongManager.h;
 			path = ../src/SongManager.h;
 			refType = 4;
@@ -9076,10 +9076,10 @@
 			usesTabs = 0;
 		};
 		AA6E01120477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ThemeManager.cpp;
 			path = ../src/ThemeManager.cpp;
 			refType = 4;
@@ -9088,10 +9088,10 @@
 			usesTabs = 0;
 		};
 		AA6E01130477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ThemeManager.h;
 			path = ../src/ThemeManager.h;
 			refType = 4;
@@ -9100,10 +9100,10 @@
 			usesTabs = 0;
 		};
 		AA6E01140477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = UnlockSystem.cpp;
 			path = ../src/UnlockSystem.cpp;
 			refType = 4;
@@ -9112,10 +9112,10 @@
 			usesTabs = 0;
 		};
 		AA6E01150477128A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = UnlockSystem.h;
 			path = ../src/UnlockSystem.h;
 			refType = 4;
@@ -9143,10 +9143,10 @@
 			sourceTree = "<group>";
 		};
 		AA6E012E047712BE005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = RageSoundDriver_Null.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -9154,10 +9154,10 @@
 			usesTabs = 0;
 		};
 		AA6E012F047712BE005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = RageSoundDriver_Null.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -9187,10 +9187,10 @@
 			sourceTree = "<group>";
 		};
 		AA6E01410477136A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = arch.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -9216,10 +9216,10 @@
 			sourceTree = "<group>";
 		};
 		AA6E01560477136A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = InputHandler_SDL.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -9227,10 +9227,10 @@
 			usesTabs = 0;
 		};
 		AA6E01570477136A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = InputHandler_SDL.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -9260,10 +9260,10 @@
 			sourceTree = "<group>";
 		};
 		AA6E01630477136A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = LowLevelWindow.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -9271,10 +9271,10 @@
 			usesTabs = 0;
 		};
 		AA6E01640477136A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = LowLevelWindow_SDL.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -9282,10 +9282,10 @@
 			usesTabs = 0;
 		};
 		AA6E01650477136A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = LowLevelWindow_SDL.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -9304,10 +9304,10 @@
 			sourceTree = "<group>";
 		};
 		AA6E01DB04771F11005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MovieTexture.cpp;
 			path = MovieTexture/MovieTexture.cpp;
 			refType = 4;
@@ -9334,10 +9334,10 @@
 			sourceTree = "<group>";
 		};
 		AA6E01DE04772005005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = SongCacheIndex.cpp;
 			path = ../src/SongCacheIndex.cpp;
 			refType = 4;
@@ -9346,10 +9346,10 @@
 			usesTabs = 0;
 		};
 		AA6E01DF04772005005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = SongCacheIndex.h;
 			path = ../src/SongCacheIndex.h;
 			refType = 4;
@@ -9358,10 +9358,10 @@
 			usesTabs = 0;
 		};
 		AA6E01E20477205A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Song.cpp;
 			path = ../src/Song.cpp;
 			refType = 4;
@@ -9370,10 +9370,10 @@
 			usesTabs = 0;
 		};
 		AA6E01E30477205A005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = song.h;
 			path = ../src/song.h;
 			refType = 4;
@@ -9382,10 +9382,10 @@
 			usesTabs = 0;
 		};
 		AA6E01E6047720A3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RandomSample.cpp;
 			path = ../src/RandomSample.cpp;
 			refType = 4;
@@ -9394,10 +9394,10 @@
 			usesTabs = 0;
 		};
 		AA6E01E7047720A3005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RandomSample.h;
 			path = ../src/RandomSample.h;
 			refType = 4;
@@ -9406,10 +9406,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD6D04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageBitmapTexture.cpp;
 			path = ../src/RageBitmapTexture.cpp;
 			refType = 4;
@@ -9418,10 +9418,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD6E04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageBitmapTexture.h;
 			path = ../src/RageBitmapTexture.h;
 			refType = 4;
@@ -9430,10 +9430,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD6F04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageDisplay.cpp;
 			path = ../src/RageDisplay.cpp;
 			refType = 4;
@@ -9442,10 +9442,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7004770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageDisplay.h;
 			path = ../src/RageDisplay.h;
 			refType = 4;
@@ -9454,10 +9454,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7204770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageException.cpp;
 			path = ../src/RageException.cpp;
 			refType = 4;
@@ -9466,10 +9466,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7304770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageException.h;
 			path = ../src/RageException.h;
 			refType = 4;
@@ -9478,10 +9478,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7404770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageInput.cpp;
 			path = ../src/RageInput.cpp;
 			refType = 4;
@@ -9490,10 +9490,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7504770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageInput.h;
 			path = ../src/RageInput.h;
 			refType = 4;
@@ -9502,10 +9502,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7604770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageInputDevice.cpp;
 			path = ../src/RageInputDevice.cpp;
 			refType = 4;
@@ -9514,10 +9514,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7704770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageInputDevice.h;
 			path = ../src/RageInputDevice.h;
 			refType = 4;
@@ -9526,10 +9526,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7804770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageLog.cpp;
 			path = ../src/RageLog.cpp;
 			refType = 4;
@@ -9538,10 +9538,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7904770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageLog.h;
 			path = ../src/RageLog.h;
 			refType = 4;
@@ -9550,10 +9550,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7A04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageMath.cpp;
 			path = ../src/RageMath.cpp;
 			refType = 4;
@@ -9562,10 +9562,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7B04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageMath.h;
 			path = ../src/RageMath.h;
 			refType = 4;
@@ -9574,10 +9574,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7C04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSound.cpp;
 			path = ../src/RageSound.cpp;
 			refType = 4;
@@ -9586,10 +9586,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7D04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSound.h;
 			path = ../src/RageSound.h;
 			refType = 4;
@@ -9598,10 +9598,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7E04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSoundManager.cpp;
 			path = ../src/RageSoundManager.cpp;
 			refType = 4;
@@ -9610,10 +9610,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD7F04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSoundManager.h;
 			path = ../src/RageSoundManager.h;
 			refType = 4;
@@ -9622,10 +9622,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8004770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSoundReader_Preload.cpp;
 			path = ../src/RageSoundReader_Preload.cpp;
 			refType = 4;
@@ -9634,10 +9634,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8104770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSoundReader_Preload.h;
 			path = ../src/RageSoundReader_Preload.h;
 			refType = 4;
@@ -9646,10 +9646,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8204770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSoundReader_Resample.cpp;
 			path = ../src/RageSoundReader_Resample.cpp;
 			refType = 4;
@@ -9658,10 +9658,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8304770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSoundReader_Resample.h;
 			path = ../src/RageSoundReader_Resample.h;
 			refType = 4;
@@ -9670,10 +9670,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8604770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSoundReader.h;
 			path = ../src/RageSoundReader.h;
 			refType = 4;
@@ -9682,10 +9682,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8704770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSoundResampler.cpp;
 			path = ../src/RageSoundResampler.cpp;
 			refType = 4;
@@ -9694,10 +9694,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8804770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSoundResampler.h;
 			path = ../src/RageSoundResampler.h;
 			refType = 4;
@@ -9706,10 +9706,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8904770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageTexture.cpp;
 			path = ../src/RageTexture.cpp;
 			refType = 4;
@@ -9718,10 +9718,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8A04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageTexture.h;
 			path = ../src/RageTexture.h;
 			refType = 4;
@@ -9730,10 +9730,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8B04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageTextureManager.cpp;
 			path = ../src/RageTextureManager.cpp;
 			refType = 4;
@@ -9742,10 +9742,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8C04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageTextureManager.h;
 			path = ../src/RageTextureManager.h;
 			refType = 4;
@@ -9754,10 +9754,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8D04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageThreads.cpp;
 			path = ../src/RageThreads.cpp;
 			refType = 4;
@@ -9766,10 +9766,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8E04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageThreads.h;
 			path = ../src/RageThreads.h;
 			refType = 4;
@@ -9778,10 +9778,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD8F04770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageTimer.cpp;
 			path = ../src/RageTimer.cpp;
 			refType = 4;
@@ -9790,10 +9790,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD9004770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageTimer.h;
 			path = ../src/RageTimer.h;
 			refType = 4;
@@ -9802,10 +9802,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD9104770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageTypes.h;
 			path = ../src/RageTypes.h;
 			refType = 4;
@@ -9814,10 +9814,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD9204770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageUtil.cpp;
 			path = ../src/RageUtil.cpp;
 			refType = 4;
@@ -9826,10 +9826,10 @@
 			usesTabs = 0;
 		};
 		AA6EFD9304770A7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageUtil.h;
 			path = ../src/RageUtil.h;
 			refType = 4;
@@ -9935,10 +9935,10 @@
 			sourceTree = "<group>";
 		};
 		AA6EFDBC04770AEA005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = SDL_dither.cpp;
 			path = ../src/SDL_dither.cpp;
 			refType = 4;
@@ -9947,10 +9947,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDBD04770AEA005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = SDL_dither.h;
 			path = ../src/SDL_dither.h;
 			refType = 4;
@@ -9959,10 +9959,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDBE04770AEA005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = SDL_rotozoom.cpp;
 			path = ../src/SDL_rotozoom.cpp;
 			refType = 4;
@@ -9971,10 +9971,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDBF04770AEA005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = SDL_rotozoom.h;
 			path = ../src/SDL_rotozoom.h;
 			refType = 4;
@@ -9983,10 +9983,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDC004770AEA005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = SDL_utils.cpp;
 			path = ../src/SDL_utils.cpp;
 			refType = 4;
@@ -9995,10 +9995,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDC104770AEA005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = SDL_utils.h;
 			path = ../src/SDL_utils.h;
 			refType = 4;
@@ -10107,10 +10107,10 @@
 			sourceTree = "<group>";
 		};
 		AA6EFDC904770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ArrowBackdrop.cpp;
 			path = ../src/ArrowBackdrop.cpp;
 			refType = 4;
@@ -10119,10 +10119,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDCA04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ArrowBackdrop.h;
 			path = ../src/ArrowBackdrop.h;
 			refType = 4;
@@ -10131,10 +10131,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDCB04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Character.cpp;
 			path = ../src/Character.cpp;
 			refType = 4;
@@ -10143,10 +10143,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDCC04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Character.h;
 			path = ../src/Character.h;
 			refType = 4;
@@ -10155,10 +10155,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDCD04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = CodeDetector.cpp;
 			path = ../src/CodeDetector.cpp;
 			refType = 4;
@@ -10167,10 +10167,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDCE04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = CodeDetector.h;
 			path = ../src/CodeDetector.h;
 			refType = 4;
@@ -10179,10 +10179,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDCF04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Course.cpp;
 			path = ../src/Course.cpp;
 			refType = 4;
@@ -10191,10 +10191,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDD004770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Course.h;
 			path = ../src/Course.h;
 			refType = 4;
@@ -10203,10 +10203,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDD104770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Font.cpp;
 			path = ../src/Font.cpp;
 			refType = 4;
@@ -10215,10 +10215,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDD204770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Font.h;
 			path = ../src/Font.h;
 			refType = 4;
@@ -10227,10 +10227,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDD304770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = FontCharAliases.cpp;
 			path = ../src/FontCharAliases.cpp;
 			refType = 4;
@@ -10239,10 +10239,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDD404770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = FontCharAliases.h;
 			path = ../src/FontCharAliases.h;
 			refType = 4;
@@ -10251,10 +10251,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDD504770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = FontCharmaps.cpp;
 			path = ../src/FontCharmaps.cpp;
 			refType = 4;
@@ -10263,10 +10263,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDD604770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = FontCharmaps.h;
 			path = ../src/FontCharmaps.h;
 			refType = 4;
@@ -10275,10 +10275,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDD704770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = FontManager.cpp;
 			path = ../src/FontManager.cpp;
 			refType = 4;
@@ -10287,10 +10287,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDD804770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = FontManager.h;
 			path = ../src/FontManager.h;
 			refType = 4;
@@ -10299,10 +10299,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDD904770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = GameConstantsAndTypes.cpp;
 			path = ../src/GameConstantsAndTypes.cpp;
 			refType = 4;
@@ -10311,10 +10311,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDDA04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = GameConstantsAndTypes.h;
 			path = ../src/GameConstantsAndTypes.h;
 			refType = 4;
@@ -10323,10 +10323,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDDB04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = GameDef.cpp;
 			path = ../src/GameDef.cpp;
 			refType = 4;
@@ -10335,10 +10335,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDDC04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = GameDef.h;
 			path = ../src/GameDef.h;
 			refType = 4;
@@ -10347,10 +10347,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDDD04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = GameInput.cpp;
 			path = ../src/GameInput.cpp;
 			refType = 4;
@@ -10359,10 +10359,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDDE04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = GameInput.h;
 			path = ../src/GameInput.h;
 			refType = 4;
@@ -10371,10 +10371,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDDF04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Grade.cpp;
 			path = ../src/Grade.cpp;
 			refType = 4;
@@ -10383,10 +10383,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDE004770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Grade.h;
 			path = ../src/Grade.h;
 			refType = 4;
@@ -10395,10 +10395,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDE104770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Inventory.cpp;
 			path = ../src/Inventory.cpp;
 			refType = 4;
@@ -10407,10 +10407,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDE204770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Inventory.h;
 			path = ../src/Inventory.h;
 			refType = 4;
@@ -10419,10 +10419,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDE304770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = LyricsLoader.cpp;
 			path = ../src/LyricsLoader.cpp;
 			refType = 4;
@@ -10431,10 +10431,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDE404770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = LyricsLoader.h;
 			path = ../src/LyricsLoader.h;
 			refType = 4;
@@ -10443,10 +10443,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDE504770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NoteData.cpp;
 			path = ../src/NoteData.cpp;
 			refType = 4;
@@ -10455,10 +10455,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDE604770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NoteData.h;
 			path = ../src/NoteData.h;
 			refType = 4;
@@ -10467,10 +10467,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDE704770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NoteDataWithScoring.cpp;
 			path = ../src/NoteDataWithScoring.cpp;
 			refType = 4;
@@ -10479,10 +10479,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDE804770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NoteDataWithScoring.h;
 			path = ../src/NoteDataWithScoring.h;
 			refType = 4;
@@ -10491,10 +10491,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDE904770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NoteFieldPositioning.cpp;
 			path = ../src/NoteFieldPositioning.cpp;
 			refType = 4;
@@ -10503,10 +10503,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDEA04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NoteFieldPositioning.h;
 			path = ../src/NoteFieldPositioning.h;
 			refType = 4;
@@ -10515,10 +10515,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDED04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NotesLoader.cpp;
 			path = ../src/NotesLoader.cpp;
 			refType = 4;
@@ -10527,10 +10527,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDEE04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NotesLoader.h;
 			path = ../src/NotesLoader.h;
 			refType = 4;
@@ -10539,10 +10539,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDEF04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NotesLoaderBMS.cpp;
 			path = ../src/NotesLoaderBMS.cpp;
 			refType = 4;
@@ -10551,10 +10551,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDF004770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NotesLoaderBMS.h;
 			path = ../src/NotesLoaderBMS.h;
 			refType = 4;
@@ -10563,10 +10563,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDF104770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NotesLoaderDWI.cpp;
 			path = ../src/NotesLoaderDWI.cpp;
 			refType = 4;
@@ -10575,10 +10575,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDF204770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NotesLoaderDWI.h;
 			path = ../src/NotesLoaderDWI.h;
 			refType = 4;
@@ -10587,10 +10587,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDF304770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NotesLoaderKSF.cpp;
 			path = ../src/NotesLoaderKSF.cpp;
 			refType = 4;
@@ -10599,10 +10599,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDF404770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NotesLoaderKSF.h;
 			path = ../src/NotesLoaderKSF.h;
 			refType = 4;
@@ -10611,10 +10611,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDF504770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NotesLoaderSM.cpp;
 			path = ../src/NotesLoaderSM.cpp;
 			refType = 4;
@@ -10623,10 +10623,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDF604770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NotesLoaderSM.h;
 			path = ../src/NotesLoaderSM.h;
 			refType = 4;
@@ -10635,10 +10635,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDF704770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NotesWriterDWI.cpp;
 			path = ../src/NotesWriterDWI.cpp;
 			refType = 4;
@@ -10647,10 +10647,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDF804770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NotesWriterDWI.h;
 			path = ../src/NotesWriterDWI.h;
 			refType = 4;
@@ -10659,10 +10659,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDF904770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NotesWriterSM.cpp;
 			path = ../src/NotesWriterSM.cpp;
 			refType = 4;
@@ -10671,10 +10671,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDFA04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NotesWriterSM.h;
 			path = ../src/NotesWriterSM.h;
 			refType = 4;
@@ -10683,10 +10683,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDFB04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NoteTypes.cpp;
 			path = ../src/NoteTypes.cpp;
 			refType = 4;
@@ -10695,10 +10695,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDFC04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NoteTypes.h;
 			path = ../src/NoteTypes.h;
 			refType = 4;
@@ -10707,10 +10707,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDFD04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Player.cpp;
 			path = ../src/Player.cpp;
 			refType = 4;
@@ -10719,10 +10719,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDFE04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Player.h;
 			path = ../src/Player.h;
 			refType = 4;
@@ -10731,10 +10731,10 @@
 			usesTabs = 0;
 		};
 		AA6EFDFF04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = PlayerAI.cpp;
 			path = ../src/PlayerAI.cpp;
 			refType = 4;
@@ -10743,10 +10743,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0004770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = PlayerAI.h;
 			path = ../src/PlayerAI.h;
 			refType = 4;
@@ -10755,10 +10755,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0104770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = PlayerNumber.cpp;
 			path = ../src/PlayerNumber.cpp;
 			refType = 4;
@@ -10767,10 +10767,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0204770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = PlayerNumber.h;
 			path = ../src/PlayerNumber.h;
 			refType = 4;
@@ -10779,10 +10779,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0304770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = PlayerOptions.cpp;
 			path = ../src/PlayerOptions.cpp;
 			refType = 4;
@@ -10791,10 +10791,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0404770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = PlayerOptions.h;
 			path = ../src/PlayerOptions.h;
 			refType = 4;
@@ -10803,10 +10803,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0704770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = SongOptions.cpp;
 			path = ../src/SongOptions.cpp;
 			refType = 4;
@@ -10815,10 +10815,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0804770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = SongOptions.h;
 			path = ../src/SongOptions.h;
 			refType = 4;
@@ -10827,10 +10827,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0904770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = StageStats.cpp;
 			path = ../src/StageStats.cpp;
 			refType = 4;
@@ -10839,10 +10839,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0A04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = StageStats.h;
 			path = ../src/StageStats.h;
 			refType = 4;
@@ -10851,10 +10851,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0B04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = StyleDef.cpp;
 			path = ../src/StyleDef.cpp;
 			refType = 4;
@@ -10863,10 +10863,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0C04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = StyleDef.h;
 			path = ../src/StyleDef.h;
 			refType = 4;
@@ -10875,10 +10875,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0D04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = StyleInput.h;
 			path = ../src/StyleInput.h;
 			refType = 4;
@@ -10887,10 +10887,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0E04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = TitleSubstitution.cpp;
 			path = ../src/TitleSubstitution.cpp;
 			refType = 4;
@@ -10899,10 +10899,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE0F04770C79005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = TitleSubstitution.h;
 			path = ../src/TitleSubstitution.h;
 			refType = 4;
@@ -10926,10 +10926,10 @@
 			sourceTree = "<group>";
 		};
 		AA6EFE5804770CAA005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = IniFile.cpp;
 			path = ../src/IniFile.cpp;
 			refType = 4;
@@ -10938,10 +10938,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE5904770CAA005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = IniFile.h;
 			path = ../src/IniFile.h;
 			refType = 4;
@@ -10950,10 +10950,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE5A04770CAA005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MsdFile.cpp;
 			path = ../src/MsdFile.cpp;
 			refType = 4;
@@ -10962,10 +10962,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE5B04770CAA005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MsdFile.h;
 			path = ../src/MsdFile.h;
 			refType = 4;
@@ -10974,10 +10974,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE6004770CF7005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = global.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -10985,10 +10985,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE6104770CF7005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenDimensions.h;
 			path = ../src/ScreenDimensions.h;
 			refType = 4;
@@ -10997,10 +10997,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE6204770CF7005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = StdString.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -11008,10 +11008,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE6304770CF7005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = StepMania.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -11019,10 +11019,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE6404770CF7005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = StepMania.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -11141,10 +11141,10 @@
 			sourceTree = "<group>";
 		};
 		AA6EFE6E04770D61005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Banner.cpp;
 			path = ../src/Banner.cpp;
 			refType = 4;
@@ -11153,10 +11153,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE6F04770D61005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Banner.h;
 			path = ../src/Banner.h;
 			refType = 4;
@@ -11165,10 +11165,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE7604770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = BPMDisplay.cpp;
 			path = ../src/BPMDisplay.cpp;
 			refType = 4;
@@ -11177,10 +11177,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE7704770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = BPMDisplay.h;
 			path = ../src/BPMDisplay.h;
 			refType = 4;
@@ -11189,10 +11189,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE7804770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = CourseContentsList.cpp;
 			path = ../src/CourseContentsList.cpp;
 			refType = 4;
@@ -11201,10 +11201,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE7904770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = CourseContentsList.h;
 			path = ../src/CourseContentsList.h;
 			refType = 4;
@@ -11213,10 +11213,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE7A04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = CourseEntryDisplay.cpp;
 			path = ../src/CourseEntryDisplay.cpp;
 			refType = 4;
@@ -11225,10 +11225,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE7B04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = CourseEntryDisplay.h;
 			path = ../src/CourseEntryDisplay.h;
 			refType = 4;
@@ -11237,10 +11237,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE7E04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = DifficultyIcon.cpp;
 			path = ../src/DifficultyIcon.cpp;
 			refType = 4;
@@ -11249,10 +11249,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE7F04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = DifficultyIcon.h;
 			path = ../src/DifficultyIcon.h;
 			refType = 4;
@@ -11261,10 +11261,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE8004770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = DifficultyMeter.cpp;
 			path = ../src/DifficultyMeter.cpp;
 			refType = 4;
@@ -11273,10 +11273,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE8104770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = DifficultyMeter.h;
 			path = ../src/DifficultyMeter.h;
 			refType = 4;
@@ -11285,10 +11285,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE8204770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = DifficultyRating.cpp;
 			path = ../src/DifficultyRating.cpp;
 			refType = 4;
@@ -11297,10 +11297,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE8304770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = DifficultyRating.h;
 			path = ../src/DifficultyRating.h;
 			refType = 4;
@@ -11309,10 +11309,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE8404770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = EditMenu.cpp;
 			path = ../src/EditMenu.cpp;
 			refType = 4;
@@ -11321,10 +11321,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE8504770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = EditMenu.h;
 			path = ../src/EditMenu.h;
 			refType = 4;
@@ -11333,10 +11333,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE8A04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = FadingBanner.cpp;
 			path = ../src/FadingBanner.cpp;
 			refType = 4;
@@ -11345,10 +11345,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE8B04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = FadingBanner.h;
 			path = ../src/FadingBanner.h;
 			refType = 4;
@@ -11357,10 +11357,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE8C04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = GradeDisplay.cpp;
 			path = ../src/GradeDisplay.cpp;
 			refType = 4;
@@ -11369,10 +11369,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE8D04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = GradeDisplay.h;
 			path = ../src/GradeDisplay.h;
 			refType = 4;
@@ -11381,10 +11381,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE8E04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = GrooveGraph.cpp;
 			path = ../src/GrooveGraph.cpp;
 			refType = 4;
@@ -11393,10 +11393,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE8F04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = GrooveGraph.h;
 			path = ../src/GrooveGraph.h;
 			refType = 4;
@@ -11405,10 +11405,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9004770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = GrooveRadar.cpp;
 			path = ../src/GrooveRadar.cpp;
 			refType = 4;
@@ -11417,10 +11417,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9104770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = GrooveRadar.h;
 			path = ../src/GrooveRadar.h;
 			refType = 4;
@@ -11429,10 +11429,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9204770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = GroupList.cpp;
 			path = ../src/GroupList.cpp;
 			refType = 4;
@@ -11441,10 +11441,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9304770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = GroupList.h;
 			path = ../src/GroupList.h;
 			refType = 4;
@@ -11453,10 +11453,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9404770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = HelpDisplay.cpp;
 			path = ../src/HelpDisplay.cpp;
 			refType = 4;
@@ -11465,10 +11465,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9504770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = HelpDisplay.h;
 			path = ../src/HelpDisplay.h;
 			refType = 4;
@@ -11477,10 +11477,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9604770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = JukeboxMenu.cpp;
 			path = ../src/JukeboxMenu.cpp;
 			refType = 4;
@@ -11489,10 +11489,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9704770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = JukeboxMenu.h;
 			path = ../src/JukeboxMenu.h;
 			refType = 4;
@@ -11501,10 +11501,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9A04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MenuTimer.cpp;
 			path = ../src/MenuTimer.cpp;
 			refType = 4;
@@ -11513,10 +11513,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9B04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MenuTimer.h;
 			path = ../src/MenuTimer.h;
 			refType = 4;
@@ -11525,10 +11525,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9C04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MeterDisplay.cpp;
 			path = ../src/MeterDisplay.cpp;
 			refType = 4;
@@ -11537,10 +11537,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9D04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MeterDisplay.h;
 			path = ../src/MeterDisplay.h;
 			refType = 4;
@@ -11549,10 +11549,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9E04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MusicBannerWheel.cpp;
 			path = ../src/MusicBannerWheel.cpp;
 			refType = 4;
@@ -11561,10 +11561,10 @@
 			usesTabs = 0;
 		};
 		AA6EFE9F04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MusicBannerWheel.h;
 			path = ../src/MusicBannerWheel.h;
 			refType = 4;
@@ -11573,10 +11573,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEA004770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MusicList.cpp;
 			path = ../src/MusicList.cpp;
 			refType = 4;
@@ -11585,10 +11585,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEA104770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MusicList.h;
 			path = ../src/MusicList.h;
 			refType = 4;
@@ -11597,10 +11597,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEA204770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MusicSortDisplay.cpp;
 			path = ../src/MusicSortDisplay.cpp;
 			refType = 4;
@@ -11609,10 +11609,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEA304770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MusicSortDisplay.h;
 			path = ../src/MusicSortDisplay.h;
 			refType = 4;
@@ -11621,10 +11621,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEA404770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MusicWheel.cpp;
 			path = ../src/MusicWheel.cpp;
 			refType = 4;
@@ -11633,10 +11633,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEA504770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MusicWheel.h;
 			path = ../src/MusicWheel.h;
 			refType = 4;
@@ -11645,10 +11645,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEA604770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MusicWheelItem.cpp;
 			path = ../src/MusicWheelItem.cpp;
 			refType = 4;
@@ -11657,10 +11657,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEA704770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MusicWheelItem.h;
 			path = ../src/MusicWheelItem.h;
 			refType = 4;
@@ -11669,10 +11669,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEA804770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = OptionIcon.cpp;
 			path = ../src/OptionIcon.cpp;
 			refType = 4;
@@ -11681,10 +11681,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEA904770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = OptionIcon.h;
 			path = ../src/OptionIcon.h;
 			refType = 4;
@@ -11693,10 +11693,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEAA04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = OptionIconRow.cpp;
 			path = ../src/OptionIconRow.cpp;
 			refType = 4;
@@ -11705,10 +11705,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEAB04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = OptionIconRow.h;
 			path = ../src/OptionIconRow.h;
 			refType = 4;
@@ -11717,10 +11717,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEAC04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = OptionsCursor.cpp;
 			path = ../src/OptionsCursor.cpp;
 			refType = 4;
@@ -11729,10 +11729,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEAD04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = OptionsCursor.h;
 			path = ../src/OptionsCursor.h;
 			refType = 4;
@@ -11741,10 +11741,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEAE04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScrollBar.cpp;
 			path = ../src/ScrollBar.cpp;
 			refType = 4;
@@ -11753,10 +11753,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEAF04770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScrollBar.h;
 			path = ../src/ScrollBar.h;
 			refType = 4;
@@ -11765,10 +11765,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEB004770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScrollingList.cpp;
 			path = ../src/ScrollingList.cpp;
 			refType = 4;
@@ -11777,10 +11777,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEB104770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScrollingList.h;
 			path = ../src/ScrollingList.h;
 			refType = 4;
@@ -11789,10 +11789,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEB204770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = SnapDisplay.cpp;
 			path = ../src/SnapDisplay.cpp;
 			refType = 4;
@@ -11801,10 +11801,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEB304770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = SnapDisplay.h;
 			path = ../src/SnapDisplay.h;
 			refType = 4;
@@ -11813,10 +11813,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEB404770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = TextBanner.cpp;
 			path = ../src/TextBanner.cpp;
 			refType = 4;
@@ -11825,10 +11825,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEB504770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = TextBanner.h;
 			path = ../src/TextBanner.h;
 			refType = 4;
@@ -11837,10 +11837,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEB604770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = WheelNotifyIcon.cpp;
 			path = ../src/WheelNotifyIcon.cpp;
 			refType = 4;
@@ -11849,10 +11849,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEB704770E7C005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = WheelNotifyIcon.h;
 			path = ../src/WheelNotifyIcon.h;
 			refType = 4;
@@ -11941,10 +11941,10 @@
 			sourceTree = "<group>";
 		};
 		AA6EFEFD04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ArrowEffects.cpp;
 			path = ../src/ArrowEffects.cpp;
 			refType = 4;
@@ -11953,10 +11953,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEFE04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ArrowEffects.h;
 			path = ../src/ArrowEffects.h;
 			refType = 4;
@@ -11965,10 +11965,10 @@
 			usesTabs = 0;
 		};
 		AA6EFEFF04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Background.cpp;
 			path = ../src/Background.cpp;
 			refType = 4;
@@ -11977,10 +11977,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0004770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Background.h;
 			path = ../src/Background.h;
 			refType = 4;
@@ -11989,10 +11989,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0104770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = BGAnimation.cpp;
 			path = ../src/BGAnimation.cpp;
 			refType = 4;
@@ -12001,10 +12001,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0204770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = BGAnimation.h;
 			path = ../src/BGAnimation.h;
 			refType = 4;
@@ -12013,10 +12013,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0304770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = BGAnimationLayer.cpp;
 			path = ../src/BGAnimationLayer.cpp;
 			refType = 4;
@@ -12025,10 +12025,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0404770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = BGAnimationLayer.h;
 			path = ../src/BGAnimationLayer.h;
 			refType = 4;
@@ -12037,10 +12037,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0504770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Combo.cpp;
 			path = ../src/Combo.cpp;
 			refType = 4;
@@ -12049,10 +12049,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0604770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Combo.h;
 			path = ../src/Combo.h;
 			refType = 4;
@@ -12061,10 +12061,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0704770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = DancingCharacters.cpp;
 			path = ../src/DancingCharacters.cpp;
 			refType = 4;
@@ -12073,10 +12073,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0804770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = DancingCharacters.h;
 			path = ../src/DancingCharacters.h;
 			refType = 4;
@@ -12085,10 +12085,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0904770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = GhostArrow.cpp;
 			path = ../src/GhostArrow.cpp;
 			refType = 4;
@@ -12097,10 +12097,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0A04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = GhostArrow.h;
 			path = ../src/GhostArrow.h;
 			refType = 4;
@@ -12109,10 +12109,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0D04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = GhostArrowRow.cpp;
 			path = ../src/GhostArrowRow.cpp;
 			refType = 4;
@@ -12121,10 +12121,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF0E04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = GhostArrowRow.h;
 			path = ../src/GhostArrowRow.h;
 			refType = 4;
@@ -12133,10 +12133,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF1304770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = HoldGhostArrow.cpp;
 			path = ../src/HoldGhostArrow.cpp;
 			refType = 4;
@@ -12145,10 +12145,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF1404770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = HoldGhostArrow.h;
 			path = ../src/HoldGhostArrow.h;
 			refType = 4;
@@ -12157,10 +12157,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF1504770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = HoldJudgment.cpp;
 			path = ../src/HoldJudgment.cpp;
 			refType = 4;
@@ -12169,10 +12169,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF1604770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = HoldJudgment.h;
 			path = ../src/HoldJudgment.h;
 			refType = 4;
@@ -12181,10 +12181,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF1704770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Judgment.cpp;
 			path = ../src/Judgment.cpp;
 			refType = 4;
@@ -12193,10 +12193,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF1804770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Judgment.h;
 			path = ../src/Judgment.h;
 			refType = 4;
@@ -12205,10 +12205,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF1A04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = LifeMeter.h;
 			path = ../src/LifeMeter.h;
 			refType = 4;
@@ -12217,10 +12217,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF1B04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = LifeMeterBar.cpp;
 			path = ../src/LifeMeterBar.cpp;
 			refType = 4;
@@ -12229,10 +12229,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF1C04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = LifeMeterBar.h;
 			path = ../src/LifeMeterBar.h;
 			refType = 4;
@@ -12241,10 +12241,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF1D04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = LifeMeterBattery.cpp;
 			path = ../src/LifeMeterBattery.cpp;
 			refType = 4;
@@ -12253,10 +12253,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF1E04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = LifeMeterBattery.h;
 			path = ../src/LifeMeterBattery.h;
 			refType = 4;
@@ -12265,10 +12265,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF1F04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = LyricDisplay.cpp;
 			path = ../src/LyricDisplay.cpp;
 			refType = 4;
@@ -12277,10 +12277,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2004770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = LyricDisplay.h;
 			path = ../src/LyricDisplay.h;
 			refType = 4;
@@ -12289,10 +12289,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2104770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NoteDisplay.cpp;
 			path = ../src/NoteDisplay.cpp;
 			refType = 4;
@@ -12301,10 +12301,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2204770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NoteDisplay.h;
 			path = ../src/NoteDisplay.h;
 			refType = 4;
@@ -12313,10 +12313,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2304770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NoteField.cpp;
 			path = ../src/NoteField.cpp;
 			refType = 4;
@@ -12325,10 +12325,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2404770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NoteField.h;
 			path = ../src/NoteField.h;
 			refType = 4;
@@ -12337,10 +12337,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2504770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScoreDisplay.cpp;
 			path = ../src/ScoreDisplay.cpp;
 			refType = 4;
@@ -12349,10 +12349,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2604770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScoreDisplay.h;
 			path = ../src/ScoreDisplay.h;
 			refType = 4;
@@ -12361,10 +12361,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2704770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScoreDisplayBattle.cpp;
 			path = ../src/ScoreDisplayBattle.cpp;
 			refType = 4;
@@ -12373,10 +12373,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2804770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScoreDisplayBattle.h;
 			path = ../src/ScoreDisplayBattle.h;
 			refType = 4;
@@ -12385,10 +12385,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2904770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScoreDisplayNormal.cpp;
 			path = ../src/ScoreDisplayNormal.cpp;
 			refType = 4;
@@ -12397,10 +12397,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2A04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScoreDisplayNormal.h;
 			path = ../src/ScoreDisplayNormal.h;
 			refType = 4;
@@ -12409,10 +12409,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2B04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScoreDisplayOni.cpp;
 			path = ../src/ScoreDisplayOni.cpp;
 			refType = 4;
@@ -12421,10 +12421,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2C04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScoreDisplayOni.h;
 			path = ../src/ScoreDisplayOni.h;
 			refType = 4;
@@ -12433,10 +12433,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2D04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScoreDisplayRave.cpp;
 			path = ../src/ScoreDisplayRave.cpp;
 			refType = 4;
@@ -12445,10 +12445,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF2E04770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScoreDisplayRave.h;
 			path = ../src/ScoreDisplayRave.h;
 			refType = 4;
@@ -12457,10 +12457,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF3004770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScoreKeeper.h;
 			path = ../src/ScoreKeeper.h;
 			refType = 4;
@@ -12469,10 +12469,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF3104770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScoreKeeperMAX2.cpp;
 			path = ../src/ScoreKeeperMAX2.cpp;
 			refType = 4;
@@ -12481,10 +12481,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF3204770F63005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScoreKeeperMAX2.h;
 			path = ../src/ScoreKeeperMAX2.h;
 			refType = 4;
@@ -12506,10 +12506,10 @@
 			sourceTree = "<group>";
 		};
 		AA6EFF7004770F86005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Transition.cpp;
 			path = ../src/Transition.cpp;
 			refType = 4;
@@ -12518,10 +12518,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF7104770F86005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Transition.h;
 			path = ../src/Transition.h;
 			refType = 4;
@@ -12562,10 +12562,10 @@
 			sourceTree = "<group>";
 		};
 		AA6EFF7504770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Actor.cpp;
 			path = ../src/Actor.cpp;
 			refType = 4;
@@ -12574,10 +12574,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF7604770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Actor.h;
 			path = ../src/Actor.h;
 			refType = 4;
@@ -12586,10 +12586,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF7704770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ActorFrame.cpp;
 			path = ../src/ActorFrame.cpp;
 			refType = 4;
@@ -12598,10 +12598,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF7804770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ActorFrame.h;
 			path = ../src/ActorFrame.h;
 			refType = 4;
@@ -12610,10 +12610,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF7904770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ActorScroller.cpp;
 			path = ../src/ActorScroller.cpp;
 			refType = 4;
@@ -12622,10 +12622,10 @@
 			usesTabs = 0;
 		};
 		AA6EFF7A04770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ActorScroller.h;
 			path = ../src/ActorScroller.h;
 			refType = 4;
@@ -12634,10 +12634,10 @@
 			usesTabs = 0;
 		};
 		AA6EFFB904770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = BitmapText.cpp;
 			path = ../src/BitmapText.cpp;
 			refType = 4;
@@ -12646,10 +12646,10 @@
 			usesTabs = 0;
 		};
 		AA6EFFBA04770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = BitmapText.h;
 			path = ../src/BitmapText.h;
 			refType = 4;
@@ -12658,10 +12658,10 @@
 			usesTabs = 0;
 		};
 		AA6EFFBD04770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Model.cpp;
 			path = ../src/Model.cpp;
 			refType = 4;
@@ -12670,10 +12670,10 @@
 			usesTabs = 0;
 		};
 		AA6EFFBE04770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Model.h;
 			path = ../src/Model.h;
 			refType = 4;
@@ -12682,10 +12682,10 @@
 			usesTabs = 0;
 		};
 		AA6EFFBF04770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ModelTypes.cpp;
 			path = ../src/ModelTypes.cpp;
 			refType = 4;
@@ -12694,10 +12694,10 @@
 			usesTabs = 0;
 		};
 		AA6EFFC004770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ModelTypes.h;
 			path = ../src/ModelTypes.h;
 			refType = 4;
@@ -12706,10 +12706,10 @@
 			usesTabs = 0;
 		};
 		AA6EFFC104770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Quad.h;
 			path = ../src/Quad.h;
 			refType = 4;
@@ -12718,10 +12718,10 @@
 			usesTabs = 0;
 		};
 		AA6EFFC204770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Sprite.cpp;
 			path = ../src/Sprite.cpp;
 			refType = 4;
@@ -12730,10 +12730,10 @@
 			usesTabs = 0;
 		};
 		AA6EFFC304770FFD005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Sprite.h;
 			path = ../src/Sprite.h;
 			refType = 4;
@@ -12742,41 +12742,41 @@
 			usesTabs = 0;
 		};
 		AA70E3640663112800DAE1FD = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = Foreach.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA70E3650663112800DAE1FD = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = Trail.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA70E3660663112800DAE1FD = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = Trail.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA70E3670663112800DAE1FD = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = TrailUtil.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA70E3680663112800DAE1FD = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = TrailUtil.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -12812,9 +12812,9 @@
 			};
 		};
 		AA729C420599B50D00779F33 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = TimingData.cpp;
 			path = ../src/TimingData.cpp;
 			refType = 4;
@@ -12822,9 +12822,9 @@
 			usesTabs = 0;
 		};
 		AA729C430599B50D00779F33 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = TimingData.h;
 			path = ../src/TimingData.h;
 			refType = 4;
@@ -12844,9 +12844,9 @@
 			};
 		};
 		AA729C460599B54D00779F33 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MemoryCardDisplay.cpp;
 			path = ../src/MemoryCardDisplay.cpp;
 			refType = 4;
@@ -12854,9 +12854,9 @@
 			usesTabs = 0;
 		};
 		AA729C470599B54D00779F33 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MemoryCardDisplay.h;
 			path = ../src/MemoryCardDisplay.h;
 			refType = 4;
@@ -12876,9 +12876,9 @@
 			};
 		};
 		AA729C4E0599B58D00779F33 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ReceptorArrow.cpp;
 			path = ../src/ReceptorArrow.cpp;
 			refType = 4;
@@ -12886,9 +12886,9 @@
 			usesTabs = 0;
 		};
 		AA729C4F0599B58D00779F33 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ReceptorArrow.h;
 			path = ../src/ReceptorArrow.h;
 			refType = 4;
@@ -12896,9 +12896,9 @@
 			usesTabs = 0;
 		};
 		AA729C500599B58D00779F33 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ReceptorArrowRow.cpp;
 			path = ../src/ReceptorArrowRow.cpp;
 			refType = 4;
@@ -12906,9 +12906,9 @@
 			usesTabs = 0;
 		};
 		AA729C510599B58D00779F33 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ReceptorArrowRow.h;
 			path = ../src/ReceptorArrowRow.h;
 			refType = 4;
@@ -12940,9 +12940,9 @@
 			};
 		};
 		AA729C64059A2F2400779F33 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenBranch.cpp;
 			path = ../src/ScreenBranch.cpp;
 			refType = 4;
@@ -12950,9 +12950,9 @@
 			usesTabs = 0;
 		};
 		AA729C65059A2F2400779F33 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenBranch.h;
 			path = ../src/ScreenBranch.h;
 			refType = 4;
@@ -12972,9 +12972,9 @@
 			};
 		};
 		AA76432A04DBC4BF00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = arch_setup.h;
 			path = Win32/arch_setup.h;
 			refType = 4;
@@ -12983,10 +12983,10 @@
 			usesTabs = 0;
 		};
 		AA76D15404D9D2D200D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CrashHandler.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -12994,10 +12994,10 @@
 			usesTabs = 0;
 		};
 		AA76D15504D9D2D200D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CrashHandlerChild.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13005,10 +13005,10 @@
 			usesTabs = 0;
 		};
 		AA7D404604FC3C270020E02B = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = RageSoundDriver_CA.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13016,10 +13016,10 @@
 			usesTabs = 0;
 		};
 		AA7D404704FC3C270020E02B = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = RageSoundDriver_CA.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13062,10 +13062,10 @@
 			sourceTree = "<group>";
 		};
 		AA8B6C7904AFD87300D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
 			path = chartables.c;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13073,10 +13073,10 @@
 			usesTabs = 0;
 		};
 		AA8B6C7A04AFD87300D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
 			path = get.c;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13084,10 +13084,10 @@
 			usesTabs = 0;
 		};
 		AA8B6C7B04AFD87300D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = internal.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13095,10 +13095,10 @@
 			usesTabs = 0;
 		};
 		AA8B6C7C04AFD87300D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
 			path = maketables.c;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13106,10 +13106,10 @@
 			usesTabs = 0;
 		};
 		AA8B6C7D04AFD87300D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
 			path = pcre.c;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13117,10 +13117,10 @@
 			usesTabs = 0;
 		};
 		AA8B6C7E04AFD87300D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = pcre.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13128,10 +13128,10 @@
 			usesTabs = 0;
 		};
 		AA8B6C7F04AFD87300D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
 			path = study.c;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13148,10 +13148,10 @@
 			sourceTree = "<absolute>";
 		};
 		AA8F118204A04F9B00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = DifficultyDisplay.cpp;
 			path = ../src/DifficultyDisplay.cpp;
 			refType = 4;
@@ -13160,10 +13160,10 @@
 			usesTabs = 0;
 		};
 		AA8F118304A04F9B00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = DifficultyDisplay.h;
 			path = ../src/DifficultyDisplay.h;
 			refType = 4;
@@ -13172,17 +13172,17 @@
 			usesTabs = 0;
 		};
 		AA8F136E0624BAB200C6A467 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = EnumHelper.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA8F136F0624BAB200C6A467 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = EnumHelper.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13200,18 +13200,18 @@
 			};
 		};
 		AA946AC005B27398000A1F2E = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ActorCommands.cpp;
 			path = ../src/ActorCommands.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA946AC105B27398000A1F2E = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ActorCommands.h;
 			path = ../src/ActorCommands.h;
 			refType = 4;
@@ -13230,18 +13230,18 @@
 			};
 		};
 		AA96881A05DE34B600478B95 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ConditionalBGA.cpp;
 			path = ../src/ConditionalBGA.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA96881B05DE34B600478B95 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ConditionalBGA.h;
 			path = ../src/ConditionalBGA.h;
 			refType = 4;
@@ -13260,18 +13260,18 @@
 			};
 		};
 		AA96881E05DE34CD00478B95 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = SDL_SaveJPEG.cpp;
 			path = ../src/SDL_SaveJPEG.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA96881F05DE34CD00478B95 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = SDL_SaveJPEG.h;
 			path = ../src/SDL_SaveJPEG.h;
 			refType = 4;
@@ -13290,10 +13290,10 @@
 			};
 		};
 		AA98E298049ACE39005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = arch_darwin.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13301,17 +13301,17 @@
 			usesTabs = 0;
 		};
 		AA996D9605E9ED34008CA159 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = TimeConstants.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AA996D9705E9ED34008CA159 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = TimeConstants.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13329,9 +13329,9 @@
 			};
 		};
 		AA9D236C0561B6CE00FC7F14 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = CombinedLifeMeter.h;
 			path = ../src/CombinedLifeMeter.h;
 			refType = 4;
@@ -13346,9 +13346,9 @@
 			};
 		};
 		AA9EC2F0055F5126007E5098 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageTextureID.cpp;
 			path = ../src/RageTextureID.cpp;
 			refType = 4;
@@ -13357,9 +13357,9 @@
 			usesTabs = 0;
 		};
 		AA9EC2F1055F5126007E5098 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageTextureID.h;
 			path = ../src/RageTextureID.h;
 			refType = 4;
@@ -13407,18 +13407,18 @@
 			sourceTree = "<absolute>";
 		};
 		AAA6BFEA0644AB3700AFBBC8 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenWithMenuElements.cpp;
 			path = ../src/ScreenWithMenuElements.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAA6BFEB0644AB3700AFBBC8 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenWithMenuElements.h;
 			path = ../src/ScreenWithMenuElements.h;
 			refType = 4;
@@ -13437,9 +13437,9 @@
 			};
 		};
 		AAA71EA005EE154E00D2E8FF = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = global.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13451,9 +13451,9 @@
 			};
 		};
 		AAA983CA04B9060A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ActorUtil.cpp;
 			path = ../src/ActorUtil.cpp;
 			refType = 4;
@@ -13462,9 +13462,9 @@
 			usesTabs = 0;
 		};
 		AAABAD3604F0E12B00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ModelOrSprite.h;
 			path = ../src/ModelOrSprite.h;
 			refType = 4;
@@ -13473,9 +13473,9 @@
 			usesTabs = 0;
 		};
 		AAABAD3904F0E12B00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NoteFieldPlus.cpp;
 			path = ../src/NoteFieldPlus.cpp;
 			refType = 4;
@@ -13484,9 +13484,9 @@
 			usesTabs = 0;
 		};
 		AAABAD3A04F0E12B00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NoteFieldPlus.h;
 			path = ../src/NoteFieldPlus.h;
 			refType = 4;
@@ -13495,9 +13495,9 @@
 			usesTabs = 0;
 		};
 		AAADA4AE04E5F3DE00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = ProductInfo.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13505,9 +13505,9 @@
 			usesTabs = 0;
 		};
 		AAADA51604E75DD300D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenEditCoursesMenu.cpp;
 			path = ../src/ScreenEditCoursesMenu.cpp;
 			refType = 4;
@@ -13516,9 +13516,9 @@
 			usesTabs = 0;
 		};
 		AAADA51704E75DD300D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenEditCoursesMenu.h;
 			path = ../src/ScreenEditCoursesMenu.h;
 			refType = 4;
@@ -13527,9 +13527,9 @@
 			usesTabs = 0;
 		};
 		AAADA51A04E7609A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = EditCoursesMenu.cpp;
 			path = ../src/EditCoursesMenu.cpp;
 			refType = 4;
@@ -13538,9 +13538,9 @@
 			usesTabs = 0;
 		};
 		AAADA51B04E7609A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = EditCoursesMenu.h;
 			path = ../src/EditCoursesMenu.h;
 			refType = 4;
@@ -13549,10 +13549,10 @@
 			usesTabs = 0;
 		};
 		AAADA51E04E77F4400D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = RageSoundDriver_QT1.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13560,10 +13560,10 @@
 			usesTabs = 0;
 		};
 		AAADA51F04E77F4400D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = RageSoundDriver_QT1.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13582,9 +13582,9 @@
 			sourceTree = "<group>";
 		};
 		AAAE28DB052252A500D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
 			name = filterkit.c;
 			path = src/filterkit.c;
 			refType = 4;
@@ -13593,9 +13593,9 @@
 			usesTabs = 0;
 		};
 		AAAE28DC052252A500D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = filterkit.h;
 			path = src/filterkit.h;
 			refType = 4;
@@ -13604,9 +13604,9 @@
 			usesTabs = 0;
 		};
 		AAAE28DD052252A500D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
 			name = hackedresamplesubs.c;
 			path = src/hackedresamplesubs.c;
 			refType = 4;
@@ -13615,9 +13615,9 @@
 			usesTabs = 0;
 		};
 		AAAE28DE052252A500D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = resample_defs.h;
 			path = src/resample_defs.h;
 			refType = 4;
@@ -13626,9 +13626,9 @@
 			usesTabs = 0;
 		};
 		AAAE28DF052252A500D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
 			name = resample.c;
 			path = src/resample.c;
 			refType = 4;
@@ -13637,9 +13637,9 @@
 			usesTabs = 0;
 		};
 		AAAE28E0052252A500D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
 			name = resamplesubs.c;
 			path = src/resamplesubs.c;
 			refType = 4;
@@ -13648,9 +13648,9 @@
 			usesTabs = 0;
 		};
 		AAAE28F2052254A900D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSoundReader_Resample_Fast.cpp;
 			path = ../src/RageSoundReader_Resample_Fast.cpp;
 			refType = 4;
@@ -13659,9 +13659,9 @@
 			usesTabs = 0;
 		};
 		AAAE28F3052254A900D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSoundReader_Resample_Fast.h;
 			path = ../src/RageSoundReader_Resample_Fast.h;
 			refType = 4;
@@ -13670,9 +13670,9 @@
 			usesTabs = 0;
 		};
 		AAAE28F4052254A900D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSoundReader_Resample_Good.cpp;
 			path = ../src/RageSoundReader_Resample_Good.cpp;
 			refType = 4;
@@ -13681,9 +13681,9 @@
 			usesTabs = 0;
 		};
 		AAAE28F5052254A900D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSoundReader_Resample_Good.h;
 			path = ../src/RageSoundReader_Resample_Good.h;
 			refType = 4;
@@ -13715,9 +13715,9 @@
 			sourceTree = "<group>";
 		};
 		AAB005F00579B8CB000BBA58 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = AttackDisplay.cpp;
 			path = ../src/AttackDisplay.cpp;
 			refType = 4;
@@ -13726,9 +13726,9 @@
 			usesTabs = 0;
 		};
 		AAB005F10579B8CB000BBA58 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = AttackDisplay.h;
 			path = ../src/AttackDisplay.h;
 			refType = 4;
@@ -13749,9 +13749,9 @@
 			};
 		};
 		AAB0085B057F4F7A000BBA58 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageFileDriver.cpp;
 			path = ../src/RageFileDriver.cpp;
 			refType = 4;
@@ -13760,9 +13760,9 @@
 			usesTabs = 0;
 		};
 		AAB0085C057F4F7A000BBA58 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageFileDriver.h;
 			path = ../src/RageFileDriver.h;
 			refType = 4;
@@ -13771,9 +13771,9 @@
 			usesTabs = 0;
 		};
 		AAB0085D057F4F7A000BBA58 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageFileDriverDirect.cpp;
 			path = ../src/RageFileDriverDirect.cpp;
 			refType = 4;
@@ -13782,9 +13782,9 @@
 			usesTabs = 0;
 		};
 		AAB0085E057F4F7A000BBA58 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageFileDriverDirect.h;
 			path = ../src/RageFileDriverDirect.h;
 			refType = 4;
@@ -13793,9 +13793,9 @@
 			usesTabs = 0;
 		};
 		AAB0085F057F4F7A000BBA58 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageFileManager.cpp;
 			path = ../src/RageFileManager.cpp;
 			refType = 4;
@@ -13804,9 +13804,9 @@
 			usesTabs = 0;
 		};
 		AAB00860057F4F7A000BBA58 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageFileManager.h;
 			path = ../src/RageFileManager.h;
 			refType = 4;
@@ -13851,9 +13851,9 @@
 			};
 		};
 		AAB3B36B04C38B4600D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = InputHandler.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13861,9 +13861,9 @@
 			usesTabs = 0;
 		};
 		AAB3B36C04C38B4600D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = InputHandler.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13871,9 +13871,9 @@
 			usesTabs = 0;
 		};
 		AAB3B37704C38BF600D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MovieTexture.h;
 			path = MovieTexture/MovieTexture.h;
 			refType = 4;
@@ -13882,10 +13882,10 @@
 			usesTabs = 0;
 		};
 		AAB3B37F04C3F48700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ArchHooks_darwin.h;
 			path = ArchHooks/ArchHooks_darwin.h;
 			refType = 4;
@@ -13894,10 +13894,10 @@
 			usesTabs = 0;
 		};
 		AAB3B38004C3F48700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ArchHooks_darwin.cpp;
 			path = ArchHooks/ArchHooks_darwin.cpp;
 			refType = 4;
@@ -13906,10 +13906,10 @@
 			usesTabs = 0;
 		};
 		AAB3B38504C5701D00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MovieTexture_DShow.cpp;
 			path = MovieTexture/MovieTexture_DShow.cpp;
 			refType = 4;
@@ -13918,10 +13918,10 @@
 			usesTabs = 0;
 		};
 		AAB3B38604C5701D00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MovieTexture_DShow.h;
 			path = MovieTexture/MovieTexture_DShow.h;
 			refType = 4;
@@ -13930,10 +13930,10 @@
 			usesTabs = 0;
 		};
 		AAB3B38704C5701D00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MovieTexture_DShowHelper.cpp;
 			path = MovieTexture/MovieTexture_DShowHelper.cpp;
 			refType = 4;
@@ -13942,10 +13942,10 @@
 			usesTabs = 0;
 		};
 		AAB3B38804C5701D00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MovieTexture_DShowHelper.h;
 			path = MovieTexture/MovieTexture_DShowHelper.h;
 			refType = 4;
@@ -13954,10 +13954,10 @@
 			usesTabs = 0;
 		};
 		AAB3B39004C5921800D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = MovieTexture_Null.cpp;
 			path = MovieTexture/MovieTexture_Null.cpp;
 			refType = 4;
@@ -13966,9 +13966,9 @@
 			usesTabs = 0;
 		};
 		AAB3B39104C5921800D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = MovieTexture_Null.h;
 			path = MovieTexture/MovieTexture_Null.h;
 			refType = 4;
@@ -13977,9 +13977,9 @@
 			usesTabs = 0;
 		};
 		AAB691F205704FA50078BED4 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = LightsDriver_SystemMessage.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -13987,9 +13987,9 @@
 			usesTabs = 0;
 		};
 		AAB691F305704FA50078BED4 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = LightsDriver_SystemMessage.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14016,40 +14016,40 @@
 			sourceTree = "<group>";
 		};
 		AABB00F40659EF8C00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenClearBookkeepingData.cpp;
-			path = /Users/steve/programming/stepmania/src/ScreenClearBookkeepingData.cpp;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/ScreenClearBookkeepingData.cpp;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABB00F50659EF8C00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenClearBookkeepingData.h;
-			path = /Users/steve/programming/stepmania/src/ScreenClearBookkeepingData.h;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/ScreenClearBookkeepingData.h;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABB00F60659EF8C00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenClearMachineStats.cpp;
-			path = /Users/steve/programming/stepmania/src/ScreenClearMachineStats.cpp;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/ScreenClearMachineStats.cpp;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABB00F70659EF8C00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenClearMachineStats.h;
-			path = /Users/steve/programming/stepmania/src/ScreenClearMachineStats.h;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/ScreenClearMachineStats.h;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABB00F80659EF8C00738526 = {
 			fileRef = AABB00F40659EF8C00738526;
@@ -14076,22 +14076,22 @@
 			};
 		};
 		AABB00FD0659F0A700738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenResetToDefaults.cpp;
-			path = /Users/steve/programming/stepmania/src/ScreenResetToDefaults.cpp;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/ScreenResetToDefaults.cpp;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABB00FE0659F0A700738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenResetToDefaults.h;
-			path = /Users/steve/programming/stepmania/src/ScreenResetToDefaults.h;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/ScreenResetToDefaults.h;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABB00FF0659F0A700738526 = {
 			fileRef = AABB00FD0659F0A700738526;
@@ -14106,18 +14106,18 @@
 			};
 		};
 		AABBD80605D8E9FC00B44FC2 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = HighScore.cpp;
 			path = ../src/HighScore.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AABBD80705D8E9FC00B44FC2 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = HighScore.h;
 			path = ../src/HighScore.h;
 			refType = 4;
@@ -14136,94 +14136,94 @@
 			};
 		};
 		AABBF66C0659E78D00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSurface_Load_GIF.cpp;
-			path = /Users/steve/programming/stepmania/src/RageSurface_Load_GIF.cpp;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/RageSurface_Load_GIF.cpp;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABBF66D0659E78D00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSurface_Load_GIF.h;
-			path = /Users/steve/programming/stepmania/src/RageSurface_Load_GIF.h;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/RageSurface_Load_GIF.h;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABBF66E0659E78D00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSurface_Load_JPEG.cpp;
-			path = /Users/steve/programming/stepmania/src/RageSurface_Load_JPEG.cpp;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/RageSurface_Load_JPEG.cpp;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABBF66F0659E78D00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSurface_Load_JPEG.h;
-			path = /Users/steve/programming/stepmania/src/RageSurface_Load_JPEG.h;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/RageSurface_Load_JPEG.h;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABBF6700659E78D00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSurface_Load_PNG.cpp;
-			path = /Users/steve/programming/stepmania/src/RageSurface_Load_PNG.cpp;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/RageSurface_Load_PNG.cpp;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABBF6710659E78D00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSurface_Load_PNG.h;
-			path = /Users/steve/programming/stepmania/src/RageSurface_Load_PNG.h;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/RageSurface_Load_PNG.h;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABBF6720659E78D00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSurface_Load_XPM.cpp;
-			path = /Users/steve/programming/stepmania/src/RageSurface_Load_XPM.cpp;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/RageSurface_Load_XPM.cpp;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABBF6730659E78D00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSurface_Load_XPM.h;
-			path = /Users/steve/programming/stepmania/src/RageSurface_Load_XPM.h;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/RageSurface_Load_XPM.h;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABBF6740659E78D00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSurface_Load.cpp;
-			path = /Users/steve/programming/stepmania/src/RageSurface_Load.cpp;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/RageSurface_Load.cpp;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABBF6750659E78D00738526 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSurface_Load.h;
-			path = /Users/steve/programming/stepmania/src/RageSurface_Load.h;
-			refType = 0;
-			sourceTree = "<absolute>";
+			path = ../src/RageSurface_Load.h;
+			refType = 4;
+			sourceTree = "<group>";
 		};
 		AABBF6760659E78D00738526 = {
 			fileRef = AABBF66C0659E78D00738526;
@@ -14300,36 +14300,36 @@
 			};
 		};
 		AABD0B3405DF3F22004F7929 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = CryptHelpers.cpp;
 			path = ../src/CryptHelpers.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AABD0B3505DF3F22004F7929 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = CryptHelpers.h;
 			path = ../src/CryptHelpers.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AABD0B3605DF3F22004F7929 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = CryptManager.cpp;
 			path = ../src/CryptManager.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AABD0B3705DF3F22004F7929 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = CryptManager.h;
 			path = ../src/CryptManager.h;
 			refType = 4;
@@ -14349,9 +14349,9 @@
 			};
 		};
 		AABE321A05ACD8ED001A0E84 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenEnding.cpp;
 			path = ../src/ScreenEnding.cpp;
 			refType = 4;
@@ -14359,9 +14359,9 @@
 			usesTabs = 0;
 		};
 		AABE321B05ACD8ED001A0E84 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenEnding.h;
 			path = ../src/ScreenEnding.h;
 			refType = 4;
@@ -14381,9 +14381,9 @@
 			};
 		};
 		AABE321E05ACD931001A0E84 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Foreground.cpp;
 			path = ../src/Foreground.cpp;
 			refType = 4;
@@ -14391,9 +14391,9 @@
 			usesTabs = 0;
 		};
 		AABE321F05ACD931001A0E84 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Foreground.h;
 			path = ../src/Foreground.h;
 			refType = 4;
@@ -14413,9 +14413,9 @@
 			};
 		};
 		AABE322205ACDA52001A0E84 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageFileDriverDirectHelpers.cpp;
 			path = ../src/RageFileDriverDirectHelpers.cpp;
 			refType = 4;
@@ -14423,9 +14423,9 @@
 			usesTabs = 0;
 		};
 		AABE322305ACDA52001A0E84 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageFileDriverDirectHelpers.h;
 			path = ../src/RageFileDriverDirectHelpers.h;
 			refType = 4;
@@ -14445,10 +14445,10 @@
 			};
 		};
 		AABE35EB04967E25005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = BannerCache.cpp;
 			path = ../src/BannerCache.cpp;
 			refType = 4;
@@ -14457,10 +14457,10 @@
 			usesTabs = 0;
 		};
 		AABE35EC04967E26005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = BannerCache.h;
 			path = ../src/BannerCache.h;
 			refType = 4;
@@ -14469,10 +14469,10 @@
 			usesTabs = 0;
 		};
 		AABE35EF04967E6F005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ModeSwitcher.cpp;
 			path = ../src/ModeSwitcher.cpp;
 			refType = 4;
@@ -14481,10 +14481,10 @@
 			usesTabs = 0;
 		};
 		AABE35F004967E6F005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ModeSwitcher.h;
 			path = ../src/ModeSwitcher.h;
 			refType = 4;
@@ -14493,10 +14493,10 @@
 			usesTabs = 0;
 		};
 		AABE36F60497CE16005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = arch_default.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14504,10 +14504,10 @@
 			usesTabs = 0;
 		};
 		AABE36F70497CE16005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = arch_internal.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14515,10 +14515,10 @@
 			usesTabs = 0;
 		};
 		AABE36F80497CE16005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = arch.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14526,10 +14526,10 @@
 			usesTabs = 0;
 		};
 		AABE36FC0497CE44005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ArchHooks.h;
 			path = ArchHooks/ArchHooks.h;
 			refType = 4;
@@ -14556,10 +14556,10 @@
 			sourceTree = "<group>";
 		};
 		AABE36FF0497CE83005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ArchHooks_none.h;
 			path = ArchHooks/ArchHooks_none.h;
 			refType = 4;
@@ -14568,10 +14568,10 @@
 			usesTabs = 0;
 		};
 		AABE37030497CF85005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = RageSoundDriver.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14589,18 +14589,18 @@
 			sourceTree = "<group>";
 		};
 		AABE78730591287100E8BF50 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = MemoryCardDriver.h;
 			refType = 4;
 			sourceTree = "<group>";
 			usesTabs = 0;
 		};
 		AABE78760591287100E8BF50 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = MemoryCardDriver_Null.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14619,9 +14619,9 @@
 			};
 		};
 		AABE788B05912B0600E8BF50 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = DualScrollBar.h;
 			path = ../src/DualScrollBar.h;
 			refType = 4;
@@ -14629,9 +14629,9 @@
 			usesTabs = 0;
 		};
 		AABE788C05912B0600E8BF50 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = DualScrollBar.cpp;
 			path = ../src/DualScrollBar.cpp;
 			refType = 4;
@@ -14651,9 +14651,9 @@
 			};
 		};
 		AABE7D3E051F07E900D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = Vsync.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14661,9 +14661,9 @@
 			usesTabs = 0;
 		};
 		AABE7D3F051F07E900D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = Vsync.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14671,9 +14671,9 @@
 			usesTabs = 0;
 		};
 		AABEB521051F163A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = InputHandler_Carbon.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14681,9 +14681,9 @@
 			usesTabs = 0;
 		};
 		AABEB522051F163A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = InputHandler_Carbon.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14691,9 +14691,9 @@
 			usesTabs = 0;
 		};
 		AABFA8C905A4535700D3FDD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ListDisplay.cpp;
 			path = ../src/ListDisplay.cpp;
 			refType = 4;
@@ -14701,9 +14701,9 @@
 			usesTabs = 0;
 		};
 		AABFA8CA05A4535700D3FDD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ListDisplay.h;
 			path = ../src/ListDisplay.h;
 			refType = 4;
@@ -14723,10 +14723,10 @@
 			};
 		};
 		AAC23F7C0485E68D005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageDisplay_OGL.cpp;
 			path = ../src/RageDisplay_OGL.cpp;
 			refType = 4;
@@ -14735,10 +14735,10 @@
 			usesTabs = 0;
 		};
 		AAC23F7D0485E68D005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageDisplay_OGL.h;
 			path = ../src/RageDisplay_OGL.h;
 			refType = 4;
@@ -14747,10 +14747,10 @@
 			usesTabs = 0;
 		};
 		AAC23F7E0485E68D005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageUtil_CharConversions.cpp;
 			path = ../src/RageUtil_CharConversions.cpp;
 			refType = 4;
@@ -14759,10 +14759,10 @@
 			usesTabs = 0;
 		};
 		AAC23F7F0485E68D005F316C = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageUtil_CharConversions.h;
 			path = ../src/RageUtil_CharConversions.h;
 			refType = 4;
@@ -14771,9 +14771,9 @@
 			usesTabs = 0;
 		};
 		AAC28BB904F758E500D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = BeginnerHelper.cpp;
 			path = ../src/BeginnerHelper.cpp;
 			refType = 4;
@@ -14782,9 +14782,9 @@
 			usesTabs = 0;
 		};
 		AAC28BBA04F758E500D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = BeginnerHelper.h;
 			path = ../src/BeginnerHelper.h;
 			refType = 4;
@@ -14793,9 +14793,9 @@
 			usesTabs = 0;
 		};
 		AAC622F805389A0500D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenCenterImage.cpp;
 			path = ../src/ScreenCenterImage.cpp;
 			refType = 4;
@@ -14804,9 +14804,9 @@
 			usesTabs = 0;
 		};
 		AAC622F905389A0500D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenCenterImage.h;
 			path = ../src/ScreenCenterImage.h;
 			refType = 4;
@@ -14815,9 +14815,9 @@
 			usesTabs = 0;
 		};
 		AAC622FA05389A0500D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenTestInput.cpp;
 			path = ../src/ScreenTestInput.cpp;
 			refType = 4;
@@ -14826,9 +14826,9 @@
 			usesTabs = 0;
 		};
 		AAC622FB05389A0500D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenTestInput.h;
 			path = ../src/ScreenTestInput.h;
 			refType = 4;
@@ -14837,18 +14837,18 @@
 			usesTabs = 0;
 		};
 		AAC6889905D7F3C800964E6D = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = XmlFile.cpp;
 			path = ../src/XmlFile.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAC6889A05D7F3C800964E6D = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = XmlFile.h;
 			path = ../src/XmlFile.h;
 			refType = 4;
@@ -14867,9 +14867,9 @@
 			};
 		};
 		AAC6DCE30567660A00B5D56F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = LightsManager.cpp;
 			path = ../src/LightsManager.cpp;
 			refType = 4;
@@ -14878,9 +14878,9 @@
 			usesTabs = 0;
 		};
 		AAC6DCE40567660A00B5D56F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = LightsManager.h;
 			path = ../src/LightsManager.h;
 			refType = 4;
@@ -14915,9 +14915,9 @@
 			sourceTree = "<group>";
 		};
 		AAC6DCEE0567663800B5D56F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = LightsDriver.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14925,9 +14925,9 @@
 			usesTabs = 0;
 		};
 		AAC6DCEF0567663800B5D56F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = LightsDriver_Null.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14935,9 +14935,9 @@
 			usesTabs = 0;
 		};
 		AAC6DCF00567663800B5D56F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = LightsDriver_Win32Parallel.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14945,9 +14945,9 @@
 			usesTabs = 0;
 		};
 		AAC6DCF10567663800B5D56F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = LightsDriver_Win32Parallel.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -14967,9 +14967,9 @@
 			};
 		};
 		AAC6DDDE0569C71000B5D56F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = PaneDisplay.cpp;
 			path = ../src/PaneDisplay.cpp;
 			refType = 4;
@@ -14978,9 +14978,9 @@
 			usesTabs = 0;
 		};
 		AAC6DDDF0569C71000B5D56F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = PaneDisplay.h;
 			path = ../src/PaneDisplay.h;
 			refType = 4;
@@ -15001,9 +15001,9 @@
 			};
 		};
 		AAC6DDE60569C80900B5D56F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = DifficultyList.cpp;
 			path = ../src/DifficultyList.cpp;
 			refType = 4;
@@ -15012,9 +15012,9 @@
 			usesTabs = 0;
 		};
 		AAC6DDE70569C80900B5D56F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = DifficultyList.h;
 			path = ../src/DifficultyList.h;
 			refType = 4;
@@ -15035,18 +15035,18 @@
 			};
 		};
 		AAD36082062BB8AE00D0CED8 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSoundPosMap.cpp;
 			path = ../src/RageSoundPosMap.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAD36083062BB8AE00D0CED8 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSoundPosMap.h;
 			path = ../src/RageSoundPosMap.h;
 			refType = 4;
@@ -15065,9 +15065,9 @@
 			};
 		};
 		AAD3D5AB05B5AB4E00014FAC = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageUtil_CircularBuffer.h;
 			path = ../src/RageUtil_CircularBuffer.h;
 			refType = 4;
@@ -15730,9 +15730,9 @@
 			};
 		};
 		AAD620190528FA5E00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = CharacterHead.cpp;
 			path = ../src/CharacterHead.cpp;
 			refType = 4;
@@ -15741,9 +15741,9 @@
 			usesTabs = 0;
 		};
 		AAD6201A0528FA5E00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = CharacterHead.h;
 			path = ../src/CharacterHead.h;
 			refType = 4;
@@ -15752,9 +15752,9 @@
 			usesTabs = 0;
 		};
 		AAD6201D0528FAAB00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenEndlessBreak.cpp;
 			path = ../src/ScreenEndlessBreak.cpp;
 			refType = 4;
@@ -15763,9 +15763,9 @@
 			usesTabs = 0;
 		};
 		AAD6201E0528FAAB00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenEndlessBreak.h;
 			path = ../src/ScreenEndlessBreak.h;
 			refType = 4;
@@ -15774,9 +15774,9 @@
 			usesTabs = 0;
 		};
 		AAD620A5052EC78B00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = PercentageDisplay.cpp;
 			path = ../src/PercentageDisplay.cpp;
 			refType = 4;
@@ -15785,9 +15785,9 @@
 			usesTabs = 0;
 		};
 		AAD620A6052EC78B00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = PercentageDisplay.h;
 			path = ../src/PercentageDisplay.h;
 			refType = 4;
@@ -15796,7 +15796,7 @@
 			usesTabs = 0;
 		};
 		AAD64AA10603FE7300EF8CDE = {
-			explicitFileType = sourcecode.cpp.h;
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
@@ -15805,18 +15805,18 @@
 			sourceTree = "<group>";
 		};
 		AAD64AA30604079E00EF8CDE = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenDownloadMachineStats.cpp;
 			path = ../src/ScreenDownloadMachineStats.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAD64AA40604079E00EF8CDE = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenDownloadMachineStats.h;
 			path = ../src/ScreenDownloadMachineStats.h;
 			refType = 4;
@@ -15835,17 +15835,17 @@
 			};
 		};
 		AAD6A6DE065E0A8D0042165A = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CatalogXml.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAD6A6DF065E0A8D0042165A = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CatalogXml.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -15863,17 +15863,17 @@
 			};
 		};
 		AAD6A712065E0FDF0042165A = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = Difficulty.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAD6A713065E0FDF0042165A = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = Difficulty.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -15891,18 +15891,18 @@
 			};
 		};
 		AAD7A2FA0664999800CCAB36 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = EditCoursesSongMenu.cpp;
 			path = ../src/EditCoursesSongMenu.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAD7A2FB0664999800CCAB36 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = EditCoursesSongMenu.h;
 			path = ../src/EditCoursesSongMenu.h;
 			refType = 4;
@@ -15921,9 +15921,9 @@
 			};
 		};
 		AADB4E7A04D4FE5D00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSoundReader_FileReader.h;
 			path = ../src/RageSoundReader_FileReader.h;
 			refType = 4;
@@ -15932,9 +15932,9 @@
 			usesTabs = 0;
 		};
 		AADB4E7B04D4FE5D00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSounds.cpp;
 			path = ../src/RageSounds.cpp;
 			refType = 4;
@@ -15943,9 +15943,9 @@
 			usesTabs = 0;
 		};
 		AADB4E7C04D4FE5D00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSounds.h;
 			path = ../src/RageSounds.h;
 			refType = 4;
@@ -15954,9 +15954,9 @@
 			usesTabs = 0;
 		};
 		AADB4E8004D4FEC400D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ArchHooks_Win32.cpp;
 			path = ArchHooks/ArchHooks_Win32.cpp;
 			refType = 4;
@@ -15965,9 +15965,9 @@
 			usesTabs = 0;
 		};
 		AADB4E8104D4FEC400D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ArchHooks_Win32.h;
 			path = ArchHooks/ArchHooks_Win32.h;
 			refType = 4;
@@ -15976,9 +15976,9 @@
 			usesTabs = 0;
 		};
 		AADB4E8204D4FF9B00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Crash.cpp;
 			path = Win32/Crash.cpp;
 			refType = 4;
@@ -15987,9 +15987,9 @@
 			usesTabs = 0;
 		};
 		AADB4E8304D4FF9B00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Crash.h;
 			path = Win32/Crash.h;
 			refType = 4;
@@ -16016,10 +16016,10 @@
 			sourceTree = "<group>";
 		};
 		AADB4E8804D50FB900D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CrashHandler.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16027,10 +16027,10 @@
 			usesTabs = 0;
 		};
 		AADB4E8A04D50FB900D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CrashHandlerInternal.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16038,9 +16038,9 @@
 			usesTabs = 0;
 		};
 		AADB4E8B04D50FB900D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = SignalHandler.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16048,9 +16048,9 @@
 			usesTabs = 0;
 		};
 		AADB4E8C04D50FB900D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = SignalHandler.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16085,9 +16085,9 @@
 			sourceTree = "<group>";
 		};
 		AADB4E8F04D5263200D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = arch_setup.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16095,9 +16095,9 @@
 			usesTabs = 0;
 		};
 		AADB4E9104D5288400D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ArchHooks_Unix.cpp;
 			path = ArchHooks/ArchHooks_Unix.cpp;
 			refType = 4;
@@ -16106,9 +16106,9 @@
 			usesTabs = 0;
 		};
 		AADB4E9204D5288400D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ArchHooks_Unix.h;
 			path = ArchHooks/ArchHooks_Unix.h;
 			refType = 4;
@@ -16117,10 +16117,10 @@
 			usesTabs = 0;
 		};
 		AADB4F5904D9220700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = Crash.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16128,10 +16128,10 @@
 			usesTabs = 0;
 		};
 		AADB4F5A04D9220700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = Crash.cpp;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16139,9 +16139,9 @@
 			usesTabs = 0;
 		};
 		AADBA562062007BA005D4FC2 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = arch_platform.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16153,9 +16153,9 @@
 			};
 		};
 		AADBE360053D5F8A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenBookkeeping.cpp;
 			path = ../src/ScreenBookkeeping.cpp;
 			refType = 4;
@@ -16164,9 +16164,9 @@
 			usesTabs = 0;
 		};
 		AADBE361053D5F8A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenBookkeeping.h;
 			path = ../src/ScreenBookkeeping.h;
 			refType = 4;
@@ -16175,9 +16175,9 @@
 			usesTabs = 0;
 		};
 		AADBE362053D5F8A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenNameEntryTraditional.cpp;
 			path = ../src/ScreenNameEntryTraditional.cpp;
 			refType = 4;
@@ -16186,9 +16186,9 @@
 			usesTabs = 0;
 		};
 		AADBE363053D5F8A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenNameEntryTraditional.h;
 			path = ../src/ScreenNameEntryTraditional.h;
 			refType = 4;
@@ -16197,9 +16197,9 @@
 			usesTabs = 0;
 		};
 		AADBE368053DA38C00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Bookkeeper.cpp;
 			path = ../src/Bookkeeper.cpp;
 			refType = 4;
@@ -16208,9 +16208,9 @@
 			usesTabs = 0;
 		};
 		AADBE369053DA38C00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Bookkeeper.h;
 			path = ../src/Bookkeeper.h;
 			refType = 4;
@@ -16219,10 +16219,10 @@
 			usesTabs = 0;
 		};
 		AAE443EB04B0F9F600D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = CombinedLifeMeterTug.cpp;
 			path = ../src/CombinedLifeMeterTug.cpp;
 			refType = 4;
@@ -16231,10 +16231,10 @@
 			usesTabs = 0;
 		};
 		AAE443EC04B0F9F600D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = CombinedLifeMeterTug.h;
 			path = ../src/CombinedLifeMeterTug.h;
 			refType = 4;
@@ -16243,10 +16243,10 @@
 			usesTabs = 0;
 		};
 		AAE443F304B0FEB700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScoreKeeperRave.cpp;
 			path = ../src/ScoreKeeperRave.cpp;
 			refType = 4;
@@ -16255,10 +16255,10 @@
 			usesTabs = 0;
 		};
 		AAE443F404B0FEB700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScoreKeeperRave.h;
 			path = ../src/ScoreKeeperRave.h;
 			refType = 4;
@@ -16291,121 +16291,121 @@
 			sourceTree = "<absolute>";
 		};
 		AAE66F630657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CryptBn.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F640657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CryptBn.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F650657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CryptMD5.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F660657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CryptMD5.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F670657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CryptNoise.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F680657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CryptPrime.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F690657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CryptPrime.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F6A0657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CryptRand.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F6B0657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CryptRand.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F6C0657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CryptRSA.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F6D0657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CryptRSA.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F6E0657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CryptSH512.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F6F0657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CryptSH512.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F700657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CryptSHA.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE66F710657634D002E3AD9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CryptSHA.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16453,18 +16453,18 @@
 			};
 		};
 		AAE78049060814AC0034E65F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = NetworkSyncManager.cpp;
 			path = ../src/NetworkSyncManager.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE7804A060814AC0034E65F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = NetworkSyncManager.h;
 			path = ../src/NetworkSyncManager.h;
 			refType = 4;
@@ -16483,18 +16483,18 @@
 			};
 		};
 		AAE7808506081A000034E65F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ezsockets.cpp;
 			path = ../src/ezsockets.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE7808606081A000034E65F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ezsockets.h;
 			path = ../src/ezsockets.h;
 			refType = 4;
@@ -16513,18 +16513,18 @@
 			};
 		};
 		AAE7812B0608249E0034E65F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ActiveAttackList.cpp;
 			path = ../src/ActiveAttackList.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAE7812C0608249E0034E65F = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ActiveAttackList.h;
 			path = ../src/ActiveAttackList.h;
 			refType = 4;
@@ -16549,17 +16549,17 @@
 			};
 		};
 		AAEA08F905E2335300D38622 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = ProfileHtml.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAEA08FA05E2335300D38622 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = ProfileHtml.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16577,25 +16577,25 @@
 			};
 		};
 		AAEA090605E23DF900D38622 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = LuaFunctions.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAEA090705E23DF900D38622 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = LuaHelpers.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAEA090805E23DF900D38622 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = LuaHelpers.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16628,9 +16628,9 @@
 			sourceTree = "<absolute>";
 		};
 		AAECF8BF05265DB600D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenExit.cpp;
 			path = ../src/ScreenExit.cpp;
 			refType = 4;
@@ -16639,9 +16639,9 @@
 			usesTabs = 0;
 		};
 		AAECF8C005265DB600D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenExit.h;
 			path = ../src/ScreenExit.h;
 			refType = 4;
@@ -16650,34 +16650,34 @@
 			usesTabs = 0;
 		};
 		AAED6F280601C528002D2DEE = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = Backtrace.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAED6F290601C528002D2DEE = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = Backtrace.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAED6F2A0601C528002D2DEE = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = BacktraceNames.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAED6F2B0601C528002D2DEE = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = BacktraceNames.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16707,10 +16707,10 @@
 			};
 		};
 		AAEF3D0C04B533CC00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = LoadingWindow_Cocoa.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16718,10 +16718,10 @@
 			usesTabs = 0;
 		};
 		AAEF3D0D04B533CC00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 4;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.objcpp;
 			path = LoadingWindow_Cocoa.mm;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16729,9 +16729,9 @@
 			usesTabs = 0;
 		};
 		AAEF3D1004B53E2900D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = LoadingWindow.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -16748,18 +16748,18 @@
 			sourceTree = "<absolute>";
 		};
 		AAF4206505D63FA700056441 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ModelManager.cpp;
 			path = ../src/ModelManager.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF4206605D63FA700056441 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ModelManager.h;
 			path = ../src/ModelManager.h;
 			refType = 4;
@@ -16778,18 +16778,18 @@
 			};
 		};
 		AAF4206905D6400800056441 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageModelGeometry.cpp;
 			path = ../src/RageModelGeometry.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF4206A05D6400800056441 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageModelGeometry.h;
 			path = ../src/RageModelGeometry.h;
 			refType = 4;
@@ -16808,9 +16808,9 @@
 			};
 		};
 		AAF430FD04DC98BC00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Steps.cpp;
 			path = ../src/Steps.cpp;
 			refType = 4;
@@ -16819,9 +16819,9 @@
 			usesTabs = 0;
 		};
 		AAF430FE04DC98BC00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Steps.h;
 			path = ../src/Steps.h;
 			refType = 4;
@@ -16830,10 +16830,10 @@
 			usesTabs = 0;
 		};
 		AAF580A704B3E2DC00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageUtil_FileDB.cpp;
 			path = ../src/RageUtil_FileDB.cpp;
 			refType = 4;
@@ -16842,10 +16842,10 @@
 			usesTabs = 0;
 		};
 		AAF580A804B3E2DC00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			indentWidth = 4;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageUtil_FileDB.h;
 			path = ../src/RageUtil_FileDB.h;
 			refType = 4;
@@ -16854,18 +16854,18 @@
 			usesTabs = 0;
 		};
 		AAF7435906110E8D00B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ScreenTestLights.cpp;
 			path = ../src/ScreenTestLights.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF7435A06110E8D00B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ScreenTestLights.h;
 			path = ../src/ScreenTestLights.h;
 			refType = 4;
@@ -16906,98 +16906,98 @@
 			sourceTree = "<group>";
 		};
 		AAF744B006116B0500B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CAAudioHardwareDevice.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF744B106116B0500B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CAAudioHardwareDevice.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF744B206116B0500B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CAAudioHardwareStream.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF744B306116B0500B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CAAudioHardwareStream.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF744B406116B0500B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CAAudioHardwareSystem.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF744B506116B0500B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CAAudioHardwareSystem.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF744DA06116B0600B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CAException.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF744E706116B0600B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CAPrefix.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF744F306116B0600B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			path = CAStreamBasicDescription.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF744F406116B0600B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = CAStreamBasicDescription.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF7458E061181F700B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageDisplay_Null.cpp;
 			path = ../src/RageDisplay_Null.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
 		AAF7458F061181F700B19AD1 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageDisplay_Null.h;
 			path = ../src/RageDisplay_Null.h;
 			refType = 4;
@@ -17016,9 +17016,9 @@
 			};
 		};
 		AAFC7FF00513A67700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSoundReader_FileReader.cpp;
 			path = ../src/RageSoundReader_FileReader.cpp;
 			refType = 4;
@@ -17027,9 +17027,9 @@
 			usesTabs = 0;
 		};
 		AAFC7FF10513A67700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = RageSoundReader_MP3.cpp;
 			path = ../src/RageSoundReader_MP3.cpp;
 			refType = 4;
@@ -17038,9 +17038,9 @@
 			usesTabs = 0;
 		};
 		AAFC7FF20513A67700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = RageSoundReader_MP3.h;
 			path = ../src/RageSoundReader_MP3.h;
 			refType = 4;
@@ -17070,9 +17070,9 @@
 			sourceTree = "<group>";
 		};
 		AAFC80410513A6EB00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = ogg.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -17080,9 +17080,9 @@
 			usesTabs = 0;
 		};
 		AAFC80420513A6EB00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = os_types.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -17100,9 +17100,9 @@
 			sourceTree = "<group>";
 		};
 		AAFC80440513A6EB00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = codec.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -17110,9 +17110,9 @@
 			usesTabs = 0;
 		};
 		AAFC80460513A6EB00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			path = vorbisfile.h;
 			refType = 4;
 			sourceTree = "<group>";
@@ -17120,9 +17120,9 @@
 			usesTabs = 0;
 		};
 		AAFF551D0549F39700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = GraphDisplay.cpp;
 			path = ../src/GraphDisplay.cpp;
 			refType = 4;
@@ -17131,9 +17131,9 @@
 			usesTabs = 0;
 		};
 		AAFF551E0549F39700D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = GraphDisplay.h;
 			path = ../src/GraphDisplay.h;
 			refType = 4;
@@ -17142,9 +17142,9 @@
 			usesTabs = 0;
 		};
 		AAFF55210549F43A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = ComboGraph.cpp;
 			path = ../src/ComboGraph.cpp;
 			refType = 4;
@@ -17153,9 +17153,9 @@
 			usesTabs = 0;
 		};
 		AAFF55220549F43A00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = ComboGraph.h;
 			path = ../src/ComboGraph.h;
 			refType = 4;
@@ -17164,9 +17164,9 @@
 			usesTabs = 0;
 		};
 		AAFF5541054E736D00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
 			name = Attack.cpp;
 			path = ../src/Attack.cpp;
 			refType = 4;
@@ -17175,9 +17175,9 @@
 			usesTabs = 0;
 		};
 		AAFF5542054E736D00D02EE9 = {
+			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
 			name = Attack.h;
 			path = ../src/Attack.h;
 			refType = 4;