Fri Sep 16 07:26:28 PDT 2011

autodoc/source/exes/adc_uni/makefile.mk                                                  |    1 
 basic/Library_sb.mk                                                                      |    1 
 berkeleydb/db-4.7.25.patch                                                               |    3 
 cli_ure/source/native/makefile.mk                                                        |    2 
 cppunit/ooo-DllPlugInTester.mk                                                           |    1 
 cppunit/ooo-cppunit_dll.mk                                                               |    1 
 cpputools/source/unoexe/makefile.mk                                                      |    2 
 crashrep/source/win32/soreport.cpp                                                       |    1 
 desktop/win32/source/QuickStart/QuickStart.cxx                                           |    1 
 desktop/win32/source/guiloader/genericloader.cxx                                         |    1 
 desktop/win32/source/guistdio/guistdio.inc                                               |    1 
 desktop/win32/source/officeloader/officeloader.cxx                                       |    1 
 dtrans/Library_dnd.mk                                                                    |    1 
 dtrans/Library_ftransl.mk                                                                |    1 
 dtrans/Library_mcnttype.mk                                                               |    6 
 dtrans/Library_sysdtrans.mk                                                              |    1 
 dtrans/source/win32/workbench/makefile.mk                                                |    1 
 dtrans/test/win32/dnd/makefile.mk                                                        |    1 
 embedserv/source/inprocserv/makefile.mk                                                  |    1 
 extensions/source/activex/main/makefile.mk                                               |    2 
 extensions/test/ole/cpptest/readme.txt                                                   |    4 
 fpicker/util/makefile.mk                                                                 |    2 
 framework/source/uielement/spinfieldtoolbarcontroller.cxx                                |    3 
 hyphen/hyphen-2.7.1.patch                                                                |    3 
 jurt/source/pipe/wrapper/makefile.mk                                                     |    1 
 jvmfwk/plugins/sunmajor/pluginlib/makefile.mk                                            |    4 
 libtextcat/libtextcat-2.2.patch                                                          |    3 
 migrationanalysis/src/msokill/makefile.mk                                                |    1 
 neon/neon.patch                                                                          |    3 
 odk/source/unoapploader/win/makefile.mk                                                  |    1 
 pyuno/zipcore/makefile.mk                                                                |    1 
 redland/raptor/raptor-1.4.18.patch.dmake                                                 |    4 
 redland/rasqal/rasqal-0.9.16.patch.dmake                                                 |    3 
 redland/redland/redland-1.0.8.patch.dmake                                                |    3 
 sal/inc/sal/config.h                                                                     |    3 
 sal/inc/systools/win32/snprintf.h                                                        |   67 ++++++++++
 sal/inc/systools/win32/snprintf.h.deleteme                                               |   67 ----------
 sal/inc/systools/win32/uwinapi.h                                                         |   67 ++++++++++
 sal/inc/systools/win32/uwinapi.h.deleteme                                                |   67 ----------
 sal/osl/w32/dllentry.c                                                                   |    1 
 sal/osl/w32/file.cxx                                                                     |    2 
 sal/osl/w32/file_dirvol.cxx                                                              |    2 
 sal/osl/w32/file_error.c                                                                 |    2 
 sal/osl/w32/file_url.cxx                                                                 |    1 
 sal/osl/w32/security.c                                                                   |    1 
 sal/osl/w32/signal.cxx                                                                   |    1 
 sal/osl/w32/tempfile.cxx                                                                 |    1 
 sal/prj/build.lst                                                                        |    5 
 sal/util/makefile.mk                                                                     |    7 +
 sc/Library_scui.mk                                                                       |    1 
 sc/Library_vbaobj.mk                                                                     |    1 
 scaddins/Library_analysis.mk                                                             |    6 
 sdext/source/pdfimport/xpdfwrapper/makefile.mk                                           |    1 
 setup_native/source/win32/customactions/indexingfilter/makefile.mk                       |    2 
 setup_native/source/win32/customactions/javafilter/makefile.mk                           |    2 
 setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx |    1 
 setup_native/source/win32/customactions/languagepacks/makefile.mk                        |    2 
 setup_native/source/win32/customactions/languagepacks/respintest.cxx                     |    1 
 setup_native/source/win32/customactions/patch/makefile.mk                                |    4 
 setup_native/source/win32/customactions/patch/swappatchfiles.cxx                         |    1 
 setup_native/source/win32/customactions/quickstarter/makefile.mk                         |    2 
 setup_native/source/win32/customactions/rebase/makefile.mk                               |    2 
 setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk                         |    2 
 setup_native/source/win32/customactions/reg4msdoc/makefile.mk                            |    2 
 setup_native/source/win32/customactions/reg64/makefile.mk                                |    2 
 setup_native/source/win32/customactions/regactivex/makefile.mk                           |    2 
 setup_native/source/win32/customactions/sellang/makefile.mk                              |    2 
 setup_native/source/win32/customactions/sellang/sellang.cxx                              |    1 
 setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx               |    1 
 setup_native/source/win32/customactions/shellextensions/checkpatches.cxx                 |    2 
 setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx           |    1 
 setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx                  |    1 
 setup_native/source/win32/customactions/shellextensions/layerlinks.cxx                   |    1 
 setup_native/source/win32/customactions/shellextensions/makefile.mk                      |    2 
 setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx              |    1 
 setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx                 |    1 
 setup_native/source/win32/customactions/thesaurus/makefile.mk                            |    2 
 setup_native/source/win32/customactions/thesaurus/thesaurus.cxx                          |    1 
 setup_native/source/win32/customactions/tools/makefile.mk                                |    2 
 shell/source/win32/makefile.mk                                                           |    1 
 shell/source/win32/shlxthandler/makefile.mk                                              |    3 
 shell/source/win32/shlxthandler/ooofilt/makefile.mk                                      |    4 
 shell/source/win32/shlxthandler/prophdl/makefile.mk                                      |    3 
 solenv/gbuild/platform/windows.mk                                                        |    2 
 solenv/gbuild/platform/winmingw.mk                                                       |    2 
 solenv/inc/wntgcci.mk                                                                    |    9 -
 solenv/inc/wntmsc.mk                                                                     |    9 -
 soltools/cpp/makefile.mk                                                                 |    1 
 soltools/javadep/makefile.mk                                                             |    1 
 soltools/ldump/makefile.mk                                                               |    1 
 soltools/mkdepend/makefile.mk                                                            |    1 
 soltools/testSHL/makefile.mk                                                             |    1 
 svx/source/dialog/sendreportw32.cxx                                                      |    1 
 vcl/Library_vcl.mk                                                                       |    1 
 94 files changed, 297 insertions(+), 155 deletions(-)

