diff --git a/Makefile.mak b/Makefile.mak
index 78c4b457..72dcf768 100644
--- a/Makefile.mak
+++ b/Makefile.mak
@@ -85,9 +85,9 @@ $**
 |
 
 {th02}.c{bin\th02}.obj:
-	$(CC) $(CFLAGS) -ml -Z -DGAME=2 -n$(@D) -c $**
+	$(CC) $(CFLAGS) -ml -3 -Z -DGAME=2 -n$(@D) -c $**
 {th02}.cpp{bin\th02}.obj:
-	$(CC) $(CFLAGS) -ml -Z -DGAME=2 -n$(@D) -c $**
+	$(CC) $(CFLAGS) -ml -3 -Z -DGAME=2 -n$(@D) -c $**
 
 bin\th02\zun_res.com: th02\zun_res1.cpp th02\zun_res2.c th02\zun_res3.c
 	$(CC) $(CFLAGS) -mt -lt -Z -DGAME=2 -nbin\th02\ -eZUN_RES.COM @&&|
@@ -110,9 +110,9 @@ $**
 |
 
 {th03}.c{bin\th03}.obj:
-	$(CC) $(CFLAGS) -ml -Z -DGAME=3 -n$(@D) -c $**
+	$(CC) $(CFLAGS) -ml -3 -Z -DGAME=3 -n$(@D) -c $**
 {th03}.cpp{bin\th03}.obj:
-	$(CC) $(CFLAGS) -ml -Z -DGAME=3 -n$(@D) -c $**
+	$(CC) $(CFLAGS) -ml -3 -Z -DGAME=3 -n$(@D) -c $**
 
 bin\th03\res_yume.com: th03\res_yume.cpp
 	$(CC) $(CFLAGS) -mt -lt -Z -DGAME=3 -nbin\th03\ -eRES_YUME.COM @&&|
@@ -163,7 +163,7 @@ $**
 |
 
 {th05}.cpp{bin\th05}.obj:
-	$(CC) $(CFLAGS) -ml -Z -DGAME=5 -n$(@D) -c $**
+	$(CC) $(CFLAGS) -ml -3 -Z -DGAME=5 -n$(@D) -c $**
 
 bin\th05\res_kso.com: th05\res_kso.cpp
 	$(CC) $(CFLAGS) -mt -lt -Z -DGAME=5 -nbin\th05\ -eRES_KSO.COM @&&|
diff --git a/th02/formats/mpn_l_i.cpp b/th02/formats/mpn_l_i.cpp
index 67006704..84ed3951 100644
--- a/th02/formats/mpn_l_i.cpp
+++ b/th02/formats/mpn_l_i.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 #include <mem.h>
 #include "platform.h"
