Make include guards sane in vcl

We have a convention. Use it. Kill copypasta.

Change-Id: I512e1c8e75b5da20b6756ffc88209a27674ad7c7

41 files changed, 110 insertions, 138 deletions

diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
index 90433ddc53da..d5d4a89f4687 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
@@ -30,6 +30,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERCHECKOBOX_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
index 15943efbfa82..9b31303dfb21 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
@@ -30,6 +30,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERRADIOGROUP_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
index a590462611b7..d02193d05570 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERRADIOGROUP_H
-#define _SV_AQUA11WRAPPERRADIOGROUP_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOGROUP_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOGROUP_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERRADIOGROUP_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOGROUP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/aqua/saldata.hxx
index ef6c8d292646..b9da7dbecab8 100644
--- a/vcl/inc/aqua/saldata.hxx
+++ b/vcl/inc/aqua/saldata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALDATA_HXX
-#define _SV_SALDATA_HXX
+#ifndef INCLUDED_VCL_INC_AQUA_SALDATA_HXX
+#define INCLUDED_VCL_INC_AQUA_SALDATA_HXX
 
 #include <config_features.h>
 
@@ -118,6 +118,6 @@ sal_Bool ImplSalYieldMutexTryToAcquire();
 void ImplSalYieldMutexAcquire();
 void ImplSalYieldMutexRelease();
 
-#endif  // _SV_SALDATA_HXX
+#endif // INCLUDED_VCL_INC_AQUA_SALDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index e7c122a23c84..11446a14bf05 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALFRAME_H
-#define _SV_SALFRAME_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALFRAME_H
+#define INCLUDED_VCL_INC_AQUA_SALFRAME_H
 
 #include <premac.h>
 #include <IOKit/pwr_mgt/IOPMLib.h>
@@ -212,6 +212,6 @@ public:
     AquaSalFrame& operator=(const AquaSalFrame&);
 };
 
-#endif // _SV_SALFRAME_H
+#endif // INCLUDED_VCL_INC_AQUA_SALFRAME_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salinst.h b/vcl/inc/aqua/salinst.h
index 72c000006bca..2e6045b11767 100644
--- a/vcl/inc/aqua/salinst.h
+++ b/vcl/inc/aqua/salinst.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALINST_H
-#define _SV_SALINST_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALINST_H
+#define INCLUDED_VCL_INC_AQUA_SALINST_H
 
 #include "comphelper/solarmutex.hxx"
 #include "osl/thread.hxx"
@@ -170,6 +170,6 @@ class YieldMutexReleaser
 CGImageRef CreateCGImage( const Image& );
 NSImage*   CreateNSImage( const Image& );
 
-#endif // _SV_SALINST_H
+#endif // INCLUDED_VCL_INC_AQUA_SALINST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salmenu.h b/vcl/inc/aqua/salmenu.h
index 326bcd7f4cf2..4be94eaf04e7 100644
--- a/vcl/inc/aqua/salmenu.h
+++ b/vcl/inc/aqua/salmenu.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALMENU_H
-#define _SV_SALMENU_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALMENU_H
+#define INCLUDED_VCL_INC_AQUA_SALMENU_H
 
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
@@ -109,6 +109,6 @@ public:
     NSMenuItem*         mpMenuItem;           // The NSMenuItem
 };
 
-#endif // _SV_SALMENU_H
+#endif // INCLUDED_VCL_INC_AQUA_SALMENU_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salobj.h b/vcl/inc/aqua/salobj.h
index 09d951f91188..0bd82821ab1e 100644
--- a/vcl/inc/aqua/salobj.h
+++ b/vcl/inc/aqua/salobj.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALOBJ_H
-#define _SV_SALOBJ_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALOBJ_H
+#define INCLUDED_VCL_INC_AQUA_SALOBJ_H
 
 #include "vcl/sysdata.hxx"
 #include "salobj.hxx"
@@ -70,6 +70,6 @@ public:
     virtual const SystemEnvData*    GetSystemData() const;
 };
 
