fixincludeguards.sh: include/u*

Change-Id: I8a07ccb309490206a2edd36f2fe4d0e2c0982ea2

include/ucbhelper/activedatasink.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_ACTIVEDATASINK_HXX
-#define _UCBHELPER_ACTIVEDATASINK_HXX
+#ifndef INCLUDED_UCBHELPER_ACTIVEDATASINK_HXX
+#define INCLUDED_UCBHELPER_ACTIVEDATASINK_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
@@ -64,6 +64,6 @@ public:
 
 } /* namespace ucbhelper */
 
-#endif /* !_UCBHELPER_ACTIVEDATASINK_HXX */
+#endif /* ! INCLUDED_UCBHELPER_ACTIVEDATASINK_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/activedatastreamer.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_ACTIVEDATASTREAMER_HXX
-#define _UCBHELPER_ACTIVEDATASTREAMER_HXX
+#ifndef INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX
+#define INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/io/XActiveDataStreamer.hpp>
@@ -59,6 +59,6 @@ public:
 
 } /* namespace ucbhelper */
 
-#endif /* !_UCBHELPER_ACTIVEDATASTREAMER_HXX */
+#endif /* ! INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/cancelcommandexecution.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_CANCELCOMMANDEXECUTION_HXX_
-#define _UCBHELPER_CANCELCOMMANDEXECUTION_HXX_
+#ifndef INCLUDED_UCBHELPER_CANCELCOMMANDEXECUTION_HXX
+#define INCLUDED_UCBHELPER_CANCELCOMMANDEXECUTION_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Exception.hpp>
@@ -99,6 +99,6 @@ UCBHELPER_DLLPUBLIC void cancelCommandExecution( const com::sun::star::ucb::IOEr
     throw( com::sun::star::uno::Exception );
 }
 
-#endif // _UCBHELPER_CANCELCOMMANDEXECUTION_HXX_
+#endif // INCLUDED_UCBHELPER_CANCELCOMMANDEXECUTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/commandenvironment.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_COMMANDENVIRONMENT_HXX
-#define _UCBHELPER_COMMANDENVIRONMENT_HXX
+#ifndef INCLUDED_UCBHELPER_COMMANDENVIRONMENT_HXX
+#define INCLUDED_UCBHELPER_COMMANDENVIRONMENT_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
@@ -89,6 +89,6 @@ public:
 
 } /* namespace ucbhelper */
 
-#endif /* !_UCBHELPER_COMMANDENVIRONMENT_HXX */
+#endif /* ! INCLUDED_UCBHELPER_COMMANDENVIRONMENT_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/content.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 _UCBHELPER_CONTENT_HXX
-#define _UCBHELPER_CONTENT_HXX
+#ifndef INCLUDED_UCBHELPER_CONTENT_HXX
+#define INCLUDED_UCBHELPER_CONTENT_HXX
 
 #include "rtl/ref.hxx"
 #include <com/sun/star/ucb/ContentCreationException.hpp>
@@ -716,6 +716,6 @@ public:
 
 } /* namespace ucbhelper */
 
-#endif /* !_UCBHELPER_CONTENT_HXX */
+#endif /* ! INCLUDED_UCBHELPER_CONTENT_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/contenthelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_CONTENTHELPER_HXX
-#define _UCBHELPER_CONTENTHELPER_HXX
+#ifndef INCLUDED_UCBHELPER_CONTENTHELPER_HXX
+#define INCLUDED_UCBHELPER_CONTENTHELPER_HXX
 
 #include <com/sun/star/beans/XPropertyContainer.hpp>
 #include <com/sun/star/beans/XPropertiesChangeNotifier.hpp>
@@ -499,6 +499,6 @@ public:
 
 } // namespace ucbhelper
 
-#endif /* !_UCBHELPER_CONTENTHELPER_HXX */
+#endif /* ! INCLUDED_UCBHELPER_CONTENTHELPER_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/contentidentifier.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_CONTENTIDENTIFIER_HXX
-#define _UCBHELPER_CONTENTIDENTIFIER_HXX
+#ifndef INCLUDED_UCBHELPER_CONTENTIDENTIFIER_HXX
+#define INCLUDED_UCBHELPER_CONTENTIDENTIFIER_HXX
 
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -79,6 +79,6 @@ private:
 
 } /* namespace ucbhelper */
 
