diff --git a/build/cmake/lib/base/CMakeLists.txt b/build/cmake/lib/base/CMakeLists.txt
index 1871c54bde..28377c4772 100644
--- a/build/cmake/lib/base/CMakeLists.txt
+++ b/build/cmake/lib/base/CMakeLists.txt
@@ -58,21 +58,7 @@ endif()
 if(wxUSE_THREADS AND CMAKE_THREAD_LIBS_INIT)
     wx_lib_link_libraries(base PRIVATE ${CMAKE_THREAD_LIBS_INIT})
 endif()
-if(WIN32)
-    wx_lib_link_libraries(base PUBLIC
-        kernel32
-        user32
-        shell32
-        ole32
-        oleaut32
-        uuid
-        rpcrt4
-        advapi32
-        Shlwapi
-        version
-        uuid
-    )
-elseif(APPLE)
+if(APPLE)
     wx_lib_link_libraries(base
         PRIVATE
         "-framework Security"
diff --git a/build/cmake/toolkit.cmake b/build/cmake/toolkit.cmake
index 6dfbe4e7f3..49b798451d 100644
--- a/build/cmake/toolkit.cmake
+++ b/build/cmake/toolkit.cmake
@@ -68,13 +68,25 @@ endif()
 
 if(WXMSW)
     set(wxTOOLKIT_LIBRARIES
+        kernel32
+        user32
         gdi32
         comdlg32
         winspool
+        winmm
         shell32
+        shlwapi
         comctl32
+        ole32
+        oleaut32
+        uuid
         rpcrt4
-        Oleacc
+        advapi32
+        version
+        wsock32
+        wininet
+        oleacc
+        uxtheme
         )
 elseif(WXGTK)
     if(WXGTK3)