remove redundant includes from cmake and scons.

3 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index 0b6a3be7c84..72aae1b2361 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include "BLI_sys_types.h" /* XXX, should have a more generic include for this */
+#include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
 
 struct BMesh;
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 4c811d55dbe..48c16f8db38 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -30,9 +30,6 @@
 #include "BLI_ghash.h"
 #include "BLI_utildefines.h"
 
-/* Needed for BMesh functions used in the PBVH iterator macro */
-#include "bmesh.h"
-
 struct CCGElem;
 struct CCGKey;
 struct CustomData;
@@ -43,6 +40,8 @@ struct MFace;
 struct MVert;
 struct PBVH;
 struct PBVHNode;
+struct BMesh;
+struct BMLog;
 
 typedef struct PBVH PBVH;
 typedef struct PBVHNode PBVHNode;
@@ -123,7 +122,7 @@ unsigned int **BKE_pbvh_grid_hidden(const PBVH *bvh);
 void BKE_pbvh_get_grid_key(const PBVH *pbvh, struct CCGKey *key);
 
 /* Only valid for type == PBVH_BMESH */
-BMesh *BKE_pbvh_get_bmesh(PBVH *pbvh);
+struct BMesh *BKE_pbvh_get_bmesh(PBVH *pbvh);
 void BKE_pbvh_bmesh_detail_size_set(PBVH *pbvh, float detail_size);
 
 typedef enum {
@@ -329,4 +328,3 @@ void BKE_pbvh_gather_proxies(PBVH *pbvh, PBVHNode ***nodes,  int *totnode);
 void pbvh_show_diffuse_color_set(PBVH *bvh, int show_diffuse_color);
 
 #endif /* __BKE_PBVH_H__ */
-
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index ead8d1f1b25..710a9b787a0 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -41,6 +41,8 @@
 
 #include "GPU_buffers.h"
 
+#include "bmesh.h"
+
 #include "pbvh_intern.h"
 
 #define LEAF_LIMIT 10000