-#endif // _SV_SALOBJ_H
+#endif // INCLUDED_VCL_INC_AQUA_SALOBJ_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salprn.h b/vcl/inc/aqua/salprn.h
index 443cbe421e4f..cd8c32651b18 100644
--- a/vcl/inc/aqua/salprn.h
+++ b/vcl/inc/aqua/salprn.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALPRN_H
-#define _SV_SALPRN_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALPRN_H
+#define INCLUDED_VCL_INC_AQUA_SALPRN_H
 
 #include "aqua/aquavcltypes.h"
 
@@ -160,6 +160,6 @@ inline double TenMuToPt( double nUnits ) { return floor(((nUnits)/fPtTo100thMM)+
 
 
 
-#endif // _SV_SALPRN_H
+#endif // INCLUDED_VCL_INC_AQUA_SALPRN_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salsys.h b/vcl/inc/aqua/salsys.h
index dc5c6b2eceec..e68bdbb0b346 100644
--- a/vcl/inc/aqua/salsys.h
+++ b/vcl/inc/aqua/salsys.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALSYS_H
-#define _SV_SALSYS_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALSYS_H
+#define INCLUDED_VCL_INC_AQUA_SALSYS_H
 
 #include "salsys.hxx"
 
@@ -46,6 +46,6 @@ public:
 };
 
 
-#endif // _SV_SALSYS_H
+#endif // INCLUDED_VCL_INC_AQUA_SALSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/saltimer.h b/vcl/inc/aqua/saltimer.h
index f53f7d0df0f9..e51740ff4ba1 100644
--- a/vcl/inc/aqua/saltimer.h
+++ b/vcl/inc/aqua/saltimer.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALTIMER_H
-#define _SV_SALTIMER_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALTIMER_H
+#define INCLUDED_VCL_INC_AQUA_SALTIMER_H
 
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
diff --git a/vcl/inc/aqua/salvd.h b/vcl/inc/aqua/salvd.h
index 51f5d4112a73..0bc3d915bddd 100644
--- a/vcl/inc/aqua/salvd.h
+++ b/vcl/inc/aqua/salvd.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALVD_H
-#define _SV_SALVD_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALVD_H
+#define INCLUDED_VCL_INC_AQUA_SALVD_H
 
 #include "premac.h"
 #include <ApplicationServices/ApplicationServices.h>
@@ -80,6 +80,6 @@ public:
 
 // =======================================================================
 
-#endif // _SV_SALVD_H
+#endif // INCLUDED_VCL_INC_AQUA_SALVD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/svsys.h b/vcl/inc/aqua/svsys.h
index f46ff7685113..89bb7dce2016 100644
--- a/vcl/inc/aqua/svsys.h
+++ b/vcl/inc/aqua/svsys.h
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SVSYS_H
-#define _SV_SVSYS_H
+#ifndef INCLUDED_VCL_INC_AQUA_SVSYS_H
+#define INCLUDED_VCL_INC_AQUA_SVSYS_H
 
 #include "premac.h"
 #include "Cocoa/Cocoa.h"
 #include "postmac.h"
 
-#endif // _SV_SVSYS_H
+#endif // INCLUDED_VCL_INC_AQUA_SVSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h
index 00e061e029f8..b63f8b43f88c 100644
--- a/vcl/inc/generic/genprn.h
+++ b/vcl/inc/generic/genprn.h
@@ -95,7 +95,6 @@ public:
     virtual sal_uIntPtr                 GetErrorCode();
 };
 
-#endif // _SV_SALPRN_H
-
+#endif // INCLUDED_VCL_INC_GENERIC_GENPRN_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index d0e6a6e9d9bc..e1ef8d439e53 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -163,6 +163,6 @@ public:
     virtual GenPspGraphics *CreatePrintGraphics();
 };
 
