3 files changed, 4 insertions, 58 deletions
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 0501c5d2035e..20892a3b7826 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -144,6 +144,9 @@ ifeq ($(OS)$(CPUNAME),WNTINTEL)
 $(eval $(call gb_Library_add_exception_objects,sb,\
 	basic/source/runtime/dllmgr-x86 \
 ))
+$(eval $(call gb_Library_add_asmobjects,sb,\
+	basic/source/runtime/wnt-x86 \
+))
 else
 ifeq ($(OS)$(CPUNAME),WNTX86_64)
 $(eval $(call gb_Library_add_exception_objects,sb,\
@@ -155,16 +158,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
 ))
 endif
 endif
-ifeq ($(OS)$(COM)$(CPUNAME),WNTMSCINTEL)
-$(eval $(call gb_Library_add_asmobjects,sb,\
-	basic/source/runtime/wnt-x86 \
-))
-endif
-ifeq ($(OS)$(COM)$(CPUNAME),WNTGCCINTEL)
-$(eval $(call gb_Library_add_asmobjects,sb,\
-	basic/source/runtime/wnt-mingw \
-))
-endif
 
 # Runtime dependency for unit-tests
 $(eval $(call gb_Library_use_restarget,sb,sb))
diff --git a/basic/source/runtime/wnt-mingw.s b/basic/source/runtime/wnt-mingw.s
deleted file mode 100644
index 7d591da9afc0..000000000000
--- a/basic/source/runtime/wnt-mingw.s
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-.intel_syntax
-
-.globl _DllMgr_call32@12
-.globl _DllMgr_callFp@12
-
-_DllMgr_call32@12:
-_DllMgr_callFp@12:
-    push ebp
-    mov ebp, esp
-    push esi
-    push edi
-    mov ecx, [ebp+16]
-    jecxz $1
-    sub esp, ecx
-    mov edi, esp
-    mov esi, [ebp+12]
-    shr ecx, 2
-    rep movsd
-$1: call DWORD PTR [ebp+8]
-    # for extra safety, do not trust esp after call (in case the Basic Declare
-    # signature is wrong):
-    mov edi, [ebp-8]
-    mov esi, [ebp-4]
-    mov esp, ebp
-    pop ebp
-    ret 12
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index 1c3461a219ee..6b2aeab1b925 100644
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -24,13 +24,10 @@
 #ifdef _WIN32
 #include <prewin.h>
 #include <postwin.h>
-
-#ifndef __MINGW32__
 #include <comutil.h>
-#endif
 #include <oleauto.h>
-
 #endif
+
 #endif
 
 #include <basic/sbx.hxx>