Use our header guard convention

Using identifiers starting with underscores is questionable even if they don't
happen to clash with anything used by the language implementation.

Change-Id: I0af605d40d85ea7e47e1047572fbe180270e08ac

30 files changed, 88 insertions, 89 deletions

diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx
index 6cfb3174fe47..d05aa64227fa 100644
--- a/winaccessibility/inc/AccComponentEventListener.hxx
+++ b/winaccessibility/inc/AccComponentEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCCOMPONENTEVENTLISTENER_HXX
-#define __ACCCOMPONENTEVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCCOMPONENTEVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCCOMPONENTEVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccEventListener.hxx"
@@ -69,6 +69,6 @@ public:
     void HandleTextSelectionChangedEvent();
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCCOMPONENTEVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx
index 5cc4eb672f1c..5f556ee3e5bc 100644
--- a/winaccessibility/inc/AccContainerEventListener.hxx
+++ b/winaccessibility/inc/AccContainerEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCCONTAINEREVENTLISTENERHXX
-#define __ACCCONTAINEREVENTLISTENERHXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCCONTAINEREVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCCONTAINEREVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccEventListener.hxx"
@@ -97,6 +97,6 @@ public:
     virtual void HandleNameChangedEvent(css::uno::Any name) SAL_OVERRIDE;
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCCONTAINEREVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
index c21364f2565c..1157a52bd647 100644
--- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx
+++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCDESCENDANTMANAGEREVENTLISTENER_HXX
-#define __ACCDESCENDANTMANAGEREVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCDESCENDANTMANAGEREVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCDESCENDANTMANAGEREVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccComponentEventListener.hxx"
@@ -62,6 +62,6 @@ public:
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCDESCENDANTMANAGEREVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx
index cdf7d146445a..f392d737adcd 100644
--- a/winaccessibility/inc/AccDialogEventListener.hxx
+++ b/winaccessibility/inc/AccDialogEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCDIALOGEVENTLISTENER_HXX
-#define __ACCDIALOGEVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCDIALOGEVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCDIALOGEVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccEventListener.hxx"
@@ -49,6 +49,6 @@ public:
 
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCDIALOGEVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx
index 8f544005bba6..c656e3659533 100644
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCEVENTLISTENER_HXX
-#define __ACCEVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCEVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCEVENTLISTENER_HXX
 
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -81,6 +81,6 @@ public:
     void RemoveMeFromBroadcaster();
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCEVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccFrameEventListener.hxx b/winaccessibility/inc/AccFrameEventListener.hxx
index bd51e0134971..318b7b6bc550 100644
--- a/winaccessibility/inc/AccFrameEventListener.hxx
+++ b/winaccessibility/inc/AccFrameEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCFRAMEEVENTLISTENER_HXX
-#define __ACCFRAMEEVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCFRAMEEVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCFRAMEEVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccEventListener.hxx"
@@ -50,6 +50,6 @@ public:
 
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCFRAMEEVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccListEventListener.hxx b/winaccessibility/inc/AccListEventListener.hxx
index bd70194b9697..6065fdad7ace 100644
--- a/winaccessibility/inc/AccListEventListener.hxx
+++ b/winaccessibility/inc/AccListEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCLISTEVENTLISTENER_HXX
-#define __ACCLISTEVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCLISTEVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCLISTEVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccDescendantManagerEventListener.hxx"
@@ -51,6 +51,6 @@ public:
             css::uno::Any oldValue, css::uno::Any newValue) SAL_OVERRIDE;
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCLISTEVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccMenuEventListener.hxx b/winaccessibility/inc/AccMenuEventListener.hxx
index 5a4c6e5b832b..362ad74bb888 100644
--- a/winaccessibility/inc/AccMenuEventListener.hxx
+++ b/winaccessibility/inc/AccMenuEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCMENUEVENTLISTENER_HXX
-#define __ACCMENUEVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCMENUEVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCMENUEVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccComponentEventListener.hxx"
@@ -52,6 +52,6 @@ public:
     virtual void FireStatePropertyChange(short state, bool set) SAL_OVERRIDE;
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCMENUEVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccObject.hxx b/winaccessibility/inc/AccObject.hxx
index d7ea3d42c9c1..3ae0ca90fc22 100644
--- a/winaccessibility/inc/AccObject.hxx
+++ b/winaccessibility/inc/AccObject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCOBJECT_HXX
-#define __ACCOBJECT_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCOBJECT_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCOBJECT_HXX
 
 #include <vector>
 #include <map>
