diff --git a/vpx_ports/arm.h b/vpx_ports/arm.h
index 525a7641f2f7409fb7baa065eeea0fd2c654ea76..2562d9c1d85629a823825333373811a14e522f26 100644
--- a/vpx_ports/arm.h
+++ b/vpx_ports/arm.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef VPX_PORTS_ARM_H
-#define VPX_PORTS_ARM_H
+#ifndef VPX_PORTS_ARM_H_
+#define VPX_PORTS_ARM_H_
 #include <stdlib.h>
 #include "vpx_config.h"
 
@@ -23,5 +23,5 @@
 
 int arm_cpu_caps(void);
 
-#endif
+#endif  // VPX_PORTS_ARM_H_
 
diff --git a/vpx_ports/asm_offsets.h b/vpx_ports/asm_offsets.h
index d3a3e5a14b2a739ad9bbd41a94b53e10253948c8..317bbedcb136bcc6748321bbcd678e03dea83229 100644
--- a/vpx_ports/asm_offsets.h
+++ b/vpx_ports/asm_offsets.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef VPX_PORTS_ASM_OFFSETS_H
-#define VPX_PORTS_ASM_OFFSETS_H
+#ifndef VPX_PORTS_ASM_OFFSETS_H_
+#define VPX_PORTS_ASM_OFFSETS_H_
 
 #include <stddef.h>
 
@@ -28,4 +28,4 @@
 #define END
 #endif
 
-#endif /* VPX_PORTS_ASM_OFFSETS_H */
+#endif  // VPX_PORTS_ASM_OFFSETS_H_
diff --git a/vpx_ports/config.h b/vpx_ports/config.h
index 1abe70da929194d6e892fd7b138d598e6838bf25..3c1ab99f4aa3e668fb0f0f6d4739cecd42a73b6e 100644
--- a/vpx_ports/config.h
+++ b/vpx_ports/config.h
@@ -7,4 +7,10 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
+
+#ifndef VPX_PORTS_CONFIG_H_
+#define VPX_PORTS_CONFIG_H_
+
 #include "vpx_config.h"
+
+#endif  // VPX_PORTS_CONFIG_H_
diff --git a/vpx_ports/emmintrin_compat.h b/vpx_ports/emmintrin_compat.h
index 782d603afb6ccc15668ff037100c792efedde2cf..16176383d290de9766ddb1007d3f744020b387d7 100644
--- a/vpx_ports/emmintrin_compat.h
+++ b/vpx_ports/emmintrin_compat.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef VPX_PORTS_EMMINTRIN_COMPAT_H
-#define VPX_PORTS_EMMINTRIN_COMPAT_H
+#ifndef VPX_PORTS_EMMINTRIN_COMPAT_H_
+#define VPX_PORTS_EMMINTRIN_COMPAT_H_
 
 #if defined(__GNUC__) && __GNUC__ < 4
 /* From emmintrin.h (gcc 4.5.3) */
@@ -52,4 +52,4 @@ _mm_castsi128_pd(__m128i __A)
 }
 #endif
 
-#endif
+#endif  // VPX_PORTS_EMMINTRIN_COMPAT_H_
diff --git a/vpx_ports/mem.h b/vpx_ports/mem.h
index 62b86bb1df8ae4db468529080b959222d101fcfb..e91d776945f1215684e2f92997ab2d36f984b1d2 100644
--- a/vpx_ports/mem.h
+++ b/vpx_ports/mem.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef VPX_PORTS_MEM_H
-#define VPX_PORTS_MEM_H
+#ifndef VPX_PORTS_MEM_H_
+#define VPX_PORTS_MEM_H_
 
 #include "vpx_config.h"
 #include "vpx/vpx_integer.h"
@@ -44,4 +44,4 @@
 #define UNINITIALIZED_IS_SAFE(x) x=x
 #else
 #define UNINITIALIZED_IS_SAFE(x) x
