14 files changed, 95 insertions, 47 deletions
diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h
index 592712fbf39..34120ba655a 100644
--- a/source/blender/bmesh/bmesh.h
+++ b/source/blender/bmesh/bmesh.h
@@ -1,6 +1,4 @@
 /*
- *	BMesh API.
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -22,8 +20,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef BMESH_H
-#define BMESH_H
+#ifndef __BMESH_H__
+#define __BMESH_H__
+
+/** \file blender/bmesh/bmesh.h
+ *  \ingroup bmesh
+ */
 
 #ifdef __cplusplus
 extern "C" {
@@ -368,4 +370,4 @@ void bmesh_end_edit(BMesh *bm, int flag);
 }
 #endif
 
-#endif /* BMESH_H */
+#endif /* __BMESH_H__ */
diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h
index 462e39921dd..9835098f2be 100644
--- a/source/blender/bmesh/bmesh_class.h
+++ b/source/blender/bmesh/bmesh_class.h
@@ -20,10 +20,14 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef _BMESH_CLASS_H
-#define _BMESH_CLASS_H
+#ifndef __BMESH_CLASS_H__
+#define __BMESH_CLASS_H__
 
-/*bmesh data structures*/
+/** \file blender/bmesh/bmesh_class.h
+ *  \ingroup bmesh
+ */
+
+/* bmesh data structures */
 
 struct BMesh;
 struct BMVert;
