diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h
index 5c8b7add64..582cdec851 100644
--- a/libvo/fastmemcpy.h
+++ b/libvo/fastmemcpy.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __MPLAYER_MEMCPY
-#define __MPLAYER_MEMCPY 1
+#ifndef __FASTMEMCPY_H
+#define __FASTMEMCPY_H
 
 #include "config.h"
 #include <inttypes.h>
diff --git a/libvo/vesa_lvo.h b/libvo/vesa_lvo.h
index 9d2563b181..7ef6e4aead 100644
--- a/libvo/vesa_lvo.h
+++ b/libvo/vesa_lvo.h
@@ -9,8 +9,8 @@
  * This file contains vo_vesa interface to Linux Video Overlay.
  */
 
-#ifndef __VESA_LVO_INCLUDED
-#define __VESA_LVO_INCLUDED
+#ifndef __VESA_LVO_H
+#define __VESA_LVO_H
 
 int	 vlvo_preinit(const char *drvname);
 int      vlvo_init(unsigned src_width,unsigned src_height,
diff --git a/libvo/vosub_vidix.h b/libvo/vosub_vidix.h
index 9246c49071..d129995675 100644
--- a/libvo/vosub_vidix.h
+++ b/libvo/vosub_vidix.h
@@ -9,8 +9,8 @@
  * This file contains vosub_vidix interface to any mplayer's VO driver
  */
 
-#ifndef __VOSUB_VIDIX_INCLUDED
-#define __VOSUB_VIDIX_INCLUDED
+#ifndef __VOSUB_VIDIX_H
+#define __VOSUB_VIDIX_H
 
 		    /* drvname can be NULL */
 int	 vidix_preinit(const char *drvname,void *server);
diff --git a/libvo/wskeys.h b/libvo/wskeys.h
index 0da269fb0f..6c2c5db264 100644
--- a/libvo/wskeys.h
+++ b/libvo/wskeys.h
@@ -1,6 +1,6 @@
 
-#ifndef _MY_WSKEY
-#define _MY_WSKEY
+#ifndef _WSKEYS_H
+#define _WSKEYS_H
 
 #define wsosbrackets '['
 #define wscsbrackets ']'