New commits:
commit bb5bdbbdca966c03e6b22b455630381154cb6d01
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Sep 16 16:25:27 2011 +0200

    Revert "Trying to chop out the uwinapi library"
    
    This reverts commit 2dea0dab4fafda3c10a5bd03ad15ed39a4658b51.

diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk
index 2fbbbb2..bf959e7 100644
--- a/autodoc/source/exes/adc_uni/makefile.mk
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -39,6 +39,7 @@ PRJINC=$(PRJ)$/source
 .INCLUDE :  settings.mk
 .INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
 
+UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)
 
 # --- Files --------------------------------------------------------
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index a5bb72d..8b2e152 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -147,6 +147,7 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
 
 ifeq ($(GUI),WNT)
 $(eval $(call gb_Library_add_linked_libs,sb,\
+	uwinapi \
 	oleaut32 \
 ))
 endif
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch
index e1e5dfe..6077e66 100644
--- a/berkeleydb/db-4.7.25.patch
+++ b/berkeleydb/db-4.7.25.patch
@@ -657,12 +657,13 @@
 +
 --- misc/db-4.7.25.NC/makefile.mk	2009-07-21 11:42:40.000000000 +0200
 +++ misc/build/db-4.7.25.NC/makefile.mk	2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,75 @@
+@@ -1 +1,76 @@
 -dummy
 +PRJ=..$/..$/..$/..
 +PRJNAME=libdb47
 +TARGET=libdb47
 +USE_DEFFILE=true
++UWINAPILIB=
 +
 +.INCLUDE :  settings.mk
 +CFLAGS+=-GS -EHsc -Gy
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index 3c1c150..a4e2a5f 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -64,6 +64,8 @@ LINKFLAGS += /delayload:cppuhelper3MSC.dll \
              /delayload:cppu3.dll \
              /delayload:sal3.dll
 
+UWINAPILIB=
+
 NO_OFFUH=TRUE
 CPPUMAKERFLAGS =
 UNOTYPES = \
diff --git a/cppunit/ooo-DllPlugInTester.mk b/cppunit/ooo-DllPlugInTester.mk
index 11ef782..1c8c8a0 100644
--- a/cppunit/ooo-DllPlugInTester.mk
+++ b/cppunit/ooo-DllPlugInTester.mk
@@ -36,6 +36,7 @@ nodep = TRUE
 
 CDEFS += -DCPPUNIT_DLL
 CFLAGSCXX += -I../../include
+UWINAPILIB =
 
 OBJFILES = $(APP1OBJS)
 
diff --git a/cppunit/ooo-cppunit_dll.mk b/cppunit/ooo-cppunit_dll.mk
index e643b56..048a51e 100644
--- a/cppunit/ooo-cppunit_dll.mk
+++ b/cppunit/ooo-cppunit_dll.mk
@@ -37,6 +37,7 @@ nodep = TRUE
 
 CDEFS += -DCPPUNIT_BUILD_DLL
 CFLAGSCXX += -I../../include
+UWINAPILIB =
 
 SLOFILES = $(SHL1OBJS)
 
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk
index ec985d4..5869f18 100755
--- a/cpputools/source/unoexe/makefile.mk
+++ b/cpputools/source/unoexe/makefile.mk
@@ -74,7 +74,7 @@ APP1RPATH=UREBIN
 
 # Include all relevant (see ure/source/README) dynamic libraries, so that C++
 # UNO components running in the uno executable have a defined environment
-# (stlport, unxlngi6 libstdc++.so.6, and wntmsci10 are already
+# (stlport, unxlngi6 libstdc++.so.6, and wntmsci10 uwinapi.dll are already
 # included via APP1STDLIB, unxlngi6 libgcc_s.so.1 and wntmsci10 msvcr71.dll and
 # msvcp71.dll are magic---TODO):
 APP1STDLIBS= \
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index edbfc91..af5f725 100644
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -59,6 +59,7 @@
 #define RICHEDIT    TEXT("riched32.dll")
 #endif
 
+#include <systools/win32/uwinapi.h>
 #include <rtl/digest.h>
 #include <rtl/bootstrap.hxx>
 #include <osl/file.hxx>
diff --git a/desktop/win32/source/QuickStart/QuickStart.cxx b/desktop/win32/source/QuickStart/QuickStart.cxx
index e1e2c4d..3531c29 100755
--- a/desktop/win32/source/QuickStart/QuickStart.cxx
+++ b/desktop/win32/source/QuickStart/QuickStart.cxx
@@ -4,6 +4,7 @@
 
 #include "StdAfx.h"
 #include "resource.h"
+#include <systools/win32/uwinapi.h>
 #include <stdio.h>
 
 #define MY_TASKBAR_NOTIFICATION         WM_USER+1
diff --git a/desktop/win32/source/guiloader/genericloader.cxx b/desktop/win32/source/guiloader/genericloader.cxx
index 92d5111..1d2075a 100644
--- a/desktop/win32/source/guiloader/genericloader.cxx
+++ b/desktop/win32/source/guiloader/genericloader.cxx
@@ -46,6 +46,7 @@
 #include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
+#include <systools/win32/uwinapi.h>
 
 #include "tools/pathutils.hxx"
 #include "../extendloaderenvironment.hxx"
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc
index a73916a..05d462d 100755
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -40,6 +40,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <systools/win32/uwinapi.h>
 
 #include <stdio.h>
 #include <sal/macros.h>
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index 9fe614a..7a08d7e 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -48,6 +48,7 @@
 #include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
+#include <systools/win32/uwinapi.h>
 
 #include "rtl/string.h"
 #include <sal/macros.h>
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
index 8a4727c..09e71e8 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,dnd,\
 	shell32 \
 	user32 \
 	uuid \
+	uwinapi \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk
index d713d1c..ee1308f 100644
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_add_linked_libs,ftransl,\
 	gdi32 \
 	ole32 \
 	sal \
+	uwinapi \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk
index 5826386..7f020f2 100644
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -55,4 +55,10 @@ $(eval $(call gb_Library_add_exception_objects,mcnttype,\
 	dtrans/source/cnttype/mctfentry \
 ))
 
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,mcnttype,\
+	uwinapi \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
index 31e6a2c..de1843b 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,sysdtrans,\
 	shell32 \
 	uuid \
 	user32 \
