diff --git a/sys/unix/hints/include/cross-pre2.370 b/sys/unix/hints/include/cross-pre2.370
index bc38efa62..8d4fff0b2 100644
--- a/sys/unix/hints/include/cross-pre2.370
+++ b/sys/unix/hints/include/cross-pre2.370
@@ -133,20 +133,34 @@ override TARGET_CC = $(TOOLTOP1)/i586-pc-msdosdjgpp-gcc
 override TARGET_CXX = $(TOOLTOP1)/i586-pc-msdosdjgpp-g++
 override TARGET_AR = $(TOOLTOP1)/i586-pc-msdosdjgpp-gcc-ar
 override TARGET_STUBEDIT = ../lib/djgpp/i586-pc-msdosdjgpp/bin/stubedit
-MSDOS_TARGET_CFLAGS = -c -O -I../include -I../sys/msdos -I../win/share \
-	$(LUAINCL) -DDLB $(PDCURSESDEF) \
-	-DTILES_IN_GLYPHMAP -DCROSSCOMPILE -DCROSSCOMPILE_TARGET \
-	-DCROSS_TO_MSDOS \
-        -Wall -Wextra -Wno-missing-field-initializers -Wreturn-type -Wunused \
-        -Wformat -Wswitch -Wshadow -Wwrite-strings \
-	-Wimplicit -Wimplicit-function-declaration -Wimplicit-int \
-	-Wimplicit-fallthrough \
-	-Wmissing-parameter-type -Wold-style-definition -Wstrict-prototypes
-MSDOS_TARGET_CXXFLAGS = -c -O -I../include -I../sys/msdos -I../win/share \
+#
+ifeq "$(WANT_DEBUG)" "1"
+DBGFLAGS = -g
+else
+DBGFLAGS =
+endif
+MSDOS_GCC_CFLAGS = -Wall -Wextra -Wreturn-type -Wunused -Wformat \
+	-Wswitch -Wshadow -Wwrite-strings -Wmissing-declarations \
+	-Wunreachable-code \
+	-Wimplicit -Wimplicit-function-declaration \
+	-Wimplicit-int -Wmissing-prototypes -Wold-style-definition \
+	-Wstrict-prototypes -Wnonnull -Wformat-overflow \
+	-Wmissing-parameter-type -Wimplicit-fallthrough
+#-Wno-missing-field-initializers -Wno-cast-function-type
+#-Wno-format
+MSDOS_PEDANTIC = -pedantic
+MSDOS_GPP_CFLAGS = -Wall -Wextra -Wno-missing-field-initializers -Wreturn-type \
+	-Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -pedantic \
+	-Wmissing-declarations -Wformat-nonliteral -Wunreachable-code \
+	-Wno-maybe-uninitialized
+MSDOS_TARGET_CFLAGS = -c -O $(DBGFLAGS) -I../include -I../sys/msdos -I../win/share \
+	$(LUAINCL) -DDLB $(PDCURSESDEF) -DTILES_IN_GLYPHMAP \
+	-DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_MSDOS \
+	$(MSDOS_GCC_CFLAGS)
+MSDOS_TARGET_CXXFLAGS = -c -O $(DBGFLAGS) -I../include -I../sys/msdos -I../win/share \
         $(LUAINCL) -DDLB $(PDCURSESDEF) \
         -DUSE_TILES -DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_MSDOS \
-        -Wall -Wextra -Wno-missing-field-initializers -Wreturn-type -Wunused \
-        -Wformat -Wswitch -Wshadow -Wwrite-strings -Wno-maybe-uninitialized
+	$(MSDOS_GPP_CFLAGS)
 PDCINCL += -I$(PDCPORT)
 PDC_TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wno-unused-parameter \
 			-Wno-missing-prototypes
@@ -159,9 +173,7 @@ FONTTARGETS = $(DOSFONT)/ter-u16b.psf $(DOSFONT)/ter-u16v.psf \
 		$(DOSFONT)/ter-u28b.psf $(DOSFONT)/ter-u32b.psf
 LUABIN = ../lib/lua-$(LUA_VERSION)/src/lua
 LUA_TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS)
-override TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wmissing-declarations \
-			-Wmissing-prototypes -pedantic -Wmissing-declarations \
-			-Wformat-nonliteral
+override TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) $(MSDOS_PEDANTIC)
 override TARGET_CXXFLAGS = $(MSDOS_TARGET_CXXFLAGS)
 ifdef CPLUSPLUS_NEEDED
 override TARGET_LINK = $(TOOLTOP1)/i586-pc-msdosdjgpp-g++