summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autodoc/source/exes/adc_uni/makefile.mk1
-rw-r--r--basic/Library_sb.mk1
-rw-r--r--berkeleydb/db-4.7.25.patch3
-rw-r--r--cli_ure/source/native/makefile.mk2
-rw-r--r--cppunit/ooo-DllPlugInTester.mk1
-rw-r--r--cppunit/ooo-cppunit_dll.mk1
-rwxr-xr-xcpputools/source/unoexe/makefile.mk2
-rw-r--r--crashrep/source/win32/soreport.cpp1
-rwxr-xr-xdesktop/win32/source/QuickStart/QuickStart.cxx1
-rw-r--r--desktop/win32/source/guiloader/genericloader.cxx1
-rwxr-xr-xdesktop/win32/source/guistdio/guistdio.inc1
-rw-r--r--desktop/win32/source/officeloader/officeloader.cxx1
-rw-r--r--dtrans/Library_dnd.mk1
-rw-r--r--dtrans/Library_ftransl.mk1
-rw-r--r--dtrans/Library_mcnttype.mk6
-rw-r--r--dtrans/Library_sysdtrans.mk1
-rw-r--r--dtrans/source/win32/workbench/makefile.mk1
-rw-r--r--dtrans/test/win32/dnd/makefile.mk1
-rw-r--r--embedserv/source/inprocserv/makefile.mk1
-rw-r--r--extensions/source/activex/main/makefile.mk2
-rw-r--r--extensions/test/ole/cpptest/readme.txt4
-rw-r--r--fpicker/util/makefile.mk2
-rw-r--r--framework/source/uielement/spinfieldtoolbarcontroller.cxx3
-rw-r--r--hyphen/hyphen-2.7.1.patch3
-rw-r--r--jurt/source/pipe/wrapper/makefile.mk1
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/makefile.mk4
-rw-r--r--libtextcat/libtextcat-2.2.patch3
-rw-r--r--migrationanalysis/src/msokill/makefile.mk1
-rw-r--r--neon/neon.patch3
-rw-r--r--odk/source/unoapploader/win/makefile.mk1
-rwxr-xr-xpyuno/zipcore/makefile.mk1
-rw-r--r--redland/raptor/raptor-1.4.18.patch.dmake4
-rw-r--r--redland/rasqal/rasqal-0.9.16.patch.dmake3
-rw-r--r--redland/redland/redland-1.0.8.patch.dmake3
-rw-r--r--sal/inc/sal/config.h3
-rw-r--r--sal/inc/systools/win32/snprintf.h.deleteme (renamed from sal/inc/systools/win32/snprintf.h)0
-rw-r--r--sal/inc/systools/win32/uwinapi.h.deleteme (renamed from sal/inc/systools/win32/uwinapi.h)0
-rw-r--r--sal/osl/w32/dllentry.c1
-rw-r--r--sal/osl/w32/file.cxx2
-rw-r--r--sal/osl/w32/file_dirvol.cxx2
-rw-r--r--sal/osl/w32/file_error.c2
-rw-r--r--sal/osl/w32/file_url.cxx1
-rw-r--r--sal/osl/w32/security.c1
-rw-r--r--sal/osl/w32/signal.cxx1
-rw-r--r--sal/osl/w32/tempfile.cxx1
-rw-r--r--sal/prj/build.lst5
-rw-r--r--sal/util/makefile.mk7
-rw-r--r--sc/Library_scui.mk1
-rw-r--r--sc/Library_vbaobj.mk1
-rw-r--r--scaddins/Library_analysis.mk6
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/makefile.mk1
-rw-r--r--setup_native/source/win32/customactions/indexingfilter/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/javafilter/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx1
-rw-r--r--setup_native/source/win32/customactions/languagepacks/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/languagepacks/respintest.cxx1
-rwxr-xr-xsetup_native/source/win32/customactions/patch/makefile.mk4
-rw-r--r--setup_native/source/win32/customactions/patch/swappatchfiles.cxx1
-rw-r--r--setup_native/source/win32/customactions/quickstarter/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/rebase/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/reg64/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/regactivex/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/sellang/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/sellang/sellang.cxx1
-rw-r--r--setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx1
-rw-r--r--setup_native/source/win32/customactions/shellextensions/checkpatches.cxx2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx1
-rw-r--r--setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx1
-rw-r--r--setup_native/source/win32/customactions/shellextensions/layerlinks.cxx1
-rw-r--r--setup_native/source/win32/customactions/shellextensions/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx1
-rw-r--r--setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx1
-rwxr-xr-xsetup_native/source/win32/customactions/thesaurus/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/thesaurus/thesaurus.cxx1
-rw-r--r--setup_native/source/win32/customactions/tools/makefile.mk2
-rw-r--r--shell/source/win32/makefile.mk1
-rw-r--r--shell/source/win32/shlxthandler/makefile.mk3
-rw-r--r--shell/source/win32/shlxthandler/ooofilt/makefile.mk4
-rw-r--r--shell/source/win32/shlxthandler/prophdl/makefile.mk3
-rw-r--r--solenv/gbuild/platform/windows.mk2
-rw-r--r--solenv/gbuild/platform/winmingw.mk2
-rw-r--r--solenv/inc/wntgcci.mk9
-rw-r--r--solenv/inc/wntmsc.mk9
-rw-r--r--soltools/cpp/makefile.mk1
-rw-r--r--soltools/javadep/makefile.mk1
-rw-r--r--soltools/ldump/makefile.mk1
-rw-r--r--soltools/mkdepend/makefile.mk1
-rw-r--r--soltools/testSHL/makefile.mk1
-rw-r--r--svx/source/dialog/sendreportw32.cxx1
-rw-r--r--vcl/Library_vcl.mk1
92 files changed, 21 insertions, 163 deletions
diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk
index bf959e72b0f1..2fbbbb2535c7 100644
--- a/autodoc/source/exes/adc_uni/makefile.mk
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -39,7 +39,6 @@ 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 8b2e152a874c..a5bb72d94b2b 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -147,7 +147,6 @@ $(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 6077e6669c77..e1e5dfec3a5d 100644
--- a/berkeleydb/db-4.7.25.patch
+++ b/berkeleydb/db-4.7.25.patch
@@ -657,13 +657,12 @@
+
--- 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,76 @@
+@@ -1 +1,75 @@
-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 a4e2a5f84c6d..3c1c15011eab 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -64,8 +64,6 @@ 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 1c8c8a0a167b..11ef782a2978 100644
--- a/cppunit/ooo-DllPlugInTester.mk
+++ b/cppunit/ooo-DllPlugInTester.mk
@@ -36,7 +36,6 @@ 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 048a51e90926..e643b56b2f7d 100644
--- a/cppunit/ooo-cppunit_dll.mk
+++ b/cppunit/ooo-cppunit_dll.mk
@@ -37,7 +37,6 @@ 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 5869f180163e..ec985d41aa21 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 uwinapi.dll are already
+# (stlport, unxlngi6 libstdc++.so.6, and wntmsci10 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 af5f725e9adf..edbfc91caca1 100644
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -59,7 +59,6 @@
#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 3531c29ea317..e1e2c4da701c 100755
--- a/desktop/win32/source/QuickStart/QuickStart.cxx
+++ b/desktop/win32/source/QuickStart/QuickStart.cxx
@@ -4,7 +4,6 @@
#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 1d2075a65bc8..92d5111ef975 100644
--- a/desktop/win32/source/guiloader/genericloader.cxx
+++ b/desktop/win32/source/guiloader/genericloader.cxx
@@ -46,7 +46,6 @@
#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 05d462d23197..a73916ae0525 100755
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -40,7 +40,6 @@
#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 7a08d7ee64c7..9fe614ac39df 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -48,7 +48,6 @@
#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 09e71e85349c..8a4727cf3540 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -53,7 +53,6 @@ $(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 ee1308f9b8f7..d713d1c925a7 100644
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -49,7 +49,6 @@ $(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 7f020f2bdd7e..5826386cd5ec 100644
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -55,10 +55,4 @@ $(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 de1843beb7c2..31e6a2ce8998 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -58,7 +58,6 @@ $(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 7432d2512df2..dc75d3071fea 100644
--- a/dtrans/source/win32/workbench/makefile.mk
+++ b/dtrans/source/win32/workbench/makefile.mk
@@ -57,7 +57,6 @@ 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 93ac89b0d35c..ff0ad756f018 100644
--- a/dtrans/test/win32/dnd/makefile.mk
+++ b/dtrans/test/win32/dnd/makefile.mk
@@ -59,7 +59,6 @@ APP1STDLIBS= \
$(SALLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(UWINAPILIB) \
$(USER32LIB) \
$(OLE32LIB) \
comsupp.lib \
diff --git a/embedserv/source/inprocserv/makefile.mk b/embedserv/source/inprocserv/makefile.mk
index 024e0f9d4ee3..fbdb3608e0ec 100644
--- a/embedserv/source/inprocserv/makefile.mk
+++ b/embedserv/source/inprocserv/makefile.mk
@@ -39,7 +39,6 @@ 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 ea70b66d0f0f..75dc947aaae9 100644
--- a/extensions/source/activex/main/makefile.mk
+++ b/extensions/source/activex/main/makefile.mk
@@ -39,7 +39,6 @@ use_shl_versions=
VERSIONOBJ=
LIBTARGET=NO
USE_DEFFILE=YES
-UWINAPILIB=
.IF "$(BUILD_X64)"!=""
USE_DEFFILE_X64=TRUE
@@ -107,7 +106,6 @@ 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 4af8cfee39af..b3756da3e381 100644
--- a/extensions/test/ole/cpptest/readme.txt
+++ b/extensions/test/ole/cpptest/readme.txt
@@ -1,6 +1,2 @@
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 7d42971c25ef..42895d23d72a 100644
--- a/fpicker/util/makefile.mk
+++ b/fpicker/util/makefile.mk
@@ -50,7 +50,6 @@ COMMON_LIBS=$(CPPULIB)\
SHL1TARGET=$(TARGET1)
SHL1STDLIBS= $(COMMON_LIBS) \
- $(UWINAPILIB) \
$(ADVAPI32LIB) \
$(SHELL32LIB)\
$(OLE32LIB)\
@@ -85,7 +84,6 @@ 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 1830bd190523..9aa38bf54bff 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -59,9 +59,6 @@
#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 f4449550f301..21a0156f6dc1 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,28 @@
+@@ -1 +1,27 @@
-dummy
+PRJ = ..$/..$/..$/..
+
@@ -61,7 +61,6 @@
+
+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 88a3b160da2e..26d184a070c9 100644
--- a/jurt/source/pipe/wrapper/makefile.mk
+++ b/jurt/source/pipe/wrapper/makefile.mk
@@ -30,7 +30,6 @@ 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 5b09a67952c5..7cca05117cde 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 += uwinapi.lib advapi32.lib
+SHL1STDLIBS += advapi32.lib
.ELSE
-SHL1STDLIBS += -luwinapi -ladvapi32
+SHL1STDLIBS += -ladvapi32
.ENDIF # GCC
.ENDIF #WNT
diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch
index 0a2e5d7ca22a..80178b076d4f 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,87 @@
+@@ -1 +1,86 @@
-dummy
+#*************************************************************************
+#
@@ -1006,7 +1006,6 @@
+
+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 bee81b00c775..fb7315e08807 100644
--- a/migrationanalysis/src/msokill/makefile.mk
+++ b/migrationanalysis/src/msokill/makefile.mk
@@ -45,7 +45,6 @@ OBJFILES= $(OBJ)$/msokill.obj \
# --- Targets ------------------------------------------------------
-UWINAPILIB=
LIBSALCPPRT=
APP1NOSAL= TRUE
diff --git a/neon/neon.patch b/neon/neon.patch
index b7a3f8514335..c5178df8efdf 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,96 @@
+@@ -1,1 +1,95 @@
-dummy
+PRJ=..$/..$/..$/..$/..
+
@@ -502,7 +502,6 @@
+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 aae10c545880..d2488676ca1a 100644
--- a/odk/source/unoapploader/win/makefile.mk
+++ b/odk/source/unoapploader/win/makefile.mk
@@ -33,7 +33,6 @@ 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 abc42b3b8deb..115d16543a04 100755
--- a/pyuno/zipcore/makefile.mk
+++ b/pyuno/zipcore/makefile.mk
@@ -33,7 +33,6 @@ 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 b0172754d8f1..6bc0d2ddd0b1 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,119 @@
+@@ -1,1 +1,117 @@
-dummy
+#*************************************************************************
+#
@@ -34,10 +34,8 @@
+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 6795eb95c43d..de3ea73109e1 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,94 @@
+@@ -1,1 +1,93 @@
-dummy
+#*************************************************************************
+#
@@ -34,7 +34,6 @@
+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 34ba51d1c29a..c658867fdf69 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,111 @@
+@@ -1,1 +1,110 @@
-dummy
+#*************************************************************************
+#
@@ -34,7 +34,6 @@
+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 e4ed257e4a3f..59584bdb0f50 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -68,9 +68,6 @@
#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.deleteme
index cfed10fcaee2..cfed10fcaee2 100644
--- a/sal/inc/systools/win32/snprintf.h
+++ b/sal/inc/systools/win32/snprintf.h.deleteme
diff --git a/sal/inc/systools/win32/uwinapi.h b/sal/inc/systools/win32/uwinapi.h.deleteme
index e7874e439e5a..e7874e439e5a 100644
--- a/sal/inc/systools/win32/uwinapi.h
+++ b/sal/inc/systools/win32/uwinapi.h.deleteme
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index 4d894260446a..f6e526cf44fe 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -34,7 +34,6 @@
#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 b4648a72d2ae..3a1f799cfb44 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -32,8 +32,6 @@
#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 8e3ea7f9f284..53dbda6ccfe6 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -29,8 +29,6 @@
#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 bc9048d72a36..ac6a56f9d0ed 100644
--- a/sal/osl/w32/file_error.c
+++ b/sal/osl/w32/file_error.c
@@ -29,8 +29,6 @@
#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 82fd8d2fbc74..d665ee4a63d2 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -29,7 +29,6 @@
#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 053d39f446c1..81b0e85f98f5 100644
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -33,7 +33,6 @@
#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 659d66ee1c74..a5f243dd5061 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -40,7 +40,6 @@
#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 9922b699a932..d5d4f16fef57 100644
--- a/sal/osl/w32/tempfile.cxx
+++ b/sal/osl/w32/tempfile.cxx
@@ -29,7 +29,6 @@
#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 9f9a6accf2ef..07b7211fdd6f 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -5,13 +5,12 @@ 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\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\systools\win32\onlineupdate nmake - n sa_onlineupdate 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_uwinapi.n 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_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 3a3a164480ee..76b6c130d0af 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -78,14 +78,7 @@ 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 f57673483f71..ebfaae588316 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -122,7 +122,6 @@ $(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 fa7d5972e036..fdbf53735275 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -160,7 +160,6 @@ $(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 eecfc7f10e61..acdff8023bf4 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -48,12 +48,6 @@ $(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 0d74baf215fa..f6f3986741d8 100644
--- a/sdext/source/pdfimport/xpdfwrapper/makefile.mk
+++ b/sdext/source/pdfimport/xpdfwrapper/makefile.mk
@@ -53,7 +53,6 @@ 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 0298d05960db..00ab554af0df 100644
--- a/setup_native/source/win32/customactions/indexingfilter/makefile.mk
+++ b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
@@ -42,8 +42,6 @@ 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 3039ef4ccabd..17be4fab0e61 100644
--- a/setup_native/source/win32/customactions/javafilter/makefile.mk
+++ b/setup_native/source/win32/customactions/javafilter/makefile.mk
@@ -42,8 +42,6 @@ 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 2b7dc2556c5e..10b06d6b9df7 100644
--- a/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
@@ -53,7 +53,6 @@
#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 94eab3a0109c..e1b541bf5220 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -46,8 +46,6 @@ 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 5f979a81fa68..1b2584b2a139 100644
--- a/setup_native/source/win32/customactions/languagepacks/respintest.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/respintest.cxx
@@ -48,7 +48,6 @@
#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 641f48ab6e27..e9383441f7fc 100755
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -45,15 +45,13 @@ 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 07e9bc28bf20..ab6ca41847e1 100644
--- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
+++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
@@ -53,7 +53,6 @@
#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 57b53d262ac7..f7a9dde720b4 100644
--- a/setup_native/source/win32/customactions/quickstarter/makefile.mk
+++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk
@@ -41,8 +41,6 @@ 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 fb1fc22a8555..05399749a779 100644
--- a/setup_native/source/win32/customactions/rebase/makefile.mk
+++ b/setup_native/source/win32/customactions/rebase/makefile.mk
@@ -40,8 +40,6 @@ 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 0f162fa6cd9a..63827f3156a2 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
@@ -44,8 +44,6 @@ 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 47239713ec1e..98b01815f6d0 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
@@ -45,8 +45,6 @@ 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 a0d7fbaefc1f..a9da5860cdde 100644
--- a/setup_native/source/win32/customactions/reg64/makefile.mk
+++ b/setup_native/source/win32/customactions/reg64/makefile.mk
@@ -46,8 +46,6 @@ 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 22eb1c89f7cd..0ec7c74e900f 100644
--- a/setup_native/source/win32/customactions/regactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regactivex/makefile.mk
@@ -42,8 +42,6 @@ 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 ffad814e3d74..fba0b249c81f 100644
--- a/setup_native/source/win32/customactions/sellang/makefile.mk
+++ b/setup_native/source/win32/customactions/sellang/makefile.mk
@@ -46,8 +46,6 @@ 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 e0a775af1bcd..ca6f80b891fa 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -47,7 +47,6 @@
#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 58159cabd56f..4f86d4733348 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
@@ -52,7 +52,6 @@
#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 01ba1ab13b16..af7034362d13 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -53,8 +53,6 @@
#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 76f6b6e94a4f..db5b14cca927 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -53,7 +53,6 @@
#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 ffd6ef1a87dd..bdd90d927a46 100644
--- a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
@@ -46,7 +46,6 @@
#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 56885d408b77..8a95973c849c 100644
--- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
@@ -46,7 +46,6 @@
#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 e0950d992dc2..f5eec1004385 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -45,8 +45,6 @@ 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 f9dfc5cb99bc..7fbef718b3fc 100644
--- a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
@@ -52,7 +52,6 @@
#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 40ff772ff878..2b4ddac35412 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -53,7 +53,6 @@
#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 3041f87598ac..f91e38788045 100755
--- a/setup_native/source/win32/customactions/thesaurus/makefile.mk
+++ b/setup_native/source/win32/customactions/thesaurus/makefile.mk
@@ -46,8 +46,6 @@ 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 07bd605cb964..4127a172abc6 100644
--- a/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
+++ b/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
@@ -43,7 +43,6 @@
#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 61c58036b9a8..bf5eec30ad7e 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -43,8 +43,6 @@ 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 3878a8f9f456..ad07dca51b9a 100644
--- a/shell/source/win32/makefile.mk
+++ b/shell/source/win32/makefile.mk
@@ -46,7 +46,6 @@ 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 5778ccebd50d..f6d6c7d538d4 100644
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
@@ -46,9 +46,6 @@ 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 92111c6ed0ee..993f61729280 100644
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -32,10 +32,6 @@ 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 0dc48af1bfe5..3c5c0906e728 100644
--- a/shell/source/win32/shlxthandler/prophdl/makefile.mk
+++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk
@@ -46,9 +46,6 @@ 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 203ed8120fcf..6951a20808b7 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -177,7 +177,6 @@ gb_CXXFLAGS := \
-Zm500 \
gb_STDLIBS := \
- uwinapi \
advapi32 \
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
@@ -445,7 +444,6 @@ 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 18d71bdd4b73..fca6ebe3c0f6 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -136,7 +136,6 @@ gb_COMPILERNOOPTFLAGS := -O0
gb_STDLIBS := \
mingwthrd \
mingw32 \
- uwinapi \
mingwex \
@@ -457,7 +456,6 @@ gb_Library_PLAINLIBS_NONE += \
unicows \
user32 \
uuid \
- uwinapi \
winmm \
version \
winspool \
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 24b7e4e058c8..39c44170efe6 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -119,7 +119,6 @@ LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
STDLIBCPP=-lstdc++
-UWINAPILIB*=$(DYNAMIC) -luwinapi
.IF "$(MINGW_SHARED_GCCLIB)"=="YES" && "$(DYNAMIC_CRT)"!=""
MINGW_LIBGCC=-lgcc_s -lgcc
@@ -146,10 +145,10 @@ STDLIBCUIMT+=-lmingwthrd
STDSHLGUIMT+=-lmingwthrd
STDSHLCUIMT+=-lmingwthrd
.ENDIF
-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
+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
LIBMGR=$(AR)
LIBFLAGS=-rsu
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 41c1ea51c801..b85518a4807b 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -277,7 +277,6 @@ 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
@@ -304,10 +303,10 @@ STDSLOGUI=
STDOBJCUI=
STDSLOCUI=
-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
+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
LIBMGR=lib $(NOLOGO)
IMPLIB=lib
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
index 5cada33f9cd4..b482e490c2a2 100644
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -42,7 +42,6 @@ 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 e6dcf32350f2..4c9c8b3e9b8e 100644
--- a/soltools/javadep/makefile.mk
+++ b/soltools/javadep/makefile.mk
@@ -42,7 +42,6 @@ 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 6d0eda3bf99e..06f4955f376b 100644
--- a/soltools/ldump/makefile.mk
+++ b/soltools/ldump/makefile.mk
@@ -36,7 +36,6 @@ 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 9c700ff6754e..fc437aeb219a 100644
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -44,7 +44,6 @@ all:
.ENDIF
LIBSALCPPRT=
-UWINAPILIB=
CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS
diff --git a/soltools/testSHL/makefile.mk b/soltools/testSHL/makefile.mk
index 0377137b2274..7b7c0354b093 100644
--- a/soltools/testSHL/makefile.mk
+++ b/soltools/testSHL/makefile.mk
@@ -35,7 +35,6 @@ 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 5804f1dfb4cd..944b342f626f 100644
--- a/svx/source/dialog/sendreportw32.cxx
+++ b/svx/source/dialog/sendreportw32.cxx
@@ -36,7 +36,6 @@
#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 298699d49a89..b2af36aa6633 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -498,7 +498,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
shell32 \
user32 \
uuid \
- uwinapi \
winspool \
version \
))