-#endif /* !_UCBHELPER_CONTENTIDENTIFIER_HXX */
+#endif /* ! INCLUDED_UCBHELPER_CONTENTIDENTIFIER_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/contentinfo.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_CONTENTINFO_HXX
-#define _UCBHELPER_CONTENTINFO_HXX
+#ifndef INCLUDED_UCBHELPER_CONTENTINFO_HXX
+#define INCLUDED_UCBHELPER_CONTENTINFO_HXX
 
 #include <com/sun/star/ucb/XCommandInfo.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
@@ -157,6 +157,6 @@ public:
 
 } // namespace ucbhelper
 
-#endif /* !_UCBHELPER_CONTENTINFO_HXX */
+#endif /* ! INCLUDED_UCBHELPER_CONTENTINFO_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/fd_inputstream.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_FD_INPUTSTREAM_HXX_
-#define _UCBHELPER_FD_INPUTSTREAM_HXX_
+#ifndef INCLUDED_UCBHELPER_FD_INPUTSTREAM_HXX
+#define INCLUDED_UCBHELPER_FD_INPUTSTREAM_HXX
 
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>

include/ucbhelper/fileidentifierconverter.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_FILEIDENTIFIERCONVERTER_HXX_
-#define _UCBHELPER_FILEIDENTIFIERCONVERTER_HXX_
+#ifndef INCLUDED_UCBHELPER_FILEIDENTIFIERCONVERTER_HXX
+#define INCLUDED_UCBHELPER_FILEIDENTIFIERCONVERTER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -109,6 +109,6 @@ getSystemPathFromFileURL(
 
 }
 
-#endif // _UCBHELPER_FILEIDENTIFIERCONVERTER_HXX_
+#endif // INCLUDED_UCBHELPER_FILEIDENTIFIERCONVERTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/interactionrequest.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_INTERATIONREQUEST_HXX
-#define _UCBHELPER_INTERATIONREQUEST_HXX
+#ifndef INCLUDED_UCBHELPER_INTERACTIONREQUEST_HXX
+#define INCLUDED_UCBHELPER_INTERACTIONREQUEST_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
@@ -716,6 +716,6 @@ public:
 
 } // namespace ucbhelper
 
-#endif /* !_UCBHELPER_INTERATIONREQUEST_HXX */
+#endif /* ! INCLUDED_UCBHELPER_INTERACTIONREQUEST_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/interceptedinteraction.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_INTERCEPTEDINTERACTION_HXX_
-#define _UCBHELPER_INTERCEPTEDINTERACTION_HXX_
+#ifndef INCLUDED_UCBHELPER_INTERCEPTEDINTERACTION_HXX
+#define INCLUDED_UCBHELPER_INTERCEPTEDINTERACTION_HXX
 
 #include <vector>
 
@@ -329,6 +329,6 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
 
 } // namespace ucbhelper
 
-#endif // _UCBHELPER_INTERCEPTEDINTERACTION_HXX_
+#endif // INCLUDED_UCBHELPER_INTERCEPTEDINTERACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/macros.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_MACROS_HXX
-#define _UCBHELPER_MACROS_HXX
+#ifndef INCLUDED_UCBHELPER_MACROS_HXX
+#define INCLUDED_UCBHELPER_MACROS_HXX
 
 #include <sal/types.h>
 #include <cppuhelper/queryinterface.hxx>
@@ -756,6 +756,6 @@ Class::getSupportedServiceNames_Static()                                    \
     return aSNS;                                                            \
 }
 
-#endif /* !_UCBHELPER_MACROS_HXX */
+#endif /* ! INCLUDED_UCBHELPER_MACROS_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/propertyvalueset.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_PROPERTYVALUESET_HXX
-#define _UCBHELPER_PROPERTYVALUESET_HXX
+#ifndef INCLUDED_UCBHELPER_PROPERTYVALUESET_HXX
+#define INCLUDED_UCBHELPER_PROPERTYVALUESET_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
@@ -270,6 +270,6 @@ public:
 
 }
 
-#endif /* !_UCBHELPER_PROPERTYVALUESET_HXX */
+#endif /* ! INCLUDED_UCBHELPER_PROPERTYVALUESET_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/providerhelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_PROVIDERHELPER_HXX
-#define _UCBHELPER_PROVIDERHELPER_HXX
+#ifndef INCLUDED_UCBHELPER_PROVIDERHELPER_HXX
+#define INCLUDED_UCBHELPER_PROVIDERHELPER_HXX
 
 #include <list>
 #include <com/sun/star/ucb/XContentProvider.hpp>