-#endif // _SV_SALINST_HXX
+#endif // INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 7c3839a9d9ca..d279715c0dd0 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALBMP_HXX
-#define _SV_SALBMP_HXX
+#ifndef INCLUDED_VCL_INC_SALBMP_HXX
+#define INCLUDED_VCL_INC_SALBMP_HXX
 
 #include <tools/gen.hxx>
 #include <vcl/dllapi.h>
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 6fcb1e245732..7e8f4702875c 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALINST_HXX
-#define _SV_SALINST_HXX
+#ifndef INCLUDED_VCL_INC_SALINST_HXX
+#define INCLUDED_VCL_INC_SALINST_HXX
 
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/XComponentContext.hpp"
@@ -196,6 +196,6 @@ void InitSalMain();
 
 VCL_DLLPUBLIC int SVMain();
 
-#endif // _SV_SALINST_HXX
+#endif // INCLUDED_VCL_INC_SALINST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 5d9b0683bb22..e9ff357db7fe 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SVIDS_HRC
-#define _SV_SVIDS_HRC
+#ifndef INCLUDED_VCL_INC_SVIDS_HRC
+#define INCLUDED_VCL_INC_SVIDS_HRC
 
 #define SV_RESID_STDOFFSET                  0
 #define SV_RESID_MONOOFFSET                 1
@@ -251,6 +251,6 @@
 #define SV_ICON_ID_FORMULA                     13
 #define SV_ICON_ID_PRINTERADMIN               501
 
-#endif  // _SV_SVIDS_HRC
+#endif // INCLUDED_VCL_INC_SVIDS_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index d19e45d9d018..99fd9cb3f8a0 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -58,6 +58,6 @@ public:
     virtual const SystemEnvData*    GetSystemData() const;
 };
 
-#endif // _SV_SALOBJ_H
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 4b72fcf3fe67..8a54fd987388 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -17,14 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALBMP_H
-#define _SV_SALBMP_H
+#ifndef INCLUDED_VCL_INC_UNX_SALBMP_H
+#define INCLUDED_VCL_INC_UNX_SALBMP_H
 
 #include <prex.h>
 #include <postx.h>
-#ifndef _SV_SALGTYPE
 #include <vcl/salgtype.hxx>
-#endif
 #include <unx/saldisp.hxx>
 #include <salbmp.hxx>
 #include <vclpluginapi.h>
@@ -245,6 +243,6 @@ public:
     void            ImplClear();
 };
 
-#endif // _SV_SALBMP_HXX
+#endif // INCLUDED_VCL_INC_UNX_SALBMP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index e986f8cda221..f5890bc06e53 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALDATA_HXX
-#define _SV_SALDATA_HXX
+#ifndef INCLUDED_VCL_INC_UNX_SALDATA_HXX
+#define INCLUDED_VCL_INC_UNX_SALDATA_HXX
 
 #include <prex.h>
 #include <postx.h>
@@ -93,6 +93,6 @@ public:
 
 X11SalData* GetX11SalData();
 
-#endif // _SV_SALDATA_HXX
+#endif // INCLUDED_VCL_INC_UNX_SALDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 531c608327a0..b98bcb22fc51 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALDISP_HXX
-#define _SV_SALDISP_HXX
+#ifndef INCLUDED_VCL_INC_UNX_SALDISP_HXX
+#define INCLUDED_VCL_INC_UNX_SALDISP_HXX
 
 class   SalDisplay;
 class   SalColormap;
@@ -416,6 +416,6 @@ namespace vcl_sal {
 }
 
 
-#endif // _SV_SALDISP_HXX
+#endif // INCLUDED_VCL_INC_UNX_SALDISP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 5d3183975bff..eb11699a916d 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SV_SALFRAME_H
-#define _SV_SALFRAME_H
+
+#ifndef INCLUDED_VCL_INC_UNX_SALFRAME_H
+#define INCLUDED_VCL_INC_UNX_SALFRAME_H
 
 #include <prex.h>
 #include <postx.h>
@@ -269,16 +270,6 @@ public:
     void setPendingSizeEvent();
 };
 
