diff --git a/embedserv/source/inprocserv/makefile.mk b/embedserv/source/inprocserv/makefile.mk
index 0f81dcc8bd0d..1928b1ec42ac 100644
--- a/embedserv/source/inprocserv/makefile.mk
+++ b/embedserv/source/inprocserv/makefile.mk
@@ -57,7 +57,17 @@ SLOFILES=\
     $(SLO)$/inprocembobj.obj
 
 SHL1TARGET=$(TARGET)
-SHL1STDLIBS=\
+.IF "$(COM)"=="GCC"
+SHL1STDLIBS += -lstdc++
+.IF "$(MINGW_GCCLIB_EH)"=="YES"
+SHL1STDLIBS += -lgcc_eh
+.ENDIF
+SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt
+.ELSE
+SHL1STDLIBS=
+.ENDIF
+
+SHL1STDLIBS+=\
     $(UUIDLIB)\
     $(OLE32LIB)\
     $(GDI32LIB)\
diff --git a/extensions/source/activex/main/SOActiveX.h b/extensions/source/activex/main/SOActiveX.h
index f7017d582be9..2bf33f96b4e9 100644
--- a/extensions/source/activex/main/SOActiveX.h
+++ b/extensions/source/activex/main/SOActiveX.h
@@ -163,7 +163,7 @@ public:
     HRESULT GetUrlStruct( OLECHAR* sUrl, CComPtr<IDispatch>& pdispUrl );
     HRESULT Cleanup();
     HRESULT TerminateOffice();
-    HRESULT CSOActiveX::GetURL( const OLECHAR* url,
+    HRESULT GetURL( const OLECHAR* url,
                                 const OLECHAR* target );
 
     void CallbackCreateXInputStream( CBindStatusCallback<CSOActiveX>* pbsc, BYTE* pBytes, DWORD dwSize );
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 2addf2f037a7..255d66f46ea8 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -32,8 +32,10 @@
 #define __OLEOBJW_HXX
 #include "ole2uno.hxx"
 
+#ifdef _MSC_VER
 #pragma warning (push,1)
 #pragma warning (disable:4548)
+#endif
 
 #include <tools/presys.h>
 #define _WIN32_WINNT 0x0400
@@ -46,7 +48,9 @@
 #include <hash_map>
 #include <tools/postsys.h>
 
+#ifdef _MSC_VER
 #pragma warning (pop)
+#endif
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase4.hxx>
 
@@ -88,7 +92,7 @@ public:
     ~IUnknownWrapper_Impl();
 
     //XInterface
-    Any SAL_CALL IUnknownWrapper_Impl::queryInterface(const Type& t)
+    Any SAL_CALL queryInterface(const Type& t)
         throw (RuntimeException);
 
     // XInvokation
diff --git a/setup_native/source/win32/customactions/indexingfilter/makefile.mk b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
index ae7fc33a524f..7f8df5bad93a 100644
--- a/setup_native/source/win32/customactions/indexingfilter/makefile.mk
+++ b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
@@ -39,7 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
 DYNAMIC_CRT=
 NO_DEFAULT_STL=TRUE
 USE_DEFFILE=TRUE
-MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
diff --git a/setup_native/source/win32/customactions/javafilter/makefile.mk b/setup_native/source/win32/customactions/javafilter/makefile.mk
index 0c71f1268bd8..fc9cd828dfcc 100644
--- a/setup_native/source/win32/customactions/javafilter/makefile.mk
+++ b/setup_native/source/win32/customactions/javafilter/makefile.mk
@@ -39,7 +39,6 @@ TARGET=jfregca
 NO_DEFAULT_STL=TRUE
 ENABLE_EXCEPTIONS=TRUE
 DYNAMIC_CRT=
-MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index 5246b4717fd5..76906308a676 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -40,7 +40,6 @@ ENABLE_EXCEPTIONS=TRUE
 NO_DEFAULT_STL=TRUE
 DYNAMIC_CRT=
 USE_DEFFILE=TRUE
-MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index 996b4fc38e5d..2f3b952aeb2c 100755
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -39,7 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
 NO_DEFAULT_STL=TRUE
 DYNAMIC_CRT=
 USE_DEFFILE=TRUE
-MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk
index 44ce1a2b1acf..4d56f45adeca 100644
--- a/setup_native/source/win32/customactions/quickstarter/makefile.mk
+++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk
@@ -42,7 +42,6 @@ ENABLE_EXCEPTIONS=TRUE
 NO_DEFAULT_STL=TRUE
 DYNAMIC_CRT=
 USE_DEFFILE=TRUE
-MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
diff --git a/setup_native/source/win32/customactions/regactivex/makefile.mk b/setup_native/source/win32/customactions/regactivex/makefile.mk
index 45707071d33f..96300d45ba0d 100644
--- a/setup_native/source/win32/customactions/regactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regactivex/makefile.mk
@@ -39,7 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
 NO_DEFAULT_STL=TRUE
 DYNAMIC_CRT=
 USE_DEFFILE=TRUE
-MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
diff --git a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
index 7c194e94b1d3..69511c936f0e 100644
--- a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
@@ -55,7 +55,11 @@ INCPRE+=.\Include
 SLOFILES =	$(SLO)$/regpatchactivex.obj
 
 .IF "$(COM)"=="GCC"
-SHL1STDLIBS=	-lmingw32 -lstdc++ -lgcc -lmsvcrt
+SHL1STDLIBS += -lstdc++
+.IF "$(MINGW_GCCLIB_EH)"=="YES"
+SHL1STDLIBS += -lgcc_eh
+.ENDIF
+SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt
 .ELSE
 SHL1STDLIBS=
 .ENDIF
diff --git a/setup_native/source/win32/customactions/relnotes/makefile.mk b/setup_native/source/win32/customactions/relnotes/makefile.mk
index 8d3af6286009..b83d58468ec6 100644
--- a/setup_native/source/win32/customactions/relnotes/makefile.mk
+++ b/setup_native/source/win32/customactions/relnotes/makefile.mk
@@ -40,7 +40,6 @@ ENABLE_EXCEPTIONS=TRUE
 NO_DEFAULT_STL=TRUE
 DYNAMIC_CRT=
 USE_DEFFILE=TRUE
-MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 14546c834807..e7dc9a561883 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -39,7 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
 NO_DEFAULT_STL=TRUE
 DYNAMIC_CRT=
 USE_DEFFILE=TRUE
-MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk
index 2c6a63a6fff2..e7a6c44d6ee3 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -40,7 +40,6 @@ ENABLE_EXCEPTIONS=TRUE
 NO_DEFAULT_STL=TRUE
 DYNAMIC_CRT=
 USE_DEFFILE=TRUE
-MINGW_NODLL=YES
 
 .INCLUDE : settings.mk