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

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

39 files changed, 100 insertions, 102 deletions

diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index c22513722c73..2e0f20b9b8d6 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _AVMEDIA_MEDIACONTROL_HXX
-#define _AVMEDIA_MEDIACONTROL_HXX
+#ifndef INCLUDED_AVMEDIA_INC_MEDIACONTROL_HXX
+#define INCLUDED_AVMEDIA_INC_MEDIACONTROL_HXX
 
 #include <avmedia/mediaitem.hxx>
 
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index e6dddf91783d..d41c033cb226 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
-#define __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
+#ifndef INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_SOUNDHANDLER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_SOUNDHANDLER_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -136,6 +136,6 @@ class SoundHandler  :   // interfaces
 
 }       //  namespace avmedia
 
-#endif  //  #ifndef __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
+#endif // INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_SOUNDHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
index 7d535666f418..20ae74882be5 100644
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _GSTCOMMON_HXX
-#define _GSTCOMMON_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTCOMMON_HXX
+#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTCOMMON_HXX
 
 #include <gst/gst.h>
 
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 6d89af62b339..87a3f2369078 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRAMEGRABBER_HXX
-#define _FRAMEGRABBER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTFRAMEGRABBER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTFRAMEGRABBER_HXX
 
 #include "gstplayer.hxx"
 #include <com/sun/star/media/XFrameGrabber.hpp>
@@ -59,6 +59,6 @@ private:
 } // namespace gst
 } // namespace avmedia
 
-#endif // _FRAMEGRABBER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTFRAMEGRABBER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index e0283d196488..507ee7d82a28 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MANAGER_HXX
-#define _MANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX
 
 #include "gstcommon.hxx"
 
@@ -53,6 +53,6 @@ private:
 } // namespace gstreamer
 } // namespace avmedia
 
-#endif // _MANAGER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 23f325d8a37a..f31dcb85f49a 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PLAYER_HXX
-#define _PLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
 
 #include <osl/conditn.hxx>
 #include "gstcommon.hxx"
@@ -104,6 +104,6 @@ protected:
 } // namespace gstreamer
 } // namespace avmedia
 
-#endif // _PLAYER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index df45af121a23..659c4fc556c3 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _WINDOW_HXX
-#define _WINDOW_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX
+#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX
 
 #include "gstcommon.hxx"
 #include <cppuhelper/interfacecontainer.h>
@@ -96,6 +96,6 @@ private:
 } // namespace gstreamer
 } // namespace avmedia
 
-#endif // _WINDOW_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index 19d5edc7ecac..6a86cfb93786 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _AVMEDIA_MEDIAMISC_HXX
-#define _AVMEDIA_MEDIAMISC_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
+#define INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
 
 class ResMgr;
 
diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx
index b4b1daee7326..5be63714cbbe 100644
--- a/avmedia/source/opengl/oglframegrabber.hxx
+++ b/avmedia/source/opengl/oglframegrabber.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_FRAMEGRABBER_HXX
-#define OGL_FRAMEGRABBER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -43,6 +43,6 @@ private:
 } // namespace ogl
 } // namespace avmedia
 
-#endif // OGL_FRAMEGRABBER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLFRAMEGRABBER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/opengl/oglmanager.hxx b/avmedia/source/opengl/oglmanager.hxx
index bbecfbcb0391..cb4ec2112634 100644
--- a/avmedia/source/opengl/oglmanager.hxx
+++ b/avmedia/source/opengl/oglmanager.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_MANAGER_HXX
-#define OGL_MANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -39,6 +39,6 @@ private:
 } // namespace ogl
 } // namespace avmedia
 
-#endif // OGL_MANAGER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx
index 1f1efce2440d..86e8a6efee69 100644
--- a/avmedia/source/opengl/oglplayer.hxx
+++ b/avmedia/source/opengl/oglplayer.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_PLAYER_HXX
-#define OGL_PLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <cppuhelper/basemutex.hxx>
@@ -63,6 +63,6 @@ private:
 } // namespace ogl
 } // namespace avmedia
 