-#ifdef _SV_SALDISP_HXX
-
-inline Display *X11SalFrame::GetXDisplay() const
-{ return pDisplay_->GetDisplay(); }
-
-inline XLIB_Window X11SalFrame::GetDrawable() const
-{ return GetWindow(); }
-
-#endif
-
-#endif // _SV_SALFRAME_H
+#endif // INCLUDED_VCL_INC_UNX_SALFRAME_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 53587591d6f1..d1645002ea0f 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALINST_H
-#define _SV_SALINST_H
+#ifndef INCLUDED_VCL_INC_UNX_SALINST_H
+#define INCLUDED_VCL_INC_UNX_SALINST_H
 
 #include <tools/solar.h>
 #include <osl/thread.hxx>
@@ -82,6 +82,6 @@ public:
     virtual void            AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService);
 };
 
-#endif // _SV_SALINST_H
+#endif // INCLUDED_VCL_INC_UNX_SALINST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h
index 289b5dfb16bd..7722a8f279ae 100644
--- a/vcl/inc/unx/salmenu.h
+++ b/vcl/inc/unx/salmenu.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALMENU_H
-#define _SV_SALMENU_H
+#ifndef INCLUDED_VCL_INC_UNX_SALMENU_H
+#define INCLUDED_VCL_INC_UNX_SALMENU_H
 
 #include <tools/solar.h>
 #include <vcl/bitmap.hxx>
@@ -53,6 +53,6 @@ public:
         virtual ~X11SalMenuItem();
 };
 
-#endif // _SV_SALMENU_H
+#endif // INCLUDED_VCL_INC_UNX_SALMENU_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 96e557076c69..b644b1b9020c 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALOBJ_H
-#define _SV_SALOBJ_H
+#ifndef INCLUDED_VCL_INC_UNX_SALOBJ_H
+#define INCLUDED_VCL_INC_UNX_SALOBJ_H
 
 #include <tools/solar.h>
 #include <vcl/sysdata.hxx>
@@ -88,6 +88,6 @@ public:
     virtual const SystemEnvData*    GetSystemData() const;
 };
 
-#endif // _SV_SALOBJ_H
+#endif // INCLUDED_VCL_INC_UNX_SALOBJ_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saltimer.h b/vcl/inc/unx/saltimer.h
index e2bb1e49284a..f93acf889452 100644
--- a/vcl/inc/unx/saltimer.h
+++ b/vcl/inc/unx/saltimer.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALTIMER_H
-#define _SV_SALTIMER_H
+#ifndef INCLUDED_VCL_INC_UNX_SALTIMER_H
+#define INCLUDED_VCL_INC_UNX_SALTIMER_H
 
 #include <saltimer.hxx>
 
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index f50cdd1516d1..198bdf84dea9 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALVD_H
-#define _SV_SALVD_H
+#ifndef INCLUDED_VCL_INC_UNX_SALVD_H
+#define INCLUDED_VCL_INC_UNX_SALVD_H
 
 #include <prex.h>
 #include <postx.h>
@@ -73,22 +73,6 @@ public:
     virtual void            GetSize( long& rWidth, long& rHeight );
 };
 
-#ifdef _SV_SALDISP_HXX
-
-inline void X11SalVirtualDevice::InitGraphics( X11SalVirtualDevice *pVD )
-{ pGraphics_->Init( pVD ); }
-
-inline Display *X11SalVirtualDevice::GetXDisplay() const
-{ return pDisplay_->GetDisplay(); }
-
-inline SalDisplay *X11SalVirtualDevice::GetDisplay() const
-{ return pDisplay_; }
-
-inline sal_Bool X11SalVirtualDevice::IsDisplay() const
-{ return pDisplay_->IsDisplay(); }
-
-#endif
-
-#endif // _SV_SALVD_H
+#endif // INCLUDED_VCL_INC_UNX_SALVD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/svsys.h b/vcl/inc/unx/svsys.h
index 40ad3e04e3d6..91775820798e 100644
--- a/vcl/inc/unx/svsys.h
+++ b/vcl/inc/unx/svsys.h
@@ -16,12 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SV_SVSYS_H
-#define _SV_SVSYS_H
+#ifndef INCLUDED_VCL_INC_UNX_SVSYS_H
+#define INCLUDED_VCL_INC_UNX_SVSYS_H
 
 #include <prex.h>
 #include <postx.h>
 
