diff --git a/rtl/aix/Makefile b/rtl/aix/Makefile
index 4114df986c..9a37db5374 100644
--- a/rtl/aix/Makefile
+++ b/rtl/aix/Makefile
@@ -2450,7 +2450,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile
index ad1b082ecd..c1d49c5d28 100644
--- a/rtl/amiga/Makefile
+++ b/rtl/amiga/Makefile
@@ -2477,7 +2477,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/android/Makefile b/rtl/android/Makefile
index c2189a2e66..fee9cb3141 100644
--- a/rtl/android/Makefile
+++ b/rtl/android/Makefile
@@ -2599,7 +2599,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/aros/Makefile b/rtl/aros/Makefile
index 4807d28088..236a6393c5 100644
--- a/rtl/aros/Makefile
+++ b/rtl/aros/Makefile
@@ -2492,7 +2492,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/atari/Makefile b/rtl/atari/Makefile
index ccb30f53c0..d6c379bd4d 100644
--- a/rtl/atari/Makefile
+++ b/rtl/atari/Makefile
@@ -2447,7 +2447,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile
index 8c35af0ab9..52570a7021 100644
--- a/rtl/beos/Makefile
+++ b/rtl/beos/Makefile
@@ -2456,7 +2456,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile
index 211f4fc21a..a4df936e5e 100644
--- a/rtl/darwin/Makefile
+++ b/rtl/darwin/Makefile
@@ -2570,7 +2570,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/dragonfly/Makefile b/rtl/dragonfly/Makefile
index 044f8e284c..ce0257b73f 100644
--- a/rtl/dragonfly/Makefile
+++ b/rtl/dragonfly/Makefile
@@ -2464,7 +2464,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile
index 9e2f86bbce..f60fe812cd 100644
--- a/rtl/embedded/Makefile
+++ b/rtl/embedded/Makefile
@@ -2829,7 +2829,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile
index 33ac14e66f..ad82984666 100644
--- a/rtl/emx/Makefile
+++ b/rtl/emx/Makefile
@@ -2456,7 +2456,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile
index a3349c5c57..3d52340d37 100644
--- a/rtl/freebsd/Makefile
+++ b/rtl/freebsd/Makefile
@@ -2506,7 +2506,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/freertos/Makefile b/rtl/freertos/Makefile
index d7c75167f5..fe10be3ba0 100644
--- a/rtl/freertos/Makefile
+++ b/rtl/freertos/Makefile
@@ -2646,7 +2646,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile
index 538c10e5f5..f0af1c2e3d 100644
--- a/rtl/gba/Makefile
+++ b/rtl/gba/Makefile
@@ -2445,7 +2445,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile
index dbbbb99dc1..34ca0b680d 100644
--- a/rtl/go32v2/Makefile
+++ b/rtl/go32v2/Makefile
@@ -2458,7 +2458,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/haiku/Makefile b/rtl/haiku/Makefile
index f0eab7e21a..572b75005b 100644
--- a/rtl/haiku/Makefile
+++ b/rtl/haiku/Makefile
@@ -2488,7 +2488,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/inc/Makefile.rtl b/rtl/inc/Makefile.rtl
index 8f4998a403..7c59407184 100644
--- a/rtl/inc/Makefile.rtl
+++ b/rtl/inc/Makefile.rtl
@@ -1044,7 +1044,7 @@ System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 #
 # let it depend on buildcollations to prevent simultaneous building of $(UNICODEDATAUNIT)
 
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
                $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
                $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 
