diff --git a/Makefile.in b/Makefile.in
index 99bca80725..b596d098b9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2045,7 +2045,7 @@ COND_USE_STC_1___wxscintilla___depname = \
 @COND_SHARED_0_USE_STC_1@	= install_wxscintilla
 @COND_SHARED_0_USE_STC_1@__uninstall_wxscintilla___depname \
 @COND_SHARED_0_USE_STC_1@	= uninstall_wxscintilla
-@COND_SHARED_1@__wxscintilla_usingdll_p = -DWXUSINGDLL
+@COND_MONOLITHIC_0_SHARED_1@__wxscintilla_usingdll_p = -DWXUSINGDLL
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
diff --git a/build/bakefiles/scintilla.bkl b/build/bakefiles/scintilla.bkl
index dfb993d339..e8da6c99db 100644
--- a/build/bakefiles/scintilla.bkl
+++ b/build/bakefiles/scintilla.bkl
@@ -39,7 +39,7 @@
     </template>
 
     <set var="wxscintilla_usingdll">
-        <if cond="SHARED=='1'">WXUSINGDLL</if>
+        <if cond="SHARED=='1' and MONOLITHIC=='0'">WXUSINGDLL</if>
     </set>
 
     <lib id="wxscintilla" template="3rdparty_lib,wxscintilla_cppflags"
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 7bce73dd4c..6a124113c3 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1519,7 +1519,7 @@ __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
 !if "$(USE_GUI)" == "1"
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
 !endif
-!if "$(SHARED)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __wxscintilla_usingdll_p = -DWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index f910aba2fb..0c56aa6f7d 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1525,9 +1525,11 @@ endif
 ifeq ($(USE_GUI),1)
 __wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a
 endif
+ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 __wxscintilla_usingdll_p = -DWXUSINGDLL
 endif
+endif
 ifeq ($(MONOLITHIC),0)
 EXTRALIBS_FOR_BASE = 
 endif
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 6b48f3c9ff..369fffb449 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1709,7 +1709,7 @@ __RUNTIME_LIBS_100 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_100 = $(__THREADSFLAG)
 !endif
-!if "$(SHARED)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __wxscintilla_usingdll_p = /DWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index f20b03f6ef..c9befbc142 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -81,9 +81,11 @@ __wxtiff___depname =
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
 !endif
 __wxscintilla_usingdll_p =
+!ifeq MONOLITHIC 0
 !ifeq SHARED 1
 __wxscintilla_usingdll_p = -dWXUSINGDLL
 !endif
+!endif
 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
 EXTRALIBS_FOR_BASE =