-#endif // OGL_PLAYER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLPLAYER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx
index ba510e46f31c..2b1c9436e242 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_WINDOW_HXX
-#define OGL_WINDOW_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLWINDOW_HXX
+#define INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLWINDOW_HXX
 
 #include "oglplayer.hxx"
 
@@ -76,6 +76,6 @@ private:
 } // namespace ogl
 } // namespace avmedia
 
-#endif // OGL_WINDOW_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_OPENGL_OGLWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 0552af4cb1ef..cb7021532328 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRAMEGRABBER_HXX
-#define _FRAMEGRABBER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_FRAMEGRABBER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_FRAMEGRABBER_HXX
 
 #include "quicktimecommon.hxx"
 
@@ -60,6 +60,6 @@ private:
 } // namespace quicktime
 } // namespace avmedia
 
-#endif // _FRAMEGRABBER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_QUICKTIME_FRAMEGRABBER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index af64284a900e..b5d1b02b9a39 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MANAGER_HXX
-#define _MANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_MANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_MANAGER_HXX
 
 #include "quicktimecommon.hxx"
 
@@ -53,6 +53,6 @@ private:
 } // namespace quicktime
 } // namespace avmedia
 
-#endif // _MANAGER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_QUICKTIME_MANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 69cbcdd9f55a..3c308ca9a7ec 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PLAYER_HXX
-#define _PLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_PLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_PLAYER_HXX
 
 #include <osl/conditn.h>
 #include "quicktimecommon.hxx"
@@ -86,6 +86,6 @@ private:
 } // namespace quicktime
 } // namespace avmedia
 
-#endif // _PLAYER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_QUICKTIME_PLAYER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index 91785b889ea3..397a716ef2c6 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _QUICKTIMECOMMON_HXX
-#define _QUICKTIMECOMMON_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_QUICKTIMECOMMON_HXX
+#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_QUICKTIMECOMMON_HXX
 
 #ifdef MACOSX
 #include <premac.h>
@@ -28,9 +28,7 @@
 #include <postmac.h>
 #endif
 #include <osl/mutex.hxx>
-#ifndef __RTL_USTRING_
 #include <rtl/ustring.hxx>
-#endif
 #include <tools/stream.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 3a47e30657b7..bb96470aaefb 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _WINDOW_HXX
-#define _WINDOW_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_QUICKTIME_WINDOW_HXX
+#define INCLUDED_AVMEDIA_SOURCE_QUICKTIME_WINDOW_HXX
 
 #include "quicktimecommon.hxx"
 #include <cppuhelper/interfacecontainer.h>
@@ -102,6 +102,6 @@ private:
 } // namespace quicktime
 } // namespace avmedia
 
-#endif // _WINDOW_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_QUICKTIME_WINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 6817df65df34..9f551bd2ea51 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _AVMEDIA_MEDIAEVENT_IMPL_HXX
-#define _AVMEDIA_MEDIAEVENT_IMPL_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAEVENT_IMPL_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAEVENT_IMPL_HXX
 
 #include <avmedia/mediawindow.hxx>
 #include <cppuhelper/compbase4.hxx>
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index a5e8215d0d90..c1ba15c52cc1 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _AVMEDIA_MEDIAWINDOW_IMPL_HXX
-#define _AVMEDIA_MEDIAWINDOW_IMPL_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAWINDOW_IMPL_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAWINDOW_IMPL_HXX
 
 #include <svtools/transfer.hxx>
 #include <vcl/syschild.hxx>
diff --git a/avmedia/source/vlc/vlccommon.hxx b/avmedia/source/vlc/vlccommon.hxx
index 1bc9fa169b10..b99325b59c16 100644
--- a/avmedia/source/vlc/vlccommon.hxx
+++ b/avmedia/source/vlc/vlccommon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VLCCOMMON_HXX
-#define _VLCCOMMON_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCCOMMON_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCCOMMON_HXX
 
 #include <osl/mutex.hxx>
 #include <tools/stream.hxx>
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx
index 11ce48f3b299..d51485c57978 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VLCFRAMEGRABBER_HXX
-#define _VLCFRAMEGRABBER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/media/XFrameGrabber.hpp>
@@ -55,4 +55,4 @@ public:
 }
 }
 
