86 files changed, 166 insertions, 526 deletions

diff --git a/Repository.mk b/Repository.mk
index 9641b3bddd10..4e73deaebbd8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -615,7 +615,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	sdbc2 \
 	sofficeapp \
 	srtrs1 \
-	$(if $(filter $(OS),WNT),sysdtrans) \
 	textconv_dict \
 	ucb1 \
 	ucbhelper \
@@ -634,10 +633,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 		macabdrv1 \
 	) \
 	$(if $(filter WNT,$(OS)), \
-		dnd \
-		dtrans \
 		fps \
-		ftransl \
 		inprocserv \
 		UAccCOM \
 		winaccessibility \
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
deleted file mode 100644
index 930b552827e1..000000000000
--- a/dtrans/Library_dnd.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Library_Library,dnd))
-
-$(eval $(call gb_Library_set_componentfile,dnd,dtrans/util/dnd))
-
-$(eval $(call gb_Library_use_externals,dnd, \
-    boost_headers \
-))
-
-$(eval $(call gb_Library_use_sdk_api,dnd))
-
-$(eval $(call gb_Library_use_libraries,dnd,\
-	comphelper \
-	cppu \
-	cppuhelper \
-	sal \
-))
-
-$(eval $(call gb_Library_use_system_win32_libs,dnd,\
-	advapi32 \
-	gdi32 \
-	ole32 \
-	oleaut32 \
-	shell32 \
-	uuid \
-))
-
-$(eval $(call gb_Library_use_static_libraries,dnd,\
-	dtobj \
-))
-
-$(eval $(call gb_Library_add_exception_objects,dnd,\
-	dtrans/source/win32/dnd/globals \
-	dtrans/source/win32/dnd/idroptarget \
-	dtrans/source/win32/dnd/sourcecontext \
-	dtrans/source/win32/dnd/source \
-	dtrans/source/win32/dnd/target \
-	dtrans/source/win32/dnd/targetdragcontext \
-	dtrans/source/win32/dnd/targetdropcontext \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk
deleted file mode 100644
index e70d7215436b..000000000000
--- a/dtrans/Library_dtrans.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Library_Library,dtrans))
-
-$(eval $(call gb_Library_set_componentfile,dtrans,dtrans/source/generic/dtrans))
-
-$(eval $(call gb_Library_use_sdk_api,dtrans))
-
-$(eval $(call gb_Library_use_libraries,dtrans,\
-	cppu \
-	cppuhelper \
-	sal \
-))
-
-$(eval $(call gb_Library_add_exception_objects,dtrans,\
-	dtrans/source/generic/clipboardmanager \
-	dtrans/source/generic/generic_clipboard \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk
deleted file mode 100644
index f418af318d3f..000000000000
--- a/dtrans/Library_ftransl.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Library_Library,ftransl))
-
-$(eval $(call gb_Library_set_componentfile,ftransl,dtrans/util/ftransl))
-
-$(eval $(call gb_Library_use_sdk_api,ftransl))
-
-$(eval $(call gb_Library_use_libraries,ftransl,\
-	comphelper \
-	cppu \
-	cppuhelper \
-	sal \
-))
-
-$(eval $(call gb_Library_use_system_win32_libs,ftransl,\
-	advapi32 \
-	gdi32 \
-	ole32 \
-))
-
-$(eval $(call gb_Library_use_static_libraries,ftransl,\
-	dtobj \
-))
-
-$(eval $(call gb_Library_add_exception_objects,ftransl,\
-	dtrans/source/win32/ftransl/ftransl \
-))
-
-$(eval $(call gb_Library_set_include,ftransl,\
-        -I$(SRCDIR)/dtrans/source/inc \
-        $$(INCLUDE) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
deleted file mode 100644
index 8781e7f2d9bb..000000000000
--- a/dtrans/Library_sysdtrans.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Library_Library,sysdtrans))
-
-$(eval $(call gb_Library_set_componentfile,sysdtrans,dtrans/util/sysdtrans))
-
-$(eval $(call gb_Library_use_sdk_api,sysdtrans))
-
-$(eval $(call gb_Library_use_libraries,sysdtrans,\
-	comphelper \
-	cppu \
-	cppuhelper \
-	sal \
-))
-
-$(eval $(call gb_Library_use_system_win32_libs,sysdtrans,\
-	advapi32 \
-	gdi32 \
-	ole32 \
-	oleaut32 \
-	shell32 \
-	uuid \
-))
-
-$(eval $(call gb_Library_use_static_libraries,sysdtrans,\
-	dtobj \
-))
-
-$(eval $(call gb_Library_add_exception_objects,sysdtrans,\
-	dtrans/source/win32/clipb/WinClipbImpl \
-	dtrans/source/win32/clipb/WinClipboard \
-	dtrans/source/win32/clipb/MtaOleClipb \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dtrans/Module_dtrans.mk b/dtrans/Module_dtrans.mk
index 2ddc6f48a925..f583c41e88bb 100644
--- a/dtrans/Module_dtrans.mk
+++ b/dtrans/Module_dtrans.mk
@@ -23,14 +23,4 @@ $(eval $(call gb_Module_add_targets,dtrans,\
 	Library_mcnttype \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Module_add_targets,dtrans,\
-	Library_dnd \
-	Library_dtrans \
-	Library_ftransl \
-	Library_sysdtrans \
-	StaticLibrary_dtobj \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/dtrans/README b/dtrans/README
index 23555bce65aa..73aca8b6e496 100644
--- a/dtrans/README
+++ b/dtrans/README
@@ -1 +1,3 @@
-Clipboard abstraction - data transfer.
+Used to be a module for data transfer, but just contained Windows code.
+Now it just contains the MimeContentTypeFactory, which probably should move to
+vcl too, since it's just used there.
diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk
deleted file mode 100644
index 04ed1c53249f..000000000000
--- a/dtrans/StaticLibrary_dtobj.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,dtobj))
-
-$(eval $(call gb_StaticLibrary_use_sdk_api,dtobj))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,dtobj,\
-	dtrans/source/win32/dtobj/APNDataObject \
-	dtrans/source/win32/dtobj/DataFmtTransl \
-	dtrans/source/win32/dtobj/DOTransferable \
-	dtrans/source/win32/dtobj/DtObjFactory \
-	dtrans/source/win32/dtobj/DTransHelper \
-	dtrans/source/win32/dtobj/Fetc \
-	dtrans/source/win32/dtobj/FetcList \
-	dtrans/source/win32/dtobj/FmtFilter \
-	dtrans/source/win32/dtobj/TxtCnvtHlp \
-	dtrans/source/win32/dtobj/XNotifyingDataObject \
-	dtrans/source/win32/dtobj/XTDataObject \
-	dtrans/source/win32/misc/ImplHelper \
-))
-
-$(eval $(call gb_StaticLibrary_set_include,dtobj,\
-	-I$(SRCDIR)/dtrans/source/inc \
-	$$(INCLUDE) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dtrans/source/win32/clipb/APNDataObject.hxx b/dtrans/source/win32/clipb/APNDataObject.hxx
deleted file mode 100644
index 6937babc0dee..000000000000
--- a/dtrans/source/win32/clipb/APNDataObject.hxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-/*
-    an APartment Neutral dataobject wrapper; this wrapper of an IDataObject
-    pointer can be used from any apartment without RPC_E_WRONG_THREAD
-    which normally occurs if an apartment tries to use an interface
-    pointer of another apartment; we use containment to hold the original
-    DataObject
-*/
-class CAPNDataObject : public IDataObject
-{
-public:
-    CAPNDataObject( IDataObjectPtr rIDataObject );
-    ~CAPNDataObject( );
-
-    //IUnknown interface methods
-
-    STDMETHODIMP           QueryInterface(REFIID iid, LPVOID* ppvObject);
-    STDMETHODIMP_( ULONG ) AddRef( );
-    STDMETHODIMP_( ULONG ) Release( );
-
-    // IDataObject interface methods
-
-    STDMETHODIMP GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium );
-    STDMETHODIMP GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium );
-    STDMETHODIMP QueryGetData( LPFORMATETC pFormatetc );
-    STDMETHODIMP GetCanonicalFormatEtc( LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut );
-    STDMETHODIMP SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease );
-    STDMETHODIMP EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc );
-    STDMETHODIMP DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVISESINK pAdvSink, DWORD* pdwConnection );
-    STDMETHODIMP DUnadvise( DWORD dwConnection );
-    STDMETHODIMP EnumDAdvise( LPENUMSTATDATA* ppenumAdvise );
-
-    operator IDataObject*( );
-
-private:
-    HRESULT MarshalIDataObjectIntoCurrentApartment( IDataObject** ppIDataObj );
-
-private:
-    IDataObjectPtr  m_rIDataObjectOrg;
-    HGLOBAL         m_hGlobal;
-    LONG            m_nRefCnt;
-
-// prevent copy and assignment
-private:
-    CAPNDataObject( const CAPNDataObject& theOther );
-    CAPNDataObject& operator=( const CAPNDataObject& theOther );
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/util/dnd.component b/dtrans/util/dnd.component
deleted file mode 100644
index 8a3f5feebbb2..000000000000
--- a/dtrans/util/dnd.component
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"
-	constructor="dtrans_DragSource_get_implementation">
-    <service name="com.sun.star.datatransfer.dnd.OleDragSource"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"
-	constructor="dtrans_DropTarget_get_implementation">
-    <service name="com.sun.star.datatransfer.dnd.OleDropTarget"/>
-  </implementation>
-</component>
diff --git a/dtrans/util/ftransl.component b/dtrans/util/ftransl.component
deleted file mode 100644
index e97a897f7437..000000000000
--- a/dtrans/util/ftransl.component
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.datatransfer.DataFormatTranslator"
-	constructor="dtrans_CDataFormatTranslatorUNO_get_implementation">
-    <service name="com.sun.star.datatransfer.DataFormatTranslator"/>
-  </implementation>
-</component>
diff --git a/dtrans/util/sysdtrans.component b/dtrans/util/sysdtrans.component
deleted file mode 100644
index 263b1417258e..000000000000
--- a/dtrans/util/sysdtrans.component
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.datatransfer.clipboard.ClipboardW32"
-    constructor="dtrans_CWinClipboard_get_implementation">
-    <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>
-  </implementation>
-</component>
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 7cda2c71e986..5781081d96de 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -61,7 +61,10 @@ $(eval $(call gb_Rdb_add_components,services,\
 	$(if $(DISABLE_GUI),vcl/vcl.headless) \
 	$(if $(filter iOS,$(OS)),vcl/vcl.ios) \
 	$(if $(filter MACOSX,$(OS)),vcl/vcl.macosx) \
-	$(if $(filter WNT,$(OS)),vcl/vcl.windows) \
+	$(if $(filter WNT,$(OS)),\
+		vcl/vcl.windows \
+		vcl/vclplug_win \
+	) \
 ))
 
 ifeq ($(gb_Side),host)
@@ -158,10 +161,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 	) \
 	$(if $(filter WNT,$(OS)), \
 		avmedia/source/win/avmediawin \
-		dtrans/source/generic/dtrans \
-		dtrans/util/dnd \
-		dtrans/util/ftransl \
-		dtrans/util/sysdtrans \
 		fpicker/source/win32/fps \
 		shell/source/backends/wininetbe/wininetbe1 \
 		shell/source/win32/simplemail/smplmail \
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 50ebe0f410d1..2669c1fe4420 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -3768,76 +3768,6 @@ dtrans/source/cnttype/mcnttype.cxx
 dtrans/source/cnttype/mcnttype.hxx
 dtrans/source/cnttype/mctfentry.cxx
 dtrans/source/cnttype/wbench/testcnttype.cxx
-dtrans/source/generic/clipboardmanager.cxx
-dtrans/source/generic/clipboardmanager.hxx
-dtrans/source/generic/dtrans.cxx
-dtrans/source/generic/generic_clipboard.cxx
-dtrans/source/generic/generic_clipboard.hxx
-dtrans/source/inc/DtObjFactory.hxx
-dtrans/source/test/test_dtrans.cxx
-dtrans/source/win32/clipb/APNDataObject.hxx
-dtrans/source/win32/clipb/MtaOleClipb.cxx
-dtrans/source/win32/clipb/MtaOleClipb.hxx
-dtrans/source/win32/clipb/WinClipbImpl.cxx
-dtrans/source/win32/clipb/WinClipbImpl.hxx
-dtrans/source/win32/clipb/WinClipboard.cxx
-dtrans/source/win32/clipb/WinClipboard.hxx
-dtrans/source/win32/clipb/wcbentry.cxx
-dtrans/source/win32/dnd/dndentry.cxx
-dtrans/source/win32/dnd/globals.cxx
-dtrans/source/win32/dnd/globals.hxx
-dtrans/source/win32/dnd/idroptarget.cxx
-dtrans/source/win32/dnd/idroptarget.hxx
-dtrans/source/win32/dnd/source.cxx
-dtrans/source/win32/dnd/source.hxx
-dtrans/source/win32/dnd/sourcecontext.cxx
-dtrans/source/win32/dnd/sourcecontext.hxx
-dtrans/source/win32/dnd/target.cxx
-dtrans/source/win32/dnd/target.hxx
-dtrans/source/win32/dnd/targetdragcontext.cxx
-dtrans/source/win32/dnd/targetdragcontext.hxx
-dtrans/source/win32/dnd/targetdropcontext.cxx
-dtrans/source/win32/dnd/targetdropcontext.hxx
-dtrans/source/win32/dtobj/APNDataObject.cxx
-dtrans/source/win32/dtobj/APNDataObject.hxx
-dtrans/source/win32/dtobj/DOTransferable.cxx
-dtrans/source/win32/dtobj/DOTransferable.hxx
-dtrans/source/win32/dtobj/DTransHelper.cxx
-dtrans/source/win32/dtobj/DTransHelper.hxx
-dtrans/source/win32/dtobj/DataFmtTransl.cxx
-dtrans/source/win32/dtobj/DataFmtTransl.hxx
-dtrans/source/win32/dtobj/DtObjFactory.cxx
-dtrans/source/win32/dtobj/Fetc.cxx
-dtrans/source/win32/dtobj/Fetc.hxx
-dtrans/source/win32/dtobj/FetcList.cxx
-dtrans/source/win32/dtobj/FetcList.hxx
-dtrans/source/win32/dtobj/FmtFilter.cxx
-dtrans/source/win32/dtobj/FmtFilter.hxx
-dtrans/source/win32/dtobj/MimeAttrib.hxx
-dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
-dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
-dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
-dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
-dtrans/source/win32/dtobj/XTDataObject.cxx
-dtrans/source/win32/dtobj/XTDataObject.hxx
-dtrans/source/win32/ftransl/ftransl.cxx
-dtrans/source/win32/ftransl/ftransl.hxx
-dtrans/source/win32/ftransl/ftranslentry.cxx
-dtrans/source/win32/misc/ImplHelper.cxx
-dtrans/source/win32/misc/ImplHelper.hxx
-dtrans/source/win32/workbench/XTDo.cxx
-dtrans/source/win32/workbench/XTDo.hxx
-dtrans/source/win32/workbench/test_wincb.cxx
-dtrans/source/win32/workbench/testmarshal.cxx
-dtrans/test/win32/dnd/atlwindow.cxx
-dtrans/test/win32/dnd/atlwindow.hxx
-dtrans/test/win32/dnd/dndTest.cxx
-dtrans/test/win32/dnd/sourcelistener.cxx
-dtrans/test/win32/dnd/sourcelistener.hxx
-dtrans/test/win32/dnd/targetlistener.cxx
-dtrans/test/win32/dnd/targetlistener.hxx
-dtrans/test/win32/dnd/transferable.cxx
-dtrans/test/win32/dnd/transferable.hxx
 editeng/inc/AccessibleStringWrap.hxx
 editeng/inc/editattr.hxx
 editeng/inc/editdoc.hxx
@@ -17405,6 +17335,61 @@ vcl/win/app/salinfo.cxx
 vcl/win/app/salinst.cxx
 vcl/win/app/salshl.cxx
 vcl/win/app/saltimer.cxx
+vcl/win/dtrans/APNDataObject.cxx
+vcl/win/dtrans/APNDataObject.hxx
+vcl/win/dtrans/clipboardmanager.cxx
+vcl/win/dtrans/clipboardmanager.hxx
+vcl/win/dtrans/DataFmtTransl.cxx
+vcl/win/dtrans/DataFmtTransl.hxx
+vcl/win/dtrans/dndentry.cxx
+vcl/win/dtrans/DOTransferable.cxx
+vcl/win/dtrans/DOTransferable.hxx
+vcl/win/dtrans/DtObjFactory.cxx
+vcl/win/dtrans/DtObjFactory.hxx
+vcl/win/dtrans/dtrans.cxx
+vcl/win/dtrans/DTransHelper.cxx
+vcl/win/dtrans/DTransHelper.hxx
+vcl/win/dtrans/Fetc.cxx
+vcl/win/dtrans/Fetc.hxx
+vcl/win/dtrans/FetcList.cxx
+vcl/win/dtrans/FetcList.hxx
+vcl/win/dtrans/FmtFilter.cxx
+vcl/win/dtrans/FmtFilter.hxx
+vcl/win/dtrans/ftransl.cxx
+vcl/win/dtrans/ftranslentry.cxx
+vcl/win/dtrans/ftransl.hxx
+vcl/win/dtrans/generic_clipboard.cxx
+vcl/win/dtrans/generic_clipboard.hxx
+vcl/win/dtrans/globals.cxx
+vcl/win/dtrans/globals.hxx
+vcl/win/dtrans/idroptarget.cxx
+vcl/win/dtrans/idroptarget.hxx
+vcl/win/dtrans/ImplHelper.cxx
+vcl/win/dtrans/ImplHelper.hxx
+vcl/win/dtrans/MimeAttrib.hxx
+vcl/win/dtrans/MtaOleClipb.cxx
+vcl/win/dtrans/MtaOleClipb.hxx
+vcl/win/dtrans/sourcecontext.cxx
+vcl/win/dtrans/sourcecontext.hxx
+vcl/win/dtrans/source.cxx
+vcl/win/dtrans/source.hxx
+vcl/win/dtrans/target.cxx
+vcl/win/dtrans/targetdragcontext.cxx
+vcl/win/dtrans/targetdragcontext.hxx
+vcl/win/dtrans/targetdropcontext.cxx
+vcl/win/dtrans/targetdropcontext.hxx
+vcl/win/dtrans/target.hxx
+vcl/win/dtrans/TxtCnvtHlp.cxx
+vcl/win/dtrans/TxtCnvtHlp.hxx
+vcl/win/dtrans/wcbentry.cxx
+vcl/win/dtrans/WinClipbImpl.cxx
+vcl/win/dtrans/WinClipbImpl.hxx
+vcl/win/dtrans/WinClipboard.cxx
+vcl/win/dtrans/WinClipboard.hxx
+vcl/win/dtrans/XNotifyingDataObject.cxx
+vcl/win/dtrans/XNotifyingDataObject.hxx
+vcl/win/dtrans/XTDataObject.cxx
+vcl/win/dtrans/XTDataObject.hxx
 vcl/win/gdi/DWriteTextRenderer.cxx
 vcl/win/gdi/gdiimpl.cxx
 vcl/win/gdi/gdiimpl.hxx
@@ -17426,6 +17411,7 @@ vcl/workben/bmpfuzzer.cxx
 vcl/workben/cgmfuzzer.cxx
 vcl/workben/commonfuzzer.hxx
 vcl/workben/docxfuzzer.cxx
+vcl/workben/dtrans/test_dtrans.cxx
 vcl/workben/dxffuzzer.cxx
 vcl/workben/epsfuzzer.cxx
 vcl/workben/fftester.cxx
@@ -17478,6 +17464,19 @@ vcl/workben/svptest.cxx
 vcl/workben/tgafuzzer.cxx
 vcl/workben/tiffuzzer.cxx
 vcl/workben/vcldemo.cxx
+vcl/workben/win/dnd/atlwindow.cxx
+vcl/workben/win/dnd/atlwindow.hxx
+vcl/workben/win/dnd/dndTest.cxx
+vcl/workben/win/dnd/sourcelistener.cxx
+vcl/workben/win/dnd/sourcelistener.hxx
+vcl/workben/win/dnd/targetlistener.cxx
+vcl/workben/win/dnd/targetlistener.hxx
+vcl/workben/win/dnd/transferable.cxx
+vcl/workben/win/dnd/transferable.hxx
+vcl/workben/win/dtrans/testmarshal.cxx
+vcl/workben/win/dtrans/test_wincb.cxx
+vcl/workben/win/dtrans/XTDo.cxx
+vcl/workben/win/dtrans/XTDo.hxx
 vcl/workben/wmffuzzer.cxx
 vcl/workben/ww2fuzzer.cxx
 vcl/workben/ww6fuzzer.cxx
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index ee436749f95a..41e65c499010 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -76,15 +76,9 @@ $(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
     ucb/source/core/ucb1 \
     ucb/source/ucp/file/ucpfile1 \
     unotools/util/utl \
+    vcl/vcl.common \
 ))
 
-ifeq ($(strip $(OS)),WNT)
-$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
-    dtrans/util/ftransl \
-    dtrans/util/sysdtrans \
-))
-endif
-
 $(eval $(call gb_CppunitTest_use_configuration,starmath_qa_cppunit))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_win.mk b/vcl/Library_vclplug_win.mk
index 057c6506c17a..383b0c02e399 100644
--- a/vcl/Library_vclplug_win.mk
+++ b/vcl/Library_vclplug_win.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_Library_Library,vclplug_win))
 
+$(eval $(call gb_Library_set_componentfile,vclplug_win,vcl/vclplug_win))
+
 $(eval $(call gb_Library_set_include,vclplug_win,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
@@ -43,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_win,\
     basegfx \
     comphelper \
     cppu \
+    cppuhelper \
     i18nlangtag \
     i18nutil \
     sal \
@@ -68,19 +71,44 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_win,\
     vcl/win/app/salinst \
     vcl/win/app/salshl \
     vcl/win/app/saltimer \
+    vcl/win/dtrans/APNDataObject \
+    vcl/win/dtrans/clipboardmanager \
+    vcl/win/dtrans/DataFmtTransl \
+    vcl/win/dtrans/DOTransferable \
+    vcl/win/dtrans/DtObjFactory \
+    vcl/win/dtrans/DTransHelper \
+    vcl/win/dtrans/Fetc \
+    vcl/win/dtrans/FetcList \
+    vcl/win/dtrans/FmtFilter \
+    vcl/win/dtrans/ftransl \
+    vcl/win/dtrans/generic_clipboard \
+    vcl/win/dtrans/globals \
+    vcl/win/dtrans/idroptarget \
+    vcl/win/dtrans/ImplHelper \
+    vcl/win/dtrans/MtaOleClipb \
+    vcl/win/dtrans/source \
+    vcl/win/dtrans/sourcecontext \
+    vcl/win/dtrans/target \
+    vcl/win/dtrans/targetdragcontext \
+    vcl/win/dtrans/targetdropcontext \
+    vcl/win/dtrans/TxtCnvtHlp \
+    vcl/win/dtrans/WinClipbImpl \
+    vcl/win/dtrans/WinClipboard \
+    vcl/win/dtrans/XNotifyingDataObject \
+    vcl/win/dtrans/XTDataObject \
     vcl/win/gdi/gdiimpl \
     vcl/win/gdi/salbmp \
+    vcl/win/gdi/salfont \
     vcl/win/gdi/salgdi \
     vcl/win/gdi/salgdi2 \
-    vcl/win/gdi/salfont \
     vcl/win/gdi/salgdi_gdiplus \
     vcl/win/gdi/salnativewidgets-luna \
     vcl/win/gdi/salprn \
     vcl/win/gdi/salvd \
     vcl/win/gdi/winlayout \
     vcl/win/gdi/DWriteTextRenderer \
-    vcl/win/window/salframe \
     vcl/win/window/keynames \
+    vcl/win/window/salframe \
     vcl/win/window/salmenu \
     vcl/win/window/salobj \
     $(if $(filter SKIA,$(BUILD_TYPE)), \
@@ -88,14 +116,17 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_win,\
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,vclplug_win,\
+    advapi32 \
     d2d1 \
     dwrite \
     gdi32 \
     gdiplus \
     imm32 \
     ole32 \
+    oleaut32 \
     shell32 \
     shlwapi \
+    uuid \
     version \
     winspool \
 ))
diff --git a/dtrans/source/generic/dtrans.component b/vcl/vclplug_win.component
index 1bfb643be4d0..907694991895 100644
--- a/dtrans/source/generic/dtrans.component
+++ b/vcl/vclplug_win.component
@@ -15,16 +15,32 @@
  *   License, Version 2.0 (the "License"); you may not use this file
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
+-->
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
     xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.datatransfer.DataFormatTranslator"
+        constructor="dtrans_CDataFormatTranslatorUNO_get_implementation">
+    <service name="com.sun.star.datatransfer.DataFormatTranslator"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"
+        constructor="dtrans_DragSource_get_implementation">
+    <service name="com.sun.star.datatransfer.dnd.OleDragSource"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"
+        constructor="dtrans_DropTarget_get_implementation">
+    <service name="com.sun.star.datatransfer.dnd.OleDropTarget"/>
+  </implementation>
   <implementation name="com.sun.star.comp.datatransfer.ClipboardManager"
-	constructor="dtrans_ClipboardManager_get_implementation">
+        constructor="dtrans_ClipboardManager_get_implementation">
     <service name="com.sun.star.datatransfer.clipboard.ClipboardManager"/>
   </implementation>
   <implementation name="com.sun.star.comp.datatransfer.clipboard.GenericClipboard"
-	constructor="dtrans_GenericClipboard_get_implementation">
+        constructor="dtrans_GenericClipboard_get_implementation">
     <service name="com.sun.star.datatransfer.clipboard.GenericClipboard"/>
   </implementation>
+  <implementation name="com.sun.star.datatransfer.clipboard.ClipboardW32"
+        constructor="dtrans_CWinClipboard_get_implementation">
+    <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>
+  </implementation>
 </component>
diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/vcl/win/dtrans/APNDataObject.cxx
index 53342f21f379..53342f21f379 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.cxx
+++ b/vcl/win/dtrans/APNDataObject.cxx
diff --git a/dtrans/source/win32/dtobj/APNDataObject.hxx b/vcl/win/dtrans/APNDataObject.hxx
index 69f5c9bd313a..2d3c583ec312 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.hxx
+++ b/vcl/win/dtrans/APNDataObject.hxx
@@ -19,6 +19,11 @@
 
 #pragma once
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
+#include <objidl.h>
+
 #include <systools/win32/comtools.hxx>
 
 /*
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/vcl/win/dtrans/DOTransferable.cxx
index 8f27e7124e0a..409c671e3de4 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/vcl/win/dtrans/DOTransferable.cxx
@@ -23,8 +23,8 @@
 #include <sal/log.hxx>
 
 #include "DOTransferable.hxx"
-#include "../misc/ImplHelper.hxx"
-#include <WinClip.hxx>
+#include "ImplHelper.hxx"
+#include "WinClip.hxx"
 #include "DTransHelper.hxx"
 #include "TxtCnvtHlp.hxx"
 #include "MimeAttrib.hxx"
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/vcl/win/dtrans/DOTransferable.hxx
index af2d2008cf37..af2d2008cf37 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/vcl/win/dtrans/DOTransferable.hxx
diff --git a/dtrans/source/win32/dtobj/DTransHelper.cxx b/vcl/win/dtrans/DTransHelper.cxx
index 66d18f9fb528..66d18f9fb528 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.cxx
+++ b/vcl/win/dtrans/DTransHelper.cxx
diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/vcl/win/dtrans/DTransHelper.hxx
index 9ec202c11d07..d8ab3349cb42 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/vcl/win/dtrans/DTransHelper.hxx
@@ -24,7 +24,7 @@
 #endif
 #include <windows.h>
 #include <objidl.h>
-#include <WinClip.hxx>
+#include "WinClip.hxx"
 
 #define AUTO_INIT                 true
 
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/vcl/win/dtrans/DataFmtTransl.cxx
index f0a1601f8dfb..f666f8c75401 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/vcl/win/dtrans/DataFmtTransl.cxx
@@ -21,8 +21,8 @@
 #include <rtl/string.hxx>
 #include <osl/diagnose.h>
 #include <rtl/tencinfo.h>
-#include "../misc/ImplHelper.hxx"
-#include <WinClip.hxx>
+#include "ImplHelper.hxx"
+#include "WinClip.hxx"
 #include "MimeAttrib.hxx"
 #include "DTransHelper.hxx"
 #include <rtl/string.h>
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/vcl/win/dtrans/DataFmtTransl.hxx
index 3d748751b79c..3d748751b79c 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx
+++ b/vcl/win/dtrans/DataFmtTransl.hxx
diff --git a/dtrans/source/win32/dtobj/DtObjFactory.cxx b/vcl/win/dtrans/DtObjFactory.cxx
index 29f630bf406b..5a17d8b4c2e4 100644
--- a/dtrans/source/win32/dtobj/DtObjFactory.cxx
+++ b/vcl/win/dtrans/DtObjFactory.cxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "../../inc/DtObjFactory.hxx"
-
+#include "DtObjFactory.hxx"
 #include "XTDataObject.hxx"
 
 using namespace com::sun::star::uno;
diff --git a/dtrans/source/inc/DtObjFactory.hxx b/vcl/win/dtrans/DtObjFactory.hxx
index b5d5f5007589..b5d5f5007589 100644
--- a/dtrans/source/inc/DtObjFactory.hxx
+++ b/vcl/win/dtrans/DtObjFactory.hxx
diff --git a/dtrans/source/win32/dtobj/Fetc.cxx b/vcl/win/dtrans/Fetc.cxx
index 048b9228de5d..9bcb2f609ff6 100644
--- a/dtrans/source/win32/dtobj/Fetc.cxx
+++ b/vcl/win/dtrans/Fetc.cxx
@@ -19,7 +19,7 @@
 
 #include <osl/diagnose.h>
 #include "Fetc.hxx"
-#include "../misc/ImplHelper.hxx"
+#include "ImplHelper.hxx"
 
 CFormatEtc::CFormatEtc(  )
 {
diff --git a/dtrans/source/win32/dtobj/Fetc.hxx b/vcl/win/dtrans/Fetc.hxx
index e0880acd645d..e0880acd645d 100644
--- a/dtrans/source/win32/dtobj/Fetc.hxx
+++ b/vcl/win/dtrans/Fetc.hxx
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/vcl/win/dtrans/FetcList.cxx
index 0a262b0677fb..d8fc6a52548a 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/vcl/win/dtrans/FetcList.cxx
@@ -25,8 +25,8 @@
 #include <com/sun/star/datatransfer/XMimeContentType.hpp>
 
 #include "DataFmtTransl.hxx"
-#include "../misc/ImplHelper.hxx"
-#include <WinClip.hxx>
+#include "ImplHelper.hxx"
+#include "WinClip.hxx"
 
 #include <algorithm>
 
diff --git a/dtrans/source/win32/dtobj/FetcList.hxx b/vcl/win/dtrans/FetcList.hxx
index 2df28ff5758e..2df28ff5758e 100644
--- a/dtrans/source/win32/dtobj/FetcList.hxx
+++ b/vcl/win/dtrans/FetcList.hxx
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/vcl/win/dtrans/FmtFilter.cxx
index e9c4b42f8b68..e9c4b42f8b68 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/vcl/win/dtrans/FmtFilter.cxx
diff --git a/dtrans/source/win32/dtobj/FmtFilter.hxx b/vcl/win/dtrans/FmtFilter.hxx
index 3c05c953c95d..3c05c953c95d 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.hxx
+++ b/vcl/win/dtrans/FmtFilter.hxx
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/vcl/win/dtrans/ImplHelper.cxx
index 0e38b9183d82..0e38b9183d82 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/vcl/win/dtrans/ImplHelper.cxx
diff --git a/dtrans/source/win32/misc/ImplHelper.hxx b/vcl/win/dtrans/ImplHelper.hxx
index fbe2c7ae70e5..fbe2c7ae70e5 100644
--- a/dtrans/source/win32/misc/ImplHelper.hxx
+++ b/vcl/win/dtrans/ImplHelper.hxx
diff --git a/dtrans/source/win32/dtobj/MimeAttrib.hxx b/vcl/win/dtrans/MimeAttrib.hxx
index dc8c3ef86fbb..dc8c3ef86fbb 100644
--- a/dtrans/source/win32/dtobj/MimeAttrib.hxx
+++ b/vcl/win/dtrans/MimeAttrib.hxx
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/vcl/win/dtrans/MtaOleClipb.cxx
index aaefc9170479..d894ae7b5a48 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/vcl/win/dtrans/MtaOleClipb.cxx
@@ -34,6 +34,10 @@
 #include <sal/log.hxx>
 
 #include "MtaOleClipb.hxx"
+
+#include <svsys.h>
+#include <win/saldata.hxx>
+
 #include <osl/thread.h>
 
 #include <wchar.h>
@@ -48,8 +52,7 @@ using osl::ClearableMutexGuard;
 
 namespace /* private */
 {
-    wchar_t CLIPSRV_DLL_NAME[] = L"sysdtrans.dll";
-    wchar_t g_szWndClsName[]   = L"MtaOleReqWnd###";
+    const wchar_t g_szWndClsName[] = L"MtaOleReqWnd###";
 
     // messages constants
 
@@ -607,8 +610,8 @@ void CMtaOleClipboard::createMtaOleReqWnd( )
 {
     WNDCLASSEXW  wcex;
 
-    HINSTANCE hInst = GetModuleHandleW( CLIPSRV_DLL_NAME );
-    OSL_ENSURE( nullptr != hInst, "The name of the clipboard service dll must have changed" );
+    SalData* pSalData = GetSalData();
+    OSL_ASSERT(nullptr != pSalData->mhInst);
 
     ZeroMemory( &wcex, sizeof(wcex) );
 
@@ -617,7 +620,7 @@ void CMtaOleClipboard::createMtaOleReqWnd( )
     wcex.lpfnWndProc    = CMtaOleClipboard::mtaOleReqWndProc;
     wcex.cbClsExtra     = 0;
     wcex.cbWndExtra     = 0;
-    wcex.hInstance      = hInst;
+    wcex.hInstance      = pSalData->mhInst;
     wcex.hIcon          = nullptr;
     wcex.hCursor        = nullptr;
     wcex.hbrBackground  = nullptr;
@@ -629,7 +632,7 @@ void CMtaOleClipboard::createMtaOleReqWnd( )
 
     if ( 0 != m_MtaOleReqWndClassAtom )
         m_hwndMtaOleReqWnd = CreateWindowW(
-            g_szWndClsName, nullptr, 0, 0, 0, 0, 0, nullptr, nullptr, hInst, nullptr );
+            g_szWndClsName, nullptr, 0, 0, 0, 0, 0, nullptr, nullptr, pSalData->mhInst, nullptr );
 }
 
 unsigned int CMtaOleClipboard::run( )
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.hxx b/vcl/win/dtrans/MtaOleClipb.hxx
index c406f81aafd3..c406f81aafd3 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.hxx
+++ b/vcl/win/dtrans/MtaOleClipb.hxx
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx b/vcl/win/dtrans/TxtCnvtHlp.cxx
index 1ea9f4c9f549..a0c09a1badf5 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
+++ b/vcl/win/dtrans/TxtCnvtHlp.cxx
@@ -18,9 +18,10 @@
  */
 
 #include <osl/diagnose.h>
+
 #include "TxtCnvtHlp.hxx"
 #include "DTransHelper.hxx"
-#include "../misc/ImplHelper.hxx"
+#include "ImplHelper.hxx"
 
 using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::uno;
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx b/vcl/win/dtrans/TxtCnvtHlp.hxx
index 70bd4e32ab67..70bd4e32ab67 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
+++ b/vcl/win/dtrans/TxtCnvtHlp.hxx
diff --git a/dtrans/source/inc/WinClip.hxx b/vcl/win/dtrans/WinClip.hxx
index f90d5eea063f..f90d5eea063f 100644
--- a/dtrans/source/inc/WinClip.hxx
+++ b/vcl/win/dtrans/WinClip.hxx
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/vcl/win/dtrans/WinClipbImpl.cxx
index e991a81cecd8..05248d75e896 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/vcl/win/dtrans/WinClipbImpl.cxx
@@ -21,12 +21,12 @@
 #include "WinClipbImpl.hxx"
 
 #include <systools/win32/comtools.hxx>
-#include "../../inc/DtObjFactory.hxx"
-#include "../dtobj/APNDataObject.hxx"
-#include "../dtobj/DOTransferable.hxx"
+#include "DtObjFactory.hxx"
+#include "APNDataObject.hxx"
+#include "DOTransferable.hxx"
 #include "WinClipboard.hxx"
 #include <com/sun/star/datatransfer/clipboard/RenderingCapabilities.hpp>
-#include "../dtobj/XNotifyingDataObject.hxx"
+#include "XNotifyingDataObject.hxx"
 
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/vcl/win/dtrans/WinClipbImpl.hxx
index 9fd2fb894a8c..9fd2fb894a8c 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/vcl/win/dtrans/WinClipbImpl.hxx
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/vcl/win/dtrans/WinClipboard.cxx
index 8a1d1cc07e04..8a1d1cc07e04 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/vcl/win/dtrans/WinClipboard.cxx
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/vcl/win/dtrans/WinClipboard.hxx
index a00375926456..a00375926456 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/vcl/win/dtrans/WinClipboard.hxx
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx b/vcl/win/dtrans/XNotifyingDataObject.cxx
index 46f563f9497c..b12ea31271d2 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
+++ b/vcl/win/dtrans/XNotifyingDataObject.cxx
@@ -19,8 +19,8 @@
 
 #include <osl/diagnose.h>
 #include "XNotifyingDataObject.hxx"
-#include "../clipb/WinClipbImpl.hxx"
-#include "../clipb/WinClipboard.hxx"
+#include "WinClipbImpl.hxx"
+#include "WinClipboard.hxx"
 
 using namespace com::sun::star::datatransfer;
 using namespace com::sun::star::datatransfer::clipboard;
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/vcl/win/dtrans/XNotifyingDataObject.hxx
index 2fb3025a03fa..2fb3025a03fa 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
+++ b/vcl/win/dtrans/XNotifyingDataObject.hxx
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/vcl/win/dtrans/XTDataObject.cxx
index 01b1ce39fce4..9300d2969997 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/vcl/win/dtrans/XTDataObject.cxx
@@ -23,7 +23,7 @@
 
 #include "XTDataObject.hxx"
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
-#include "../misc/ImplHelper.hxx"
+#include "ImplHelper.hxx"
 #include "DTransHelper.hxx"
 #include "TxtCnvtHlp.hxx"
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp>
diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/vcl/win/dtrans/XTDataObject.hxx
index 77f8c53f2925..77f8c53f2925 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.hxx
+++ b/vcl/win/dtrans/XTDataObject.hxx
diff --git a/dtrans/source/generic/clipboardmanager.cxx b/vcl/win/dtrans/clipboardmanager.cxx
index 8cea07171f78..8cea07171f78 100644
--- a/dtrans/source/generic/clipboardmanager.cxx
+++ b/vcl/win/dtrans/clipboardmanager.cxx
diff --git a/dtrans/source/generic/clipboardmanager.hxx b/vcl/win/dtrans/clipboardmanager.hxx
index 56e69617dc5f..56e69617dc5f 100644
--- a/dtrans/source/generic/clipboardmanager.hxx
+++ b/vcl/win/dtrans/clipboardmanager.hxx
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/vcl/win/dtrans/ftransl.cxx
index 0a40a5b75b72..1bbf90c689c4 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/vcl/win/dtrans/ftransl.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ref.hxx>
-#include "../misc/ImplHelper.hxx"
+#include "ImplHelper.hxx"
 
 #include <shlobj.h>
 
diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/vcl/win/dtrans/ftransl.hxx
index a5c7466ae138..7a5041be5fce 100644
--- a/dtrans/source/win32/ftransl/ftransl.hxx
+++ b/vcl/win/dtrans/ftransl.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/datatransfer/XDataFormatTranslator.hpp>
 #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <WinClip.hxx>
+#include "WinClip.hxx"
 
 #include <vector>
 
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/vcl/win/dtrans/generic_clipboard.cxx
index 0394353601c8..0394353601c8 100644
--- a/dtrans/source/generic/generic_clipboard.cxx
+++ b/vcl/win/dtrans/generic_clipboard.cxx
diff --git a/dtrans/source/generic/generic_clipboard.hxx b/vcl/win/dtrans/generic_clipboard.hxx
index 3c9126bcc535..3c9126bcc535 100644
--- a/dtrans/source/generic/generic_clipboard.hxx
+++ b/vcl/win/dtrans/generic_clipboard.hxx
diff --git a/dtrans/source/win32/dnd/globals.cxx b/vcl/win/dtrans/globals.cxx
index fcddef22e6c1..fcddef22e6c1 100644
--- a/dtrans/source/win32/dnd/globals.cxx
+++ b/vcl/win/dtrans/globals.cxx
diff --git a/dtrans/source/win32/dnd/globals.hxx b/vcl/win/dtrans/globals.hxx
index 824c56a5aa73..824c56a5aa73 100644
--- a/dtrans/source/win32/dnd/globals.hxx
+++ b/vcl/win/dtrans/globals.hxx
diff --git a/dtrans/source/win32/dnd/idroptarget.cxx b/vcl/win/dtrans/idroptarget.cxx
index 8b403eb7a35f..8b403eb7a35f 100644
--- a/dtrans/source/win32/dnd/idroptarget.cxx
+++ b/vcl/win/dtrans/idroptarget.cxx
diff --git a/dtrans/source/win32/dnd/idroptarget.hxx b/vcl/win/dtrans/idroptarget.hxx
index 8bb2216aae4c..8bb2216aae4c 100644
--- a/dtrans/source/win32/dnd/idroptarget.hxx
+++ b/vcl/win/dtrans/idroptarget.hxx
diff --git a/dtrans/source/win32/dnd/source.cxx b/vcl/win/dtrans/source.cxx
index 8df8325191f4..93d94e94e4c7 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/vcl/win/dtrans/source.cxx
@@ -30,7 +30,8 @@
 #include "source.hxx"
 #include "globals.hxx"
 #include "sourcecontext.hxx"
-#include "../../inc/DtObjFactory.hxx"
+#include "DtObjFactory.hxx"
+
 #include <rtl/ustring.h>
 #include <osl/thread.h>
 #include <winuser.h>
diff --git a/dtrans/source/win32/dnd/source.hxx b/vcl/win/dtrans/source.hxx
index 876f5895224a..876f5895224a 100644
--- a/dtrans/source/win32/dnd/source.hxx
+++ b/vcl/win/dtrans/source.hxx
diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/vcl/win/dtrans/sourcecontext.cxx
index 8531fd8a1184..8531fd8a1184 100644
--- a/dtrans/source/win32/dnd/sourcecontext.cxx
+++ b/vcl/win/dtrans/sourcecontext.cxx
diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/vcl/win/dtrans/sourcecontext.hxx
index 60609559a121..60609559a121 100644
--- a/dtrans/source/win32/dnd/sourcecontext.hxx
+++ b/vcl/win/dtrans/sourcecontext.hxx
diff --git a/dtrans/source/win32/dnd/target.cxx b/vcl/win/dtrans/target.cxx
index 2bbd34027ef6..0aa04ea1f7ab 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/vcl/win/dtrans/target.cxx
@@ -31,7 +31,7 @@
 #include <rtl/ustring.h>
 #include <osl/thread.h>
 
-#include "../dtobj/DOTransferable.hxx"
+#include "DOTransferable.hxx"
 
 using namespace cppu;
 using namespace osl;
diff --git a/dtrans/source/win32/dnd/target.hxx b/vcl/win/dtrans/target.hxx
index 8f4a13f13ac9..8f4a13f13ac9 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/vcl/win/dtrans/target.hxx
diff --git a/dtrans/source/win32/dnd/targetdragcontext.cxx b/vcl/win/dtrans/targetdragcontext.cxx
index 4ffd16123d9d..4ffd16123d9d 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.cxx
+++ b/vcl/win/dtrans/targetdragcontext.cxx
diff --git a/dtrans/source/win32/dnd/targetdragcontext.hxx b/vcl/win/dtrans/targetdragcontext.hxx
index c55a8fe673e9..c55a8fe673e9 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.hxx
+++ b/vcl/win/dtrans/targetdragcontext.hxx
diff --git a/dtrans/source/win32/dnd/targetdropcontext.cxx b/vcl/win/dtrans/targetdropcontext.cxx
index 9719664a9fbb..9719664a9fbb 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.cxx
+++ b/vcl/win/dtrans/targetdropcontext.cxx
diff --git a/dtrans/source/win32/dnd/targetdropcontext.hxx b/vcl/win/dtrans/targetdropcontext.hxx
index 8584c581db0a..8584c581db0a 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.hxx
+++ b/vcl/win/dtrans/targetdropcontext.hxx
diff --git a/dtrans/source/test/makefile.mk b/vcl/workben/dtrans/makefile.mk
index 588d4685a300..588d4685a300 100644
--- a/dtrans/source/test/makefile.mk
+++ b/vcl/workben/dtrans/makefile.mk
diff --git a/dtrans/source/test/test_dtrans.cxx b/vcl/workben/dtrans/test_dtrans.cxx
index f531f12fd119..f531f12fd119 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/vcl/workben/dtrans/test_dtrans.cxx
diff --git a/dtrans/test/win32/dnd/atlwindow.cxx b/vcl/workben/win/dnd/atlwindow.cxx
index 0d8d5d77646a..0d8d5d77646a 100644
--- a/dtrans/test/win32/dnd/atlwindow.cxx
+++ b/vcl/workben/win/dnd/atlwindow.cxx
diff --git a/dtrans/test/win32/dnd/atlwindow.hxx b/vcl/workben/win/dnd/atlwindow.hxx
index 047acf6769b1..047acf6769b1 100644
--- a/dtrans/test/win32/dnd/atlwindow.hxx
+++ b/vcl/workben/win/dnd/atlwindow.hxx
diff --git a/dtrans/test/win32/dnd/dndTest.cxx b/vcl/workben/win/dnd/dndTest.cxx
index 2f2a7bccfc68..2f2a7bccfc68 100644
--- a/dtrans/test/win32/dnd/dndTest.cxx
+++ b/vcl/workben/win/dnd/dndTest.cxx
diff --git a/dtrans/test/win32/dnd/makefile.mk b/vcl/workben/win/dnd/makefile.mk
index e0d438418eb1..e0d438418eb1 100644
--- a/dtrans/test/win32/dnd/makefile.mk
+++ b/vcl/workben/win/dnd/makefile.mk
diff --git a/dtrans/test/win32/dnd/sourcelistener.cxx b/vcl/workben/win/dnd/sourcelistener.cxx
index aa3366e79a11..aa3366e79a11 100644
--- a/dtrans/test/win32/dnd/sourcelistener.cxx
+++ b/vcl/workben/win/dnd/sourcelistener.cxx
diff --git a/dtrans/test/win32/dnd/sourcelistener.hxx b/vcl/workben/win/dnd/sourcelistener.hxx
index 0fc051399042..0fc051399042 100644
--- a/dtrans/test/win32/dnd/sourcelistener.hxx
+++ b/vcl/workben/win/dnd/sourcelistener.hxx
diff --git a/dtrans/test/win32/dnd/targetlistener.cxx b/vcl/workben/win/dnd/targetlistener.cxx
index 0a93d394560a..0a93d394560a 100644
--- a/dtrans/test/win32/dnd/targetlistener.cxx
+++ b/vcl/workben/win/dnd/targetlistener.cxx
diff --git a/dtrans/test/win32/dnd/targetlistener.hxx b/vcl/workben/win/dnd/targetlistener.hxx
index f42fac33aec5..f42fac33aec5 100644
--- a/dtrans/test/win32/dnd/targetlistener.hxx
+++ b/vcl/workben/win/dnd/targetlistener.hxx
diff --git a/dtrans/test/win32/dnd/transferable.cxx b/vcl/workben/win/dnd/transferable.cxx
index 924c031763b5..924c031763b5 100644
--- a/dtrans/test/win32/dnd/transferable.cxx
+++ b/vcl/workben/win/dnd/transferable.cxx
diff --git a/dtrans/test/win32/dnd/transferable.hxx b/vcl/workben/win/dnd/transferable.hxx
index fef9cda50635..fef9cda50635 100644
--- a/dtrans/test/win32/dnd/transferable.hxx
+++ b/vcl/workben/win/dnd/transferable.hxx
diff --git a/dtrans/source/win32/workbench/XTDo.cxx b/vcl/workben/win/dtrans/XTDo.cxx
index f8da707d92e3..f8da707d92e3 100644
--- a/dtrans/source/win32/workbench/XTDo.cxx
+++ b/vcl/workben/win/dtrans/XTDo.cxx
diff --git a/dtrans/source/win32/workbench/XTDo.hxx b/vcl/workben/win/dtrans/XTDo.hxx
index 095987a49d0a..095987a49d0a 100644
--- a/dtrans/source/win32/workbench/XTDo.hxx
+++ b/vcl/workben/win/dtrans/XTDo.hxx
diff --git a/dtrans/source/win32/workbench/makefile.mk b/vcl/workben/win/dtrans/makefile.mk
index 3c82289f8ee1..3c82289f8ee1 100644
--- a/dtrans/source/win32/workbench/makefile.mk
+++ b/vcl/workben/win/dtrans/makefile.mk
diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/vcl/workben/win/dtrans/test_wincb.cxx
index 96839e22a49a..96839e22a49a 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/vcl/workben/win/dtrans/test_wincb.cxx
diff --git a/dtrans/source/win32/workbench/testmarshal.cxx b/vcl/workben/win/dtrans/testmarshal.cxx
index d9edfe753107..d9edfe753107 100644
--- a/dtrans/source/win32/workbench/testmarshal.cxx
+++ b/vcl/workben/win/dtrans/testmarshal.cxx