fixincludeguards.sh: uno*

Change-Id: I8fb3c25cd583b688104a0ee8620696e7b2958ab5

40 files changed, 82 insertions, 82 deletions

diff --git a/unodevtools/inc/unodevtools/options.hxx b/unodevtools/inc/unodevtools/options.hxx
index 8c981922d4fa..398b677a5c04 100644
--- a/unodevtools/inc/unodevtools/options.hxx
+++ b/unodevtools/inc/unodevtools/options.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNODEVTOOLS_OPTIONS_HXX
-#define INCLUDED_UNODEVTOOLS_OPTIONS_HXX
+#ifndef INCLUDED_UNODEVTOOLS_INC_UNODEVTOOLS_OPTIONS_HXX
+#define INCLUDED_UNODEVTOOLS_INC_UNODEVTOOLS_OPTIONS_HXX
 
 #include "sal/config.h"
 
@@ -37,6 +37,6 @@ sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
 
 } // end of namespace unodevtools
 
-#endif // INCLUDED_UNODEVTOOLS_OPTIONS_HXX
+#endif // INCLUDED_UNODEVTOOLS_INC_UNODEVTOOLS_OPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unodevtools/source/skeletonmaker/skeletonjava.hxx b/unodevtools/source/skeletonmaker/skeletonjava.hxx
index 39269026740f..3a45911857c7 100644
--- a/unodevtools/source/skeletonmaker/skeletonjava.hxx
+++ b/unodevtools/source/skeletonmaker/skeletonjava.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 INCLUDED_UNODEVTOOLS_SKELETONJAVA_HXX
-#define INCLUDED_UNODEVTOOLS_SKELETONJAVA_HXX
+#ifndef INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONJAVA_HXX
+#define INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONJAVA_HXX
 
 #include <fstream>
 
@@ -50,6 +50,6 @@ void generateSkeleton(ProgramOptions const & options, rtl::Reference< TypeManage
 
 } }
 
-#endif // INCLUDED_UNODEVTOOLS_SKELETONJAVA_HXX
+#endif // INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONJAVA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoidl/source/legacyprovider.hxx b/unoidl/source/legacyprovider.hxx
index 538b66f02ca6..e4d079ad8aaf 100644
--- a/unoidl/source/legacyprovider.hxx
+++ b/unoidl/source/legacyprovider.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_UNOIDL_LEGACYPROVIDER_HXX
-#define INCLUDED_UNOIDL_LEGACYPROVIDER_HXX
+#ifndef INCLUDED_UNOIDL_SOURCE_LEGACYPROVIDER_HXX
+#define INCLUDED_UNOIDL_SOURCE_LEGACYPROVIDER_HXX
 
 #include "sal/config.h"
 
diff --git a/unoidl/source/sourcefileprovider.hxx b/unoidl/source/sourcefileprovider.hxx
index 672f0d6e0208..608de8c352bc 100644
--- a/unoidl/source/sourcefileprovider.hxx
+++ b/unoidl/source/sourcefileprovider.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_UNOIDL_SOURCEFILEPROVIDER_HXX
-#define INCLUDED_UNOIDL_SOURCEFILEPROVIDER_HXX
+#ifndef INCLUDED_UNOIDL_SOURCE_SOURCEFILEPROVIDER_HXX
+#define INCLUDED_UNOIDL_SOURCE_SOURCEFILEPROVIDER_HXX
 
 #include "sal/config.h"
 
diff --git a/unoidl/source/sourcetreeprovider.hxx b/unoidl/source/sourcetreeprovider.hxx
index 1bacad8a739d..c29fa0312975 100644
--- a/unoidl/source/sourcetreeprovider.hxx
+++ b/unoidl/source/sourcetreeprovider.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_UNOIDL_SOURCETREEPROVIDER_HXX
-#define INCLUDED_UNOIDL_SOURCETREEPROVIDER_HXX
+#ifndef INCLUDED_UNOIDL_SOURCE_SOURCETREEPROVIDER_HXX
+#define INCLUDED_UNOIDL_SOURCE_SOURCETREEPROVIDER_HXX
 
 #include "sal/config.h"
 
