diff --git a/rtl/aix/Makefile b/rtl/aix/Makefile
index fc25cf1892..14c448a446 100644
--- a/rtl/aix/Makefile
+++ b/rtl/aix/Makefile
@@ -2696,7 +2696,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile
index cb897d7853..f30889aa6e 100644
--- a/rtl/amiga/Makefile
+++ b/rtl/amiga/Makefile
@@ -2723,7 +2723,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/android/Makefile b/rtl/android/Makefile
index 4fca877565..f78a239fa4 100644
--- a/rtl/android/Makefile
+++ b/rtl/android/Makefile
@@ -2845,7 +2845,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/aros/Makefile b/rtl/aros/Makefile
index a05e48517c..9c86bdcb45 100644
--- a/rtl/aros/Makefile
+++ b/rtl/aros/Makefile
@@ -2738,7 +2738,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/atari/Makefile b/rtl/atari/Makefile
index 1b6831e2b1..7b2c6d36f1 100644
--- a/rtl/atari/Makefile
+++ b/rtl/atari/Makefile
@@ -2693,7 +2693,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile
index 510d554db4..9bae672627 100644
--- a/rtl/beos/Makefile
+++ b/rtl/beos/Makefile
@@ -2702,7 +2702,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile
index d947bdfaec..ea1eda3503 100644
--- a/rtl/darwin/Makefile
+++ b/rtl/darwin/Makefile
@@ -2816,7 +2816,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/dragonfly/Makefile b/rtl/dragonfly/Makefile
index fbadea2240..7ac2f54aa2 100644
--- a/rtl/dragonfly/Makefile
+++ b/rtl/dragonfly/Makefile
@@ -2710,7 +2710,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile
index 570abea0a0..6a1fd303bd 100644
--- a/rtl/embedded/Makefile
+++ b/rtl/embedded/Makefile
@@ -3075,7 +3075,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile
index 7068432781..0d6caa413c 100644
--- a/rtl/emx/Makefile
+++ b/rtl/emx/Makefile
@@ -2702,7 +2702,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile
index 6b13abf07a..4a4ff0140e 100644
--- a/rtl/freebsd/Makefile
+++ b/rtl/freebsd/Makefile
@@ -2752,7 +2752,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/freertos/Makefile b/rtl/freertos/Makefile
index 48f84db061..e456158bc9 100644
--- a/rtl/freertos/Makefile
+++ b/rtl/freertos/Makefile
@@ -2770,7 +2770,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile
index 6338571b23..d87c827527 100644
--- a/rtl/gba/Makefile
+++ b/rtl/gba/Makefile
@@ -2691,7 +2691,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile
index dfb87ce9c4..9c8ac57b5f 100644
--- a/rtl/go32v2/Makefile
+++ b/rtl/go32v2/Makefile
@@ -2704,7 +2704,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/haiku/Makefile b/rtl/haiku/Makefile
index b8ace35e28..ab49b410b1 100644
--- a/rtl/haiku/Makefile
+++ b/rtl/haiku/Makefile
@@ -2734,7 +2734,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/human68k/Makefile b/rtl/human68k/Makefile
index 7b599e69ad..8554ac47f6 100644
--- a/rtl/human68k/Makefile
+++ b/rtl/human68k/Makefile
@@ -2693,7 +2693,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/java/Makefile b/rtl/java/Makefile
index 0ac0c4e16a..bf5075716e 100644
--- a/rtl/java/Makefile
+++ b/rtl/java/Makefile
@@ -2664,7 +2664,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile
index ac014a48be..c0dd48793b 100644
--- a/rtl/linux/Makefile
+++ b/rtl/linux/Makefile
@@ -3311,7 +3311,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile
index 167829b067..82a3c1d22f 100644
--- a/rtl/macos/Makefile
+++ b/rtl/macos/Makefile
@@ -2682,7 +2682,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile
index e96c854ceb..6e590a231a 100644
--- a/rtl/morphos/Makefile
+++ b/rtl/morphos/Makefile
@@ -2665,7 +2665,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/msdos/Makefile b/rtl/msdos/Makefile
index 7530837546..9becf2d4d3 100644
--- a/rtl/msdos/Makefile
+++ b/rtl/msdos/Makefile
@@ -2696,7 +2696,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/msxdos/Makefile b/rtl/msxdos/Makefile
index b8a365c26b..947d520a89 100644
--- a/rtl/msxdos/Makefile
+++ b/rtl/msxdos/Makefile
@@ -2666,7 +2666,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/nativent/Makefile b/rtl/nativent/Makefile
index d0dcceeeb0..64e2c7511b 100644
--- a/rtl/nativent/Makefile
+++ b/rtl/nativent/Makefile
@@ -2672,7 +2672,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile
index 8f94d25086..6a7e21f19e 100644
--- a/rtl/nds/Makefile
+++ b/rtl/nds/Makefile
@@ -2694,7 +2694,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile
index 64a12a1b9c..c00983ae80 100644
--- a/rtl/netbsd/Makefile
+++ b/rtl/netbsd/Makefile
@@ -2804,7 +2804,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile
index 38924bc352..da2d085fa7 100644
--- a/rtl/netware/Makefile
+++ b/rtl/netware/Makefile
@@ -2709,7 +2709,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile
index 2cbaa8b145..a425a6336d 100644
--- a/rtl/netwlibc/Makefile
+++ b/rtl/netwlibc/Makefile
@@ -2697,7 +2697,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/openbsd/Makefile b/rtl/openbsd/Makefile
index e3194fa3b8..70f7e4d745 100644
--- a/rtl/openbsd/Makefile
+++ b/rtl/openbsd/Makefile
@@ -2737,7 +2737,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile
index 48d2f977ca..7c899d2a38 100644
--- a/rtl/os2/Makefile
+++ b/rtl/os2/Makefile
@@ -2701,7 +2701,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile
index 2c1e1b0626..745a1bf9ee 100644
--- a/rtl/palmos/Makefile
+++ b/rtl/palmos/Makefile
@@ -2704,7 +2704,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/sinclairql/Makefile b/rtl/sinclairql/Makefile
index 761670a74f..981e420e4c 100644
--- a/rtl/sinclairql/Makefile
+++ b/rtl/sinclairql/Makefile
@@ -2693,7 +2693,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile
index e7a551dc01..6c39c4e781 100644
--- a/rtl/solaris/Makefile
+++ b/rtl/solaris/Makefile
@@ -2709,7 +2709,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile
index e9ae11e9d5..8806ae1813 100644
--- a/rtl/symbian/Makefile
+++ b/rtl/symbian/Makefile
@@ -2687,7 +2687,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/wasi/Makefile b/rtl/wasi/Makefile
index 7dd5f0b0a8..0b7dbaff6c 100644
--- a/rtl/wasi/Makefile
+++ b/rtl/wasi/Makefile
@@ -2670,7 +2670,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile
index 6eff07a783..c4f084373d 100644
--- a/rtl/watcom/Makefile
+++ b/rtl/watcom/Makefile
@@ -2700,7 +2700,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/wii/Makefile b/rtl/wii/Makefile
index 4e5d89c03e..bd683f221e 100644
--- a/rtl/wii/Makefile
+++ b/rtl/wii/Makefile
@@ -2663,7 +2663,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/win16/Makefile b/rtl/win16/Makefile
index c61dded087..cce21cc3ce 100644
--- a/rtl/win16/Makefile
+++ b/rtl/win16/Makefile
@@ -2699,7 +2699,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile
index 1dcda39fd5..914a3694d0 100644
--- a/rtl/win32/Makefile
+++ b/rtl/win32/Makefile
@@ -2710,7 +2710,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile
index b3d2f08a09..4efd8edef2 100644
--- a/rtl/win64/Makefile
+++ b/rtl/win64/Makefile
@@ -2731,7 +2731,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile
index 4ec9fdf058..bcc6ecfe8a 100644
--- a/rtl/wince/Makefile
+++ b/rtl/wince/Makefile
@@ -2689,7 +2689,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)
diff --git a/rtl/zxspectrum/Makefile b/rtl/zxspectrum/Makefile
index d07f626399..35b7799b0d 100644
--- a/rtl/zxspectrum/Makefile
+++ b/rtl/zxspectrum/Makefile
@@ -2662,7 +2662,7 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
 UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 	$(COMPILER) $(CTHREADS_OPT) $<
-NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT)
+NOTHREADS_DEPS=$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
 nothreads$(PPUEXT) : $(INC)/nothreads.pp $(NOTHREADS_DEPS)
 	$(COMPILER) $(NOTHREADS_OPT) $<
 System.NoThreads$(PPUEXT) :  $(NSINC)/System.NoThreads.pp $(NOTHREADS_DEPS)