diff --git a/rtl/win16/Makefile b/rtl/win16/Makefile
index c8a15ff59c..a24d0ec317 100644
--- a/rtl/win16/Makefile
+++ b/rtl/win16/Makefile
@@ -349,250 +349,250 @@ ifdef NO_EXCEPTIONS_IN_SYSTEM
 override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-android)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-aros)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),x86_64-aros)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),arm-android)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),mips-linux)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),mipsel-embedded)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),mipsel-android)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),jvm-java)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i8086-win16)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),aarch64-linux)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
-override TARGET_UNITS+=system
+override TARGET_UNITS+=system uuchar objpas strings wintypes winprocs win31
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_LOADERS+=prt0s prt0t prt0m prt0c prt0l prt0h
@@ -2570,3 +2570,24 @@ prt0h$(OEXT) : prt0h.asm prt0comn.asm $(COMPILER_UNITTARGETDIR)
 system$(PPUEXT) : system.pp $(SYSDEPS) $(INC)/tnyheaph.inc $(INC)/tinyheap.inc
 	$(COMPILER) -Us -Sg system.pp
 	$(EXECPPAS)
+uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp
+	$(COMPILER) $(INC)/uuchar.pp
+	$(EXECPPAS)
+objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc system$(PPUEXT)
+	$(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/objpas.pp
+	$(EXECPPAS)
+strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
+		   $(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
+		   $(INC)/genstr.inc $(INC)/genstrs.inc \
+		   system$(PPUEXT)
+	$(COMPILER) $(INC)/strings.pp
+	$(EXECPPAS)
+wintypes$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) wintypes.pp
+	$(COMPILER) wintypes.pp
+	$(EXECPPAS)
+winprocs$(PPUEXT) : wintypes$(PPUEXT) winprocs.pp
+	$(COMPILER) winprocs.pp
+	$(EXECPPAS)
+win31$(PPUEXT) : wintypes$(PPUEXT) win31.pp
+	$(COMPILER) win31.pp
+	$(EXECPPAS)
diff --git a/rtl/win16/Makefile.fpc b/rtl/win16/Makefile.fpc
index 915e1b867f..11fef86cb6 100644
--- a/rtl/win16/Makefile.fpc
+++ b/rtl/win16/Makefile.fpc
@@ -1,11 +1,13 @@
 #
-#   Makefile.fpc for MSDOS RTL
+#   Makefile.fpc for Free Pascal Win16 RTL
 #
 [package]
 main=rtl
 [target]
 loaders=prt0s prt0t prt0m prt0c prt0l prt0h 
-units=system wintypes winprocs win31
+units=system uuchar objpas strings \
+      wintypes winprocs win31
+
 
 [require]
 nortl=y
@@ -71,15 +73,34 @@ system$(PPUEXT) : system.pp $(SYSDEPS) $(INC)/tnyheaph.inc $(INC)/tinyheap.inc
         $(COMPILER) -Us -Sg system.pp
 	$(EXECPPAS)
 
+uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp
+	$(COMPILER) $(INC)/uuchar.pp
+	$(EXECPPAS)
+
+objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc system$(PPUEXT)
+        $(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/objpas.pp
+	$(EXECPPAS)
+
+strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
+                   $(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
+                   $(INC)/genstr.inc $(INC)/genstrs.inc \
+                   system$(PPUEXT)
+	$(COMPILER) $(INC)/strings.pp
+	$(EXECPPAS)
+
 #
 # WinAPI Units
 #
 
 wintypes$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) wintypes.pp
 	$(COMPILER) wintypes.pp
+	$(EXECPPAS)
 
 winprocs$(PPUEXT) : wintypes$(PPUEXT) winprocs.pp
 	$(COMPILER) winprocs.pp
+	$(EXECPPAS)
 
 win31$(PPUEXT) : wintypes$(PPUEXT) win31.pp
 	$(COMPILER) win31.pp
+	$(EXECPPAS)
+