diff --git a/unoidl/source/unoidlprovider.hxx b/unoidl/source/unoidlprovider.hxx
index 712282a239fd..6ea8aedddaf0 100644
--- a/unoidl/source/unoidlprovider.hxx
+++ b/unoidl/source/unoidlprovider.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_UNOIDL_UNOIDLPROVIDER_HXX
-#define INCLUDED_UNOIDL_UNOIDLPROVIDER_HXX
+#ifndef INCLUDED_UNOIDL_SOURCE_UNOIDLPROVIDER_HXX
+#define INCLUDED_UNOIDL_SOURCE_UNOIDLPROVIDER_HXX
 
 #include "sal/config.h"
 
diff --git a/unotest/source/cpp/getargument.hxx b/unotest/source/cpp/getargument.hxx
index 3686cdef9602..4f4bf9c6bf5c 100644
--- a/unotest/source/cpp/getargument.hxx
+++ b/unotest/source/cpp/getargument.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TEST_SOURCE_CPP_GETARGUMENT_HXX
-#define INCLUDED_TEST_SOURCE_CPP_GETARGUMENT_HXX
+#ifndef INCLUDED_UNOTEST_SOURCE_CPP_GETARGUMENT_HXX
+#define INCLUDED_UNOTEST_SOURCE_CPP_GETARGUMENT_HXX
 
 #include "sal/config.h"
 
diff --git a/unoxml/source/dom/attr.hxx b/unoxml/source/dom/attr.hxx
index 9a472b9e6b97..c00c01f54902 100644
--- a/unoxml/source/dom/attr.hxx
+++ b/unoxml/source/dom/attr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ATTR_HXX
-#define DOM_ATTR_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ATTR_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ATTR_HXX
 
 #include <memory>
 
diff --git a/unoxml/source/dom/attributesmap.hxx b/unoxml/source/dom/attributesmap.hxx
index 17afdacfefc9..3508524b2c2c 100644
--- a/unoxml/source/dom/attributesmap.hxx
+++ b/unoxml/source/dom/attributesmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ATTRIBUTESMAP_HXX
-#define DOM_ATTRIBUTESMAP_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ATTRIBUTESMAP_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ATTRIBUTESMAP_HXX
 
 #include <sal/types.h>
 #include <rtl/ref.hxx>
diff --git a/unoxml/source/dom/cdatasection.hxx b/unoxml/source/dom/cdatasection.hxx
index 620296515b7c..efd78789ad7a 100644
--- a/unoxml/source/dom/cdatasection.hxx
+++ b/unoxml/source/dom/cdatasection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_CDATASECTION_HXX
-#define DOM_CDATASECTION_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_CDATASECTION_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_CDATASECTION_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/xml/dom/XCDATASection.hpp>
diff --git a/unoxml/source/dom/characterdata.hxx b/unoxml/source/dom/characterdata.hxx
index 3debdd94d2ff..3ce25ebd67d7 100644
--- a/unoxml/source/dom/characterdata.hxx
+++ b/unoxml/source/dom/characterdata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_CHARACTERDATA_HXX
-#define DOM_CHARACTERDATA_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_CHARACTERDATA_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_CHARACTERDATA_HXX
 
 #include <libxml/tree.h>
 
diff --git a/unoxml/source/dom/childlist.hxx b/unoxml/source/dom/childlist.hxx
index baf91caf888c..a0d7162323b6 100644
--- a/unoxml/source/dom/childlist.hxx
+++ b/unoxml/source/dom/childlist.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_CHILDLIST_HXX
-#define DOM_CHILDLIST_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_CHILDLIST_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_CHILDLIST_HXX
 
 #include <sal/types.h>
 #include <rtl/ref.hxx>
diff --git a/unoxml/source/dom/comment.hxx b/unoxml/source/dom/comment.hxx
index df095b223948..fefabdcb4c10 100644
--- a/unoxml/source/dom/comment.hxx
+++ b/unoxml/source/dom/comment.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_COMMENT_HXX
-#define DOM_COMMENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_COMMENT_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_COMMENT_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/xml/dom/XComment.hpp>
diff --git a/unoxml/source/dom/document.hxx b/unoxml/source/dom/document.hxx
index 97c08cfafc2c..9225a8447e0a 100644
--- a/unoxml/source/dom/document.hxx
+++ b/unoxml/source/dom/document.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_DOCUMENT_HXX
-#define DOM_DOCUMENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_DOCUMENT_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_DOCUMENT_HXX
 
 #include <set>
 #include <memory>
diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx
index f1c5daf2ae91..a44db313f7b4 100644
--- a/unoxml/source/dom/documentbuilder.hxx
+++ b/unoxml/source/dom/documentbuilder.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_DOCUMENTBUILDER_HXX
-#define DOM_DOCUMENTBUILDER_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_DOCUMENTBUILDER_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_DOCUMENTBUILDER_HXX
 
 #include <sal/types.h>
 
diff --git a/unoxml/source/dom/documentfragment.hxx b/unoxml/source/dom/documentfragment.hxx
index d3f3ca941766..e3f9d9f0563b 100644
--- a/unoxml/source/dom/documentfragment.hxx
+++ b/unoxml/source/dom/documentfragment.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_DOCUMENTFRAGMENT_HXX
-#define DOM_DOCUMENTFRAGMENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_DOCUMENTFRAGMENT_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_DOCUMENTFRAGMENT_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/xml/dom/XDocumentFragment.hpp>
diff --git a/unoxml/source/dom/documenttype.hxx b/unoxml/source/dom/documenttype.hxx
index 17ca8fb942da..559da965b961 100644
--- a/unoxml/source/dom/documenttype.hxx
+++ b/unoxml/source/dom/documenttype.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_DOCUMENTTYPE_HXX
-#define DOM_DOCUMENTTYPE_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_DOCUMENTTYPE_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_DOCUMENTTYPE_HXX
 
 #include <libxml/tree.h>
 
diff --git a/unoxml/source/dom/domimplementation.hxx b/unoxml/source/dom/domimplementation.hxx
index 29bade3aa45d..08fec83b7aeb 100644
--- a/unoxml/source/dom/domimplementation.hxx
+++ b/unoxml/source/dom/domimplementation.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_DOMIMPLEMENTATION_HXX
-#define DOM_DOMIMPLEMENTATION_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_DOMIMPLEMENTATION_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_DOMIMPLEMENTATION_HXX
 
 #include <sal/types.h>
 
diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx
index 26baa2ffc53c..7ca517d9e825 100644
--- a/unoxml/source/dom/element.hxx
+++ b/unoxml/source/dom/element.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ELEMENT_HXX
-#define DOM_ELEMENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ELEMENT_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ELEMENT_HXX
 
 #include <libxml/tree.h>
 
diff --git a/unoxml/source/dom/elementlist.hxx b/unoxml/source/dom/elementlist.hxx
index 5bfc422f806f..da8d99600c28 100644
--- a/unoxml/source/dom/elementlist.hxx
+++ b/unoxml/source/dom/elementlist.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ELEMENTLIST_HXX
-#define DOM_ELEMENTLIST_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ELEMENTLIST_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ELEMENTLIST_HXX
 
 #include <vector>
 
diff --git a/unoxml/source/dom/entitiesmap.hxx b/unoxml/source/dom/entitiesmap.hxx
index 0e857ed3e4fe..aa9c47c7ec9b 100644
--- a/unoxml/source/dom/entitiesmap.hxx
+++ b/unoxml/source/dom/entitiesmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ENTITIESMAP_HXX
-#define DOM_ENTITIESMAP_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ENTITIESMAP_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ENTITIESMAP_HXX
 
 #include <sal/types.h>
 #include <rtl/ref.hxx>
diff --git a/unoxml/source/dom/entity.hxx b/unoxml/source/dom/entity.hxx
index 64fd0feb5518..edc0892449f9 100644
--- a/unoxml/source/dom/entity.hxx
+++ b/unoxml/source/dom/entity.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ENTITY_HXX
-#define DOM_ENTITY_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ENTITY_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ENTITY_HXX
 
 #include <libxml/tree.h>
 #include <libxml/entities.h>
diff --git a/unoxml/source/dom/entityreference.hxx b/unoxml/source/dom/entityreference.hxx
index 6368195e8659..6a7e3a718db4 100644
--- a/unoxml/source/dom/entityreference.hxx
+++ b/unoxml/source/dom/entityreference.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ENTITYREFERENCE_HXX
-#define DOM_ENTITYREFERENCE_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ENTITYREFERENCE_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ENTITYREFERENCE_HXX
 
 #include <libxml/tree.h>
 