-#endif // _SV_SVSYS_H
+#endif // INCLUDED_VCL_INC_UNX_SVSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index bedfbaed0948..258d9a5f896a 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALBMP_H
-#define _SV_SALBMP_H
+#ifndef INCLUDED_VCL_INC_WIN_SALBMP_H
+#define INCLUDED_VCL_INC_WIN_SALBMP_H
 
 #include <tools/gen.hxx>
 #include <win/wincomp.hxx>
@@ -100,6 +100,6 @@ public:
     virtual bool                GetSystemData( BitmapSystemData& rData );
 };
 
-#endif // _SV_SALBMP_HXX
+#endif // INCLUDED_VCL_INC_WIN_SALBMP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index d1464d5958ee..ecaeca5aee83 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALDATA_HXX
-#define _SV_SALDATA_HXX
+#ifndef INCLUDED_VCL_INC_WIN_SALDATA_HXX
+#define INCLUDED_VCL_INC_WIN_SALDATA_HXX
 
 #include "osl/module.h"
 
@@ -313,6 +313,6 @@ inline WinSalObject* GetSalObjWindowPtr( HWND hWnd )
     return (WinSalObject*)GetWindowLongPtr( hWnd, SAL_OBJECT_THIS );
 }
 
-#endif  // _SV_SALDATA_HXX
+#endif // INCLUDED_VCL_INC_WIN_SALDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index cdde4b9a7a68..0a54ac2ba61d 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALFRAME_H
-#define _SV_SALFRAME_H
+#ifndef INCLUDED_VCL_INC_WIN_SALFRAME_H
+#define INCLUDED_VCL_INC_WIN_SALFRAME_H
 
 #include <vcl/sysdata.hxx>
 #include <salframe.hxx>
@@ -146,6 +146,6 @@ namespace vcl_sal {
         LONG nSymbol );
 }
 
-#endif // _SV_SALFRAME_H
+#endif // INCLUDED_VCL_INC_WIN_SALFRAME_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc
index 086702bcefc0..a351bba0b907 100644
--- a/vcl/inc/win/salids.hrc
+++ b/vcl/inc/win/salids.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALIDS_HRC
-#define _SV_SALIDS_HRC
+#ifndef INCLUDED_VCL_INC_WIN_SALIDS_HRC
+#define INCLUDED_VCL_INC_WIN_SALIDS_HRC
 
 // Cursor
 #define SAL_RESID_POINTER_NULL                      10000
@@ -106,6 +106,6 @@
 
 #define SAL_RESID_ICON_DEFAULT                      1
 
-#endif // _SV_SALIDS_HRC
+#endif // INCLUDED_VCL_INC_WIN_SALIDS_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h
index 2b0dfaa1bc0a..f9f5e0af20cd 100644
--- a/vcl/inc/win/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALINST_H
-#define _SV_SALINST_H
+#ifndef INCLUDED_VCL_INC_WIN_SALINST_H
+#define INCLUDED_VCL_INC_WIN_SALINST_H
 
 #include <salinst.hxx>
 
@@ -83,6 +83,6 @@ HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, sal_Bool bAsChild );
 void ImplSalStartTimer( sal_uIntPtr nMS, sal_Bool bMutex = sal_False );
 void ImplSalPrinterAbortJobAsync( HDC hPrnDC );
 