@@ -128,6 +128,6 @@ public:
     void  setLocalizedResourceString();
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCOBJECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccObjectContainerEventListener.hxx b/winaccessibility/inc/AccObjectContainerEventListener.hxx
index fd046cd17cb8..5faf38e81d39 100644
--- a/winaccessibility/inc/AccObjectContainerEventListener.hxx
+++ b/winaccessibility/inc/AccObjectContainerEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCOBJECTCONTAINEREVENTLISTENER_HXX
-#define _ACCOBJECTCONTAINEREVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTCONTAINEREVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTCONTAINEREVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccContainerEventListener.hxx"
diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx b/winaccessibility/inc/AccObjectManagerAgent.hxx
index 5aa9f81e4abb..7e685b772bed 100644
--- a/winaccessibility/inc/AccObjectManagerAgent.hxx
+++ b/winaccessibility/inc/AccObjectManagerAgent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCOBJECTMANAGERAGENT_HXX
-#define __ACCOBJECTMANAGERAGENT_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTMANAGERAGENT_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTMANAGERAGENT_HXX
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index 84bfca64d879..66b74b465492 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCOBJECTWINMANAGER_HXX
-#define __ACCOBJECTWINMANAGER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTWINMANAGER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTWINMANAGER_HXX
 
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -144,6 +144,6 @@ public:
     bool IsStateManageDescendant(com::sun::star::accessibility::XAccessible* pAccessible);
 
 };
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTWINMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx b/winaccessibility/inc/AccParagraphEventListener.hxx
index 4b5c5d2d98ed..c0fb6e4a5ce5 100644
--- a/winaccessibility/inc/AccParagraphEventListener.hxx
+++ b/winaccessibility/inc/AccParagraphEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCPARAGRAPHEVENTLISTENER_HXX
-#define __ACCPARAGRAPHEVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCPARAGRAPHEVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCPARAGRAPHEVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccContainerEventListener.hxx"
@@ -51,6 +51,6 @@ public:
     void HandleTextSelectionChangedEvent();
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCPARAGRAPHEVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccResource.hxx b/winaccessibility/inc/AccResource.hxx
index f98d212f7bff..793ab866f3cc 100644
--- a/winaccessibility/inc/AccResource.hxx
+++ b/winaccessibility/inc/AccResource.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCRESOURCE_HXX
-#define _ACCRESOURCE_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCRESOURCE_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCRESOURCE_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -61,7 +61,6 @@ public:
     static ::rtl::OUString loadString(sal_uInt16 _nResId);
 };
 
-
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCRESOURCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccTableEventListener.hxx b/winaccessibility/inc/AccTableEventListener.hxx
index 78438193e80a..501afdd4a7e0 100644
--- a/winaccessibility/inc/AccTableEventListener.hxx
+++ b/winaccessibility/inc/AccTableEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCTABLEEVENTLISTENER_HXX
-#define __ACCTABLEEVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCTABLEEVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCTABLEEVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccDescendantManagerEventListener.hxx"
@@ -49,6 +49,6 @@ public:
 
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCTABLEEVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccTextComponentEventListener.hxx b/winaccessibility/inc/AccTextComponentEventListener.hxx
index 1b111db7fa35..5f1a6f54f8cf 100644
--- a/winaccessibility/inc/AccTextComponentEventListener.hxx
+++ b/winaccessibility/inc/AccTextComponentEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCTEXTCOMPONENTEVENTLISTENER_HXX
-#define __ACCTEXTCOMPONENTEVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCTEXTCOMPONENTEVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCTEXTCOMPONENTEVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccComponentEventListener.hxx"
@@ -42,6 +42,6 @@ public:
 
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCTEXTCOMPONENTEVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccTopWindowListener.hxx b/winaccessibility/inc/AccTopWindowListener.hxx
index 278232003585..96ec05d160d0 100644
--- a/winaccessibility/inc/AccTopWindowListener.hxx
+++ b/winaccessibility/inc/AccTopWindowListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCTOPWINDOWLISTENER_HXX
-#define __ACCTOPWINDOWLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCTOPWINDOWLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCTOPWINDOWLISTENER_HXX
 
 #include <com/sun/star/awt/XTopWindowListener.hpp>
 #include <com/sun/star/awt/XExtendedToolkit.hpp>