diff --git a/unoxml/source/dom/node.hxx b/unoxml/source/dom/node.hxx
index 093b7023cbb8..d3d2696fba74 100644
--- a/unoxml/source/dom/node.hxx
+++ b/unoxml/source/dom/node.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_NODE_HXX
-#define DOM_NODE_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_NODE_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_NODE_HXX
 
 #include <libxml/tree.h>
 
diff --git a/unoxml/source/dom/notation.hxx b/unoxml/source/dom/notation.hxx
index 5aa1c0e2ced4..b7ab881e094c 100644
--- a/unoxml/source/dom/notation.hxx
+++ b/unoxml/source/dom/notation.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_NOTATION_HXX
-#define DOM_NOTATION_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_NOTATION_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_NOTATION_HXX
 
 #include <libxml/tree.h>
 
diff --git a/unoxml/source/dom/notationsmap.hxx b/unoxml/source/dom/notationsmap.hxx
index 8a594a3bbbef..0e7071e86af1 100644
--- a/unoxml/source/dom/notationsmap.hxx
+++ b/unoxml/source/dom/notationsmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_NOTATIONSMAP_HXX
-#define DOM_NOTATIONSMAP_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_NOTATIONSMAP_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_NOTATIONSMAP_HXX
 
 #include <sal/types.h>
 #include <rtl/ref.hxx>
diff --git a/unoxml/source/dom/processinginstruction.hxx b/unoxml/source/dom/processinginstruction.hxx
index 96141e6162e3..df298a04a3f9 100644
--- a/unoxml/source/dom/processinginstruction.hxx
+++ b/unoxml/source/dom/processinginstruction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_PROCESSINGINSTRUCTION_HXX
-#define DOM_PROCESSINGINSTRUCTION_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_PROCESSINGINSTRUCTION_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_PROCESSINGINSTRUCTION_HXX
 
 #include <libxml/tree.h>
 
diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx
index 79956a2a1e1c..69f320860f1d 100644
--- a/unoxml/source/dom/saxbuilder.hxx
+++ b/unoxml/source/dom/saxbuilder.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_SAXBUILDER_HXX
-#define DOM_SAXBUILDER_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_SAXBUILDER_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_SAXBUILDER_HXX
 
 #include <stack>
 #include <map>
diff --git a/unoxml/source/dom/text.hxx b/unoxml/source/dom/text.hxx
index 35d8c6b9802c..08fb9c8f37c1 100644
--- a/unoxml/source/dom/text.hxx
+++ b/unoxml/source/dom/text.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_TEXT_HXX
-#define DOM_TEXT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_TEXT_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_TEXT_HXX
 
 #include <libxml/tree.h>
 
diff --git a/unoxml/source/events/event.hxx b/unoxml/source/events/event.hxx
index 61721872755f..bb9391309de4 100644
--- a/unoxml/source/events/event.hxx
+++ b/unoxml/source/events/event.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EVENT_EVENT_HXX
-#define EVENT_EVENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_EVENT_HXX
+#define INCLUDED_UNOXML_SOURCE_EVENTS_EVENT_HXX
 
 #include <sal/types.h>
 
diff --git a/unoxml/source/events/eventdispatcher.hxx b/unoxml/source/events/eventdispatcher.hxx
index 065be2d9c8d8..b6259f481a20 100644
--- a/unoxml/source/events/eventdispatcher.hxx
+++ b/unoxml/source/events/eventdispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EVENT_EVENT_DISPATCHER_HXX
-#define EVENT_EVENT_DISPATCHER_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_EVENTDISPATCHER_HXX
+#define INCLUDED_UNOXML_SOURCE_EVENTS_EVENTDISPATCHER_HXX
 
 #include <map>
 #include <vector>
diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx
index 92296c0fb1b3..5f3d31c21b8e 100644
--- a/unoxml/source/events/mouseevent.hxx
+++ b/unoxml/source/events/mouseevent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EVENT_MOUSEEVENT_HXX
-#define EVENT_MOUSEEVENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_MOUSEEVENT_HXX
+#define INCLUDED_UNOXML_SOURCE_EVENTS_MOUSEEVENT_HXX
 
 #include <com/sun/star/xml/dom/events/PhaseType.hpp>
 #include <com/sun/star/xml/dom/events/XMouseEvent.hpp>
diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx
index 8687233f6d37..ce305c85b1b2 100644
--- a/unoxml/source/events/mutationevent.hxx
+++ b/unoxml/source/events/mutationevent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EVENT_MUTATIONEVENT_HXX
-#define EVENT_MUTATIONEVENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_MUTATIONEVENT_HXX
+#define INCLUDED_UNOXML_SOURCE_EVENTS_MUTATIONEVENT_HXX
 
 #include <sal/types.h>
 
diff --git a/unoxml/source/events/testlistener.hxx b/unoxml/source/events/testlistener.hxx
index 5d5b1e4f4fe5..d2ebba67bb86 100644
--- a/unoxml/source/events/testlistener.hxx
+++ b/unoxml/source/events/testlistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EVENT_TESTLISTENER_HXX
-#define EVENT_TESTLISTENER_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_TESTLISTENER_HXX
+#define INCLUDED_UNOXML_SOURCE_EVENTS_TESTLISTENER_HXX
 
 #include <sal/types.h>
 
diff --git a/unoxml/source/events/uievent.hxx b/unoxml/source/events/uievent.hxx
index 1f9f70fad169..13e9785b7ff1 100644
--- a/unoxml/source/events/uievent.hxx
+++ b/unoxml/source/events/uievent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EVENT_UIEVENT_HXX
-#define EVENT_UIEVENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_UIEVENT_HXX
+#define INCLUDED_UNOXML_SOURCE_EVENTS_UIEVENT_HXX
 
 #include <sal/types.h>
 
diff --git a/unoxml/source/rdf/CNodes.hxx b/unoxml/source/rdf/CNodes.hxx
index 37ea5283fb2e..70653c6fa4f4 100644
--- a/unoxml/source/rdf/CNodes.hxx
+++ b/unoxml/source/rdf/CNodes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CNODES_HXX
-#define _CNODES_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_RDF_CNODES_HXX
+#define INCLUDED_UNOXML_SOURCE_RDF_CNODES_HXX
 
 #include <sal/config.h>
 #include <cppuhelper/factory.hxx>
diff --git a/unoxml/source/rdf/librdf_repository.hxx b/unoxml/source/rdf/librdf_repository.hxx
index c3effbabaf71..c26e43a39664 100644
--- a/unoxml/source/rdf/librdf_repository.hxx
+++ b/unoxml/source/rdf/librdf_repository.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _LIBRDF_REPOSITORY_HXX
-#define _LIBRDF_REPOSITORY_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_RDF_LIBRDF_REPOSITORY_HXX
+#define INCLUDED_UNOXML_SOURCE_RDF_LIBRDF_REPOSITORY_HXX
 
 #include <sal/config.h>
 #include <cppuhelper/factory.hxx>
diff --git a/unoxml/source/xpath/nodelist.hxx b/unoxml/source/xpath/nodelist.hxx
index 3fcdee8aa9f4..91312de21650 100644
--- a/unoxml/source/xpath/nodelist.hxx
+++ b/unoxml/source/xpath/nodelist.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XPATH_NODELIST_HXX
-#define XPATH_NODELIST_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_XPATH_NODELIST_HXX
+#define INCLUDED_UNOXML_SOURCE_XPATH_NODELIST_HXX
 
 #include <sal/types.h>
 #include <rtl/ref.hxx>
diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx
index 3e20adbd2e58..afa24d822dbe 100644
--- a/unoxml/source/xpath/xpathapi.hxx
+++ b/unoxml/source/xpath/xpathapi.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XPATH_XPATHAPI_HXX
-#define XPATH_XPATHAPI_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_XPATH_XPATHAPI_HXX
+#define INCLUDED_UNOXML_SOURCE_XPATH_XPATHAPI_HXX
 
 #include <map>
 #include <vector>
diff --git a/unoxml/source/xpath/xpathobject.hxx b/unoxml/source/xpath/xpathobject.hxx
index 57d181bd92f6..f576d852064c 100644
--- a/unoxml/source/xpath/xpathobject.hxx
+++ b/unoxml/source/xpath/xpathobject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XPATH_XPATHOBJECT_HXX
-#define XPATH_XPATHOBJECT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_XPATH_XPATHOBJECT_HXX
+#define INCLUDED_UNOXML_SOURCE_XPATH_XPATHOBJECT_HXX
 
 #include <boost/shared_ptr.hpp>