4 files changed, 22 insertions, 13 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operators_private.h b/source/blender/bmesh/intern/bmesh_operators_private.h
index 33c68b1b0da..13bd9179955 100644
--- a/source/blender/bmesh/intern/bmesh_operators_private.h
+++ b/source/blender/bmesh/intern/bmesh_operators_private.h
@@ -20,8 +20,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef BM_OPERATORS_PRIVATE_H
-#define BM_OPERATORS_PRIVATE_H
+#ifndef __BMESH_OPERATORS_PRIVATE_H__
+#define __BMESH_OPERATORS_PRIVATE_H__
+
+/** \file blender/bmesh/intern/bmesh_operators_private.h
+ *  \ingroup bmesh
+ */
 
 struct BMesh;
 struct BMOperator;
@@ -98,4 +102,4 @@ void bmesh_create_circle_exec(BMesh *bm, BMOperator *op);
 void bmesh_bridge_loops_exec(BMesh *bm, BMOperator *op);
 void bmesh_solidify_face_region_exec(BMesh *bm, BMOperator *op);
 
-#endif
+#endif /* __BMESH_OPERATORS_PRIVATE_H__ */
diff --git a/source/blender/bmesh/intern/bmesh_private.h b/source/blender/bmesh/intern/bmesh_private.h
index f6c6cda845b..3ed58c506ec 100644
--- a/source/blender/bmesh/intern/bmesh_private.h
+++ b/source/blender/bmesh/intern/bmesh_private.h
@@ -25,6 +25,9 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#ifndef __BMESH_PRIVATE_H__
+#define __BMESH_PRIVATE_H__
+
 /** \file blender/bmesh/intern/bmesh_private.h
  *  \ingroup bmesh
  *
@@ -33,9 +36,6 @@
  *  parts of the bmesh internals.
  */
 
-#ifndef BMESH_PRIVATE_H
-#define BMESH_PRIVATE_H
-
 struct Link;
 struct BMLoop;
 
@@ -59,7 +59,7 @@ int bmesh_check_element(BMesh *bm, void *element, const char htype);
 int bmesh_radial_length(struct BMLoop *l);
 int bmesh_disk_count(BMVert *v);
 
-/*internal selection flushing*/
+/* internal selection flushing */
 void bmesh_selectmode_flush(struct BMesh *bm);
 
 /*internal filter API*/
@@ -91,8 +91,8 @@ void bmesh_flip_normal(struct BMesh *bm, struct BMFace *f);
 BMEdge *bmesh_disk_next(BMEdge *e, BMVert *v);
 BMEdge *bmesh_disk_prev(BMEdge *e, BMVert *v);
 
-/*include the rest of our private declarations*/
+/* include the rest of our private declarations */
 #include "bmesh_structure.h"
 #include "bmesh_operators_private.h"
 
-#endif
+#endif /* __BMESH_PRIVATE_H__ */
diff --git a/source/blender/bmesh/intern/bmesh_structure.h b/source/blender/bmesh/intern/bmesh_structure.h
index a0cc7dfb8d1..ab10fb4f062 100644
--- a/source/blender/bmesh/intern/bmesh_structure.h
+++ b/source/blender/bmesh/intern/bmesh_structure.h
@@ -25,6 +25,9 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#ifndef __BMESH_STRUCTURE_H__
+#define __BMESH_STRUCTURE_H__
+
 /** \file blender/bmesh/intern/bmesh_structure.h
  *  \ingroup bmesh
  *
@@ -36,9 +39,6 @@
  * descriptive comments.  but seriously, don't use this stuff.
  */
 
-#ifndef BM_STRUCTURE_H
-#define BM_STRUCTURE_H
-
 struct ListBase;
 
 void remove_loop_radial_link(BMLoop *l);
@@ -99,4 +99,4 @@ struct BMFace *bmesh_jfke(struct BMesh *bm, struct BMFace *f1, struct BMFace *f2
 struct BMVert *bmesh_urmv(struct BMesh *bm, struct BMFace *sf, struct BMVert *sv);
 //int *bmesh_grkv(struct BMesh *bm, struct BMFace *sf, struct BMVert *kv);
 
-#endif
+#endif /* __BMESH_STRUCTURE_H__ */
diff --git a/source/blender/bmesh/intern/bmesh_walkers_private.h b/source/blender/bmesh/intern/bmesh_walkers_private.h
index 45a61f3faa6..2d59a940448 100644
--- a/source/blender/bmesh/intern/bmesh_walkers_private.h
+++ b/source/blender/bmesh/intern/bmesh_walkers_private.h
@@ -20,6 +20,9 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#ifndef __BMESH_WALKERS_PRIVATE_H__
+#define __BMESH_WALKERS_PRIVATE_H__
+
 /** \file blender/bmesh/intern/bmesh_walkers_private.h
  *  \ingroup bmesh
  *
@@ -82,3 +85,5 @@ typedef struct connectedVertexWalker {
 	bmesh_walkerGeneric header;
 	BMVert *curvert;
 } connectedVertexWalker;
+
+#endif /* __BMESH_WALKERS_PRIVATE_H__ */