diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index b7cc9e1699..047134a61f 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3459,16 +3459,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                wxSTC                                   -->
 <!-- ====================================================================== -->
 
-<set var="STC_SRC" hints="files">
+<set var="STC_CMN_SRC" hints="files">
     src/stc/stc.cpp
     src/stc/PlatWX.cpp
     src/stc/ScintillaWX.cpp
 </set>
 
-<set var="STC_HDR" hints="files">
+<set var="STC_CMN_HDR" hints="files">
     wx/stc/stc.h
 </set>
 
+<set var="STC_OSX_COCOA_SRC" hints="files">
+    src/stc/PlatWXcocoa.mm
+</set>
+
+<set var="STC_OSX_COCOA_HDR" hints="files">
+</set>
+
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
@@ -3650,6 +3657,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="MEDIA_SRC">$(MEDIA_CMN_SRC) $(MEDIA_PLATFORM_SRC)</set>
     <set var="MEDIA_HDR">$(MEDIA_CMN_HDR) $(MEDIA_PLATFORM_HDR)</set>
 
+    <!-- wxSTC files: -->
+    <set var="STC_PLATFORM_SRC" hints="files">
+        <if cond="TOOLKIT=='OSX_COCOA'">$(STC_OSX_COCOA_SRC)</if>
+    </set>
+    <set var="STC_PLATFORM_HDR" hints="files">
+        <if cond="TOOLKIT=='OSX_COCOA'">$(STC_OSX_COCOA_HDR)</if>
+    </set>
+    <set var="STC_SRC">$(STC_CMN_SRC) $(STC_PLATFORM_SRC)</set>
+    <set var="STC_HDR">$(STC_CMN_HDR) $(STC_PLATFORM_HDR)</set>
+
 
     <set var="GUI_CORE_HEADERS" hints="files">
         <if cond="USE_GUI=='1' and WXUNIV=='0'">$(GUI_HDR)</if>
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 75cc4a916f..0e5f97b7f0 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -3196,13 +3196,20 @@ set(RICHTEXT_HDR
     wx/xrc/xh_richtext.h
 )
 
-set(STC_SRC
+set(STC_CMN_SRC
     src/stc/stc.cpp
     src/stc/PlatWX.cpp
     src/stc/ScintillaWX.cpp
 )
 
-set(STC_HDR
+set(STC_CMN_HDR
     wx/stc/stc.h
 )
 
+set(STC_OSX_COCOA_SRC
+    src/stc/PlatWXcocoa.mm
+)
+
+set(STC_OSX_COCOA_HDR
+)
+
diff --git a/build/cmake/lib/stc/CMakeLists.txt b/build/cmake/lib/stc/CMakeLists.txt
index 82b79518fa..25bb80801e 100644
--- a/build/cmake/lib/stc/CMakeLists.txt
+++ b/build/cmake/lib/stc/CMakeLists.txt
@@ -9,7 +9,11 @@
 
 include(../../source_groups.cmake)
 
-wx_append_sources(STC_FILES STC)
+wx_append_sources(STC_FILES STC_CMN)
+
+if(WXOSX_COCOA)
+    wx_append_sources(STC_FILES STC_OSX_COCOA)
+endif()
 
 wx_add_builtin_library(wxscintilla
     src/stc/scintilla/lexers/LexA68k.cxx
diff --git a/build/files b/build/files
index 8df05a9460..08fcbfb6d4 100644
--- a/build/files
+++ b/build/files
@@ -3129,10 +3129,15 @@ RICHTEXT_HDR =
 
 # wxSTC
 
-STC_SRC =
+STC_CMN_SRC =
     src/stc/stc.cpp
     src/stc/PlatWX.cpp
     src/stc/ScintillaWX.cpp
 
-STC_HDR =
+STC_CMN_HDR =
     wx/stc/stc.h
+
+STC_OSX_COCOA_SRC =
+    src/stc/PlatWXcocoa.mm
+STC_OSX_COCOA_HDR =
+
diff --git a/build/upmake b/build/upmake
index 33b6d0c7fb..de8d1c80b4 100755
--- a/build/upmake
+++ b/build/upmake
@@ -1441,7 +1441,7 @@ if (!$only_bkl) {
             qa       => [qw(QA)],
             ribbon   => [qw(RIBBON)],
             richtext => [qw(RICHTEXT)],
-            stc      => [qw(STC)],
+            stc      => [qw(STC_CMN)],
             webview  => [qw(WEBVIEW_CMN WEBVIEW_MSW)],
             xml      => [qw(XML)],
             xrc      => [qw(XRC)],
diff --git a/build/upmake_script.pl b/build/upmake_script.pl
index f11bbeaf72..594e553c74 100755
--- a/build/upmake_script.pl
+++ b/build/upmake_script.pl
@@ -82,7 +82,7 @@ if (!$only_bkl) {
             qa       => [qw(QA)],
             ribbon   => [qw(RIBBON)],
             richtext => [qw(RICHTEXT)],
-            stc      => [qw(STC)],
+            stc      => [qw(STC_CMN)],
             webview  => [qw(WEBVIEW_CMN WEBVIEW_MSW)],
             xml      => [qw(XML)],
             xrc      => [qw(XRC)],