+	uwinapi \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/dtrans/source/win32/workbench/makefile.mk b/dtrans/source/win32/workbench/makefile.mk
index dc75d30..7432d25 100644
--- a/dtrans/source/win32/workbench/makefile.mk
+++ b/dtrans/source/win32/workbench/makefile.mk
@@ -57,6 +57,7 @@ APP1OBJS=		$(OBJ)$/test_wincb.obj
 APP1STDLIBS=	$(SALLIB) \
                 $(CPPULIB)			\
                 $(CPPUHELPERLIB)	\
+                $(SOLARLIBDIR)$/uwinapi.lib\
                 $(USER32LIB) \
                 $(OLE32LIB)\
                 $(COMDLG32LIB)
diff --git a/dtrans/test/win32/dnd/makefile.mk b/dtrans/test/win32/dnd/makefile.mk
index ff0ad75..93ac89b 100644
--- a/dtrans/test/win32/dnd/makefile.mk
+++ b/dtrans/test/win32/dnd/makefile.mk
@@ -59,6 +59,7 @@ APP1STDLIBS= \
     $(SALLIB) \
     $(CPPUHELPERLIB) \
     $(CPPULIB)		\
+    $(UWINAPILIB) \
     $(USER32LIB)		\
     $(OLE32LIB)		\
     comsupp.lib		\
diff --git a/embedserv/source/inprocserv/makefile.mk b/embedserv/source/inprocserv/makefile.mk
index fbdb360..024e0f9 100644
--- a/embedserv/source/inprocserv/makefile.mk
+++ b/embedserv/source/inprocserv/makefile.mk
@@ -39,6 +39,7 @@ use_shl_versions=
 LIBTARGET=NO
 USE_DEFFILE=YES
 LIBCMT=libcmt.lib
+UWINAPILIB=
 
 # --- Files -------------------------------------
 
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk
index 75dc947..ea70b66 100644
--- a/extensions/source/activex/main/makefile.mk
+++ b/extensions/source/activex/main/makefile.mk
@@ -39,6 +39,7 @@ use_shl_versions=
 VERSIONOBJ=
 LIBTARGET=NO
 USE_DEFFILE=YES
+UWINAPILIB=
 
 .IF "$(BUILD_X64)"!=""
 USE_DEFFILE_X64=TRUE
@@ -106,6 +107,7 @@ SHL1RES=$(RES)$/$(TARGET).res
 CDEFS_X64+:=$(foreach,i,$(CDEFS) $(subst,-D_X86_=1,  $i))
 LIBTARGET_X64=NO
 USE_DEFFILE_X64=YES
+UWINAPILIB_X64=
 
 SLOFILES_X64= \
     $(SLO_X64)$/so_activex.obj \
diff --git a/extensions/test/ole/cpptest/readme.txt b/extensions/test/ole/cpptest/readme.txt
index b3756da..4af8cfe 100644
--- a/extensions/test/ole/cpptest/readme.txt
+++ b/extensions/test/ole/cpptest/readme.txt
@@ -1,2 +1,6 @@
 Creates the com.sun.star.ServiceManager with CoCreateInstance in a cpp program.
 This little program can be used as starting point for further tests.
+
+
+It needs uwinapi.dll, which is in the program folder of OOo (URE\bin in
+OOo 3.0)
diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk
index 42895d2..7d42971 100644
--- a/fpicker/util/makefile.mk
+++ b/fpicker/util/makefile.mk
@@ -50,6 +50,7 @@ COMMON_LIBS=$(CPPULIB)\
 
 SHL1TARGET=$(TARGET1)
 SHL1STDLIBS=		$(COMMON_LIBS) \
+            $(UWINAPILIB) \
             $(ADVAPI32LIB) \
             $(SHELL32LIB)\
             $(OLE32LIB)\
@@ -84,6 +85,7 @@ SHL2NOCHECK=TRUE
 SHL2TARGET=$(TARGET2)
 
 SHL2STDLIBS=		$(COMMON_LIBS) \
+            $(UWINAPILIB) \
             $(ADVAPI32LIB) \
             $(OLE32LIB)\
             $(GDI32LIB)\
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 9aa38bf..1830bd1 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -59,6 +59,9 @@
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <tools/urlobj.hxx>
+#ifdef WINNT
+#include <systools/win32/snprintf.h>
+#endif
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/hyphen/hyphen-2.7.1.patch b/hyphen/hyphen-2.7.1.patch
index 21a0156..f444955 100644
--- a/hyphen/hyphen-2.7.1.patch
+++ b/hyphen/hyphen-2.7.1.patch
@@ -51,7 +51,7 @@
  	rm -rf hyphen.us* hyph_en_US.dic
 --- misc/hyphen-2.7.1/makefile.mk	2010-12-02 10:35:40.265625000 +0100
 +++ misc/build/hyphen-2.7.1/makefile.mk	2010-12-02 10:25:45.750000000 +0100
-@@ -1 +1,27 @@
+@@ -1 +1,28 @@
 -dummy
 +PRJ = ..$/..$/..$/..
 +
@@ -61,6 +61,7 @@
 +
 +USE_DEFFILE=TRUE
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++UWINAPILIB=
 +
 +.INCLUDE : settings.mk
 +
diff --git a/jurt/source/pipe/wrapper/makefile.mk b/jurt/source/pipe/wrapper/makefile.mk
index 26d184a..88a3b16 100644
--- a/jurt/source/pipe/wrapper/makefile.mk
+++ b/jurt/source/pipe/wrapper/makefile.mk
@@ -30,6 +30,7 @@ PRJNAME = jurt
 TARGET = wrapper
 
 NO_DEFAULT_STL = TRUE
+UWINAPILIB =
 VISIBILITY_HIDDEN = TRUE
 
 .INCLUDE: settings.mk
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
index 7cca051..5b09a67 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
@@ -67,9 +67,9 @@ SHL1STDLIBS= \
 
 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"!="GCC"
-SHL1STDLIBS += advapi32.lib
+SHL1STDLIBS += uwinapi.lib advapi32.lib
 .ELSE
-SHL1STDLIBS += -ladvapi32 
+SHL1STDLIBS += -luwinapi -ladvapi32 
 .ENDIF # GCC
 .ENDIF #WNT
 
diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch
index 80178b0..0a2e5d7 100644
--- a/libtextcat/libtextcat-2.2.patch
+++ b/libtextcat/libtextcat-2.2.patch
@@ -969,7 +969,7 @@
 +}
 --- misc/libtextcat-2.2/src/makefile.mk	Mon Mar 31 11:30:06 2008
 +++ misc/build/libtextcat-2.2/src/makefile.mk	Mon Mar 31 11:29:42 2008
-@@ -1 +1,86 @@
+@@ -1 +1,87 @@
 -dummy
 +#*************************************************************************
 +#
@@ -1006,6 +1006,7 @@
 +
 +USE_DEFFILE=TRUE
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++UWINAPILIB=
 +
 +.INCLUDE : settings.mk
 +
diff --git a/migrationanalysis/src/msokill/makefile.mk b/migrationanalysis/src/msokill/makefile.mk
index fb7315e..bee81b0 100644
--- a/migrationanalysis/src/msokill/makefile.mk
+++ b/migrationanalysis/src/msokill/makefile.mk
@@ -45,6 +45,7 @@ OBJFILES= 	$(OBJ)$/msokill.obj \
 
 # --- Targets ------------------------------------------------------
 
+UWINAPILIB=
 LIBSALCPPRT=
 
 APP1NOSAL=		TRUE
diff --git a/neon/neon.patch b/neon/neon.patch
index c5178df..b7a3f85 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -492,7 +492,7 @@
 +#endif
 --- misc/neon-0.29.5/src/makefile.mk	2011-02-03 10:32:38.000000000 +0100
 +++ misc/build/neon-0.29.5/src/makefile.mk	2011-02-03 10:26:19.000000000 +0100
-@@ -1,1 +1,95 @@
+@@ -1,1 +1,96 @@
 -dummy
 +PRJ=..$/..$/..$/..$/..
 +
@@ -502,6 +502,7 @@
 +USE_DEFFILE=TRUE
 +NO_DEFAULT_STL=TRUE
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++UWINAPILIB=
 +
 +# --- Settings -----------------------------------------------------
 +
diff --git a/odk/source/unoapploader/win/makefile.mk b/odk/source/unoapploader/win/makefile.mk
index d248867..aae10c5 100644
--- a/odk/source/unoapploader/win/makefile.mk
+++ b/odk/source/unoapploader/win/makefile.mk
@@ -33,6 +33,7 @@ TARGETTYPE=GUI
 LIBTARGET=NO
 
 DYNAMIC_CRT=
+UWINAPILIB=
 NO_DEFAULT_STL=true
 
 # --- Settings -----------------------------------------------------
diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk
index 115d165..abc42b3 100755
--- a/pyuno/zipcore/makefile.mk
+++ b/pyuno/zipcore/makefile.mk
@@ -33,6 +33,7 @@ LIBTARGET=NO
 
 .INCLUDE : settings.mk
 .IF "$(L10N_framework)"==""
+UWINAPILIB =
 
 .IF "$(SYSTEM_PYTHON)" == "YES"
 systempython:
diff --git a/redland/raptor/raptor-1.4.18.patch.dmake b/redland/raptor/raptor-1.4.18.patch.dmake
index 6bc0d2d..b017275 100644
--- a/redland/raptor/raptor-1.4.18.patch.dmake
+++ b/redland/raptor/raptor-1.4.18.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:25:51 2008
 +++ misc/build/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:33:14 2008
-@@ -1,1 +1,117 @@
+@@ -1,1 +1,119 @@
 -dummy
 +#*************************************************************************
 +#
@@ -34,8 +34,10 @@
 +PRJNAME=redland
 +TARGET=raptor
 +LIBTARGET=NO
++UWINAPIDLL=
 +
 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++UWINAPILIB=
 +
 +
 +# --- Settings -----------------------------------------------------
diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake
index de3ea73..6795eb9 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.dmake
+++ b/redland/rasqal/rasqal-0.9.16.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:56:45 2008
 +++ misc/build/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:55:09 2008
-@@ -1,1 +1,93 @@
+@@ -1,1 +1,94 @@
 -dummy
 +#*************************************************************************
 +#
@@ -34,6 +34,7 @@
 +PRJNAME=redland
 +TARGET=rasqal
 +LIBTARGET=NO
++UWINAPILIB=
 +
 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 +
diff --git a/redland/redland/redland-1.0.8.patch.dmake b/redland/redland/redland-1.0.8.patch.dmake
index c658867..34ba51d 100644
--- a/redland/redland/redland-1.0.8.patch.dmake
+++ b/redland/redland/redland-1.0.8.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:32:46 2008
 +++ misc/build/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:26:20 2008
-@@ -1,1 +1,110 @@
+@@ -1,1 +1,111 @@
 -dummy
 +#*************************************************************************
 +#
@@ -34,6 +34,7 @@
 +PRJNAME=redland
 +TARGET=librdf
 +LIBTARGET=NO
++UWINAPILIB=
 +
 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 +
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index 59584bd..e4ed257 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -68,6 +68,9 @@
 #ifdef __MINGW32__
 #define _SNPRINTF_DLLIMPORT
 #endif
+#ifndef _SNPRINTF_H
+#include <systools/win32/snprintf.h>
+#endif
 
 #endif /* defined WIN32 */
 