-#endif // _VLCFRAMEGRABBER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index 948464f8c871..36eebceb9e2c 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VLCMANAGER_HXX
-#define _VLCMANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX
 #include <boost/scoped_ptr.hpp>
 #include <com/sun/star/media/XManager.hpp>
 #include "vlccommon.hxx"
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index effb5b2270d2..455d5875e687 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VLCPLAYER_HXX
-#define _VLCPLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCPLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCPLAYER_HXX
 
 #include "vlccommon.hxx"
 #include <boost/shared_ptr.hpp>
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index c907edb1c141..a34c0bfd96b4 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.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 _VLCWINDOW_HXX
-#define _VLCWINDOW_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX
 
 #include "vlccommon.hxx"
 
@@ -71,4 +71,4 @@ public:
 }
 }
 
-#endif // _VLCWINDOW_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX
diff --git a/avmedia/source/vlc/wrapper/Common.hxx b/avmedia/source/vlc/wrapper/Common.hxx
index 9cdffcc213a4..f4984b6b1482 100644
--- a/avmedia/source/vlc/wrapper/Common.hxx
+++ b/avmedia/source/vlc/wrapper/Common.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _WRAPPER_COMMON_HXX
-#define _WRAPPER_COMMON_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_COMMON_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_COMMON_HXX
 
 namespace avmedia
 {
diff --git a/avmedia/source/vlc/wrapper/EventHandler.hxx b/avmedia/source/vlc/wrapper/EventHandler.hxx
index 82c6efcdb5d9..37272c2ea2ad 100644
--- a/avmedia/source/vlc/wrapper/EventHandler.hxx
+++ b/avmedia/source/vlc/wrapper/EventHandler.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _WRAPPER_EVENT_HANDLER_HXX
-#define _WRAPPER_EVENT_HANDLER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
 #include <boost/function.hpp>
 #include <boost/noncopyable.hpp>
 #include <salhelper/thread.hxx>
@@ -37,6 +37,6 @@ namespace wrapper
 }
 }
 
-#endif // _WRAPPER_EVENT_HANDLER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/EventManager.hxx b/avmedia/source/vlc/wrapper/EventManager.hxx
index b29aea360273..8ee2eb6fe17f 100644
--- a/avmedia/source/vlc/wrapper/EventManager.hxx
+++ b/avmedia/source/vlc/wrapper/EventManager.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _WRAPPER_EVENT_MANAGER_HXX
-#define _WRAPPER_EVENT_MANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
 
 #include <boost/function.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/avmedia/source/vlc/wrapper/Instance.hxx b/avmedia/source/vlc/wrapper/Instance.hxx
index 0432bf14c9c6..76d800bd497a 100644
--- a/avmedia/source/vlc/wrapper/Instance.hxx
+++ b/avmedia/source/vlc/wrapper/Instance.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _WRAPPER_INSTANCE_HXX
-#define _WRAPPER_INSTANCE_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_INSTANCE_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_INSTANCE_HXX
 
 struct libvlc_instance_t;
 
diff --git a/avmedia/source/vlc/wrapper/Media.hxx b/avmedia/source/vlc/wrapper/Media.hxx
index 0cdadf0d33c9..cf1d4e719ca7 100644
--- a/avmedia/source/vlc/wrapper/Media.hxx
+++ b/avmedia/source/vlc/wrapper/Media.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _WRAPPER_MEDIA_HXX
-#define _WRAPPER_MEDIA_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_MEDIA_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_MEDIA_HXX
 
 struct libvlc_media_t;
 
diff --git a/avmedia/source/vlc/wrapper/Player.hxx b/avmedia/source/vlc/wrapper/Player.hxx
index 77e45914f2b6..018c5ebce5ec 100644
--- a/avmedia/source/vlc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/wrapper/Player.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _WRAPPER_PLAYER_HXX
-#define _WRAPPER_PLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_PLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_PLAYER_HXX
 #if defined UNX
 # include <stdint.h>
 #endif
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index e7db7a7cdbb6..2426dea706dc 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _SYMBOL_LOADER_HXX
-#define _SYMBOL_LOADER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_SYMBOLLOADER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_SYMBOLLOADER_HXX
 #if defined( WNT )
 # include <windows.h>
 # include <winreg.h>
