diff --git a/source/blender/python/api2_2x/Armature.c b/source/blender/python/api2_2x/Armature.c
index e8ecd8937d2..3760d139d02 100644
--- a/source/blender/python/api2_2x/Armature.c
+++ b/source/blender/python/api2_2x/Armature.c
@@ -44,8 +44,7 @@
 #include "DNA_object_types.h" //This must come before BIF_editarmature.h...
 #include "BIF_editarmature.h"
 
-//------------------UNDECLARED EXTERNAL PROTOTYPES--------------------
-//These are evil 'extern' declarations for functions with no anywhere
+//------------------EXTERNAL PROTOTYPES--------------------
 extern void free_editArmature(void);
 extern void make_boneList(ListBase* list, ListBase *bones, EditBone *parent);
 extern void editbones_to_armature (ListBase *list, Object *ob);
diff --git a/source/blender/python/api2_2x/Armature.h b/source/blender/python/api2_2x/Armature.h
index 4d14b41fdc8..dbf21d1e5a5 100644
--- a/source/blender/python/api2_2x/Armature.h
+++ b/source/blender/python/api2_2x/Armature.h
@@ -40,8 +40,8 @@
 //-------------------MODULE INIT---------------------------------
 PyObject *Armature_Init( void );
 //-------------------TYPEOBJECT----------------------------------
-PyTypeObject Armature_Type;
-PyTypeObject BonesDict_Type;
+extern PyTypeObject Armature_Type;
+extern PyTypeObject BonesDict_Type;
 //-------------------STRUCT DEFINITION---------------------------
 typedef struct {
 	PyObject_HEAD 
diff --git a/source/blender/python/api2_2x/Bone.h b/source/blender/python/api2_2x/Bone.h
index a99f2bdf393..756651d79c2 100644
--- a/source/blender/python/api2_2x/Bone.h
+++ b/source/blender/python/api2_2x/Bone.h
@@ -38,8 +38,8 @@
 #define BoneObject_Check(v) ((v)->ob_type == &Bone_Type)
 #define EditBoneObject_Check(v) ((v)->ob_type == &EditBone_Type)
 //-------------------TYPEOBJECT----------------------------------
-PyTypeObject EditBone_Type;
-PyTypeObject Bone_Type;
+extern PyTypeObject EditBone_Type;
+extern PyTypeObject Bone_Type;
 //-------------------STRUCT DEFINITION----------------------------
 
 typedef struct {
diff --git a/source/blender/python/api2_2x/NLA.h b/source/blender/python/api2_2x/NLA.h
index 59adc4a55dd..07632124bba 100644
--- a/source/blender/python/api2_2x/NLA.h
+++ b/source/blender/python/api2_2x/NLA.h
@@ -39,7 +39,7 @@
 /** NLA module initialization function. */
 PyObject *NLA_Init( void );
 
-PyTypeObject Action_Type;
+extern PyTypeObject Action_Type;
 
 /** Python BPy_NLA structure definition. */
 typedef struct {
diff --git a/source/blender/python/api2_2x/Pose.h b/source/blender/python/api2_2x/Pose.h
index 9506afd01fa..dc90c8820f0 100644
--- a/source/blender/python/api2_2x/Pose.h
+++ b/source/blender/python/api2_2x/Pose.h
@@ -39,9 +39,9 @@
 #define PoseBoneObject_Check(v) ((v)->ob_type == &PoseBone_Type)
 #define PoseBonesDictObject_Check(v) ((v)->ob_type == &PoseBonesDict_Type)
 //-------------------TYPEOBJECT----------------------------------
-PyTypeObject Pose_Type;
-PyTypeObject PoseBone_Type;
-PyTypeObject PoseBonesDict_Type;
+extern PyTypeObject Pose_Type;
+extern PyTypeObject PoseBone_Type;
+extern PyTypeObject PoseBonesDict_Type;
 //-------------------STRUCT DEFINITION----------------------------
 typedef struct {
 	PyObject_HEAD