@@ -271,6 +271,6 @@ public:
 
 } // namespace ucbhelper
 
-#endif /* !_UCBHELPER_PROVIDERHELPER_HXX */
+#endif /* ! INCLUDED_UCBHELPER_PROVIDERHELPER_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/proxydecider.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_PROXYDECIDER_HXX
-#define _UCBHELPER_PROXYDECIDER_HXX
+#ifndef INCLUDED_UCBHELPER_PROXYDECIDER_HXX
+#define INCLUDED_UCBHELPER_PROXYDECIDER_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -133,6 +133,6 @@ private:
 
 } // namespace ucbhelper
 
-#endif /* !_UCBHELPER_PROXYDECIDER_HXX */
+#endif /* ! INCLUDED_UCBHELPER_PROXYDECIDER_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/registerucb.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_REGISTERUCB_HXX_
-#define _UCBHELPER_REGISTERUCB_HXX_
+#ifndef INCLUDED_UCBHELPER_REGISTERUCB_HXX
+#define INCLUDED_UCBHELPER_REGISTERUCB_HXX
 
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Reference.h>
@@ -101,6 +101,6 @@ UCBHELPER_DLLPUBLIC bool registerAtUcb(
     throw (com::sun::star::uno::RuntimeException);
 
 }
-#endif // _UCBHELPER_REGISTERUCB_HXX_
+#endif // INCLUDED_UCBHELPER_REGISTERUCB_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/resultset.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_RESULTSET_HXX
-#define _UCBHELPER_RESULTSET_HXX
+#ifndef INCLUDED_UCBHELPER_RESULTSET_HXX
+#define INCLUDED_UCBHELPER_RESULTSET_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -568,6 +568,6 @@ public:
 
 }
 
-#endif /* !_UCBHELPER_RESULTSET_HXX */
+#endif /* ! INCLUDED_UCBHELPER_RESULTSET_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/resultsethelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_RESULTSETHELPER_HXX
-#define _UCBHELPER_RESULTSETHELPER_HXX
+#ifndef INCLUDED_UCBHELPER_RESULTSETHELPER_HXX
+#define INCLUDED_UCBHELPER_RESULTSETHELPER_HXX
 
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -199,6 +199,6 @@ public:
 
 }
 
-#endif /* !_UCBHELPER_RESULTSETHELPER_HXX */
+#endif /* ! INCLUDED_UCBHELPER_RESULTSETHELPER_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/resultsetmetadata.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_RESULTSETMETADATA_HXX
-#define _UCBHELPER_RESULTSETMETADATA_HXX
+#ifndef INCLUDED_UCBHELPER_RESULTSETMETADATA_HXX
+#define INCLUDED_UCBHELPER_RESULTSETMETADATA_HXX
 
 #include <vector>
 #include <com/sun/star/uno/Reference.hxx>
@@ -465,6 +465,6 @@ public:
 
 } // namespace ucbhelper
 
-#endif /* !_UCBHELPER_RESULTSETMETADATA_HXX */
+#endif /* ! INCLUDED_UCBHELPER_RESULTSETMETADATA_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/simpleauthenticationrequest.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX
-#define _UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX
+#ifndef INCLUDED_UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX
+#define INCLUDED_UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/interactionrequest.hxx>
@@ -144,6 +144,6 @@ public:
 
 } // namespace ucbhelper
 
-#endif /* !_UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX */
+#endif /* ! INCLUDED_UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/simplecertificatevalidationrequest.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX
-#define _UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX
+#ifndef INCLUDED_UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX
+#define INCLUDED_UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/interactionrequest.hxx>
@@ -58,6 +58,6 @@ public:
 
 } // namespace ucbhelper
 
-#endif /* !_UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX */
+#endif /* ! INCLUDED_UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/simpleinteractionrequest.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX
-#define _UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX
+#ifndef INCLUDED_UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX
+#define INCLUDED_UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX
 
 #include <ucbhelper/interactionrequest.hxx>
 #include "ucbhelper/ucbhelperdllapi.h"
@@ -85,6 +85,6 @@ public:
 
 } // namespace ucbhelper
 