diff --git a/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx b/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx
index f2868a388294..b37158c31bb0 100644
--- a/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx
+++ b/avmedia/source/vlc/wrapper/ThreadsafeQueue.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 _THREADSAFE_QUEUE_HXX
-#define _THREADSAFE_QUEUE_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_THREADSAFEQUEUE_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_THREADSAFEQUEUE_HXX
 #include <queue>
 #include <iostream>
 #include <osl/mutex.hxx>
@@ -77,5 +77,5 @@ void ThreadsafeQueue<T>::pop( T& data )
 }
 }
 
-#endif // _THREADSAFE_QUEUE_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_THREADSAFEQUEUE_HXX
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/avmedia/source/vlc/wrapper/Types.hxx b/avmedia/source/vlc/wrapper/Types.hxx
index 06a0674c06da..913aa2b8f147 100644
--- a/avmedia/source/vlc/wrapper/Types.hxx
+++ b/avmedia/source/vlc/wrapper/Types.hxx
@@ -2,8 +2,8 @@
 
 /* Typedefs and structures that represent the libvlc API / ABI */
 
-#ifndef _WRAPPER_TYPES_HXX
-#define _WRAPPER_TYPES_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX
 
 #if defined WNT
         typedef __int64 libvlc_time_t;
@@ -46,6 +46,6 @@ struct libvlc_track_description_t
 
 }
 
-#endif // _WRAPPER_TYPES_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 809d1df0f734..841da8f97f8a 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRAMEGRABBER_HXX
-#define _FRAMEGRABBER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_FRAMEGRABBER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_WIN_FRAMEGRABBER_HXX
 
 #include "wincommon.hxx"
 
@@ -61,6 +61,6 @@ private:
 } // namespace win
 } // namespace avmedia
 
-#endif // _FRAMEGRABBER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_WIN_FRAMEGRABBER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx
index 0a713fbcd696..f954872ffa86 100644
--- a/avmedia/source/win/interface.hxx
+++ b/avmedia/source/win/interface.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _AVMEDIA_INTERFACE_HXX
-#define _AVMEDIA_INTERFACE_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_INTERFACE_HXX
+#define INCLUDED_AVMEDIA_SOURCE_WIN_INTERFACE_HXX
 
 extern "C" const CLSID CLSID_MediaDet;
 extern "C" const IID IID_IMediaDet;
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 24854b9a76c4..9bd7f25ab48f 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MANAGER_HXX
-#define _MANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_MANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_WIN_MANAGER_HXX
 
 #include "wincommon.hxx"
 
@@ -53,6 +53,6 @@ private:
 } // namespace win
 } // namespace avmedia
 
-#endif // _MANAGER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_WIN_MANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index 8d3035d6ff76..b2e861df6811 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PLAYER_HXX
-#define _PLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_PLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_WIN_PLAYER_HXX
 
 #include "wincommon.hxx"
 
@@ -118,6 +118,6 @@ private:
 } // namespace win
 } // namespace avmedia
 
-#endif // _PLAYER_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_WIN_PLAYER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index e2b8673268ad..8f4c8a923e92 100644
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _WINCOMMON_HXX
-#define _WINCOMMON_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_WINCOMMON_HXX
+#define INCLUDED_AVMEDIA_SOURCE_WIN_WINCOMMON_HXX
 
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index afa7361c1414..f0f82b5b0136 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _WINDOW_HXX
-#define _WINDOW_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_WINDOW_HXX
+#define INCLUDED_AVMEDIA_SOURCE_WIN_WINDOW_HXX
 
 #include "wincommon.hxx"
 #include <cppuhelper/interfacecontainer.h>
@@ -110,6 +110,6 @@ private:
 } // namespace win
 } // namespace avmedia
 
-#endif // _WINDOW_HXX
+#endif // INCLUDED_AVMEDIA_SOURCE_WIN_WINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */