Forgot to define WITH_COLLADA in SCons in recent commit

Also fix some issues with header files:
- Added ifndef .. define .. endif blocks to be sure headers are not
  including twice.
- DO not include WM stuff in headers, use anonymous structure names instead.

3 files changed, 17 insertions, 5 deletions

diff --git a/source/blender/editors/io/SConscript b/source/blender/editors/io/SConscript
index fd766ddacdc..7046698e9d2 100644
--- a/source/blender/editors/io/SConscript
+++ b/source/blender/editors/io/SConscript
@@ -8,4 +8,7 @@ defs = []
 incs = '../include ../../blenfont ../../blenkernel ../../blenlib ../../blenloader ../../bmesh'
 incs += '../../makesdna ../../makesrna ../../windowmanager ../../collada'
 
+if env['WITH_BF_COLLADA']:
+    defs += 'WITH_COLLADA'
+
 env.BlenderLib ( 'bf_editor_io', sources, Split(incs), defines=defs, libtype=['core','player'], priority=[330,210] )
diff --git a/source/blender/editors/io/io_collada.h b/source/blender/editors/io/io_collada.h
index 4f53ec99de0..5cb255e1b7c 100644
--- a/source/blender/editors/io/io_collada.h
+++ b/source/blender/editors/io/io_collada.h
@@ -28,8 +28,12 @@
  *  \ingroup editor/io
  */
 
-#include "WM_types.h"
-#include "WM_api.h"
+#ifndef __IO_COLLADA_H__
+#define __IO_COLLADA_H__
 
-extern void WM_OT_collada_export(wmOperatorType *ot);
-extern void WM_OT_collada_import(wmOperatorType *ot);
+struct wmOperatorType;
+
+void WM_OT_collada_export(struct wmOperatorType *ot);
+void WM_OT_collada_import(struct wmOperatorType *ot);
+
+#endif
diff --git a/source/blender/editors/io/io_ops.h b/source/blender/editors/io/io_ops.h
index dd494eb77eb..1e2c4443e43 100644
--- a/source/blender/editors/io/io_ops.h
+++ b/source/blender/editors/io/io_ops.h
@@ -28,4 +28,9 @@
  *  \ingroup editor/io
  */
 
-extern void ED_operatortypes_io(void);
+#ifndef __IO_OPS_H__
+#define __IO_OPS_H__
+
+void ED_operatortypes_io(void);
+
+#endif