diff --git a/rtl/java/Makefile b/rtl/java/Makefile
index 25f594e965..7782f02b6a 100644
--- a/rtl/java/Makefile
+++ b/rtl/java/Makefile
@@ -2418,7 +2418,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile
index 8008b9feb4..204bbe094d 100644
--- a/rtl/linux/Makefile
+++ b/rtl/linux/Makefile
@@ -3062,7 +3062,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile
index d5de1f1c31..ed99c2280c 100644
--- a/rtl/macos/Makefile
+++ b/rtl/macos/Makefile
@@ -2436,7 +2436,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile
index fffe985f4b..0a9d08ea5f 100644
--- a/rtl/morphos/Makefile
+++ b/rtl/morphos/Makefile
@@ -2419,7 +2419,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/msdos/Makefile b/rtl/msdos/Makefile
index 6f7115a25d..0b49c3ec8b 100644
--- a/rtl/msdos/Makefile
+++ b/rtl/msdos/Makefile
@@ -2450,7 +2450,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/msxdos/Makefile b/rtl/msxdos/Makefile
index 004884e5b4..f7dd2d6c5d 100644
--- a/rtl/msxdos/Makefile
+++ b/rtl/msxdos/Makefile
@@ -2420,7 +2420,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/nativent/Makefile b/rtl/nativent/Makefile
index 2bd80d8cd4..40b1cd7226 100644
--- a/rtl/nativent/Makefile
+++ b/rtl/nativent/Makefile
@@ -2426,7 +2426,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile
index b94eead988..b789bae73e 100644
--- a/rtl/nds/Makefile
+++ b/rtl/nds/Makefile
@@ -2448,7 +2448,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile
index 6e5d6deb0f..7b17e5f339 100644
--- a/rtl/netbsd/Makefile
+++ b/rtl/netbsd/Makefile
@@ -2558,7 +2558,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile
index 2571acd78b..e02313a12b 100644
--- a/rtl/netware/Makefile
+++ b/rtl/netware/Makefile
@@ -2463,7 +2463,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile
index f75409d05c..1b1e3afffa 100644
--- a/rtl/netwlibc/Makefile
+++ b/rtl/netwlibc/Makefile
@@ -2451,7 +2451,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/openbsd/Makefile b/rtl/openbsd/Makefile
index 129720aaac..513d1c655a 100644
--- a/rtl/openbsd/Makefile
+++ b/rtl/openbsd/Makefile
@@ -2491,7 +2491,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile
index 432f9266db..83eb7a0b69 100644
--- a/rtl/os2/Makefile
+++ b/rtl/os2/Makefile
@@ -2455,7 +2455,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile
index 20c06787f4..35e557dec9 100644
--- a/rtl/palmos/Makefile
+++ b/rtl/palmos/Makefile
@@ -2458,7 +2458,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/sinclairql/Makefile b/rtl/sinclairql/Makefile
index 0a64f3f7a5..4d7587e905 100644
--- a/rtl/sinclairql/Makefile
+++ b/rtl/sinclairql/Makefile
@@ -2447,7 +2447,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile
index c604f976f4..136e31e36d 100644
--- a/rtl/solaris/Makefile
+++ b/rtl/solaris/Makefile
@@ -2463,7 +2463,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile
index 39213fcca4..800d733752 100644
--- a/rtl/symbian/Makefile
+++ b/rtl/symbian/Makefile
@@ -2441,7 +2441,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/wasi/Makefile b/rtl/wasi/Makefile
index 7916cd6cef..21e5285b51 100644
--- a/rtl/wasi/Makefile
+++ b/rtl/wasi/Makefile
@@ -2424,7 +2424,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile
index 226e6fde48..0612167e99 100644
--- a/rtl/watcom/Makefile
+++ b/rtl/watcom/Makefile
@@ -2454,7 +2454,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/wii/Makefile b/rtl/wii/Makefile
index 44be1e2ec6..d2a1918ade 100644
--- a/rtl/wii/Makefile
+++ b/rtl/wii/Makefile
@@ -2417,7 +2417,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/win16/Makefile b/rtl/win16/Makefile
index 4f22ae476f..8b8219de66 100644
--- a/rtl/win16/Makefile
+++ b/rtl/win16/Makefile
@@ -2453,7 +2453,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile
index aa992c9d31..40bf53fc52 100644
--- a/rtl/win32/Makefile
+++ b/rtl/win32/Makefile
@@ -2464,7 +2464,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile
index c880561697..af31755387 100644
--- a/rtl/win64/Makefile
+++ b/rtl/win64/Makefile
@@ -2485,7 +2485,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile
index b083f7175e..3bd2c189d0 100644
--- a/rtl/wince/Makefile
+++ b/rtl/wince/Makefile
@@ -2443,7 +2443,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)
diff --git a/rtl/zxspectrum/Makefile b/rtl/zxspectrum/Makefile
index 653ac05ef6..53d1c7168d 100644
--- a/rtl/zxspectrum/Makefile
+++ b/rtl/zxspectrum/Makefile
@@ -2416,7 +2416,7 @@ typinfo$(PPUEXT): $(TYPINFO_DEPS)
 	$(COMPILER) -Sg $(TYPINFO_OPT) $<
 System.TypInfo$(PPUEXT): $(NSINC)/System.TypInfo.pp $(TYPINFO_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) -Sg $(TYPINFO_OPT) $<
-CHARACTER_DEPS=$(OBJPASDIR)/character.pas \
+CHARACTER_DEPS=$(OBJPASDIR)/character.pas $(UNICODEDATAUNIT)$(PPUEXT) \
 	       $(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
 	       $(CHARACTER_DEPS_OS) $(CHARACTER_DEPS_CPU)
 character$(PPUEXT): $(CHARACTER_DEPS)