diff --git a/rtl/aix/Makefile b/rtl/aix/Makefile
index 35d777ec09..b1953affb3 100644
--- a/rtl/aix/Makefile
+++ b/rtl/aix/Makefile
@@ -2319,7 +2319,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile
index c94e0020c0..b0ecb06e23 100644
--- a/rtl/amiga/Makefile
+++ b/rtl/amiga/Makefile
@@ -2351,7 +2351,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/android/Makefile b/rtl/android/Makefile
index 9c6882bf08..4737c1b122 100644
--- a/rtl/android/Makefile
+++ b/rtl/android/Makefile
@@ -2458,7 +2458,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/aros/Makefile b/rtl/aros/Makefile
index e9c7d35f17..b3851a370c 100644
--- a/rtl/aros/Makefile
+++ b/rtl/aros/Makefile
@@ -2366,7 +2366,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/atari/Makefile b/rtl/atari/Makefile
index 5e7841d497..45e290a723 100644
--- a/rtl/atari/Makefile
+++ b/rtl/atari/Makefile
@@ -2321,7 +2321,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile
index d741bf4936..f70e9e58da 100644
--- a/rtl/beos/Makefile
+++ b/rtl/beos/Makefile
@@ -2327,7 +2327,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile
index d68abac936..cbedf63913 100644
--- a/rtl/darwin/Makefile
+++ b/rtl/darwin/Makefile
@@ -2447,7 +2447,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/dragonfly/Makefile b/rtl/dragonfly/Makefile
index 37ab5f0b1a..551b9fd578 100644
--- a/rtl/dragonfly/Makefile
+++ b/rtl/dragonfly/Makefile
@@ -2328,7 +2328,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile
index 2a60399d21..5b611dd027 100644
--- a/rtl/embedded/Makefile
+++ b/rtl/embedded/Makefile
@@ -2685,7 +2685,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile
index 3a15a6d9f3..e5153f33c7 100644
--- a/rtl/emx/Makefile
+++ b/rtl/emx/Makefile
@@ -2331,7 +2331,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile
index 93b6016396..1afd2c39f1 100644
--- a/rtl/freebsd/Makefile
+++ b/rtl/freebsd/Makefile
@@ -2369,7 +2369,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/freertos/Makefile b/rtl/freertos/Makefile
index e53432f9ab..60b48303b8 100644
--- a/rtl/freertos/Makefile
+++ b/rtl/freertos/Makefile
@@ -2516,7 +2516,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile
index 3698822086..36886ed346 100644
--- a/rtl/gba/Makefile
+++ b/rtl/gba/Makefile
@@ -2320,7 +2320,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile
index 9580970ab4..466d1b148a 100644
--- a/rtl/go32v2/Makefile
+++ b/rtl/go32v2/Makefile
@@ -2326,7 +2326,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/haiku/Makefile b/rtl/haiku/Makefile
index a6620fa420..9916212e75 100644
--- a/rtl/haiku/Makefile
+++ b/rtl/haiku/Makefile
@@ -2360,7 +2360,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/java/Makefile b/rtl/java/Makefile
index 65bb3de9ab..b18c3398a8 100644
--- a/rtl/java/Makefile
+++ b/rtl/java/Makefile
@@ -2290,7 +2290,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile
index c31c68ebba..d5b4d91f8c 100644
--- a/rtl/linux/Makefile
+++ b/rtl/linux/Makefile
@@ -2920,7 +2920,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile
index f3f2712e68..66c6320e54 100644
--- a/rtl/macos/Makefile
+++ b/rtl/macos/Makefile
@@ -2309,7 +2309,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile
index fa7f82ee2f..90ab0735d2 100644
--- a/rtl/morphos/Makefile
+++ b/rtl/morphos/Makefile
@@ -2293,7 +2293,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/msdos/Makefile b/rtl/msdos/Makefile
index 214d7a6847..7373aac9c2 100644
--- a/rtl/msdos/Makefile
+++ b/rtl/msdos/Makefile
@@ -2320,7 +2320,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/msxdos/Makefile b/rtl/msxdos/Makefile
index c39a1c9a7a..df4f3ce40b 100644
--- a/rtl/msxdos/Makefile
+++ b/rtl/msxdos/Makefile
@@ -2290,7 +2290,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/nativent/Makefile b/rtl/nativent/Makefile
index 0902137197..e983a11b44 100644
--- a/rtl/nativent/Makefile
+++ b/rtl/nativent/Makefile
@@ -2297,7 +2297,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile
index f4e4bb8127..a10050e063 100644
--- a/rtl/nds/Makefile
+++ b/rtl/nds/Makefile
@@ -2320,7 +2320,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile
index 58f5d4bcf0..c291caedc2 100644
--- a/rtl/netbsd/Makefile
+++ b/rtl/netbsd/Makefile
@@ -2425,7 +2425,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile
index 3c5f70c15a..e17702850f 100644
--- a/rtl/netware/Makefile
+++ b/rtl/netware/Makefile
@@ -2332,7 +2332,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile
index 56d0335dd0..8831b94b16 100644
--- a/rtl/netwlibc/Makefile
+++ b/rtl/netwlibc/Makefile
@@ -2322,7 +2322,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/openbsd/Makefile b/rtl/openbsd/Makefile
index 017aed5ac9..78fbe2066c 100644
--- a/rtl/openbsd/Makefile
+++ b/rtl/openbsd/Makefile
@@ -2358,7 +2358,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile
index bbdf8c1876..108c674082 100644
--- a/rtl/os2/Makefile
+++ b/rtl/os2/Makefile
@@ -2330,7 +2330,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile
index 2474f58b4f..b82a4e7f18 100644
--- a/rtl/palmos/Makefile
+++ b/rtl/palmos/Makefile
@@ -2333,7 +2333,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/sinclairql/Makefile b/rtl/sinclairql/Makefile
index 45ba73fa12..7e9bf88250 100644
--- a/rtl/sinclairql/Makefile
+++ b/rtl/sinclairql/Makefile
@@ -2321,7 +2321,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile
index 426c6263d4..0b1c689ea8 100644
--- a/rtl/solaris/Makefile
+++ b/rtl/solaris/Makefile
@@ -2334,7 +2334,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile
index 92604f6df5..10c69fd6cb 100644
--- a/rtl/symbian/Makefile
+++ b/rtl/symbian/Makefile
@@ -2311,7 +2311,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/wasi/Makefile b/rtl/wasi/Makefile
index 9035b866f7..3308448bc8 100644
--- a/rtl/wasi/Makefile
+++ b/rtl/wasi/Makefile
@@ -2295,7 +2295,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile
index c1601ec32e..c9b7118b16 100644
--- a/rtl/watcom/Makefile
+++ b/rtl/watcom/Makefile
@@ -2327,7 +2327,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/wii/Makefile b/rtl/wii/Makefile
index 82bbe002dc..ae24ee5662 100644
--- a/rtl/wii/Makefile
+++ b/rtl/wii/Makefile
@@ -2289,7 +2289,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/win16/Makefile b/rtl/win16/Makefile
index 05b7075879..c63c5c5e66 100644
--- a/rtl/win16/Makefile
+++ b/rtl/win16/Makefile
@@ -2320,7 +2320,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile
index 161efcb50e..d80dcd87bd 100644
--- a/rtl/win32/Makefile
+++ b/rtl/win32/Makefile
@@ -891,6 +891,7 @@ SYSUTILSDIR=$(WINDIR)
 SYSUTILS_OPT=-Fi$(WINDIR)
 SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
 WINDIRSDIR=$(WINDIR)
+DYNLIBSINCDIR=$(WINDIR)
 include $(WININC)/makefile.inc
 WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
 EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
@@ -2332,7 +2333,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile
index c0dd7868cc..b7767b5f99 100644
--- a/rtl/win64/Makefile
+++ b/rtl/win64/Makefile
@@ -885,6 +885,7 @@ SYSUTILSDIR=$(WINDIR)
 SYSUTILS_OPT=-Fi../win
 SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
 WINDIRSDIR=$(WINDIR)
+DYNLIBSINCDIR=$(WINDIR)
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
@@ -2353,7 +2354,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile
index bbdd60f4a5..ae59a99c39 100644
--- a/rtl/wince/Makefile
+++ b/rtl/wince/Makefile
@@ -2312,7 +2312,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)
diff --git a/rtl/zxspectrum/Makefile b/rtl/zxspectrum/Makefile
index ddb1a88575..2ad4992111 100644
--- a/rtl/zxspectrum/Makefile
+++ b/rtl/zxspectrum/Makefile
@@ -2287,7 +2287,7 @@ ports$(PPUEXT) : $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
 System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 	$(COMPILER) $(PORTS_OPT) $<
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
 	     objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
 	     $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 dynlibs$(PPUEXT) : $(DYNLIBS_DEPS)