Fix OBJECT_GUARDED_FREE compiler error when type is in namespace

5 files changed, 11 insertions, 9 deletions

diff --git a/source/blender/collada/BCAnimationCurve.h b/source/blender/collada/BCAnimationCurve.h
index 4651290ea0f..7b523ac53ca 100644
--- a/source/blender/collada/BCAnimationCurve.h
+++ b/source/blender/collada/BCAnimationCurve.h
@@ -23,8 +23,9 @@
 #include "collada_utils.h"
 #include "BCSampleData.h"
 
-extern "C" {
 #include "MEM_guardedalloc.h"
+
+extern "C" {
 #include "BKE_fcurve.h"
 #include "BKE_armature.h"
 #include "BKE_material.h"
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index 0ebcd6d0919..24a960ab287 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -56,6 +56,8 @@
 #include "COLLADASWInstanceNode.h"
 #include "COLLADASWBaseInputElement.h"
 
+#include "MEM_guardedalloc.h"
+
 extern "C" {
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
@@ -99,8 +101,6 @@ extern char build_commit_time[];
 extern char build_hash[];
 #endif
 
-#include "MEM_guardedalloc.h"
-
 #include "RNA_access.h"
 }
 
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 30e41a8d720..f2c52b125a4 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -43,6 +43,8 @@
 #include "COLLADASaxFWLLoader.h"
 #include "COLLADASaxFWLIExtraDataCallbackHandler.h"
 
+#include "MEM_guardedalloc.h"
+
 extern "C" {
 #include "BLI_listbase.h"
 #include "BLI_math.h"
@@ -68,8 +70,6 @@ extern "C" {
 
 #include "RNA_access.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "WM_api.h"
 #include "WM_types.h"
 }
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index e02a7a014f1..8ed30a0dc81 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -31,6 +31,8 @@
 #include "COLLADAFWMeshVertexData.h"
 #include "COLLADAFWPolygons.h"
 
+#include "MEM_guardedalloc.h"
+
 extern "C" {
 #include "BKE_customdata.h"
 #include "BKE_displist.h"
@@ -44,8 +46,6 @@ extern "C" {
 #include "BLI_math.h"
 #include "BLI_string.h"
 #include "BLI_edgehash.h"
-
-#include "MEM_guardedalloc.h"
 }
 
 #include "ArmatureImporter.h"
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index d5011581204..5db4609c7c2 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -27,6 +27,9 @@
 
 #include <set>
 #include <string>
+
+#include "MEM_guardedalloc.h"
+
 extern "C" {
 #include "DNA_modifier_types.h"
 #include "DNA_customdata_types.h"
@@ -62,8 +65,6 @@ extern "C" {
 #include "ED_node.h"
 #include "ED_object.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "WM_api.h" /* XXX hrm, see if we can do without this */
 #include "WM_types.h"