diff --git a/AMBuildScript b/AMBuildScript
index 89712b15..7ff6eb3a 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -140,7 +140,7 @@ class SM:
 			#Finish up
 			self.compiler.AddToListVar('CDEFINES', 'SOURCEMOD_BUILD')
 			self.compiler.AddToListVar('CDEFINES', 'SM_GENERATED_BUILD')
-			self.compiler.AddToListVar('CXXINCLUDES',
+			self.compiler.AddToListVar('CINCLUDES',
 			                           os.path.join(AMBuild.outputFolder, 'includes'))
 			self.compiler.ToConfig(AMBuild, 'compiler')
 			AMBuild.cache.CacheVariable('vendor', self.vendor)
diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl
index 94a18d66..eab7c803 100755
--- a/tools/buildbot/bootstrap.pl
+++ b/tools/buildbot/bootstrap.pl
@@ -44,7 +44,7 @@ if ($reconf) {
 	my ($result);
 	print "Attempting to reconfigure...\n";
 	if ($^O eq "linux") {
-		$result = `python3.1 ../build/configure.py --enable-optimize`;
+		$result = `CC=gcc-4.1 CXX=gcc-4.1 python3.1 ../build/configure.py --enable-optimize`;
 	} else {
 		$result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
 	}