diff --git a/th02/formats/pi_load.cpp b/th02/formats/pi_load.cpp
index 0ca9838b..d90e401e 100644
--- a/th02/formats/pi_load.cpp
+++ b/th02/formats/pi_load.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 extern "C" {
 #include "platform.h"
diff --git a/th02/formats/pi_put.cpp b/th02/formats/pi_put.cpp
index d8d2655d..b97987b0 100644
--- a/th02/formats/pi_put.cpp
+++ b/th02/formats/pi_put.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 #include <mem.h>
 #include "platform.h"
diff --git a/th02/hardware/grppsafx.cpp b/th02/hardware/grppsafx.cpp
index 21f22236..4966bebb 100644
--- a/th02/hardware/grppsafx.cpp
+++ b/th02/hardware/grppsafx.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 #include <mbctype.h>
 #include <mbstring.h>
diff --git a/th02/main02_1.cpp b/th02/main02_1.cpp
index 44c61c50..2d86145c 100644
--- a/th02/main02_1.cpp
+++ b/th02/main02_1.cpp
@@ -3,7 +3,7 @@
  * 1st part of code segment #2 of TH02's MAIN.EXE
  */
 
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 #include <stddef.h>
 #include "platform.h"
diff --git a/th02/math/vector.cpp b/th02/math/vector.cpp
index eea64d52..1fe7f6f6 100644
--- a/th02/math/vector.cpp
+++ b/th02/math/vector.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 #include "platform.h"
 #include "pc98.h"
diff --git a/th03/formats/cdg_load.cpp b/th03/formats/cdg_load.cpp
index f3acfbe1..08daaad9 100644
--- a/th03/formats/cdg_load.cpp
+++ b/th03/formats/cdg_load.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 extern "C" {
 #include <io.h>
diff --git a/th03/formats/mrs.cpp b/th03/formats/mrs.cpp
index 42f6d850..4ab7d064 100644
--- a/th03/formats/mrs.cpp
+++ b/th03/formats/mrs.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 #include <stddef.h>
 #include "platform.h"
diff --git a/th03/formats/pi_put_i.cpp b/th03/formats/pi_put_i.cpp
index 02c3f0a2..56c98d05 100644
--- a/th03/formats/pi_put_i.cpp
+++ b/th03/formats/pi_put_i.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3 -Z
+#pragma option -zCSHARED
 
 #include "platform.h"
 #include "x86real.h"
diff --git a/th03/formats/pi_put_q.cpp b/th03/formats/pi_put_q.cpp
index 774e6c13..98c0921e 100644
--- a/th03/formats/pi_put_q.cpp
+++ b/th03/formats/pi_put_q.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 #include "platform.h"
 #include "x86real.h"
diff --git a/th03/math/polar.cpp b/th03/math/polar.cpp
index f782a8fe..7bacf4a0 100644
--- a/th03/math/polar.cpp
+++ b/th03/math/polar.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 #include "th03/math/polar.hpp"
 
diff --git a/th03/math/vector.cpp b/th03/math/vector.cpp
index 07d265c4..6d1b3401 100644
--- a/th03/math/vector.cpp
+++ b/th03/math/vector.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 #include "platform.h"
 #include "master.hpp"
diff --git a/th04/formats/mpn_free.cpp b/th04/formats/mpn_free.cpp
index 16e9fa6f..ac5b646f 100644
--- a/th04/formats/mpn_free.cpp
+++ b/th04/formats/mpn_free.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 #include <stddef.h>
 #include "platform.h"
diff --git a/th04/formats/mpn_l_i.cpp b/th04/formats/mpn_l_i.cpp
index 6698eb0c..a457941d 100644
--- a/th04/formats/mpn_l_i.cpp
+++ b/th04/formats/mpn_l_i.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3
+#pragma option -zCSHARED
 
 #include <mem.h>
 #include "platform.h"
diff --git a/th04/main/hud/hp.cpp b/th04/main/hud/hp.cpp
index 0d97b85a..417cf316 100644
--- a/th04/main/hud/hp.cpp
+++ b/th04/main/hud/hp.cpp
@@ -1,5 +1,3 @@
-#pragma option -3
-
 #include "platform.h"
 #include "pc98.h"
 #include "th04/main/hud/hud.hpp"
diff --git a/th04/main/midboss/inv.cpp b/th04/main/midboss/inv.cpp
index 2bc7b7e3..d47e1817 100644
--- a/th04/main/midboss/inv.cpp
+++ b/th04/main/midboss/inv.cpp
@@ -1,5 +1,3 @@
-#pragma option -3
-
 #include "platform.h"
 #include "pc98.h"
 #include "th01/math/subpixel.hpp"
diff --git a/th04/math/vector.cpp b/th04/math/vector.cpp
index b005984f..a19b6012 100644
--- a/th04/math/vector.cpp
+++ b/th04/math/vector.cpp
@@ -1,5 +1,3 @@
-#pragma option -3
-
 #include <stddef.h>
 #include "platform.h"
 #include "pc98.h"
diff --git a/th04/snd/load.cpp b/th04/snd/load.cpp
index 638649cc..950a1c9f 100644
--- a/th04/snd/load.cpp
+++ b/th04/snd/load.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED -3 -Z-
+#pragma option -zCSHARED -Z-
 
 #include "platform.h"
 #include "x86real.h"
diff --git a/th05/formats/pi_cpp_2.cpp b/th05/formats/pi_cpp_2.cpp
index e4fa4b72..1b1f3594 100644
--- a/th05/formats/pi_cpp_2.cpp
+++ b/th05/formats/pi_cpp_2.cpp
@@ -1,6 +1,6 @@
 // Second TH05 .PI C++ translation unit.
 
-#pragma option -zCSHARED_
+#pragma option -zCSHARED_ -2 -k-
 
 #include <stddef.h>
 #include "platform.h"
@@ -23,8 +23,6 @@ void pascal near pi_put_8_rowloop(
 	screen_x_t left, vram_y_t top, pixel_t w, size_t stride_packed
 );
 
-#pragma option -k-
-
 // MODDERS: Just give egc_setup_copy() a mask parameter and remove this
 // abomination of a function.
 void near pi_mask_setup_egc_and_advance(void)
diff --git a/th05/snd/load.cpp b/th05/snd/load.cpp
index b880c8fa..0185dad6 100644
--- a/th05/snd/load.cpp
+++ b/th05/snd/load.cpp
@@ -1,4 +1,4 @@
-#pragma option -zCSHARED_ -3
+#pragma option -zCSHARED_
 
 #include <errno.h>
 #include "platform.h"