@@ -158,4 +162,4 @@ typedef struct BMesh {
 #define BM_LOOP		4
 #define BM_FACE		8
 
-#endif /* _BMESH_CLASS_H */
+#endif /* __BMESH_CLASS_H__ */
diff --git a/source/blender/bmesh/bmesh_error.h b/source/blender/bmesh/bmesh_error.h
index 50be73ee80d..26f499afd22 100644
--- a/source/blender/bmesh/bmesh_error.h
+++ b/source/blender/bmesh/bmesh_error.h
@@ -20,8 +20,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef _BMESH_ERROR_H
-#define _BMESH_ERROR_H
+#ifndef __BMESH_ERROR_H__
+#define __BMESH_ERROR_H__
+
+/** \file blender/bmesh/bmesh_error.h
+ *  \ingroup bmesh
+ */
 
 /*----------- bmop error system ----------*/
 
@@ -65,4 +69,4 @@ int BMO_error_catch_op(BMesh *bm, BMOperator *catchop, int errorcode, char **msg
 #define BMERR_INVALID_SELECTION			9
 #define BMERR_MESH_ERROR				10
 
-#endif /* _BMESH_ERROR_H */
+#endif /* __BMESH_ERROR_H__ */
diff --git a/source/blender/bmesh/bmesh_iterators.h b/source/blender/bmesh/bmesh_iterators.h
index ee7c23da31c..51df9460e8b 100644
--- a/source/blender/bmesh/bmesh_iterators.h
+++ b/source/blender/bmesh/bmesh_iterators.h
@@ -20,6 +20,13 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#ifndef __BMESH_ITERATORS_H__
+#define __BMESH_ITERATORS_H__
+
+/** \file blender/bmesh/bmesh_iterators.h
+ *  \ingroup bmesh
+ */
+
 /*
  * BMESH ITERATORS
  *
@@ -32,9 +39,6 @@
  *
 */
 
-#ifndef BM_ITERATORS_H
-#define BM_ITERATORS_H
-
 #include "BLI_mempool.h"
 
 /* Defines for passing to BM_iter_new.
@@ -129,4 +133,4 @@ void *bmiter__loop_of_face_step(struct BMIter *iter);
 
 #include "intern/bmesh_iterators_inline.c"
 
-#endif
+#endif /* __BMESH_ITERATORS_H__ */
diff --git a/source/blender/bmesh/bmesh_marking.h b/source/blender/bmesh/bmesh_marking.h
index c2fffb58c40..0fd1a621d81 100644
--- a/source/blender/bmesh/bmesh_marking.h
+++ b/source/blender/bmesh/bmesh_marking.h
@@ -20,8 +20,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef BM_MARKING_H
-#define BM_MARKING_H
+#ifndef __BMESH_MARKING_H__
+#define __BMESH_MARKING_H__
+
+/** \file blender/bmesh/bmesh_marking.h
+ *  \ingroup bmesh
+ */
 
 typedef struct BMEditSelection
 {
@@ -69,4 +73,4 @@ void BM_select_history_store(BMesh *bm, void *data);
 void BM_select_history_validate(BMesh *bm);
 void BM_select_history_clear(BMesh *em);
 
-#endif
+#endif /* __BMESH_MARKING_H__ */
diff --git a/source/blender/bmesh/bmesh_operator_api.h b/source/blender/bmesh/bmesh_operator_api.h
index 506e0715765..461149f07b8 100644
--- a/source/blender/bmesh/bmesh_operator_api.h
+++ b/source/blender/bmesh/bmesh_operator_api.h
@@ -20,8 +20,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef _BMESH_OPERATOR_API_H
-#define _BMESH_OPERATOR_API_H
+#ifndef __BMESH_OPERATOR_API_H__
+#define __BMESH_OPERATOR_API_H__
+
+/** \file blender/bmesh/bmesh_operator_api.h
+ *  \ingroup bmesh
+ */
 
 #ifdef __cplusplus
 extern "C" {
@@ -549,4 +553,4 @@ BM_INLINE void *BMO_slot_map_ptr_get(BMesh *bm, BMOperator *op, const char *slot
 }
 #endif
 
-#endif /* _BMESH_OPERATOR_API_H */
+#endif /* __BMESH_OPERATOR_API_H__ */
diff --git a/source/blender/bmesh/bmesh_operators.h b/source/blender/bmesh/bmesh_operators.h
index 22a841c1b61..ad4bd801d0f 100644
--- a/source/blender/bmesh/bmesh_operators.h
+++ b/source/blender/bmesh/bmesh_operators.h
@@ -20,8 +20,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef _BMESH_OPERATORS_H
-#define _BMESH_OPERATORS_H
+#ifndef __BMESH_OPERATORS_H__
+#define __BMESH_OPERATORS_H__
+
+/** \file blender/bmesh/bmesh_operators.h
+ *  \ingroup bmesh
+ */
 
 /*see comments in intern/bmesh_opdefines.c for documentation of specific operators*/
 
@@ -98,4 +102,4 @@ void BM_esubdivideflag(struct Object *obedit, BMesh *bm, int flag, float smooth,
                        float fractal, int beauty, int numcuts, int seltype,
                        int cornertype, int singleedge, int gridfill, int seed);
 
-#endif
+#endif /* __BMESH_OPERATORS_H__ */
diff --git a/source/blender/bmesh/bmesh_queries.h b/source/blender/bmesh/bmesh_queries.h
index 5fd7c533d20..72b0464e689 100644
--- a/source/blender/bmesh/bmesh_queries.h
+++ b/source/blender/bmesh/bmesh_queries.h
@@ -20,8 +20,13 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef BMESH_QUERIES_H
-#define BMESH_QUERIES_H
+#ifndef __BMESH_QUERIES_H__
+#define __BMESH_QUERIES_H__
+
+/** \file blender/bmesh/bmesh_queries.h
+ *  \ingroup bmesh
+ */
+
 #include <stdio.h>
 
 /* Queries */
@@ -113,4 +118,4 @@ int BM_face_validate(BMesh *bm, BMFace *face, FILE *err);
  * edges in the face.*/
 void BM_face_legal_splits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len);
 
-#endif
+#endif /* __BMESH_QUERIES_H__ */
diff --git a/source/blender/bmesh/bmesh_walkers.h b/source/blender/bmesh/bmesh_walkers.h
index b5e9f68f2f3..a9515dbd3e7 100644
--- a/source/blender/bmesh/bmesh_walkers.h
+++ b/source/blender/bmesh/bmesh_walkers.h
@@ -20,8 +20,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef BM_WALKERS_H
-#define BM_WALKERS_H
+#ifndef __BMESH_WALKERS_H__
+#define __BMESH_WALKERS_H__
+
+/** \file blender/bmesh/bmesh_walkers.h
+ *  \ingroup bmesh
+ */
 
 #include "BLI_ghash.h"
 
@@ -132,4 +136,4 @@ enum {
 /* use with BMW_init, so as not to confuse with restrict flags */
 #define BMW_NIL_LAY  0
 
-#endif
+#endif /* __BMESH_WALKERS_H__ */
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__ */
diff --git a/source/blender/bmesh/operators/bmo_subdivide.h b/source/blender/bmesh/operators/bmo_subdivide.h
index a0e2574b09f..dd5198bdc30 100644
--- a/source/blender/bmesh/operators/bmo_subdivide.h
+++ b/source/blender/bmesh/operators/bmo_subdivide.h
@@ -20,8 +20,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef _SUBDIVIDEOP_H
-#define _SUBDIVIDEOP_H
+#ifndef __BMO_SUBDIVIDE_H__
+#define __BMO_SUBDIVIDE_H__
+
+/** \file blender/bmesh/operators/bmo_subdivide.h
+ *  \ingroup bmesh
+ */
 
 typedef struct subdparams {
 	int numcuts;
@@ -59,4 +63,4 @@ typedef struct SubDPattern {
  *   split the edge only?
  */
 
-#endif /* _SUBDIVIDEOP_H */
+#endif /* __BMO_SUBDIVIDE_H__ */