diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
index c064d92d260..21d686a8e80 100644
--- a/intern/atomic/atomic_ops.h
+++ b/intern/atomic/atomic_ops.h
@@ -26,8 +26,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ATOMIC_OPS_H__
-#define ATOMIC_OPS_H__
+#ifndef __ATOMIC_OPS_H__
+#define __ATOMIC_OPS_H__
 
 #include <assert.h>
 
@@ -304,4 +304,4 @@ atomic_sub_u(unsigned *p, unsigned x)
 #endif
 }
 
-#endif /* ATOMIC_OPS_H__ */
+#endif /* __ATOMIC_OPS_H__ */
diff --git a/source/blender/blenlib/BLI_math_interp.h b/source/blender/blenlib/BLI_math_interp.h
index 21975763779..543ff1bb38c 100644
--- a/source/blender/blenlib/BLI_math_interp.h
+++ b/source/blender/blenlib/BLI_math_interp.h
@@ -26,8 +26,8 @@
  *
  */
 
-#ifndef BLI_MATH_INTERP
-#define BLI_MATH_INTERP
+#ifndef __BLI_MATH_INTERP__
+#define __BLI_MATH_INTERP__
 
 void BLI_bicubic_interpolation_fl(const float *buffer, float *output, int width, int height,
                                   int components, float u, float v);
@@ -41,4 +41,4 @@ void BLI_bilinear_interpolation_fl(const float *buffer, float *output, int width
 void BLI_bilinear_interpolation_char(const unsigned char *buffer, unsigned char *output, int width, int height,
                                      int components, float u, float v);
 
-#endif
+#endif  /* __BLI_MATH_INTERP__ */
diff --git a/source/blender/imbuf/intern/IMB_colormanagement_intern.h b/source/blender/imbuf/intern/IMB_colormanagement_intern.h
index c372e125a66..db9345d2e1e 100644
--- a/source/blender/imbuf/intern/IMB_colormanagement_intern.h
+++ b/source/blender/imbuf/intern/IMB_colormanagement_intern.h
@@ -28,8 +28,8 @@
  *
  */
 
-#ifndef IMB_COLORMANAGEMENT_INTERN_H
-#define IMB_COLORMANAGEMENT_INTERN_H
+#ifndef __IMB_COLORMANAGEMENT_INTERN_H__
+#define __IMB_COLORMANAGEMENT_INTERN_H__
 
 #include "DNA_listBase.h"
 
@@ -97,4 +97,4 @@ void colorspace_set_default_role(char *colorspace, int size, int role);
 void colormanage_imbuf_set_default_spaces(struct ImBuf *ibuf);
 void colormanage_imbuf_make_linear(struct ImBuf *ibuf, const char *from_colorspace);
 
-#endif  /* IMB_COLORMANAGEMENT_INTERN_H */
+#endif  /* __IMB_COLORMANAGEMENT_INTERN_H__ */