@@ -63,6 +63,6 @@ public:
     sal_Int64 GetMSComPtr(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam);
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCTOPWINDOWLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccTreeEventListener.hxx b/winaccessibility/inc/AccTreeEventListener.hxx
index 3b0dcafd4330..3ac46c8a0cc2 100644
--- a/winaccessibility/inc/AccTreeEventListener.hxx
+++ b/winaccessibility/inc/AccTreeEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCTREEEVENTLISTENER_HXX
-#define __ACCTREEEVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCTREEEVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCTREEEVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccDescendantManagerEventListener.hxx"
@@ -46,6 +46,6 @@ public:
             css::uno::Any oldValue, css::uno::Any newValue);
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCTREEEVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx
index ca17cb13bac4..1bf3dd27f2c9 100644
--- a/winaccessibility/inc/AccWindowEventListener.hxx
+++ b/winaccessibility/inc/AccWindowEventListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCWINDOWEVENTLISTENER_HXX
-#define __ACCWINDOWEVENTLISTENER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCWINDOWEVENTLISTENER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCWINDOWEVENTLISTENER_HXX
 
 #include <stdio.h>
 #include "AccEventListener.hxx"
@@ -50,6 +50,6 @@ public:
 
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCWINDOWEVENTLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/ResIDGenerator.hxx b/winaccessibility/inc/ResIDGenerator.hxx
index dfe43a4f513c..e5995f65b48d 100644
--- a/winaccessibility/inc/ResIDGenerator.hxx
+++ b/winaccessibility/inc/ResIDGenerator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __RESIDGENERATOR_HXX
-#define __RESIDGENERATOR_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_RESIDGENERATOR_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_RESIDGENERATOR_HXX
 
 #define PRIMARY_RESID 0x00000001
 #include <deque>
@@ -45,6 +45,6 @@ public:
 
 };
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_RESIDGENERATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/accHelper.hxx b/winaccessibility/inc/accHelper.hxx
index f0dd29bae440..189454a34777 100644
--- a/winaccessibility/inc/accHelper.hxx
+++ b/winaccessibility/inc/accHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCHELPER_HXX
-#define __ACCHELPER_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCHELPER_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_ACCHELPER_HXX
 
 #include <UAccCOMdllapi.h>
 
@@ -35,6 +35,6 @@ enum DIRECTION
 struct IMAccessible;
 UACCCOM_DLLPUBLIC IMAccessible * UAccCOMCreateInstance();
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_ACCHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/unomsaaevent.hxx b/winaccessibility/inc/unomsaaevent.hxx
index e8bb3eb9ba36..8fff53a63045 100644
--- a/winaccessibility/inc/unomsaaevent.hxx
+++ b/winaccessibility/inc/unomsaaevent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __UNOMSAAEVENT_HXX
-#define __UNOMSAAEVENT_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_INC_UNOMSAAEVENT_HXX
+#define INCLUDED_WINACCESSIBILITY_INC_UNOMSAAEVENT_HXX
 
 //STATE_CHANGED with get FOCUSED -> EVENT_OBJECT_FOCUS
 const short UM_EVENT_STATE_FOCUSED = 0 ;
@@ -105,6 +105,6 @@ const short UM_EVENT_TEXT_SELECTION_CHANGED = 39;
 const short UM_EVENT_SECTION_CHANGED = 40;
 const short UM_EVENT_COLUMN_CHANGED = 41;
 
-#endif
+#endif // INCLUDED_WINACCESSIBILITY_INC_UNOMSAAEVENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/AccAction.h b/winaccessibility/source/UAccCOM/AccAction.h
index 51a60f1fb99c..7a31fcb4cb12 100644
--- a/winaccessibility/source/UAccCOM/AccAction.h
+++ b/winaccessibility/source/UAccCOM/AccAction.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCACTION_H_
-#define __ACCACTION_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCACTION_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCACTION_H
 
 #include "resource.h"       // main symbols
 #include "AccActionBase.h"
@@ -100,6 +100,6 @@ public:
 
 };
 