-#endif // _SV_SALINST_H
+#endif // INCLUDED_VCL_INC_WIN_SALINST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h
index d8152b394445..28f623f16eb5 100644
--- a/vcl/inc/win/salmenu.h
+++ b/vcl/inc/win/salmenu.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALMENU_H
-#define _SV_SALMENU_H
+#ifndef INCLUDED_VCL_INC_WIN_SALMENU_H
+#define INCLUDED_VCL_INC_WIN_SALMENU_H
 
 #include <vcl/bitmap.hxx>
 #include <salmenu.hxx>
@@ -64,6 +64,6 @@ public:
     WinSalMenu*  mpSalMenu;    // the menu where this item is inserted
 };
 
-#endif // _SV_SALMENU_H
+#endif // INCLUDED_VCL_INC_WIN_SALMENU_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h
index c0c6df93a164..844f052989bf 100644
--- a/vcl/inc/win/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALOBJ_H
-#define _SV_SALOBJ_H
+#ifndef INCLUDED_VCL_INC_WIN_SALOBJ_H
+#define INCLUDED_VCL_INC_WIN_SALOBJ_H
 
 #include <salobj.hxx>
 
@@ -55,6 +55,6 @@ public:
     virtual const SystemEnvData*    GetSystemData() const;
 };
 
-#endif // _SV_SALOBJ_H
+#endif // INCLUDED_VCL_INC_WIN_SALOBJ_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index d33716b9413d..411924dd2dbb 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALPRN_H
-#define _SV_SALPRN_H
+#ifndef INCLUDED_VCL_INC_WIN_SALPRN_H
+#define INCLUDED_VCL_INC_WIN_SALPRN_H
 
 #include <salprn.hxx>
 
@@ -115,6 +115,6 @@ public:
     bool isValid() const { return mbValid; }
 };
 
-#endif // _SV_SALPRN_H
+#endif // INCLUDED_VCL_INC_WIN_SALPRN_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h
index 9056ed0bf9da..19a0144c04b9 100644
--- a/vcl/inc/win/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALSYS_H
-#define _SV_SALSYS_H
+#ifndef INCLUDED_VCL_INC_WIN_SALSYS_H
+#define INCLUDED_VCL_INC_WIN_SALSYS_H
 
 #include <salsys.hxx>
 
@@ -75,6 +75,6 @@ public:
                                 sal_IntPtr /*LPRECT*/ );
 };
 
-#endif // _SV_SALSYS_H
+#endif // INCLUDED_VCL_INC_WIN_SALSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/saltimer.h b/vcl/inc/win/saltimer.h
index 9dfc8005abf3..93d98d6c8f18 100644
--- a/vcl/inc/win/saltimer.h
+++ b/vcl/inc/win/saltimer.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALTIMER_H
-#define _SV_SALTIMER_H
+#ifndef INCLUDED_VCL_INC_WIN_SALTIMER_H
+#define INCLUDED_VCL_INC_WIN_SALTIMER_H
 
 #include <saltimer.hxx>
 
diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h
index c6f5b1e4e2f5..f59a0bff2845 100644
--- a/vcl/inc/win/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALVD_H
-#define _SV_SALVD_H
+#ifndef INCLUDED_VCL_INC_WIN_SALVD_H
+#define INCLUDED_VCL_INC_WIN_SALVD_H
 
 #include <salvd.hxx>
 
@@ -55,6 +55,6 @@ public:
     virtual void                    GetSize( long& rWidth, long& rHeight );
 };
 
-#endif // _SV_SALVD_H
+#endif // INCLUDED_VCL_INC_WIN_SALVD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/svsys.h b/vcl/inc/win/svsys.h
index df1a854f09b8..5554da9e0b0c 100644
--- a/vcl/inc/win/svsys.h
+++ b/vcl/inc/win/svsys.h
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SVSYS_H
-#define _SV_SVSYS_H
+#ifndef INCLUDED_VCL_INC_WIN_SVSYS_H
+#define INCLUDED_VCL_INC_WIN_SVSYS_H
 
 #ifdef WNT
 #include <prewin.h>
 #include <postwin.h>
 #endif
 
-#endif // _SV_SVSYS_H
+#endif // INCLUDED_VCL_INC_WIN_SVSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */