From cefa2745b8f432a4e774c9c10a44abf091018f7b Mon Sep 17 00:00:00 2001
From: Pierre Muller <pierre@freepascal.org>
Date: Fri, 4 Aug 2023 17:16:24 +0200
Subject: [PATCH] Regenerate Makefile's after inc/Makefile.rtl change

---
 rtl/aix/Makefile        | 3 ++-
 rtl/amiga/Makefile      | 3 ++-
 rtl/android/Makefile    | 3 ++-
 rtl/aros/Makefile       | 3 ++-
 rtl/atari/Makefile      | 3 ++-
 rtl/beos/Makefile       | 3 ++-
 rtl/darwin/Makefile     | 3 ++-
 rtl/dragonfly/Makefile  | 3 ++-
 rtl/embedded/Makefile   | 3 ++-
 rtl/emx/Makefile        | 3 ++-
 rtl/freebsd/Makefile    | 3 ++-
 rtl/freertos/Makefile   | 3 ++-
 rtl/gba/Makefile        | 3 ++-
 rtl/go32v2/Makefile     | 3 ++-
 rtl/haiku/Makefile      | 3 ++-
 rtl/java/Makefile       | 3 ++-
 rtl/linux/Makefile      | 3 ++-
 rtl/macos/Makefile      | 3 ++-
 rtl/morphos/Makefile    | 3 ++-
 rtl/msdos/Makefile      | 3 ++-
 rtl/msxdos/Makefile     | 3 ++-
 rtl/nativent/Makefile   | 3 ++-
 rtl/nds/Makefile        | 3 ++-
 rtl/netbsd/Makefile     | 3 ++-
 rtl/netware/Makefile    | 3 ++-
 rtl/netwlibc/Makefile   | 3 ++-
 rtl/openbsd/Makefile    | 3 ++-
 rtl/os2/Makefile        | 3 ++-
 rtl/palmos/Makefile     | 3 ++-
 rtl/sinclairql/Makefile | 3 ++-
 rtl/solaris/Makefile    | 3 ++-
 rtl/symbian/Makefile    | 3 ++-
 rtl/wasi/Makefile       | 3 ++-
 rtl/watcom/Makefile     | 3 ++-
 rtl/wii/Makefile        | 3 ++-
 rtl/win16/Makefile      | 3 ++-
 rtl/win32/Makefile      | 3 ++-
 rtl/win64/Makefile      | 3 ++-
 rtl/wince/Makefile      | 3 ++-
 rtl/zxspectrum/Makefile | 3 ++-
 40 files changed, 80 insertions(+), 40 deletions(-)