diff --git a/sal/inc/systools/win32/snprintf.h b/sal/inc/systools/win32/snprintf.h
new file mode 100644
index 0000000..cfed10f
--- /dev/null
+++ b/sal/inc/systools/win32/snprintf.h
@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef _SNPRINTF_H
+#define _SNPRINTF_H
+
+#if     !defined(_WIN32)
+#error ERROR: Only Win32 target supported!
+#endif
+
+/* Macros for Unicode/ANSI support like in TCHAR.H */
+
+#ifdef _UNICODE
+#define sntprintf   snwprintf
+#define vsntprintf  vsnwprintf
+#else
+#define sntprintf   snprintf
+#define vsntprintf  vsnprintf
+#endif
+
+/* Define needed types if they are not yet defined */
+
+
+#   ifndef _VA_LIST_DEFINED
+    typedef char *  va_list;
+#   define _VA_LIST_DEFINED
+#   endif
+
+
+#   ifndef _WCHAR_T_DEFINED
+    typedef unsigned short wchar_t;
+#   define _WCHAR_T_DEFINED
+#   endif
+
+
+#ifndef _SNPRINTF_DLLIMPORT
+#define _SNPRINTF_DLLIMPORT __declspec( dllimport )
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*  Implementations of snprintf following the ISO/IEC 9899:1999 (ISO C99)
+    standard.
+    The difference compared to _snprintf is that the buffer always is zero
+    terminated (unless count is zero) and the return value is the number of
+    characters (not including terminating zero) that would have been written
+    even if the buffer wasn't large
+    enough to hold the string. */
+
+
+
+/* UNICODE version */
+_SNPRINTF_DLLIMPORT int __cdecl snwprintf( wchar_t *buffer, size_t count, const wchar_t *format, ... );
+
+/* SBCS and MBCS version */
+_SNPRINTF_DLLIMPORT int __cdecl snprintf( char *buffer, size_t count, const char *format, ... );
+
+/* Conflict with STL_port inline implementation */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SNPRINTF_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/snprintf.h.deleteme b/sal/inc/systools/win32/snprintf.h.deleteme
deleted file mode 100644
index cfed10f..0000000
--- a/sal/inc/systools/win32/snprintf.h.deleteme
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef _SNPRINTF_H
-#define _SNPRINTF_H
-
-#if     !defined(_WIN32)
-#error ERROR: Only Win32 target supported!
-#endif
-
-/* Macros for Unicode/ANSI support like in TCHAR.H */
-
-#ifdef _UNICODE
-#define sntprintf   snwprintf
-#define vsntprintf  vsnwprintf
-#else
-#define sntprintf   snprintf
-#define vsntprintf  vsnprintf
-#endif
-
-/* Define needed types if they are not yet defined */
-
-
-#   ifndef _VA_LIST_DEFINED
-    typedef char *  va_list;
-#   define _VA_LIST_DEFINED
-#   endif
-
-
-#   ifndef _WCHAR_T_DEFINED
-    typedef unsigned short wchar_t;
-#   define _WCHAR_T_DEFINED
-#   endif
-
-
-#ifndef _SNPRINTF_DLLIMPORT
-#define _SNPRINTF_DLLIMPORT __declspec( dllimport )
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*  Implementations of snprintf following the ISO/IEC 9899:1999 (ISO C99)
-    standard.
-    The difference compared to _snprintf is that the buffer always is zero
-    terminated (unless count is zero) and the return value is the number of
-    characters (not including terminating zero) that would have been written
-    even if the buffer wasn't large
-    enough to hold the string. */
-
-
-
-/* UNICODE version */
-_SNPRINTF_DLLIMPORT int __cdecl snwprintf( wchar_t *buffer, size_t count, const wchar_t *format, ... );
-
-/* SBCS and MBCS version */
-_SNPRINTF_DLLIMPORT int __cdecl snprintf( char *buffer, size_t count, const char *format, ... );
-
-/* Conflict with STL_port inline implementation */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SNPRINTF_H */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/uwinapi.h b/sal/inc/systools/win32/uwinapi.h
new file mode 100644
index 0000000..e7874e4
--- /dev/null
+++ b/sal/inc/systools/win32/uwinapi.h
@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#pragma once
+#include <sal/macros.h>
+#ifdef _UWINAPI_
+#   define _KERNEL32_
+#   define _USER32_
+#   define _SHELL32_
+#endif
+
+#ifndef _WINDOWS_
+#ifdef _MSC_VER
+#   pragma warning(push,1) /* disable warnings within system headers */
+#endif
+#   include <windows.h>
+#ifdef _MSC_VER
+#   pragma warning(pop)
+#endif
+#endif
+
+#ifdef __MINGW32__
+#include <basetyps.h>
+#ifdef _UWINAPI_
+#define WINBASEAPI
+#endif
+#endif
+
+#ifdef __cplusplus
+
+inline bool IsValidHandle(HANDLE handle)
+{
+    return  handle != INVALID_HANDLE_VALUE && handle != NULL;
+}
+
+#else   /* __cplusplus */
+
+#define IsValidHandle(Handle)   ((DWORD)(Handle) + 1 > 1)
+
+#endif  /* __cplusplus */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/systools/win32/uwinapi.h.deleteme b/sal/inc/systools/win32/uwinapi.h.deleteme
deleted file mode 100644
index e7874e4..0000000
--- a/sal/inc/systools/win32/uwinapi.h.deleteme
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#pragma once
-#include <sal/macros.h>
-#ifdef _UWINAPI_
-#   define _KERNEL32_
-#   define _USER32_
-#   define _SHELL32_
-#endif
-
-#ifndef _WINDOWS_
-#ifdef _MSC_VER
-#   pragma warning(push,1) /* disable warnings within system headers */
-#endif
-#   include <windows.h>
-#ifdef _MSC_VER
-#   pragma warning(pop)
-#endif
-#endif
-
-#ifdef __MINGW32__
-#include <basetyps.h>
-#ifdef _UWINAPI_
-#define WINBASEAPI
-#endif
-#endif
-
-#ifdef __cplusplus
-
-inline bool IsValidHandle(HANDLE handle)
-{
-    return  handle != INVALID_HANDLE_VALUE && handle != NULL;
-}
-
-#else   /* __cplusplus */
-
-#define IsValidHandle(Handle)   ((DWORD)(Handle) + 1 > 1)
-
-#endif  /* __cplusplus */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index f6e526c..4d89426 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -34,6 +34,7 @@
 #pragma warning(pop)
 #endif
 #include <tlhelp32.h>
+#include <systools/win32/uwinapi.h>
 #include <winsock.h>
 #include <osl/diagnose.h>
 #include <sal/types.h>
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 3a1f799..b4648a7 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -32,6 +32,8 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
+#include "systools/win32/uwinapi.h"
+
 #include "osl/file.hxx"
 
 #include "file_url.h"
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 53dbda6..8e3ea7f 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -29,6 +29,8 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
+#include "systools/win32/uwinapi.h"
+
 #include "osl/file.h"
 
 #include "file_url.h"
diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c
index ac6a56f..bc9048d 100644
--- a/sal/osl/w32/file_error.c
+++ b/sal/osl/w32/file_error.c
@@ -29,6 +29,8 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
+#include "systools/win32/uwinapi.h"
+
 #include "file_error.h"
 
 #include "osl/diagnose.h"
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index d665ee4..82fd8d2 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -29,6 +29,7 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
+#include "systools/win32/uwinapi.h"
 
 #include "file_url.h"
 #include <sal/macros.h>
diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c
index 81b0e85..053d39f 100644
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -33,6 +33,7 @@
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <osl/file.h>
+#include <systools/win32/uwinapi.h>
 #include <sal/macros.h>
 #include "secimpl.h"
 
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index a5f243d..659d66e 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -40,6 +40,7 @@
 #include <DbgHelp.h>
 #endif
 #include <errorrep.h>
+#include <systools/win32/uwinapi.h>
 #include <sal/macros.h>
 
 typedef struct _oslSignalHandlerImpl
diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
index d5d4f16..9922b69 100644
--- a/sal/osl/w32/tempfile.cxx
+++ b/sal/osl/w32/tempfile.cxx
@@ -29,6 +29,7 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
+#include "systools/win32/uwinapi.h"
 
 #include "osl/file.h"
 
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 07b7211..9f9a6ac 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -5,12 +5,13 @@ sa	sal\typesconfig							nmake	-	all	sa_tc sa_inc NULL
 sa	sal\cpprt								nmake	-	u	sa_cpprt sa_util sa_inc NULL
 sa	sal\rtl\source							nmake	-	all	sa_rtl sa_tc.u sa_inc NULL
 sa	sal\textenc								nmake	-	all	sa_textenc sa_tc.u sa_inc NULL
-sa	sal\systools\win32\onlineupdate			nmake	-	n	sa_onlineupdate sa_inc NULL
+sa	sal\systools\win32\uwinapi				nmake	-	n	sa_uwinapi sa_inc NULL
+sa	sal\systools\win32\onlineupdate			nmake	-	n	sa_onlineupdate sa_uwinapi.n sa_inc NULL
 sa	sal\osl\w32								nmake	-	n	sa_osln sa_inc NULL
 sa  sal\qa                                  nmake   -   all sa_qa sa_util NULL
 sa	sal\osl\unx								nmake	-	u	sa_oslu sa_tc.u sa_inc NULL
 sa	sal\osl\all								nmake	-	all	sa_oslall sa_tc.u sa_inc NULL
-sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_onlineupdate.n sa_osln.n sa_oslu.u sa_rtl sa_textenc NULL
+sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_onlineupdate.n sa_osln.n sa_oslu.u sa_rtl sa_textenc NULL
 sa sal\cppunittester nmake - all sa_cppunittester sa_cpprt.u sa_util NULL
 sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util NULL
 sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_cppunittester sa_util NULL
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index 76b6c13..3a3a164 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -78,7 +78,14 @@ SHL1RPATH=URELIB
 
 .IF "$(GUI)"=="WNT"
 
+.IF "$(COM)"=="GCC"
+UWINAPILIB=     -luwinapi
+.ELSE
+UWINAPILIB=     $(LB)$/uwinapi.lib
+.ENDIF
+
 SHL1STDLIBS=	\
