diff --git a/libavcodec/ps2/mmi.h b/libavcodec/ps2/mmi.h
index e2e49a86c6..62e8fcec6e 100644
--- a/libavcodec/ps2/mmi.h
+++ b/libavcodec/ps2/mmi.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __mmi_H
-#define __mmi_H
+#ifndef MMI_H
+#define MMI_H
 
 #define align16 __attribute__ ((aligned (16)))
 
diff --git a/libavcodec/snow.h b/libavcodec/snow.h
index d75d6e3e07..71bafa825f 100644
--- a/libavcodec/snow.h
+++ b/libavcodec/snow.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _SNOW_H
-#define _SNOW_H
+#ifndef SNOW_H
+#define SNOW_H
 
 #include "dsputil.h"
 
diff --git a/libavformat/framehook.h b/libavformat/framehook.h
index d5573c1df4..1902ebc909 100644
--- a/libavformat/framehook.h
+++ b/libavformat/framehook.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _FRAMEHOOK_H
-#define _FRAMEHOOK_H
+#ifndef FRAMEHOOK_H
+#define FRAMEHOOK_H
 
 #warning VHOOK is deprecated. Please help porting libmpcodecs or a better filter system to FFmpeg instead of wasting your time writing new filters for this crappy one.
 
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 424d6dabd1..05acaa152a 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _OS_SUPPORT_H
-#define _OS_SUPPORT_H
+#ifndef OS_SUPPORT_H
+#define OS_SUPPORT_H
 
 /**
  * @file os_support.h
@@ -108,4 +108,4 @@ extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
 #endif /* HAVE_SYS_POLL_H */
 #endif /* CONFIG_FFSERVER */
 
-#endif /* _OS_SUPPORT_H */
+#endif /* OS_SUPPORT_H */
diff --git a/libavutil/bswap.h b/libavutil/bswap.h
index 3b6c2c0407..211a15c0ab 100644
--- a/libavutil/bswap.h
+++ b/libavutil/bswap.h
@@ -23,8 +23,8 @@
  * byte swap.
  */
 
-#ifndef __BSWAP_H__
-#define __BSWAP_H__
+#ifndef BSWAP_H
+#define BSWAP_H
 
 #include <stdint.h>
 #include "common.h"
@@ -138,4 +138,4 @@ static inline uint64_t bswap_64(uint64_t x)
 #define le2me_64(x) (x)
 #endif
 
-#endif /* __BSWAP_H__ */
+#endif /* BSWAP_H */
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 75e8bf3a42..4de9d58f34 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -243,7 +243,7 @@ if((y)<(x)){\
 #define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf
 #define strcat strcat_is_forbidden_due_to_security_issues_use_av_strlcat
 #define exit exit_is_forbidden
-#if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H))
+#if !(defined(LIBAVFORMAT_BUILD) || defined(FRAMEHOOK_H))
 #define printf please_use_av_log
 #define fprintf please_use_av_log
 #endif
diff --git a/libpostproc/mangle.h b/libpostproc/mangle.h
index 3521fa9bb5..1913270beb 100644
--- a/libpostproc/mangle.h
+++ b/libpostproc/mangle.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __MANGLE_H
-#define __MANGLE_H
+#ifndef MANGLE_H
+#define MANGLE_H
 
 /* Feel free to add more to the list, eg. a.out IMO */
 /* Use rip-relative addressing if compiling PIC code on x86-64. */
@@ -43,5 +43,5 @@
 #endif
 #endif
 
-#endif /* !__MANGLE_H */
+#endif /* !MANGLE_H */