diff --git a/rtl/aix/Makefile b/rtl/aix/Makefile
index 98b1d21747..d42194431d 100644
--- a/rtl/aix/Makefile
+++ b/rtl/aix/Makefile
@@ -2527,7 +2527,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile
index abf50ce12d..f29ce6db05 100644
--- a/rtl/amiga/Makefile
+++ b/rtl/amiga/Makefile
@@ -2559,7 +2559,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/android/Makefile b/rtl/android/Makefile
index 7a3660338b..9e7cb5b123 100644
--- a/rtl/android/Makefile
+++ b/rtl/android/Makefile
@@ -2666,7 +2666,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/aros/Makefile b/rtl/aros/Makefile
index da516e42d1..e84ea9a226 100644
--- a/rtl/aros/Makefile
+++ b/rtl/aros/Makefile
@@ -2574,7 +2574,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/atari/Makefile b/rtl/atari/Makefile
index ec6e9ab549..43f9195d7a 100644
--- a/rtl/atari/Makefile
+++ b/rtl/atari/Makefile
@@ -2529,7 +2529,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile
index 1fb6cac554..7e32b89abb 100644
--- a/rtl/beos/Makefile
+++ b/rtl/beos/Makefile
@@ -2535,7 +2535,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile
index e9e2581939..9ebeee19e5 100644
--- a/rtl/darwin/Makefile
+++ b/rtl/darwin/Makefile
@@ -2655,7 +2655,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/dragonfly/Makefile b/rtl/dragonfly/Makefile
index 363197d180..13e2a8cfce 100644
--- a/rtl/dragonfly/Makefile
+++ b/rtl/dragonfly/Makefile
@@ -2536,7 +2536,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile
index 071f6012e3..e7898d51fe 100644
--- a/rtl/embedded/Makefile
+++ b/rtl/embedded/Makefile
@@ -2893,7 +2893,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile
index 79f2c426da..b304181ac4 100644
--- a/rtl/emx/Makefile
+++ b/rtl/emx/Makefile
@@ -2539,7 +2539,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile
index 1811ff728c..bb658a40a4 100644
--- a/rtl/freebsd/Makefile
+++ b/rtl/freebsd/Makefile
@@ -2577,7 +2577,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/freertos/Makefile b/rtl/freertos/Makefile
index 05d365df93..22a2058bc2 100644
--- a/rtl/freertos/Makefile
+++ b/rtl/freertos/Makefile
@@ -2724,7 +2724,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile
index 1431e49e02..bb56a374f2 100644
--- a/rtl/gba/Makefile
+++ b/rtl/gba/Makefile
@@ -2528,7 +2528,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile
index c0dfd37cc3..17d3e1058b 100644
--- a/rtl/go32v2/Makefile
+++ b/rtl/go32v2/Makefile
@@ -2534,7 +2534,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/haiku/Makefile b/rtl/haiku/Makefile
index 201feb09b5..6ec085b0e9 100644
--- a/rtl/haiku/Makefile
+++ b/rtl/haiku/Makefile
@@ -2568,7 +2568,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/java/Makefile b/rtl/java/Makefile
index 743085e68a..184da87799 100644
--- a/rtl/java/Makefile
+++ b/rtl/java/Makefile
@@ -2498,7 +2498,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile
index 61a4a9f05b..e855b62d25 100644
--- a/rtl/linux/Makefile
+++ b/rtl/linux/Makefile
@@ -3128,7 +3128,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile
index 4138bedf3a..9de3618b7a 100644
--- a/rtl/macos/Makefile
+++ b/rtl/macos/Makefile
@@ -2517,7 +2517,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile
index bd30422452..6f79ea00c4 100644
--- a/rtl/morphos/Makefile
+++ b/rtl/morphos/Makefile
@@ -2501,7 +2501,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/msdos/Makefile b/rtl/msdos/Makefile
index aec255265c..68466dfa78 100644
--- a/rtl/msdos/Makefile
+++ b/rtl/msdos/Makefile
@@ -2528,7 +2528,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/msxdos/Makefile b/rtl/msxdos/Makefile
index 92a487a06b..7162162154 100644
--- a/rtl/msxdos/Makefile
+++ b/rtl/msxdos/Makefile
@@ -2498,7 +2498,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/nativent/Makefile b/rtl/nativent/Makefile
index 4d1ed8a2ef..fd3f22df0b 100644
--- a/rtl/nativent/Makefile
+++ b/rtl/nativent/Makefile
@@ -2505,7 +2505,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile
index b6e51ebc03..0cab89c434 100644
--- a/rtl/nds/Makefile
+++ b/rtl/nds/Makefile
@@ -2528,7 +2528,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile
index 4e738998d0..a772b22794 100644
--- a/rtl/netbsd/Makefile
+++ b/rtl/netbsd/Makefile
@@ -2633,7 +2633,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile
index 1df150521e..0b10a0b8d9 100644
--- a/rtl/netware/Makefile
+++ b/rtl/netware/Makefile
@@ -2540,7 +2540,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile
index 78cfd0b141..a3b7a97098 100644
--- a/rtl/netwlibc/Makefile
+++ b/rtl/netwlibc/Makefile
@@ -2530,7 +2530,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/openbsd/Makefile b/rtl/openbsd/Makefile
index ba76e4514a..3a442da79b 100644
--- a/rtl/openbsd/Makefile
+++ b/rtl/openbsd/Makefile
@@ -2566,7 +2566,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile
index 9ccd3b348a..069496e0ad 100644
--- a/rtl/os2/Makefile
+++ b/rtl/os2/Makefile
@@ -2538,7 +2538,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile
index 039bcaa11d..3061a03be3 100644
--- a/rtl/palmos/Makefile
+++ b/rtl/palmos/Makefile
@@ -2541,7 +2541,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/sinclairql/Makefile b/rtl/sinclairql/Makefile
index 39159c0df6..2ff2e9ed8e 100644
--- a/rtl/sinclairql/Makefile
+++ b/rtl/sinclairql/Makefile
@@ -2529,7 +2529,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile
index f4f6ad2217..2da45b6529 100644
--- a/rtl/solaris/Makefile
+++ b/rtl/solaris/Makefile
@@ -2542,7 +2542,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile
index 4d39d132e0..facff60cee 100644
--- a/rtl/symbian/Makefile
+++ b/rtl/symbian/Makefile
@@ -2519,7 +2519,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/wasi/Makefile b/rtl/wasi/Makefile
index 24813828da..6071af30d3 100644
--- a/rtl/wasi/Makefile
+++ b/rtl/wasi/Makefile
@@ -2503,7 +2503,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile
index 16981711d4..49da2d32e3 100644
--- a/rtl/watcom/Makefile
+++ b/rtl/watcom/Makefile
@@ -2535,7 +2535,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/wii/Makefile b/rtl/wii/Makefile
index b36090e05f..8f8978fba7 100644
--- a/rtl/wii/Makefile
+++ b/rtl/wii/Makefile
@@ -2497,7 +2497,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/win16/Makefile b/rtl/win16/Makefile
index 0093487f37..cc0c704bd4 100644
--- a/rtl/win16/Makefile
+++ b/rtl/win16/Makefile
@@ -2528,7 +2528,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile
index 589e4a7e1f..241318f9bb 100644
--- a/rtl/win32/Makefile
+++ b/rtl/win32/Makefile
@@ -2540,7 +2540,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile
index 7ae6f36049..ddf82a0e96 100644
--- a/rtl/win64/Makefile
+++ b/rtl/win64/Makefile
@@ -2557,7 +2557,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile
index ce1dacf920..f38721e093 100644
--- a/rtl/wince/Makefile
+++ b/rtl/wince/Makefile
@@ -2520,7 +2520,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<
diff --git a/rtl/zxspectrum/Makefile b/rtl/zxspectrum/Makefile
index 6b05d4a3de..90ad454e38 100644
--- a/rtl/zxspectrum/Makefile
+++ b/rtl/zxspectrum/Makefile
@@ -2495,7 +2495,8 @@ cpall$(PPUEXT): $(CPALL_DEPS)
 System.CodePages.All$(PPUEXT):  $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
 	$(COMPILER) $(CPALL_OPT) -Fu$(INC) -Fi$(RTL)/charmaps $<
 FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp \
-		  $(CHARACTERUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
+		  $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT \
+		  $(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
 		  $(FPWIDESTRING_DEPS_OS) $(FPWIDESTRING_DEPS_CPU)
 fpwidestring$(PPUEXT): $(FPWIDESTRING_DEPS)
 	$(COMPILER) $(FPWIDESTRING_OPT) $<