diff --git a/wincon/Makefile.bcc b/wincon/Makefile.bcc
index 0dc4e5fb..ea02f16a 100644
--- a/wincon/Makefile.bcc
+++ b/wincon/Makefile.bcc
@@ -21,17 +21,17 @@ osdir		= $(PDCURSES_SRCDIR)\wincon
 CC		= bcc32c -q
 
 !ifdef DEBUG
-CFLAGS		= -N -v -y -DPDCDEBUG
+CFLAGS		= -N -v -y -DPDCDEBUG -DNO_STDINT_H
 !else
-CFLAGS		= -O
+CFLAGS		= -O -DNO_STDINT_H
 !endif
 
+!ifdef UTF8
+WIDEOPT		= -DPDC_WIDE -DPDC_FORCE_UTF8
+!else
 !ifdef WIDE
 WIDEOPT		= -DPDC_WIDE
 !endif
-
-!ifdef UTF8
-UTF8OPT		= -DPDC_FORCE_UTF8
 !endif
 
 !ifdef INFOEX
@@ -39,7 +39,7 @@ INFOPT          = -DHAVE_NO_INFOEX
 !endif
 
 BUILD		= $(CC) -I$(PDCURSES_SRCDIR) -c -Tpe $(CFLAGS) \
-$(WIDEOPT) $(UTF8OPT) $(INFOPT)
+$(WIDEOPT) $(INFOPT)
 BUILD_OS	= $(BUILD) -Xdriver -Wno-deprecated-declarations
 
 LIBEXE		= tlib /C /E /0 /a
diff --git a/wingui/Makefile.bcc b/wingui/Makefile.bcc
index dee2fc8b..e576adae 100644
--- a/wingui/Makefile.bcc
+++ b/wingui/Makefile.bcc
@@ -20,21 +20,21 @@ common		= $(PDCURSES_SRCDIR)\common
 CC		= bcc32 -q
 
 !ifdef DEBUG
-CFLAGS		= -N -v -y -DPDCDEBUG
+CFLAGS		= -N -v -y -DPDCDEBUG -DNO_STDINT_H
 !else
-CFLAGS		= -O
+CFLAGS		= -O -DNO_STDINT_H
 !endif
 
+!ifdef UTF8
+WIDEOPT		= -DPDC_WIDE -DPDC_FORCE_UTF8
+!else
 !ifdef WIDE
 WIDEOPT		= -DPDC_WIDE
 !endif
-
-!ifdef UTF8
-UTF8OPT		= -DPDC_FORCE_UTF8
 !endif
 
 BUILD		= $(CC) -I$(PDCURSES_SRCDIR) -c -Tpe -w32 $(CFLAGS) -w-par \
-$(WIDEOPT) $(UTF8OPT)
+$(WIDEOPT)
 
 LIBEXE		= tlib /C /E /0 /a