-#endif /* !_UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX */
+#endif /* ! INCLUDED_UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/simpleioerrorrequest.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_SIMPLEIOERRORREQUEST_HXX
-#define _UCBHELPER_SIMPLEIOERRORREQUEST_HXX
+#ifndef INCLUDED_UCBHELPER_SIMPLEIOERRORREQUEST_HXX
+#define INCLUDED_UCBHELPER_SIMPLEIOERRORREQUEST_HXX
 
 #include <com/sun/star/ucb/IOErrorCode.hpp>
 #include <ucbhelper/interactionrequest.hxx>
@@ -64,6 +64,6 @@ public:
 
 } // namespace ucbhelper
 
-#endif /* !_UCBHELPER_SIMPLEIOERRORREQUEST_HXX */
+#endif /* ! INCLUDED_UCBHELPER_SIMPLEIOERRORREQUEST_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/simplenameclashresolverequest.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX
-#define _UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX
+#ifndef INCLUDED_UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX
+#define INCLUDED_UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/interactionrequest.hxx>
@@ -72,6 +72,6 @@ public:
 
 } // namespace ucbhelper
 
-#endif /* !_UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX */
+#endif /* ! INCLUDED_UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/ucbhelper/std_inputstream.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _UCBHELPER_STD_INPUTSTREAM_HXX_
-#define _UCBHELPER_STD_INPUTSTREAM_HXX_
+#ifndef INCLUDED_UCBHELPER_STD_INPUTSTREAM_HXX
+#define INCLUDED_UCBHELPER_STD_INPUTSTREAM_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <istream>

include/ucbhelper/std_outputstream.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _UCBHELPER_STD_OUTPUTSTREAM_HXX_
-#define _UCBHELPER_STD_OUTPUTSTREAM_HXX_
+#ifndef INCLUDED_UCBHELPER_STD_OUTPUTSTREAM_HXX
+#define INCLUDED_UCBHELPER_STD_OUTPUTSTREAM_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <ostream>

include/ucbhelper/ucbhelperdllapi.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UCBHELPERDLLAPI_H
-#define INCLUDED_UCBHELPERDLLAPI_H
+#ifndef INCLUDED_UCBHELPER_UCBHELPERDLLAPI_H
+#define INCLUDED_UCBHELPER_UCBHELPERDLLAPI_H
 
 #include "sal/types.h"
 
@@ -29,6 +29,6 @@
 #endif
 #define UCBHELPER_DLLPRIVATE SAL_DLLPRIVATE
 
-#endif /* INCLUDED_UCBHELPERDLLAPI_H */
+#endif // INCLUDED_UCBHELPER_UCBHELPERDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/uno/any2.h

@@ -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 _UNO_ANY2_H_
-#define _UNO_ANY2_H_
+#ifndef INCLUDED_UNO_ANY2_H
+#define INCLUDED_UNO_ANY2_H
 
 #include <cppu/cppudllapi.h>
 #include <uno/data.h>

include/uno/current_context.h

@@ -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 _UNO_CURRENT_CONTEXT_H_
-#define _UNO_CURRENT_CONTEXT_H_
+#ifndef INCLUDED_UNO_CURRENT_CONTEXT_H
+#define INCLUDED_UNO_CURRENT_CONTEXT_H
 
 #include <cppu/cppudllapi.h>
 #include <rtl/ustring.h>

include/uno/current_context.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 _UNO_CURRENT_CONTEXT_HXX_
-#define _UNO_CURRENT_CONTEXT_HXX_
+#ifndef INCLUDED_UNO_CURRENT_CONTEXT_HXX
+#define INCLUDED_UNO_CURRENT_CONTEXT_HXX
 
 #include <uno/current_context.h>
 

include/uno/data.h

@@ -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 _UNO_DATA_H_
-#define _UNO_DATA_H_
+#ifndef INCLUDED_UNO_DATA_H
+#define INCLUDED_UNO_DATA_H
 
 #include <cppu/cppudllapi.h>
 

include/uno/dispatcher.h

@@ -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 _UNO_DISPATCHER_H_
-#define _UNO_DISPATCHER_H_
+#ifndef INCLUDED_UNO_DISPATCHER_H
+#define INCLUDED_UNO_DISPATCHER_H
 
 #include <sal/types.h>
 #include <rtl/ustring.h>

include/uno/environment.h