-#endif //__ACCACTION_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCACTION_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/AccRelation.h b/winaccessibility/source/UAccCOM/AccRelation.h
index 7783ba504936..10aa825bae7e 100644
--- a/winaccessibility/source/UAccCOM/AccRelation.h
+++ b/winaccessibility/source/UAccCOM/AccRelation.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCRELATION_H_
-#define __ACCRELATION_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCRELATION_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCRELATION_H
 
 #include "resource.h"       // main symbols
 
@@ -83,6 +83,6 @@ private:
     com::sun::star::accessibility::AccessibleRelation relation;
 };
 
-#endif //__ACCRELATION_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCRELATION_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/AccTable.h b/winaccessibility/source/UAccCOM/AccTable.h
index ce956f62a541..689347a0a6fd 100644
--- a/winaccessibility/source/UAccCOM/AccTable.h
+++ b/winaccessibility/source/UAccCOM/AccTable.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCTABLE_H_
-#define __ACCTABLE_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTABLE_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTABLE_H
 
 #include "resource.h"       // main symbols
 
@@ -169,6 +169,6 @@ private:
     }
 };
 
-#endif //__ACCTABLE_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTABLE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h b/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
index e2cb07e6372a..1f32629b06d6 100644
--- a/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
+++ b/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCESSIBLEKEYSTROKE_H_
-#define __ACCESSIBLEKEYSTROKE_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H
 
 #pragma once
 
@@ -152,6 +152,6 @@ const short PROPERTIES = 17;
 const short FRONT = 18;
 
 
-#endif //#define __ACCESSIBLEKEYSTROKE_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/CheckEnableAccessible.h b/winaccessibility/source/UAccCOM/CheckEnableAccessible.h
index 90099ace2138..8d324eed4073 100644
--- a/winaccessibility/source/UAccCOM/CheckEnableAccessible.h
+++ b/winaccessibility/source/UAccCOM/CheckEnableAccessible.h
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CHECKENABLEACCESSIBLE_HXX
-#define _CHECKENABLEACCESSIBLE_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_CHECKENABLEACCESSIBLE_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_CHECKENABLEACCESSIBLE_H
 
 inline bool IsEnableAccessibleInterface() { return true; }
 
 #define CHECK_ENABLE_INF if(!IsEnableAccessibleInterface()){ return S_FALSE; }
 #define CHECK_ENABLE_INF_ZERO if(!IsEnableAccessibleInterface()){ return 0; }
 
-#endif //_CHECKENABLEACCESSIBLE_HXX
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_CHECKENABLEACCESSIBLE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h
index 30c9e0a62738..c2c0f6b5234e 100644
--- a/winaccessibility/source/UAccCOM/EnumVariant.h
+++ b/winaccessibility/source/UAccCOM/EnumVariant.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ENUMVARIANT_H_
-#define __ENUMVARIANT_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ENUMVARIANT_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ENUMVARIANT_H
 
 #include "resource.h"       // main symbols
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -94,6 +94,6 @@ private:
         m_pXAccessibleSelection;
 };
 
-#endif //__ENUMVARIANT_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ENUMVARIANT_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/MAccessible.h b/winaccessibility/source/UAccCOM/MAccessible.h
index 7262cb39b7af..cdeee228cab4 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.h
+++ b/winaccessibility/source/UAccCOM/MAccessible.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __MACCESSIBLE_H_
-#define __MACCESSIBLE_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_MACCESSIBLE_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_MACCESSIBLE_H
 
 #include <windows.h>
 #include "resource.h"       // main symbols
@@ -294,6 +294,6 @@ public:
 
 
 
-#endif //__MACCESSIBLE_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_MACCESSIBLE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h b/winaccessibility/source/UAccCOM/UNOXWrapper.h
index 4dd7a07c2dbc..6d22b31de5c4 100644
--- a/winaccessibility/source/UAccCOM/UNOXWrapper.h
+++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __UNOXWRAPPER_H_
-#define __UNOXWRAPPER_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_UNOXWRAPPER_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_UNOXWRAPPER_H
 
 #include "resource.h"       // main symbols
 
@@ -65,6 +65,6 @@ protected:
     com::sun::star::accessibility::XAccessible* pUNOInterface;
 };
 
-#endif //__UNOXWRAPPER_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_UNOXWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */