Resolves fdo#70681: fixincludeguards.pl: all that's left

Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

35 files changed, 70 insertions, 70 deletions

diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx
index 7bd42adea6a8..19bf5501bc4a 100644
--- a/dtrans/source/cnttype/mcnttfactory.hxx
+++ b/dtrans/source/cnttype/mcnttfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MCNTTFACTORY_HXX_
-#define _MCNTTFACTORY_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTFACTORY_HXX
+#define INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTFACTORY_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx
index 0ebb192989b7..4812bc5b64ee 100644
--- a/dtrans/source/cnttype/mcnttype.hxx
+++ b/dtrans/source/cnttype/mcnttype.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MCNTTYPE_HXX_
-#define _MCNTTYPE_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTYPE_HXX
+#define INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTYPE_HXX
 
 #include <cppuhelper/compbase1.hxx>
 #include <rtl/ustring.hxx>
diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx
index 090f7597c3c7..89c8845e2b9b 100644
--- a/dtrans/source/generic/clipboardmanager.hxx
+++ b/dtrans/source/generic/clipboardmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DTRANS_CLIPBOARDMANAGER_HXX_
-#define _DTRANS_CLIPBOARDMANAGER_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_GENERIC_CLIPBOARDMANAGER_HXX
+#define INCLUDED_DTRANS_SOURCE_GENERIC_CLIPBOARDMANAGER_HXX
 
 #include <cppuhelper/compbase3.hxx>
 
diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx
index a6853ce29379..0d937171cca0 100644
--- a/dtrans/source/generic/generic_clipboard.hxx
+++ b/dtrans/source/generic/generic_clipboard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DTRANS_GENERIC_CLIPBOARD_HXX_
-#define _DTRANS_GENERIC_CLIPBOARD_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_GENERIC_GENERIC_CLIPBOARD_HXX
+#define INCLUDED_DTRANS_SOURCE_GENERIC_GENERIC_CLIPBOARD_HXX
 
 #include <cppuhelper/compbase4.hxx>
 
diff --git a/dtrans/source/inc/DtObjFactory.hxx b/dtrans/source/inc/DtObjFactory.hxx
index 0031dc5d7cc3..23ca93e25206 100644
--- a/dtrans/source/inc/DtObjFactory.hxx
+++ b/dtrans/source/inc/DtObjFactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DTOBJFACTORY_HXX_
-#define _DTOBJFACTORY_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_INC_DTOBJFACTORY_HXX
+#define INCLUDED_DTRANS_SOURCE_INC_DTOBJFACTORY_HXX
 
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/dtrans/source/win32/clipb/APNDataObject.hxx b/dtrans/source/win32/clipb/APNDataObject.hxx
index 740bd5508595..fbfbdb4ca45d 100644
--- a/dtrans/source/win32/clipb/APNDataObject.hxx
+++ b/dtrans/source/win32/clipb/APNDataObject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _APNDATAOBJECT_HXX_
-#define _APNDATAOBJECT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_APNDATAOBJECT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_APNDATAOBJECT_HXX
 
 /*
     an APartment Neutral dataobject wrapper; this wrapper of a IDataObject
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.hxx b/dtrans/source/win32/clipb/MtaOleClipb.hxx
index e3ebfd2a1b3c..a8458a1c3fec 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.hxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MTAOLECLIPB_HXX_
-#define _MTAOLECLIPB_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_MTAOLECLIPB_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_MTAOLECLIPB_HXX
 
 #include <sal/types.h>
 #include <osl/mutex.hxx>
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index bb496df082fa..e248dad499b4 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _WINCLIPBIMPL_HXX_
-#define _WINCLIPBIMPL_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_WINCLIPBIMPL_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_WINCLIPBIMPL_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx
index 36344799719f..8e6f66271645 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _WINCLIPBOARD_HXX_
-#define _WINCLIPBOARD_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_WINCLIPBOARD_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_WINCLIPBOARD_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx
index e614e50962b6..a6214e95a168 100644
--- a/dtrans/source/win32/dnd/globals.hxx
+++ b/dtrans/source/win32/dnd/globals.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _GLOBALS_HXX_
-#define _GLOBALS_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_GLOBALS_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_GLOBALS_HXX
 
 #include <osl/mutex.hxx>
 
diff --git a/dtrans/source/win32/dnd/idroptarget.hxx b/dtrans/source/win32/dnd/idroptarget.hxx
index bbaa799b147b..19f797443ac0 100644
--- a/dtrans/source/win32/dnd/idroptarget.hxx
+++ b/dtrans/source/win32/dnd/idroptarget.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _IDROPTARGET_HXX_
-#define _IDROPTARGET_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_IDROPTARGET_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_IDROPTARGET_HXX
 
 #include "target.hxx"
 
diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx
index 333fc7b61106..1cbf840b5ecd 100644
--- a/dtrans/source/win32/dnd/source.hxx
+++ b/dtrans/source/win32/dnd/source.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SOURCE_HXX_
-#define _SOURCE_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCE_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCE_HXX
 
 #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx
index f149abb5e556..3682ea2a9840 100644
--- a/dtrans/source/win32/dnd/sourcecontext.hxx
+++ b/dtrans/source/win32/dnd/sourcecontext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SOURCECONTEXT_HXX_
-#define _SOURCECONTEXT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCECONTEXT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCECONTEXT_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx
index 6216213eedbb..708f21a7e6d3 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/dtrans/source/win32/dnd/target.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TARGET_HXX_
-#define _TARGET_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGET_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGET_HXX
 
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
diff --git a/dtrans/source/win32/dnd/targetdragcontext.hxx b/dtrans/source/win32/dnd/targetdragcontext.hxx
index 26029c86681b..8e0ad473e33e 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TARGETDRAGCONTEXT_HXX_
-#define _TARGETDRAGCONTEXT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDRAGCONTEXT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDRAGCONTEXT_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
diff --git a/dtrans/source/win32/dnd/targetdropcontext.hxx b/dtrans/source/win32/dnd/targetdropcontext.hxx
index 6f428c89b080..4b945737cc7b 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TARGETDROPCONTEXT_HXX_
-#define _TARGETDROPCONTEXT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDROPCONTEXT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDROPCONTEXT_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp>
diff --git a/dtrans/source/win32/dtobj/APNDataObject.hxx b/dtrans/source/win32/dtobj/APNDataObject.hxx
index bc23d88d6c8c..9522aae05129 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.hxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _APNDATAOBJECT_HXX_
-#define _APNDATAOBJECT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_APNDATAOBJECT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_APNDATAOBJECT_HXX
 
 #include <systools/win32/comtools.hxx>
 
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx
index 5e20010949d5..3090439f5228 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DOTRANSFERABLE_HXX_
-#define _DOTRANSFERABLE_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DOTRANSFERABLE_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DOTRANSFERABLE_HXX
 
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 
diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx
index 7c9424f34026..308331efabbe 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DTRANSHELPER_HXX_
-#define _DTRANSHELPER_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DTRANSHELPER_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DTRANSHELPER_HXX
 
 #if defined _MSC_VER
 #pragma warning(push,1)
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
index fb024d869347..12c105431b0f 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DATAFMTTRANSL_HXX_
-#define _DATAFMTTRANSL_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DATAFMTTRANSL_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DATAFMTTRANSL_HXX
 
 #include <com/sun/star/datatransfer/XDataFormatTranslator.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
diff --git a/dtrans/source/win32/dtobj/Fetc.hxx b/dtrans/source/win32/dtobj/Fetc.hxx
index 7358b9a3ef61..4f86c691bc94 100644
--- a/dtrans/source/win32/dtobj/Fetc.hxx
+++ b/dtrans/source/win32/dtobj/Fetc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FETC_HXX_
-#define _FETC_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FETC_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FETC_HXX
 
 #include <sal/types.h>
 
diff --git a/dtrans/source/win32/dtobj/FetcList.hxx b/dtrans/source/win32/dtobj/FetcList.hxx
index cab9b02782e8..97ee1ed9b67c 100644
--- a/dtrans/source/win32/dtobj/FetcList.hxx
+++ b/dtrans/source/win32/dtobj/FetcList.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FETCLIST_HXX_
-#define _FETCLIST_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FETCLIST_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FETCLIST_HXX
 
 #include <sal/types.h>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
diff --git a/dtrans/source/win32/dtobj/FmtFilter.hxx b/dtrans/source/win32/dtobj/FmtFilter.hxx
index 8020662adb3b..8ee93a2935c2 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.hxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FMTFILTER_HXX_
-#define _FMTFILTER_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FMTFILTER_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FMTFILTER_HXX
 
 #include <sal/types.h>
 
diff --git a/dtrans/source/win32/dtobj/MimeAttrib.hxx b/dtrans/source/win32/dtobj/MimeAttrib.hxx
index 278f2aa36323..eb57ba750ea1 100644
--- a/dtrans/source/win32/dtobj/MimeAttrib.hxx
+++ b/dtrans/source/win32/dtobj/MimeAttrib.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MIMEATTRIB_HXX_
-#define _MIMEATTRIB_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_MIMEATTRIB_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_MIMEATTRIB_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
index 8f3b2a02ace0..e2fe22835cb4 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TXTCNVTHLP_HXX_
-#define _TXTCNVTHLP_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_TXTCNVTHLP_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_TXTCNVTHLP_HXX
 
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
 
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
index 43d94f1f6b4d..fbe45cb91b36 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XNOTIFYINGDATAOBJECT_HXX_
-#define _XNOTIFYINGDATAOBJECT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_XNOTIFYINGDATAOBJECT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_XNOTIFYINGDATAOBJECT_HXX
 
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx
index 6e1b1c21f25d..9577cb5143c5 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XTDATAOBJECT_HXX_
-#define _XTDATAOBJECT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_XTDATAOBJECT_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_XTDATAOBJECT_HXX
 
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx
index b7913097720e..6bf5ec2dd18b 100644
--- a/dtrans/source/win32/ftransl/ftransl.hxx
+++ b/dtrans/source/win32/ftransl/ftransl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FTRANSL_HXX_
-#define _FTRANSL_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_FTRANSL_FTRANSL_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_FTRANSL_FTRANSL_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
diff --git a/dtrans/source/win32/misc/ImplHelper.hxx b/dtrans/source/win32/misc/ImplHelper.hxx
index de50bd8f94ff..e612744e8763 100644
--- a/dtrans/source/win32/misc/ImplHelper.hxx
+++ b/dtrans/source/win32/misc/ImplHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _IMPLHELPER_HXX_
-#define _IMPLHELPER_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_MISC_IMPLHELPER_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_MISC_IMPLHELPER_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/dtrans/source/win32/misc/WinClip.hxx b/dtrans/source/win32/misc/WinClip.hxx
index 5689a7bf294d..268c7a0392a6 100644
--- a/dtrans/source/win32/misc/WinClip.hxx
+++ b/dtrans/source/win32/misc/WinClip.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _WINCLIP_HXX_
-#define _WINCLIP_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_MISC_WINCLIP_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_MISC_WINCLIP_HXX
 
 #include <sal/types.h>
 
diff --git a/dtrans/source/win32/workbench/XTDo.hxx b/dtrans/source/win32/workbench/XTDo.hxx
index 6d4891419269..213534439e0d 100644
--- a/dtrans/source/win32/workbench/XTDo.hxx
+++ b/dtrans/source/win32/workbench/XTDo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XTDATAOBJECT_HXX_
-#define _XTDATAOBJECT_HXX_
+#ifndef INCLUDED_DTRANS_SOURCE_WIN32_WORKBENCH_XTDO_HXX
+#define INCLUDED_DTRANS_SOURCE_WIN32_WORKBENCH_XTDO_HXX
 
 #if defined _MSC_VER
 #pragma warning(push,1)
diff --git a/dtrans/test/win32/dnd/atlwindow.hxx b/dtrans/test/win32/dnd/atlwindow.hxx
index 63756578539d..0dbb0f5d879c 100644
--- a/dtrans/test/win32/dnd/atlwindow.hxx
+++ b/dtrans/test/win32/dnd/atlwindow.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _WINDOW_HXX_
-#define _WINDOW_HXX_
+#ifndef INCLUDED_DTRANS_TEST_WIN32_DND_ATLWINDOW_HXX
+#define INCLUDED_DTRANS_TEST_WIN32_DND_ATLWINDOW_HXX
 #include <atlbase.h>
 extern CComModule _Module;
 #include <atlcom.h>
diff --git a/dtrans/test/win32/dnd/sourcelistener.hxx b/dtrans/test/win32/dnd/sourcelistener.hxx
index 07d3294a61aa..72b1b9aa28af 100644
--- a/dtrans/test/win32/dnd/sourcelistener.hxx
+++ b/dtrans/test/win32/dnd/sourcelistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SOURCELISTENER_HXX_
-#define _SOURCELISTENER_HXX_
+#ifndef INCLUDED_DTRANS_TEST_WIN32_DND_SOURCELISTENER_HXX
+#define INCLUDED_DTRANS_TEST_WIN32_DND_SOURCELISTENER_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
diff --git a/dtrans/test/win32/dnd/targetlistener.hxx b/dtrans/test/win32/dnd/targetlistener.hxx
index da14fad93411..a70a669fb3b9 100644
--- a/dtrans/test/win32/dnd/targetlistener.hxx
+++ b/dtrans/test/win32/dnd/targetlistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TARGETLISTENER_HXX_
-#define _TARGETLISTENER_HXX_
+#ifndef INCLUDED_DTRANS_TEST_WIN32_DND_TARGETLISTENER_HXX
+#define INCLUDED_DTRANS_TEST_WIN32_DND_TARGETLISTENER_HXX
 
 #if defined _MSC_VER
 #pragma warning(push,1)
diff --git a/dtrans/test/win32/dnd/transferable.hxx b/dtrans/test/win32/dnd/transferable.hxx
index 49fba2719ac5..96688ddbf166 100644
--- a/dtrans/test/win32/dnd/transferable.hxx
+++ b/dtrans/test/win32/dnd/transferable.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TRANSFERABLE_HXX_
-#define _TRANSFERABLE_HXX_
+#ifndef INCLUDED_DTRANS_TEST_WIN32_DND_TRANSFERABLE_HXX
+#define INCLUDED_DTRANS_TEST_WIN32_DND_TRANSFERABLE_HXX
 
 #include <cppuhelper/servicefactory.hxx>
 #include <com/sun/star/datatransfer/XTransferable.hpp>