-#endif
+#endif  // VPX_PORTS_MEM_H_
diff --git a/vpx_ports/mem_ops.h b/vpx_ports/mem_ops.h
index 2d44a3a5827d5b44e917b98046012d8e807fb41c..8c8b52618e2714f3d3ced890dd3780ebe934efa6 100644
--- a/vpx_ports/mem_ops.h
+++ b/vpx_ports/mem_ops.h
@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#ifndef VPX_PORTS_MEM_OPS_H_
+#define VPX_PORTS_MEM_OPS_H_
 
 /* \file
  * \brief Provides portable memory access primitives
@@ -220,3 +222,5 @@ static void mem_put_le32(void *vmem, MEM_VALUE_T val) {
   mem[2] = (val >> 16) & 0xff;
   mem[3] = (val >> 24) & 0xff;
 }
+
+#endif  // VPX_PORTS_MEM_OPS_H_
diff --git a/vpx_ports/mem_ops_aligned.h b/vpx_ports/mem_ops_aligned.h
index 0100300a7ea0391653c35e031bcd6eacf62dfdb9..da7c65d963f136731a75421c7f42a853cdcabf36 100644
--- a/vpx_ports/mem_ops_aligned.h
+++ b/vpx_ports/mem_ops_aligned.h
@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#ifndef VPX_PORTS_MEM_OPS_ALIGNED_H_
+#define VPX_PORTS_MEM_OPS_ALIGNED_H_
 
 /* \file
  * \brief Provides portable memory access primitives for operating on aligned
@@ -155,3 +157,5 @@ mem_put_le_aligned_generic(32)
 #undef swap_endian_32
 #undef swap_endian_16_se
 #undef swap_endian_32_se
+
+#endif  // VPX_PORTS_MEM_OPS_ALIGNED_H_
diff --git a/vpx_ports/vpx_once.h b/vpx_ports/vpx_once.h
index 6052c4d96df98ca0e35f549d1be63c469c719b8b..182892acfaa1b7703ae0282301fe6f973e104f70 100644
--- a/vpx_ports/vpx_once.h
+++ b/vpx_ports/vpx_once.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef VPX_ONCE_H
-#define VPX_ONCE_H
+#ifndef VPX_PORTS_VPX_ONCE_H_
+#define VPX_PORTS_VPX_ONCE_H_
 
 #include "vpx_config.h"
 
@@ -100,4 +100,4 @@ static void once(void (*func)(void))
 }
 #endif
 
-#endif
+#endif  // VPX_PORTS_VPX_ONCE_H_
diff --git a/vpx_ports/vpx_timer.h b/vpx_ports/vpx_timer.h
index cdad9ef1d75e2637468be00ecf99e3f26c40d7b5..9e2015e623d2ca3d2aa0333bcf27cb674b921e07 100644
--- a/vpx_ports/vpx_timer.h
+++ b/vpx_ports/vpx_timer.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef VPX_TIMER_H
-#define VPX_TIMER_H
+#ifndef VPX_PORTS_VPX_TIMER_H_
+#define VPX_PORTS_VPX_TIMER_H_
 #include "vpx/vpx_integer.h"
 
 #if CONFIG_OS_SUPPORT
@@ -114,4 +114,4 @@ vpx_usec_timer_elapsed(struct vpx_usec_timer *t) {
 
 #endif /* CONFIG_OS_SUPPORT */
 
-#endif
+#endif  // VPX_PORTS_VPX_TIMER_H_
diff --git a/vpx_ports/x86.h b/vpx_ports/x86.h
index fdbed2524e70625030f57d5086ec6769c1663075..a9d51a3bc90f480dd0ecb14ee2da17e6769c5eab 100644
--- a/vpx_ports/x86.h
+++ b/vpx_ports/x86.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef VPX_PORTS_X86_H
-#define VPX_PORTS_X86_H
+#ifndef VPX_PORTS_X86_H_
+#define VPX_PORTS_X86_H_
 #include <stdlib.h>
 #include "vpx_config.h"
 
@@ -256,5 +256,5 @@ x87_set_double_precision(void) {
 
 
 extern void vpx_reset_mmx_state(void);
-#endif
+#endif  // VPX_PORTS_X86_H_