diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile
index 1796965da0..2246eded82 100644
--- a/rtl/go32v2/Makefile
+++ b/rtl/go32v2/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/09/01]
+# Makefile generated by fpcmake v1.00 [2000/09/02]
 #
 
 defaultrule: all
@@ -204,7 +204,7 @@ endif
 
 override LOADEROBJECTS+=prt0 exceptn fpu
 override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings go32 dpmiexcp initc ports profile dxeload emu387 dos crt objects printer graph sysutils math typinfo cpu mmx getopts heaptrc lineinfo msmouse varutils
-override RSTOBJECTS+=math
+override RSTOBJECTS+=math varutils
 
 # Clean
 
@@ -1156,7 +1156,7 @@ fpc_distclean: fpc_clean
 # Also run clean first if targetdir is set. Unittargetdir is always
 # set if targetdir or unittargetdir is specified
 ifdef UNITTARGETDIR
-TARGETDIRCLEAN=clean
+TARGETDIRCLEAN=fpc_clean
 endif
 
 fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)
diff --git a/rtl/go32v2/Makefile.fpc b/rtl/go32v2/Makefile.fpc
index ab9dce4fc4..ad603cddf0 100644
--- a/rtl/go32v2/Makefile.fpc
+++ b/rtl/go32v2/Makefile.fpc
@@ -10,7 +10,7 @@ units=$(SYSTEMUNIT) objpas strings \
       sysutils math typinfo \
       cpu mmx getopts heaptrc lineinfo \
       msmouse varutils
-rst=math
+rst=math varutils
 
 [require]
 rtl=0
diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile
index af2b77c412..1b552044b7 100644
--- a/rtl/os2/Makefile
+++ b/rtl/os2/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/09/01]
+# Makefile generated by fpcmake v1.00 [2000/09/02]
 #
 
 defaultrule: all
@@ -193,8 +193,8 @@ endif
 # Targets
 
 override LOADEROBJECTS+=prt0 prt1 code2 code3
-override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi dive pmerr dos crt objects printer sysutils math typinfo ucomplex cpu mmx getopts heaptrc lineinfo varutils
-override RSTOBJECTS+=math
+override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi dive pmerr dos crt objects printer sysutils math typinfo varutils ucomplex cpu mmx getopts heaptrc lineinfo
+override RSTOBJECTS+=math varutils
 
 # Clean
 
@@ -1146,7 +1146,7 @@ fpc_distclean: fpc_clean
 # Also run clean first if targetdir is set. Unittargetdir is always
 # set if targetdir or unittargetdir is specified
 ifdef UNITTARGETDIR
-TARGETDIRCLEAN=clean
+TARGETDIRCLEAN=fpc_clean
 endif
 
 fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)
diff --git a/rtl/os2/Makefile.fpc b/rtl/os2/Makefile.fpc
index e193495ea4..5e6430c26c 100644
--- a/rtl/os2/Makefile.fpc
+++ b/rtl/os2/Makefile.fpc
@@ -8,9 +8,9 @@ units=$(SYSTEMUNIT) objpas strings \
       ports os2def doscalls moncalls kbdcalls moucalls viocalls \
       pmbitmap pmwin pmgpi dive pmerr \
       dos crt objects printer \
-      sysutils math typinfo \
-      ucomplex cpu mmx getopts heaptrc lineinfo varutils
-rst=math
+      sysutils math typinfo varutils \
+      ucomplex cpu mmx getopts heaptrc lineinfo
+rst=math varutils
 
 [require]
 rtl=0
diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile
index 55c29fe193..cf2ccda35d 100644
--- a/rtl/win32/Makefile
+++ b/rtl/win32/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/09/01]
+# Makefile generated by fpcmake v1.00 [2000/09/02]
 #
 
 defaultrule: all
@@ -198,8 +198,8 @@ endif
 # Targets
 
 override LOADEROBJECTS+=wprt0 wdllprt0
-override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings windows ole2 opengl32 os_types winsock initc dos crt objects graph sysutils typinfo math cpu mmx getopts heaptrc lineinfo wincrt winmouse sockets printer dynlibs varutils
-override RSTOBJECTS+=math
+override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings windows ole2 opengl32 os_types winsock initc dos crt objects graph sysutils typinfo math varutils cpu mmx getopts heaptrc lineinfo wincrt winmouse sockets printer dynlibs
+override RSTOBJECTS+=math varutils
 
 # Clean
 
@@ -1151,7 +1151,7 @@ fpc_distclean: fpc_clean
 # Also run clean first if targetdir is set. Unittargetdir is always
 # set if targetdir or unittargetdir is specified
 ifdef UNITTARGETDIR
-TARGETDIRCLEAN=clean
+TARGETDIRCLEAN=fpc_clean
 endif
 
 fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)
diff --git a/rtl/win32/Makefile.fpc b/rtl/win32/Makefile.fpc
index 9ef4ff3b55..6c465dcbf8 100644
--- a/rtl/win32/Makefile.fpc
+++ b/rtl/win32/Makefile.fpc
@@ -7,11 +7,10 @@ loaders=wprt0 wdllprt0
 units=$(SYSTEMUNIT) objpas strings \
       windows ole2 opengl32 os_types winsock initc \
       dos crt objects graph \
-      sysutils typinfo math \
+      sysutils typinfo math varutils \
       cpu mmx getopts heaptrc lineinfo \
-      wincrt winmouse sockets printer dynlibs varutils
-
-rst=math
+      wincrt winmouse sockets printer dynlibs
+rst=math varutils
 
 [require]
 rtl=0