diff --git a/uppsrc/Core/Core.upp b/uppsrc/Core/Core.upp
index ca1c5b94d..b5c6633c4 100644
--- a/uppsrc/Core/Core.upp
+++ b/uppsrc/Core/Core.upp
@@ -32,7 +32,7 @@ link(SOLARIS) "-Wl,-R -Wl,/usr/local/lib";
 link(GCC POSIX STACKTRACE) -rdynamic;
 
 file
-	Core.h options(BUILDER_OPTION) PCH,
+	Core.h options PCH,
 	config.h,
 	Defs.h,
 	Cpu.cpp optimize_speed,
diff --git a/uppsrc/Draw/Draw.upp b/uppsrc/Draw/Draw.upp
index ea744d5d1..dafd23ef6 100644
--- a/uppsrc/Draw/Draw.upp
+++ b/uppsrc/Draw/Draw.upp
@@ -21,7 +21,7 @@ library(OSX11) "fontconfig freetype expat";
 library(FREEBSD) xcb;
 
 file
-	Draw.h options(BUILDER_OPTION) PCH,
+	Draw.h options PCH,
 	FontInt.h,
 	Font.cpp,
 	FontCR.cpp,
diff --git a/uppsrc/Turtle/Turtle.upp b/uppsrc/Turtle/Turtle.upp
index 693a4254b..4167355b3 100644
--- a/uppsrc/Turtle/Turtle.upp
+++ b/uppsrc/Turtle/Turtle.upp
@@ -5,7 +5,7 @@ uses
 	CtrlLib;
 
 file
-	Turtle.h options PCH,
+	Turtle.h,
 	Keys.h,
 	After.h,
 	Local.h,
diff --git a/uppsrc/ide/AutoSetup.cpp b/uppsrc/ide/AutoSetup.cpp
index d2285edb1..4ca3a1696 100644
--- a/uppsrc/ide/AutoSetup.cpp
+++ b/uppsrc/ide/AutoSetup.cpp
@@ -401,6 +401,7 @@ void AutoSetup()
 							lib
 			           ) + ";\n"
 			"ALLOW_PRECOMPILED_HEADERS = \"1\";\n"
+			"COMMON_OPTIONS = \"/Zm200\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
@@ -446,7 +447,7 @@ void AutoSetup()
 							lib
 			           ) + ";\n"
 			"ALLOW_PRECOMPILED_HEADERS = \"1\";\n"
-			"COMMON_OPTIONS = \"/arch:SSE2\";\n"
+			"COMMON_OPTIONS = \"/arch:SSE2 /Zm200\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
@@ -496,6 +497,7 @@ void AutoSetup()
 							lib
 			           ) + ";\n"
 			"ALLOW_PRECOMPILED_HEADERS = \"1\";\n"
+			"COMMON_OPTIONS = \"/Zm200\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
@@ -541,7 +543,7 @@ void AutoSetup()
 							lib
 			           ) + ";\n"
 			"ALLOW_PRECOMPILED_HEADERS = \"1\";\n"
-			"COMMON_OPTIONS = \"/arch:SSE2\";\n"
+			"COMMON_OPTIONS = \"/arch:SSE2 /Zm200\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
@@ -589,6 +591,7 @@ void AutoSetup()
 							lib
 			           ) + ";\n"
 			"ALLOW_PRECOMPILED_HEADERS = \"1\";\n"
+			"COMMON_OPTIONS = \"/Zm200\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
@@ -632,7 +635,7 @@ void AutoSetup()
 							lib
 			           ) + ";\n"
 			"ALLOW_PRECOMPILED_HEADERS = \"1\";\n"
-			"COMMON_OPTIONS = \"/arch:SSE2\";\n"
+			"COMMON_OPTIONS = \"/arch:SSE2 /Zm200\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
@@ -680,6 +683,7 @@ void AutoSetup()
 							lib
 			           ) + ";\n"
 			"ALLOW_PRECOMPILED_HEADERS = \"1\";\n"
+			"COMMON_OPTIONS = \"/Zm200\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
@@ -723,7 +727,7 @@ void AutoSetup()
 							lib
 			           ) + ";\n"
 			"ALLOW_PRECOMPILED_HEADERS = \"1\";\n"
-			"COMMON_OPTIONS = \"/arch:SSE2\";\n"
+			"COMMON_OPTIONS = \"/arch:SSE2 /Zm200\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
@@ -809,7 +813,7 @@ void AutoSetup()
 							AppendFileName(sdk, "Lib") +
 							lib
 			           ) + ";\n"
-			"COMMON_OPTIONS = \"/arch:SSE2\";\n"
+			"COMMON_OPTIONS = \"/arch:SSE2 /Zm200\";\n"
 		);
 		SaveFile(AppendFileName(dir, "default_method"), m);
 	}
diff --git a/uppsrc/ide/ide.upp b/uppsrc/ide/ide.upp
index a64f29e08..81f43f59e 100644
--- a/uppsrc/ide/ide.upp
+++ b/uppsrc/ide/ide.upp
@@ -25,7 +25,7 @@ link(WIN32 MSC) /MAP;
 
 file
 	IDE readonly separator,
-	ide.h options(BUILDER_OPTION) PCH,
+	ide.h options PCH,
 	version.h,
 	UppDlg.h,
 	BaseDlg.cpp,