diff --git a/components/dockedformeditor/Makefile b/components/dockedformeditor/Makefile
index 99b98974f5..e383cafa42 100644
--- a/components/dockedformeditor/Makefile
+++ b/components/dockedformeditor/Makefile
@@ -1066,343 +1066,343 @@ ifeq ($(CPU_OS_TARGET),loongarch64-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(CPU_OS_TARGET),i386-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-haiku)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-symbian)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-nativent)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-iphonesim)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-aros)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),m68k-macosclassic)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),m68k-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),m68k-sinclairql)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),m68k-human68k)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc-amiga)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc-macosclassic)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc-wii)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc-aix)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),sparc-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-haiku)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-openbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-iphonesim)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-aros)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-dragonfly)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),arm-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),arm-gba)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),arm-nds)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),arm-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),arm-symbian)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),arm-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),arm-aros)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),arm-freertos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),arm-ios)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),armeb-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),armeb-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),mips-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),mipsel-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),mipsel-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),mipsel-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),mipsel-ps1)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),mips64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),mips64el-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),jvm-java)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),jvm-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i8086-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i8086-msdos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i8086-win16)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),aarch64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),aarch64-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),aarch64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),aarch64-win64)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),aarch64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),aarch64-iphonesim)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),aarch64-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),aarch64-ios)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),wasm32-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),wasm32-wasi)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),sparc64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),riscv32-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),riscv32-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),riscv32-freertos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),riscv64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),riscv64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),xtensa-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),xtensa-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),xtensa-freertos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),z80-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),z80-zxspectrum)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),z80-msxdos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),z80-amstradcpc)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),loongarch64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 endif
 ifeq ($(CPU_OS_TARGET),i386-linux)
 override COMPILER_INCLUDEDIR+=source
diff --git a/components/dockedformeditor/Makefile.compiled b/components/dockedformeditor/Makefile.compiled
index 09ae10591b..c7defeca48 100644
--- a/components/dockedformeditor/Makefile.compiled
+++ b/components/dockedformeditor/Makefile.compiled
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Makefile Value="2"/>
-  <Params Value="-Fu.;source;../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazdebuggers/lazdebuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../buildintf/units/$(CPU_TARGET)-$(OS_TARGET);../codetools/units/$(CPU_TARGET)-$(OS_TARGET);../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET);../freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/design/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) -Fisource -MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) dockedformeditor.pas"/>
+  <Params Value="-Fu.;source;../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazdebuggers/lazdebuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../buildintf/units/$(CPU_TARGET)-$(OS_TARGET);../codetools/units/$(CPU_TARGET)-$(OS_TARGET);../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET);../freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/design/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) -Fisource -MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) dockedformeditor.pas"/>
 </CONFIG>
diff --git a/components/dockedformeditor/Makefile.fpc b/components/dockedformeditor/Makefile.fpc
index 65b2054533..759fac67c3 100644
--- a/components/dockedformeditor/Makefile.fpc
+++ b/components/dockedformeditor/Makefile.fpc
@@ -2,7 +2,7 @@
 #
 #   Makefile.fpc for DockedFormEditor 0.0
 #
-#   This file was generated on 06/08/2024
+#   This file was generated on 10/24/2024
 
 [package]
 name=dockedformeditor
@@ -12,7 +12,7 @@ version=0.0
 unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 unitdir=. source ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/lazdebuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/design/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 includedir=source
-options=-MObjFPC -Scghi -O1 -g -gl -gv -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+options=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
 
 [target]
 units=dockedformeditor.pas
diff --git a/components/dockedformeditor/dockedformeditor.lpk b/components/dockedformeditor/dockedformeditor.lpk
index 7fc6725ff2..e556078814 100644
--- a/components/dockedformeditor/dockedformeditor.lpk
+++ b/components/dockedformeditor/dockedformeditor.lpk
@@ -12,12 +12,6 @@
         <OtherUnitFiles Value="source"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\$(LCLWidgetType)"/>
       </SearchPaths>
-      <Linking>
-        <Debugging>
-          <UseValgrind Value="True"/>
-          <UseExternalDbgSyms Value="True"/>
-        </Debugging>
-      </Linking>
       <Other>
         <CustomOptions Value="$(IDEBuildOptions)"/>
       </Other>