+                $(UWINAPILIB)\
                 $(ADVAPI32LIB)\
                 $(WS2_32LIB)\
                 $(MPRLIB)\
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index ebfaae5..f576734 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -122,6 +122,7 @@ $(eval $(call gb_Library_add_linked_libs,scui,\
 	msvcrt \
 	$(gb_Library_win32_OLDNAMES) \
 	user32 \
+	uwinapi \
 ))
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index fdbf537..fa7d597 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -160,6 +160,7 @@ $(eval $(call gb_Library_add_linked_libs,vbaobj,\
 	msvcrt \
 	$(gb_Library_win32_OLDNAMES) \
 	user32 \
+	uwinapi \
 ))
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
index acdff80..eecfc7f 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -48,6 +48,12 @@ $(eval $(call gb_Library_add_linked_libs,analysis,\
 	tl \
 ))
 
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,analysis,\
+    uwinapi \
+))
+endif
+
 $(eval $(call gb_Library_add_exception_objects,analysis,\
 	scaddins/source/analysis/analysis \
 	scaddins/source/analysis/analysishelper \
diff --git a/sdext/source/pdfimport/xpdfwrapper/makefile.mk b/sdext/source/pdfimport/xpdfwrapper/makefile.mk
index f6f3986..0d74baf 100644
--- a/sdext/source/pdfimport/xpdfwrapper/makefile.mk
+++ b/sdext/source/pdfimport/xpdfwrapper/makefile.mk
@@ -53,6 +53,7 @@ CFLAGS += -I$(SOLARINCDIR)$/xpdf
 .ENDIF
 
 # --- Files --------------------------------------------------------
+UWINAPILIB:=
 APP1TARGET=$(TARGET)
 APP1LIBSALCPPRT=
 APP1OBJS= \
diff --git a/setup_native/source/win32/customactions/indexingfilter/makefile.mk b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
index 00ab554..0298d05 100644
--- a/setup_native/source/win32/customactions/indexingfilter/makefile.mk
+++ b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
@@ -42,6 +42,8 @@ USE_DEFFILE=TRUE
 
 .IF "$(GUI)"=="WNT"
 
+UWINAPILIB=
+
 SLOFILES =	$(SLO)$/restartindexingservice.obj
 
 SHL1LIBS = $(SLB)$/$(TARGET).lib 
diff --git a/setup_native/source/win32/customactions/javafilter/makefile.mk b/setup_native/source/win32/customactions/javafilter/makefile.mk
index 17be4fa..3039ef4 100644
--- a/setup_native/source/win32/customactions/javafilter/makefile.mk
+++ b/setup_native/source/win32/customactions/javafilter/makefile.mk
@@ -42,6 +42,8 @@ DYNAMIC_CRT=
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
+UWINAPILIB=
+
 SLOFILES =	$(SLO)$/jfregca.obj
 
 STDSHL += \
diff --git a/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx b/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
index 10b06d6..2b7dc25 100644
--- a/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
@@ -53,6 +53,7 @@
 #include <stdio.h>
 #include <sal/macros.h>
 
+#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 #define WININIT_FILENAME    "wininit.ini"
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index e1b541b..94eab3a 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -46,6 +46,8 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
+UWINAPILIB=
+
 SLOFILES =	$(SLO)$/lngpckinsthelper.obj \
             $(SLO)$/respintest.obj \
             $(SLO)$/checkrunningofficelanguagepack.obj
diff --git a/setup_native/source/win32/customactions/languagepacks/respintest.cxx b/setup_native/source/win32/customactions/languagepacks/respintest.cxx
index 1b2584b..5f979a8 100644
--- a/setup_native/source/win32/customactions/languagepacks/respintest.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/respintest.cxx
@@ -48,6 +48,7 @@
 #include <string>
 #include <sal/macros.h>
 
+#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 using namespace std;
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index e938344..641f48a 100755
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -45,13 +45,15 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
+UWINAPILIB=
+
 SLOFILES = \
     $(SLO)$/swappatchfiles.obj
 
 STDSHL += \
     $(ADVAPI32LIB)\
     $(MSILIB)\
-    $(SHELL32LIB)								
+        $(SHELL32LIB)								
 
 .IF "$(COM)"=="GCC"
 STDSHL+=	\
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
index ab6ca41..07e9bc2 100644
--- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
+++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
@@ -53,6 +53,7 @@
 #include <stdio.h>
 #include <sal/macros.h>
 
+#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 #define WININIT_FILENAME    "wininit.ini"
diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk
index f7a9dde..57b53d2 100644
--- a/setup_native/source/win32/customactions/quickstarter/makefile.mk
+++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk
@@ -41,6 +41,8 @@ USE_DEFFILE=TRUE
 
 .INCLUDE : settings.mk
 
+UWINAPILIB=
+
 # --- Files --------------------------------------------------------
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
diff --git a/setup_native/source/win32/customactions/rebase/makefile.mk b/setup_native/source/win32/customactions/rebase/makefile.mk
index 0539974..fb1fc22 100644
--- a/setup_native/source/win32/customactions/rebase/makefile.mk
+++ b/setup_native/source/win32/customactions/rebase/makefile.mk
@@ -40,6 +40,8 @@ MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
+UWINAPILIB=
+
 # --- Files --------------------------------------------------------
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
index 63827f3..0f162fa 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
@@ -44,6 +44,8 @@ CFLAGS+=-DUNICODE -D_UNICODE
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
+UWINAPILIB=
+
 SLOFILES =	$(SLO)$/reg4allmsi.obj            
 
 SHL1STDLIBS=	$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
index 98b0181..4723971 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
@@ -45,6 +45,8 @@ CFLAGS+=-DUNICODE -D_UNICODE
 
 .IF "$(GUI)"=="WNT"
 
+UWINAPILIB=
+
 SLOFILES =	$(SLO)$/msihelper.obj\
             $(SLO)$/windowsregistry.obj\
             $(SLO)$/userregistrar.obj\
diff --git a/setup_native/source/win32/customactions/reg64/makefile.mk b/setup_native/source/win32/customactions/reg64/makefile.mk
index a9da586..a0d7fba 100644
--- a/setup_native/source/win32/customactions/reg64/makefile.mk
+++ b/setup_native/source/win32/customactions/reg64/makefile.mk
@@ -46,6 +46,8 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
+UWINAPILIB=
+
 SLOFILES = \
     $(SLO)$/reg64.obj
 
diff --git a/setup_native/source/win32/customactions/regactivex/makefile.mk b/setup_native/source/win32/customactions/regactivex/makefile.mk
index 0ec7c74..22eb1c8 100644
--- a/setup_native/source/win32/customactions/regactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regactivex/makefile.mk
@@ -42,6 +42,8 @@ USE_DEFFILE=TRUE
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
+UWINAPILIB=
+
 SLOFILES =	$(SLO)$/regactivex.obj
 
 STDSHL += \
diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk b/setup_native/source/win32/customactions/sellang/makefile.mk
index fba0b24..ffad814 100644
--- a/setup_native/source/win32/customactions/sellang/makefile.mk
+++ b/setup_native/source/win32/customactions/sellang/makefile.mk
@@ -46,6 +46,8 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
 
 # --- Files --------------------------------------------------------
 
+UWINAPILIB=
+
 SLOFILES = \
     $(SLO)$/sellang.obj
 
diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx
index ca6f80b..e0a775a 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -47,6 +47,7 @@
 #include <string.h>
 
 #include <sal/macros.h>
+#include <systools/win32/uwinapi.h>
 
 static const char *
 langid_to_string( LANGID langid, int *have_default_lang )
diff --git a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
index 4f86d47..58159ca 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
@@ -52,6 +52,7 @@
 #include <queue>
 #include <stdio.h>
 
+#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index af70343..01ba1ab 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -53,6 +53,8 @@
 #include <stdio.h>
 #include <strsafe.h>
 
+#include <systools/win32/uwinapi.h>
+
 //----------------------------------------------------------
 #ifdef DEBUG
 inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
diff --git a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
index db5b14c..76f6b6e 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -53,6 +53,7 @@
 #include <stdio.h>
 #include <sal/macros.h>
 
+#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 #define WININIT_FILENAME    "wininit.ini"
diff --git a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
index bdd90d9..ffd6ef1 100644
--- a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
@@ -46,6 +46,7 @@
 
 #include <tchar.h>
 #include <string>
+#include <systools/win32/uwinapi.h>
 
 #include <../tools/seterror.hxx>
 
diff --git a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
index 8a95973..56885d4 100644
--- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
@@ -46,6 +46,7 @@
 
 #include <tchar.h>
 #include <string>
+#include <systools/win32/uwinapi.h>
 
 #include <../tools/seterror.hxx>
 
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index f5eec10..e0950d9 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -45,6 +45,8 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
+UWINAPILIB=
+
 SLOFILES = \
     $(SLO)$/shellextensions.obj \
     $(SLO)$/startmenuicon.obj \
diff --git a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx b/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
index 7fbef71..f9dfc5c 100644
--- a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
@@ -52,6 +52,7 @@
 #include <queue>
 #include <stdio.h>
 
+#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 static void SetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index 2b4ddac..40ff772 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -53,6 +53,7 @@
 #include <stdio.h>
 #include <strsafe.h>
 
+#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 //----------------------------------------------------------
diff --git a/setup_native/source/win32/customactions/thesaurus/makefile.mk b/setup_native/source/win32/customactions/thesaurus/makefile.mk
index f91e387..3041f87 100755
--- a/setup_native/source/win32/customactions/thesaurus/makefile.mk
+++ b/setup_native/source/win32/customactions/thesaurus/makefile.mk
@@ -46,6 +46,8 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
 
 # --- Files --------------------------------------------------------
 
+UWINAPILIB=
+
 SLOFILES = \
     $(SLO)$/thesaurus.obj
 
diff --git a/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx b/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
index 4127a17..07bd605 100644
--- a/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
+++ b/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
@@ -43,6 +43,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <systools/win32/uwinapi.h>
 #include <io.h>
 #include <iostream>
 #include <fstream>
diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk
index bf5eec3..61c5803 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -43,6 +43,8 @@ USE_DEFFILE=TRUE
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
+UWINAPILIB=
+
 SLOFILES =	$(SLO)$/seterror.obj \
             $(SLO)$/checkversion.obj
 
diff --git a/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk
index ad07dca..3878a8f 100644
--- a/shell/source/win32/makefile.mk
+++ b/shell/source/win32/makefile.mk
@@ -46,6 +46,7 @@ SHL1TARGET=$(TARGET).uno
 SHL1STDLIBS=$(CPPULIB)\
             $(CPPUHELPERLIB)\
             $(SALLIB)\
+            $(UWINAPILIB) \
             $(ADVAPI32LIB) \
             $(OLE32LIB) \
             $(SHELL32LIB)
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index f6d6c7d..5778cce 100644
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
@@ -46,6 +46,9 @@ ALL :
 .ENDIF
 
 
+UWINAPILIB =
+UWINAPILIB_X64 =
+
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
 .IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
index 993f617..92111c6 100644
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -32,6 +32,10 @@ LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
+# Do not use the uwinapi library
+UWINAPILIB=
+
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk
index 3c5c090..0dc48af 100644
--- a/shell/source/win32/shlxthandler/prophdl/makefile.mk
+++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk
@@ -46,6 +46,9 @@ ALL :
 .ENDIF
 
 
+UWINAPILIB =
+UWINAPILIB_X64 =
+
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
 .IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -wd4100
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 6951a20..203ed81 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -177,6 +177,7 @@ gb_CXXFLAGS := \
 	-Zm500 \
 
 gb_STDLIBS := \
+	uwinapi \
 	advapi32 \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
@@ -444,6 +445,7 @@ gb_Library_PLAINLIBS_NONE += \
 	unicows \
 	user32 \
 	uuid \
+	uwinapi \
 	version \
 	winmm \
 	winspool \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index fca6ebe..18d71bd 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -136,6 +136,7 @@ gb_COMPILERNOOPTFLAGS := -O0
 gb_STDLIBS := \
 	mingwthrd \
 	mingw32 \
+	uwinapi \
 	mingwex \
 
 
@@ -456,6 +457,7 @@ gb_Library_PLAINLIBS_NONE += \
 	unicows \
 	user32 \
 	uuid \
+	uwinapi \
 	winmm \
 	version \
 	winspool \
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 39c4417..24b7e4e 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -119,6 +119,7 @@ LINKFLAGSDEBUG=-g
 LINKFLAGSOPT=
 
 STDLIBCPP=-lstdc++
+UWINAPILIB*=$(DYNAMIC) -luwinapi
 
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES" && "$(DYNAMIC_CRT)"!=""
 MINGW_LIBGCC=-lgcc_s -lgcc
@@ -145,10 +146,10 @@ STDLIBCUIMT+=-lmingwthrd
 STDSHLGUIMT+=-lmingwthrd
 STDSHLCUIMT+=-lmingwthrd
 .ENDIF
-STDLIBGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group -lm -lkernel32 -luser32 -lmsvcrt
-STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group -lm -lkernel32 -luser32 -lmsvcrt
-STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group -lm -lkernel32 -luser32 -lmsvcrt
-STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group -lm -lkernel32 -luser32 -lmsvcrt
+STDLIBGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
+STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
+STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
+STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
 
 LIBMGR=$(AR)
 LIBFLAGS=-rsu
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index b85518a..41c1ea5 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -277,6 +277,7 @@ LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib /NODEFAULTLIB
 LINKFLAGSDEBUG=-DEBUG
 LINKFLAGSOPT=
 
+UWINAPILIB*=uwinapi.lib
 .IF "$(DYNAMIC_CRT)"!=""
 .IF "$(USE_DEBUG_RUNTIME)" != ""
 LIBCMT=msvcrtd.lib
@@ -303,10 +304,10 @@ STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
 
-STDLIBGUIMT=$(LIBCMT) $(LIBCPMT) kernel32.lib user32.lib oldnames.lib
-STDLIBCUIMT=$(LIBCMT) $(LIBCPMT) kernel32.lib user32.lib oldnames.lib
-STDSHLGUIMT=$(LIBCMT) $(LIBCPMT) kernel32.lib user32.lib oldnames.lib
-STDSHLCUIMT=$(LIBCMT) $(LIBCPMT) kernel32.lib user32.lib oldnames.lib
+STDLIBGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDLIBCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDSHLGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDSHLCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
 
 LIBMGR=lib $(NOLOGO)
 IMPLIB=lib
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
index b482e49..5cada33 100644
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -42,6 +42,7 @@ all:
     @echo Nothing done when cross-compiling
 .ENDIF
 
+UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)
 
 # --- Files --------------------------------------------------------
diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk
index 4c9c8b3..e6dcf32 100644
--- a/soltools/javadep/makefile.mk
+++ b/soltools/javadep/makefile.mk
@@ -42,6 +42,7 @@ all:
     @echo Nothing done when cross-compiling
 .ENDIF
 
+UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)
 
 # --- Files --------------------------------------------------------
diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk
index 06f4955..6d0eda3 100644
--- a/soltools/ldump/makefile.mk
+++ b/soltools/ldump/makefile.mk
@@ -36,6 +36,7 @@ TARGETTYPE=CUI
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
+UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)
 
 # --- Files --------------------------------------------------------
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index fc437ae..9c700ff 100644
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -44,6 +44,7 @@ all:
 .ENDIF
 
 LIBSALCPPRT=
+UWINAPILIB=
 
 CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS  
 
diff --git a/soltools/testSHL/makefile.mk b/soltools/testSHL/makefile.mk
index 7b7c035..0377137 100644
--- a/soltools/testSHL/makefile.mk
+++ b/soltools/testSHL/makefile.mk
@@ -35,6 +35,7 @@ TARGETTYPE=CUI
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk
 
+UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)
 
 # ------------------------------------------------------------------
diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx
index 944b342..5804f1d 100644
--- a/svx/source/dialog/sendreportw32.cxx
+++ b/svx/source/dialog/sendreportw32.cxx
@@ -36,6 +36,7 @@
 #include <postwin.h>
 #include <tchar.h>
 #include <stdio.h>
+#include <systools/win32/uwinapi.h>
 #include <sal/macros.h>
 
 // need to undef min and max macros from MS headers here to make
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index b2af36a..298699d 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -498,6 +498,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     shell32 \
     user32 \
     uuid \
+    uwinapi \
     winspool \
     version \
 ))