@@ -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 _UNO_ENVIRONMENT_H_
-#define _UNO_ENVIRONMENT_H_
+#ifndef INCLUDED_UNO_ENVIRONMENT_H
+#define INCLUDED_UNO_ENVIRONMENT_H
 
 #include <cppu/cppudllapi.h>
 #include <rtl/ustring.h>

include/uno/environment.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 _UNO_ENVIRONMENT_HXX_
-#define _UNO_ENVIRONMENT_HXX_
+#ifndef INCLUDED_UNO_ENVIRONMENT_HXX
+#define INCLUDED_UNO_ENVIRONMENT_HXX
 
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>

include/uno/lbnames.h

@@ -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 _UNO_LBNAMES_H_
-#define _UNO_LBNAMES_H_
+#ifndef INCLUDED_UNO_LBNAMES_H
+#define INCLUDED_UNO_LBNAMES_H
 
 /* I assume "LB" means "Language Binding" */
 

include/uno/mapping.h

@@ -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 _UNO_MAPPING_H_
-#define _UNO_MAPPING_H_
+#ifndef INCLUDED_UNO_MAPPING_H
+#define INCLUDED_UNO_MAPPING_H
 
 #include <cppu/cppudllapi.h>
 #include <rtl/ustring.h>

include/uno/mapping.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 _UNO_MAPPING_HXX_
-#define _UNO_MAPPING_HXX_
+#ifndef INCLUDED_UNO_MAPPING_HXX
+#define INCLUDED_UNO_MAPPING_HXX
 
 #include <cppu/macros.hxx>
 #include <rtl/alloc.h>

include/uno/sequence2.h

@@ -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 _UNO_SEQUENCE2_H_
-#define _UNO_SEQUENCE2_H_
+#ifndef INCLUDED_UNO_SEQUENCE2_H
+#define INCLUDED_UNO_SEQUENCE2_H
 
 #include <cppu/cppudllapi.h>
 #include <uno/data.h>

include/unotest/bootstrapfixturebase.hxx

@@ -6,8 +6,8 @@
  * 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/.
  */
-#ifndef INCLUDED_UNOUNOTEST_BOOTSTRAPFIXTUREBASE_HXX
-#define INCLUDED_UNOUNOTEST_BOOTSTRAPFIXTUREBASE_HXX
+#ifndef INCLUDED_UNOTEST_BOOTSTRAPFIXTUREBASE_HXX
+#define INCLUDED_UNOTEST_BOOTSTRAPFIXTUREBASE_HXX
 
 #include <sal/config.h>
 

include/unotest/gettestargument.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TEST_GETTESTARGUMENT_HXX
-#define INCLUDED_TEST_GETTESTARGUMENT_HXX
+#ifndef INCLUDED_UNOTEST_GETTESTARGUMENT_HXX
+#define INCLUDED_UNOTEST_GETTESTARGUMENT_HXX
 
 #include "sal/config.h"
 

include/unotest/officeconnection.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TEST_OFFICECONNECTION_HXX
-#define INCLUDED_TEST_OFFICECONNECTION_HXX
+#ifndef INCLUDED_UNOTEST_OFFICECONNECTION_HXX
+#define INCLUDED_UNOTEST_OFFICECONNECTION_HXX
 
 #include "sal/config.h"
 

include/unotest/toabsolutefileurl.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TEST_TOABSOLUTEFILEURL_HXX
-#define INCLUDED_TEST_TOABSOLUTEFILEURL_HXX
+#ifndef INCLUDED_UNOTEST_TOABSOLUTEFILEURL_HXX
+#define INCLUDED_UNOTEST_TOABSOLUTEFILEURL_HXX
 
 #include "sal/config.h"
 

include/unotest/uniquepipename.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TEST_UNIQUEPIPENAME_HXX
-#define INCLUDED_TEST_UNIQUEPIPENAME_HXX
+#ifndef INCLUDED_UNOTEST_UNIQUEPIPENAME_HXX
+#define INCLUDED_UNOTEST_UNIQUEPIPENAME_HXX
 
 #include "sal/config.h"
 

include/unotools/accessiblerelationsethelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
-#define _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_ACCESSIBLERELATIONSETHELPER_HXX
+#define INCLUDED_UNOTOOLS_ACCESSIBLERELATIONSETHELPER_HXX
 
 #include "unotools/unotoolsdllapi.h"