Removing Blender Game Engine from Blender 2.8

Folders removed entirely:
* //extern/recastnavigation
* //intern/decklink
* //intern/moto
* //source/blender/editors/space_logic
* //source/blenderplayer
* //source/gameengine

This includes DNA data and any reference to the BGE code in Blender itself.
We are bumping the subversion.

Pending tasks:
* Tile/clamp code in image editor draw code.
* Viewport drawing code (so much of this will go away because of BI removal
  that we can wait until then to remove this.

15 files changed, 19 insertions, 1552 deletions

diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 95cbdeadf87..e1306253df8 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -434,8 +434,7 @@ typedef enum ePose_Flags {
 	POSE_RECALCPATHS = (1 << 4),
 	/* set by BKE_pose_rebuild to give a chance to the IK solver to rebuild IK tree */
 	POSE_WAS_REBUILT = (1 << 5),
-	/* set by game_copy_pose to indicate that this pose is used in the game engine */
-	POSE_GAME_ENGINE = (1 << 6),
+	POSE_FLAG_DEPRECATED = (1 << 6), /* deprecated. */
 	/* pose constraint flags needs to be updated */
 	POSE_CONSTRAINTS_NEED_UPDATE_FLAGS = (1 << 7),
 } ePose_Flags;
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
deleted file mode 100644
index 6bdea21da1e..00000000000
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file DNA_actuator_types.h
- *  \ingroup DNA
- *
- * #bActuator type is specifically for use by Object logic-bricks in the game-engine.
- */
-
-#ifndef __DNA_ACTUATOR_TYPES_H__
-#define __DNA_ACTUATOR_TYPES_H__
-
-struct Object;
-struct Mesh;
-struct Scene;
-struct Group;
-struct Text;
-
-/* ****************** ACTUATORS ********************* */
-
-/* unused now, moved to editobjectactuator in 2.02. Still needed for dna */
-typedef struct bAddObjectActuator {
-	int time, pad;
-	struct Object *ob;
-} bAddObjectActuator;
-
-typedef struct bActionActuator {
-	struct bAction *act;    /* Pointer to action */
-	short   type, flag;     /* Playback type */  // not in use
-	float   sta, end;       /* Start & End frames */
-	char    name[64];       /* For property-driven playback, MAX_NAME */
-	char    frameProp[64];  /* Set this property to the actions current frame, MAX_NAME */
-	short   blendin;        /* Number of frames of blending */
-	short   priority;       /* Execution priority */
-	short   layer;          /* Animation layer */
-	short   end_reset;      /* Ending the actuator (negative pulse) wont reset the action to its starting frame */
-	short   strideaxis;     /* Displacement axis */
-	short   blend_mode;		/* Layer blending mode */
-	float   stridelength;   /* Displacement incurred by cycle */ // not in use
-	float   layer_weight;   /* How much of the previous layer to use for blending. (<0 = disable, 0 = add mode) */
-} bActionActuator;
-
-typedef struct Sound3D {
-	float min_gain;
-	float max_gain;
-	float reference_distance;
-	float max_distance;
-	float rolloff_factor;
-	float cone_inner_angle;
-	float cone_outer_angle;
-	float cone_outer_gain;
-} Sound3D;
-
-typedef struct bSoundActuator {
-	short flag, sndnr;
-	int pad1, pad2;
-	short pad3[2];
-	float volume, pitch;
-	struct bSound *sound;
-	struct Sound3D sound3D;
-	short type, pad4;
-	short pad5, pad6[1];
-} bSoundActuator;
-
-typedef struct bEditObjectActuator {
-	int time;
-	short type, flag;
-	struct Object *ob;
-	struct Mesh *me;
-	char name[64];	/* MAX_NAME */
-	float linVelocity[3]; /* initial lin. velocity on creation */
-	float angVelocity[3]; /* initial ang. velocity on creation */
-	float mass;
-	short localflag; /* flag for the lin & ang. vel: apply locally   */
-	short dyn_operation;
-	short upflag, trackflag; /* flag for up axis and track axis */
-	int pad;
-} bEditObjectActuator;
-
-typedef struct bSceneActuator {
-	short type, pad1;
-	int pad;
-	struct Scene *scene;
-	struct Object *camera;
-} bSceneActuator;
-
-typedef struct bPropertyActuator {
-	int pad, type;
-	char name[64], value[64];	/* MAX_NAME */
-	struct Object *ob;
-} bPropertyActuator;
-
-typedef struct bObjectActuator {
-	short flag, type, otype;
-	short damping;
-	float forceloc[3], forcerot[3];
-	float pad[3], pad1[3];
-	float dloc[3], drot[3]; /* angle in radians */
-	float linearvelocity[3], angularvelocity[3];
-	struct Object *reference;
-} bObjectActuator;
-
-/* deprecated, handled by bActionActuator now */
-typedef struct bIpoActuator {
-	short flag, type;
-	float sta, end;
-	char name[64];		/* MAX_NAME */
-	char frameProp[64];	/* Set this property to the actions current frame, MAX_NAME */
-	
-	short pad1, pad2, pad3, pad4;
-	
-} bIpoActuator;
-
-typedef struct bCameraActuator {
-	struct Object *ob;
-	float height, min, max;
-	float damping;
-	short pad1, axis;
-	float pad2;
-} bCameraActuator;
-
-typedef struct bConstraintActuator {
-	short type, mode;
-	short flag, damp;
-	short time, rotdamp;
-	int pad;
-	float minloc[3], maxloc[3];
-	float minrot[3], maxrot[3];
-	char matprop[64];	/* MAX_NAME */
-} bConstraintActuator;
-
-typedef struct bGroupActuator {
-	short flag, type;
-	int sta, end;
-	char name[64];		/* property or groupkey, MAX_NAME */
-	
-	short pad[3], cur, butsta, butend;/* not referenced, can remove? */
-	/* struct Group *group;		not used, remove */
-	
-} bGroupActuator;
-
-/* I added a few extra fields here, to facilitate conversions                */
-typedef struct bRandomActuator {
-	int  seed;
-	int   distribution;
-	int int_arg_1;
-	int int_arg_2;
-	float float_arg_1;
-	float float_arg_2;
-	char  propname[64];	/* MAX_NAME */
-} bRandomActuator;
-
-typedef struct bMessageActuator {
-	char toPropName[64];	/* Send to all objects with this propertyname. Empty to broadcast. MAX_NAME. */
-	struct Object *toObject;/* (Possible future use) pointer to a single destination object. */
-	char subject[64];		/* Message Subject to send. MAX_NAME. */
-	short bodyType, pad1;	/* bodyType is either 'User defined text' or PropName */
-	int pad2;
-	char body[64];			/* Either User Defined Text or our PropName to send value of, MAX_NAME */
-} bMessageActuator;
-
-typedef struct bGameActuator {
-	short flag, type;
-	int sta, end;
-	char filename[64];
-	char loadaniname[64];
-} bGameActuator;
-
-typedef struct bVisibilityActuator {
-	/** bit 0: Is this object visible? 
-	 ** bit 1: Apply recursively  
-	 ** bit 2: Is this object an occluder? */
-	int flag;
-} bVisibilityActuator;
-
-typedef struct bTwoDFilterActuator {
-	char pad[4];
-	/* Tells what type of 2D Filter */
-	short type;
-	/* (flag == 0) means 2D filter is activate and
-	 * (flag != 0) means 2D filter is inactive */
-	short flag;
-	int   int_arg;
-	/* a float argument */
-	float float_arg;
-	struct Text *text;
-} bTwoDFilterActuator;
-
-typedef struct bParentActuator {
-	char pad[2];
-	short flag;
-	int type;
-	struct Object *ob;
-} bParentActuator;
-
-typedef struct bStateActuator {
-	int type;			/* 0=Set, 1=Add, 2=Rem, 3=Chg */
-	unsigned int mask;	/* the bits to change */
-} bStateActuator;
-
-typedef struct bArmatureActuator {
-	char posechannel[64];	/* MAX_NAME */
-	char constraint[64];	/* MAX_NAME */
-	int type;		/* 0=run, 1=enable, 2=disable, 3=set target, 4=set weight */
-	float weight;
-	float influence;
-	float pad;
-	struct Object *target;
-	struct Object *subtarget;
-} bArmatureActuator;
-
-typedef struct bSteeringActuator {
-	char pad[5];
-	char flag;
-	short facingaxis;
-	int type;		/* 0=seek, 1=flee, 2=path following */
-	float dist;
-	float velocity;
-	float acceleration;
-	float turnspeed;
-	int updateTime;
-	struct Object *target;
-	struct Object *navmesh;
-} bSteeringActuator;
-
-typedef struct bMouseActuator {
-	short type; /* 0=Visibility, 1=Look */
-	short flag;
-
-	int object_axis[2];
-	float threshold[2];
-	float sensitivity[2];
-	float limit_x[2];
-	float limit_y[2];
-} bMouseActuator;
-
-
-typedef struct bActuator {
-	struct bActuator *next, *prev, *mynew;
-	short type;
-	/**
-	 * Tells what type of actuator data \ref data holds. 
-	 */
-	short flag;
-	short otype, go;
-	char name[64];	/* MAX_NAME */
-
-	/**
-	 * data must point to an object actuator type struct.
-	 */
-	void *data;
-
-	/**
-	 * For ipo's and props: to find out which object the actuator
-	 * belongs to */
-	struct Object *ob;
-
-} bActuator;
-
-/* objectactuator->flag */
-#define ACT_FORCE_LOCAL			1
-#define ACT_TORQUE_LOCAL		2
-#define ACT_SERVO_LIMIT_X		2
-#define ACT_DLOC_LOCAL			4
-#define ACT_SERVO_LIMIT_Y		4
-#define ACT_DROT_LOCAL			8
-#define ACT_SERVO_LIMIT_Z		8
-#define ACT_LIN_VEL_LOCAL		16
-#define ACT_ANG_VEL_LOCAL		32
-//#define ACT_ADD_LIN_VEL_LOCAL	64
-#define ACT_ADD_LIN_VEL			64
-#define ACT_ADD_CHAR_LOC		128
-#define ACT_CHAR_JUMP			256
-
-/* objectactuator->type */
-#define ACT_OBJECT_NORMAL		0
-#define ACT_OBJECT_SERVO		1
-#define ACT_OBJECT_CHARACTER	2
-
-/* actuator->type */
-#define ACT_OBJECT		0
-#define ACT_IPO			1
-#define ACT_LAMP		2
-#define ACT_CAMERA		3
-#define ACT_MATERIAL	4
-#define ACT_SOUND		5
-#define ACT_PROPERTY	6
-	/* these two obsolete since 2.02 */
-#define ACT_ADD_OBJECT	7
-#define ACT_END_OBJECT	8
-
-#define ACT_CONSTRAINT	9
-#define ACT_EDIT_OBJECT	10
-#define ACT_SCENE		11
-#define ACT_GROUP		12
-#define ACT_RANDOM      13
-#define ACT_MESSAGE     14
-#define ACT_ACTION		15	/* __ NLA */
-#define ACT_GAME		17
-#define ACT_VISIBILITY          18
-#define ACT_2DFILTER	19
-#define ACT_PARENT      20
-#define ACT_SHAPEACTION 21
-#define ACT_STATE		22
-#define ACT_ARMATURE	23
-#define ACT_STEERING    24
-#define ACT_MOUSE		25
-
-/* actuator flag */
-#define ACT_SHOW		1
-#define ACT_DEL			2
-#define ACT_NEW			4
-#define ACT_LINKED		8	
-#define ACT_VISIBLE		16	
-#define ACT_PIN			32
-#define ACT_DEACTIVATE  64
-
-/* link codes */
-#define LINK_SENSOR		0
-#define LINK_CONTROLLER	1
-#define LINK_ACTUATOR	2
-
-/* keyboardsensor->type */
-#define SENS_ALL_KEYS	1
-
-/* actionactuator->type */
-#define ACT_ACTION_PLAY			0
-#define ACT_ACTION_PINGPONG		1
-#define ACT_ACTION_FLIPPER		2
-#define ACT_ACTION_LOOP_STOP	3
-#define ACT_ACTION_LOOP_END		4
-#define ACT_ACTION_KEY2KEY		5
-#define ACT_ACTION_FROM_PROP	6
-#define ACT_ACTION_MOTION		7
-
-/* actionactuator->blend_mode */
-#define ACT_ACTION_BLEND		0
-#define ACT_ACTION_ADD			1
-
-/* ipoactuator->type */
-/* used for conversion from 2.01 */
-#define ACT_IPO_FROM_PROP	6
-
-/* groupactuator->type */
-#define ACT_GROUP_PLAY		0
-#define ACT_GROUP_PINGPONG	1
-#define ACT_GROUP_FLIPPER	2
-#define ACT_GROUP_LOOP_STOP	3
-#define ACT_GROUP_LOOP_END	4
-#define ACT_GROUP_FROM_PROP	5
-#define ACT_GROUP_SET		6
-
-/* ipoactuator->flag */
-#define ACT_IPOFORCE        (1 << 0)
-#define ACT_IPOEND          (1 << 1)
-#define ACT_IPOLOCAL		(1 << 2)
-#define ACT_IPOCHILD        (1 << 4)	
-#define ACT_IPOADD			(1 << 5)
-
-/* property actuator->type */
-#define ACT_PROP_ASSIGN		0
-#define ACT_PROP_ADD		1
-#define ACT_PROP_COPY		2
-#define ACT_PROP_TOGGLE		3
-#define ACT_PROP_LEVEL		4
-
-/* constraint flag */
-#define ACT_CONST_NONE		0
-#define ACT_CONST_LOCX		1
-#define ACT_CONST_LOCY		2
-#define ACT_CONST_LOCZ		4
-#define ACT_CONST_ROTX		8
-#define ACT_CONST_ROTY		16
-#define ACT_CONST_ROTZ		32
-#define ACT_CONST_NORMAL	64
-#define ACT_CONST_MATERIAL	128
-#define ACT_CONST_PERMANENT 256
-#define ACT_CONST_DISTANCE	512
-#define ACT_CONST_LOCAL     1024
-#define ACT_CONST_DOROTFH	2048
-
-/* constraint mode */
-#define ACT_CONST_DIRPX		1
-#define ACT_CONST_DIRPY		2
-#define ACT_CONST_DIRPZ		4
-#define ACT_CONST_DIRNX		8
-#define ACT_CONST_DIRNY		16
-#define ACT_CONST_DIRNZ		32
-
-/* constraint type */
-#define ACT_CONST_TYPE_LOC	0
-#define ACT_CONST_TYPE_DIST	1
-#define ACT_CONST_TYPE_ORI	2
-#define ACT_CONST_TYPE_FH   3
-
-/* editObjectActuator->type */
-#define ACT_EDOB_ADD_OBJECT		0
-#define ACT_EDOB_END_OBJECT		1
-#define ACT_EDOB_REPLACE_MESH		2
-#define ACT_EDOB_TRACK_TO		3
-#define ACT_EDOB_DYNAMICS		4
-
-/* editObjectActuator->localflag */
-#define ACT_EDOB_LOCAL_LINV		2
-#define ACT_EDOB_LOCAL_ANGV		4
-
-/* editObjectActuator->flag */
-#define ACT_TRACK_3D			1
-
-/* editObjectActuator->upflag */
-#define ACT_TRACK_UP_X			0
-#define ACT_TRACK_UP_Y			1
-#define ACT_TRACK_UP_Z			2
-
-/* editObjectActuator->trackflag */
-#define ACT_TRACK_TRAXIS_X			0
-#define ACT_TRACK_TRAXIS_Y			1
-#define ACT_TRACK_TRAXIS_Z			2
-#define ACT_TRACK_TRAXIS_NEGX		3
-#define ACT_TRACK_TRAXIS_NEGY		4
-#define ACT_TRACK_TRAXIS_NEGZ		5
-
-/* editObjectActuator->flag for replace mesh actuator */
-#define ACT_EDOB_REPLACE_MESH_NOGFX		2 /* use for replace mesh actuator */
-#define ACT_EDOB_REPLACE_MESH_PHYS		4
-
-/* editObjectActuator->dyn_operation */
-#define ACT_EDOB_RESTORE_DYN	0
-#define ACT_EDOB_SUSPEND_DYN	1
-#define ACT_EDOB_ENABLE_RB		2
-#define ACT_EDOB_DISABLE_RB		3
-#define ACT_EDOB_SET_MASS		4
-
-
-/* SceneActuator->type */
-#define ACT_SCENE_RESTART		0
-#define ACT_SCENE_SET			1
-#define ACT_SCENE_CAMERA		2
-#define ACT_SCENE_ADD_FRONT		3
-#define ACT_SCENE_ADD_BACK		4
-#define ACT_SCENE_REMOVE		5
-#define ACT_SCENE_SUSPEND		6
-#define ACT_SCENE_RESUME		7
-
-
-/* randomAct->distribution */
-#define ACT_RANDOM_BOOL_CONST                  0
-#define ACT_RANDOM_BOOL_UNIFORM                1
-#define ACT_RANDOM_BOOL_BERNOUILLI             2
-#define ACT_RANDOM_INT_CONST                   3
-#define ACT_RANDOM_INT_UNIFORM                 4
-#define ACT_RANDOM_INT_POISSON		           5
-#define ACT_RANDOM_FLOAT_CONST                 6
-#define ACT_RANDOM_FLOAT_UNIFORM               7
-#define ACT_RANDOM_FLOAT_NORMAL                8
-#define ACT_RANDOM_FLOAT_NEGATIVE_EXPONENTIAL  9
-
-/* SoundActuator->flag */
-#define ACT_SND_3D_SOUND		1
-
-/*  SoundActuator->type */
-#define ACT_SND_PLAY_STOP_SOUND		0
-#define ACT_SND_PLAY_END_SOUND		1
-#define ACT_SND_LOOP_STOP_SOUND		2
-#define ACT_SND_LOOP_END_SOUND		3
-#define ACT_SND_LOOP_BIDIRECTIONAL_SOUND		4
-#define ACT_SND_LOOP_BIDIRECTIONAL_STOP_SOUND	5
-
-/* messageactuator->type */
-#define ACT_MESG_MESG		0
-#define ACT_MESG_PROP		1
-
-/* gameactuator->type */
-#define ACT_GAME_LOAD		0
-#define ACT_GAME_START		1
-#define ACT_GAME_RESTART	2
-#define ACT_GAME_QUIT		3
-#define ACT_GAME_SAVECFG	4
-#define ACT_GAME_LOADCFG	5
-#define ACT_GAME_SCREENSHOT	6
-
-/* visibilityact->flag */
-/* Set means the object will become invisible */
-#define ACT_VISIBILITY_INVISIBLE       (1 << 0)
-#define ACT_VISIBILITY_RECURSIVE       (1 << 1)
-#define ACT_VISIBILITY_OCCLUSION       (1 << 2)
-
-/* twodfilter->type */
-#define ACT_2DFILTER_ENABLED			-2
-#define ACT_2DFILTER_DISABLED			-1
-#define ACT_2DFILTER_NOFILTER			0
-#define ACT_2DFILTER_MOTIONBLUR			1
-#define ACT_2DFILTER_BLUR				2
-#define ACT_2DFILTER_SHARPEN			3
-#define ACT_2DFILTER_DILATION			4
-#define ACT_2DFILTER_EROSION			5
-#define ACT_2DFILTER_LAPLACIAN			6
-#define ACT_2DFILTER_SOBEL				7
-#define ACT_2DFILTER_PREWITT			8
-#define ACT_2DFILTER_GRAYSCALE			9
-#define ACT_2DFILTER_SEPIA				10
-#define ACT_2DFILTER_INVERT				11
-#define ACT_2DFILTER_CUSTOMFILTER		12
-#define ACT_2DFILTER_NUMBER_OF_FILTERS	13
-
-/* parentactuator->type */
-#define ACT_PARENT_SET      0
-#define ACT_PARENT_REMOVE   1
-
-/* parentactuator->flag */
-#define ACT_PARENT_COMPOUND	1
-#define ACT_PARENT_GHOST	2
-
-/* armatureactuator->type */
-#define ACT_ARM_RUN			0
-#define ACT_ARM_ENABLE		1
-#define ACT_ARM_DISABLE		2
-#define ACT_ARM_SETTARGET	3
-#define ACT_ARM_SETWEIGHT	4
-#define ACT_ARM_SETINFLUENCE	5
-/* update this define if more types are added */
-#define ACT_ARM_MAXTYPE		5
-
-/* stateactuator->type */
-#define ACT_STATE_SET		0
-#define ACT_STATE_ADD		1
-#define ACT_STATE_REMOVE	2
-#define ACT_STATE_CHANGE	3
-
-/* steeringactuator->type */
-#define ACT_STEERING_SEEK   0
-#define ACT_STEERING_FLEE   1
-#define ACT_STEERING_PATHFOLLOWING   2
-/* steeringactuator->flag */
-#define ACT_STEERING_SELFTERMINATED   1
-#define ACT_STEERING_ENABLEVISUALIZATION   2
-#define ACT_STEERING_AUTOMATICFACING   4
-#define ACT_STEERING_NORMALUP  8
-#define ACT_STEERING_LOCKZVEL  16
-
-/* mouseactuator->type */
-#define ACT_MOUSE_VISIBILITY	0
-#define ACT_MOUSE_LOOK			1
-
-/* mouseactuator->flag */
-#define ACT_MOUSE_VISIBLE	(1 << 0)
-#define ACT_MOUSE_USE_AXIS_X	(1 << 1)
-#define ACT_MOUSE_USE_AXIS_Y	(1 << 2)
-#define ACT_MOUSE_RESET_X	(1 << 3)
-#define ACT_MOUSE_RESET_Y	(1 << 4)
-#define ACT_MOUSE_LOCAL_X	(1 << 5)
-#define ACT_MOUSE_LOCAL_Y	(1 << 6)
-
-/* mouseactuator->object_axis */
-#define ACT_MOUSE_OBJECT_AXIS_X	0
-#define ACT_MOUSE_OBJECT_AXIS_Y	1
-#define ACT_MOUSE_OBJECT_AXIS_Z	2
-
-#endif  /* __DNA_ACTUATOR_TYPES_H__ */
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index 4c4440ad573..9a87b64ac08 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -488,7 +488,7 @@ typedef enum eBConstraint_Types {
 	CONSTRAINT_TYPE_DISTLIMIT = 14,			/* limit distance */
 	CONSTRAINT_TYPE_STRETCHTO = 15,			/* claiming this to be mine :) is in tuhopuu bjornmose */ 
 	CONSTRAINT_TYPE_MINMAX = 16,  			/* floor constraint */
-	CONSTRAINT_TYPE_RIGIDBODYJOINT = 17,		/* rigidbody constraint */
+	/* CONSTRAINT_TYPE_DEPRECATED = 17 */
 	CONSTRAINT_TYPE_CLAMPTO = 18, 			/* clampto constraint */
 	CONSTRAINT_TYPE_TRANSFORM = 19,			/* transformation (loc/rot/size -> loc/rot/size) constraint */
 	CONSTRAINT_TYPE_SHRINKWRAP = 20,		/* shrinkwrap (loc/rot) constraint */
@@ -841,10 +841,6 @@ typedef enum eObjectSolver_Flags {
 	OBJECTSOLVER_ACTIVECLIP	= (1<<0)
 } eObjectSolver_Flags;
 
-/* Rigid-Body Constraint */
-#define CONSTRAINT_DRAW_PIVOT 0x40
-#define 	CONSTRAINT_DISABLE_LINKED_COLLISION 0x80
-
 /* ObjectSolver Constraint -> flag */
 typedef enum eStretchTo_Flags {
 	STRETCHTOCON_USE_BULGE_MIN = (1 << 0),
diff --git a/source/blender/makesdna/DNA_controller_types.h b/source/blender/makesdna/DNA_controller_types.h
deleted file mode 100644
index 154542d60c5..00000000000
--- a/source/blender/makesdna/DNA_controller_types.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file DNA_controller_types.h
- *  \ingroup DNA
- *
- * #bController type is specifically for use by Object logic-bricks in the game-engine.
- */
-
-#ifndef __DNA_CONTROLLER_TYPES_H__
-#define __DNA_CONTROLLER_TYPES_H__
-
-struct bActuator;
-struct Text;
-struct bSensor;
-
-/* ****************** CONTROLLERS ********************* */
-
-typedef struct bExpressionCont {
-	char str[128];
-} bExpressionCont;
-
-typedef struct bPythonCont {
-	struct Text *text;
-	char module[64];
-	int mode;
-	int flag; /* only used for debug now */
-} bPythonCont;
-
-typedef struct bController {
-	struct bController *next, *prev, *mynew;
-	short type, flag, inputs, totlinks;
-	short otype, totslinks, pad2, pad3;
-	
-	char name[64];
-	void *data;
-	
-	struct bActuator **links;
-
-	struct bSensor **slinks;
-	short val, valo;
-	unsigned int state_mask;
-	
-} bController;
-
-/* controller->type */
-#define CONT_LOGIC_AND	0
-#define CONT_LOGIC_OR	1
-#define CONT_EXPRESSION	2
-#define CONT_PYTHON		3
-#define CONT_LOGIC_NAND	4
-#define CONT_LOGIC_NOR	5
-#define CONT_LOGIC_XOR	6
-#define CONT_LOGIC_XNOR	7
-
-/* controller->flag */
-#define CONT_SHOW		1
-#define CONT_DEL		2
-#define CONT_NEW		4
-#define CONT_MASK		8
-#define CONT_PRIO		16
-#define CONT_DEACTIVATE	32
-
-/* pyctrl->flag */
-#define CONT_PY_DEBUG	1
-
-/* pyctrl->mode */
-#define CONT_PY_SCRIPT	0
-#define CONT_PY_MODULE	1
-
-#endif  /* __DNA_CONTROLLER_TYPES_H__ */
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index bc33b7ba6e2..b6f74c7e6f7 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -75,14 +75,6 @@ typedef struct VolumeSettings {
 	float ms_spread;
 } VolumeSettings;
 
-/* Game Engine Options (old Texface mode, transp and flag) */
-typedef struct GameSettings {
-	int flag;
-	int alpha_blend;
-	int face_orientation;
-	int pad1;
-} GameSettings;
-
 typedef struct TexPaintSlot {
 	struct Image *ima; /* image to be painted on */
 	char *uvname;      /* customdata index for uv layer, MAX_NAME*/
@@ -116,7 +108,6 @@ typedef struct Material {
 	/* end synced with render_types.h */
 	
 	struct VolumeSettings vol;
-	struct GameSettings game;
 
 	float fresnel_mir, fresnel_mir_i;
 	float fresnel_tra, fresnel_tra_i;
@@ -228,33 +219,6 @@ typedef struct Material {
 	ListBase gpumaterial;		/* runtime */
 } Material;
 
-
-/* **************** GAME PROPERTIES ********************* */
-// Blend Transparency Options - alpha_blend /* match GPU_material::GPUBlendMode */
-#define GEMAT_SOLID		0 /* GPU_BLEND_SOLID */
-#define GEMAT_ADD		1 /* GPU_BLEND_ADD */
-#define	GEMAT_ALPHA		2 /* GPU_BLEND_ALPHA */
-#define GEMAT_CLIP		4 /* GPU_BLEND_CLIP */
-#define	GEMAT_ALPHA_SORT	8 /* GPU_BLEND_ALPHA_SORT */
-#define	GEMAT_ALPHA_TO_COVERAGE	16 /* GPU_BLEND_ALPHA_TO_COVERAGE */
-
-// Game Options - flag
-#define GEMAT_BACKCULL 		16 /* KX_BACKCULL */
-#define GEMAT_SHADED		32 /* KX_LIGHT */
-#define GEMAT_TEXT		64 /* RAS_RENDER_3DPOLYGON_TEXT */
-#define	GEMAT_NOPHYSICS		128
-#define GEMAT_INVISIBLE 	256
-
-// Face Orientation Options - face_orientation
-#define GEMAT_NORMAL		0
-#define GEMAT_HALO		512  /* BILLBOARD_SCREENALIGNED  */
-#define GEMAT_BILLBOARD		1024 /* BILLBOARD_AXISALIGNED */
-#define GEMAT_SHADOW		2048 /* SHADOW */
-
-// Use Textures - not defined directly in the UI
-#define GEMAT_TEX		4096 /* KX_TEX */
-
-
 /* **************** MATERIAL ********************* */
 
 /* maximum number of materials per material array.
diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h
index e7ebd3b72d7..16c96073469 100644
--- a/source/blender/makesdna/DNA_object_force_types.h
+++ b/source/blender/makesdna/DNA_object_force_types.h
@@ -218,59 +218,6 @@ typedef struct SBVertex {
 	float vec[4];
 } SBVertex;
 
-typedef struct BulletSoftBody {
-	int flag;				/* various boolean options */
-	float linStiff;			/* linear stiffness 0..1 */
-	float	angStiff;		/* angular stiffness 0..1 */
-	float	volume;			/* volume preservation 0..1 */
-
-	int	viterations;		/* Velocities solver iterations */
-	int	piterations;		/* Positions solver iterations */
-	int	diterations;		/* Drift solver iterations */
-	int	citerations;		/* Cluster solver iterations */
-
-	float	kSRHR_CL;		/* Soft vs rigid hardness [0,1] (cluster only) */
-	float	kSKHR_CL;		/* Soft vs kinetic hardness [0,1] (cluster only) */
-	float	kSSHR_CL;		/* Soft vs soft hardness [0,1] (cluster only) */
-	float	kSR_SPLT_CL;	/* Soft vs rigid impulse split [0,1] (cluster only) */
-
-	float	kSK_SPLT_CL;	/* Soft vs rigid impulse split [0,1] (cluster only) */
-	float	kSS_SPLT_CL;	/* Soft vs rigid impulse split [0,1] (cluster only) */
-	float	kVCF;			/* Velocities correction factor (Baumgarte) */
-	float	kDP;			/* Damping coefficient [0,1] */
-
-	float	kDG;			/* Drag coefficient [0,+inf] */
-	float	kLF;			/* Lift coefficient [0,+inf] */
-	float	kPR;			/* Pressure coefficient [-inf,+inf] */
-	float	kVC;			/* Volume conversation coefficient [0,+inf] */
-
-	float	kDF;			/* Dynamic friction coefficient [0,1] */
-	float	kMT;			/* Pose matching coefficient [0,1] */
-	float	kCHR;			/* Rigid contacts hardness [0,1] */
-	float	kKHR;			/* Kinetic contacts hardness [0,1] */
-
-	float	kSHR;			/* Soft contacts hardness [0,1] */
-	float	kAHR;			/* Anchors hardness [0,1] */
-	int		collisionflags;	/* Vertex/Face or Signed Distance Field(SDF) or Clusters, Soft versus Soft or Rigid */
-	int		numclusteriterations;	/* number of iterations to refine collision clusters*/
-	float	welding;		/* welding limit to remove duplicate/nearby vertices, 0.0..0.01 */
-	float   margin;			/* margin specific to softbody */
-} BulletSoftBody;
-
-/* BulletSoftBody.flag */
-#define OB_BSB_SHAPE_MATCHING	2
-// #define OB_BSB_UNUSED 4
-#define OB_BSB_BENDING_CONSTRAINTS 8
-#define OB_BSB_AERO_VPOINT 16 /* aero model, Vertex normals are oriented toward velocity*/
-// #define OB_BSB_AERO_VTWOSIDE 32 /* aero model, Vertex normals are flipped to match velocity */
-
-/* BulletSoftBody.collisionflags */
-#define OB_BSB_COL_SDF_RS	2 /* SDF based rigid vs soft */
-#define OB_BSB_COL_CL_RS	4 /* Cluster based rigid vs soft */
-#define OB_BSB_COL_CL_SS	8 /* Cluster based soft vs soft */
-#define OB_BSB_COL_VF_SS	16 /* Vertex/Face based soft vs soft */
-
-
 typedef struct SoftBody {
 	/* dynamic data */
 	int totpoint, totspring;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 2cbc266ea0c..bb17b10b299 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -212,9 +212,7 @@ typedef struct Object {
 	short transflag, protectflag;	/* transformation settings and transform locks  */
 	short trackflag, upflag;
 	short nlaflag;				/* used for DopeSheet filtering settings (expanded/collapsed) */
-	short scaflag;				/* ui state for game logic */
-	char scavisflag;			/* more display settings for game logic */
-	char pad;
+	short pad[2];
 
 	/* did last modifier stack generation need mapping support? */
 	char lastNeedMapping;  /* bool */
@@ -223,39 +221,9 @@ typedef struct Object {
 	/* dupli-frame settings */
 	int dupon, dupoff, dupsta, dupend;
 
-	/* during realtime */
-
-	/* note that inertia is only called inertia for historical reasons
-	 * and is not changed to avoid DNA surgery. It actually reflects the 
-	 * Size value in the GameButtons (= radius) */
-
-	float mass, damping, inertia;
-	/* The form factor k is introduced to give the user more control
-	 * and to fix incompatibility problems.
-	 * For rotational symmetric objects, the inertia value can be
-	 * expressed as: Theta = k * m * r^2
-	 * where m = Mass, r = Radius
-	 * For a Sphere, the form factor is by default = 0.4
-	 */
-
-	float formfactor;
-	float rdamping;
-	float margin;
-	float max_vel; /* clamp the maximum velocity 0.0 is disabled */
-	float min_vel; /* clamp the minimum velocity 0.0 is disabled */
-	float max_angvel; /* clamp the maximum angular velocity, 0.0 is disabled */
-	float min_angvel; /* clamp the minimum angular velocity, 0.0 is disabled */
-	float obstacleRad;
-	
-	/* "Character" physics properties */
-	float step_height;
-	float jump_speed;
-	float fall_speed;
-	unsigned char max_jumps;
-	char pad2;
-
 	/* Depsgraph */
 	short base_flag; /* used by depsgraph, flushed from base */
+	short pad8;
 
 	/** Collision mask settings */
 	unsigned short col_group, col_mask;
@@ -270,11 +238,6 @@ typedef struct Object {
 	char empty_drawtype;
 	float empty_drawsize;
 	float dupfacesca;	/* dupliface scale */
-	
-	ListBase prop;			/* game logic property list (not to be confused with IDProperties) */
-	ListBase sensors;		/* game logic sensors */
-	ListBase controllers;	/* game logic controllers */
-	ListBase actuators;		/* game logic actuators */
 
 	float sf; /* sf is time-offset */
 
@@ -284,25 +247,22 @@ typedef struct Object {
 	unsigned char pad5[6];
 	float col[4];			/* object color */
 
-	int gameflag;
-	int gameflag2;
-
 	char restrictflag;		/* for restricting view, select, render etc. accessible in outliner */
 	char pad3;
 	short softflag;			/* softbody settings */
-	float anisotropicFriction[3];
+	float pad9[3];
 
 	ListBase constraints;		/* object constraints */
 	ListBase nlastrips  DNA_DEPRECATED;			// XXX deprecated... old animation system
 	ListBase hooks  DNA_DEPRECATED;				// XXX deprecated... old animation system
 	ListBase particlesystem;	/* particle systems */
 	
-	struct BulletSoftBody *bsoft;	/* settings for game engine bullet soft body */
 	struct PartDeflect *pd;		/* particle deflector/attractor/collision data */
 	struct SoftBody *soft;		/* if exists, saved in file */
 	struct Group *dup_group;	/* object duplicator for group */
+	void *pad10;
 
-	char  body_type;			/* for now used to temporarily holds the type of collision object */
+	char  pad4;
 	char  shapeflag;			/* flag for pinning */
 	short shapenr;				/* current shape key for menu or pinned */
 	float smoothresh;			/* smoothresh is phong interpolation ray_shadow correction in render */
@@ -313,8 +273,6 @@ typedef struct Object {
 	void *pad7;
 	uint64_t lastDataMask;   /* the custom data layer mask that was last used to calculate derivedDeform and derivedFinal */
 	uint64_t customdata_mask; /* (extra) custom data layer mask to use for creating derivedmesh, set by depsgraph */
-	unsigned int state;			/* bit masks of game controllers that are active */
-	unsigned int init_state;	/* bit masks of initial state as recorded by the users */
 
 	/* Runtime valuated curve-specific data, not stored in the file */
 	struct CurveCache *curve_cache;
@@ -476,8 +434,6 @@ enum {
 	OB_NEGZ = 5,
 };
 
-/* gameflag in game.h */
-
 /* dt: no flags */
 enum {
 	OB_BOUNDBOX  = 1,
@@ -580,84 +536,6 @@ enum {
 /* collision masks */
 #define OB_MAX_COL_MASKS    16
 
-/* ob->gameflag */
-enum {
-	OB_DYNAMIC               = 1 << 0,
-	OB_CHILD                 = 1 << 1,
-	OB_ACTOR                 = 1 << 2,
-	OB_INERTIA_LOCK_X        = 1 << 3,
-	OB_INERTIA_LOCK_Y        = 1 << 4,
-	OB_INERTIA_LOCK_Z        = 1 << 5,
-	OB_DO_FH                 = 1 << 6,
-	OB_ROT_FH                = 1 << 7,
-	OB_ANISOTROPIC_FRICTION  = 1 << 8,
-	OB_GHOST                 = 1 << 9,
-	OB_RIGID_BODY            = 1 << 10,
-	OB_BOUNDS                = 1 << 11,
-
-	OB_COLLISION_RESPONSE    = 1 << 12,
-	OB_SECTOR                = 1 << 13,
-	OB_PROP                  = 1 << 14,
-	OB_MAINACTOR             = 1 << 15,
-
-	OB_COLLISION             = 1 << 16,
-	OB_SOFT_BODY             = 1 << 17,
-	OB_OCCLUDER              = 1 << 18,
-	OB_SENSOR                = 1 << 19,
-	OB_NAVMESH               = 1 << 20,
-	OB_HASOBSTACLE           = 1 << 21,
-	OB_CHARACTER             = 1 << 22,
-
-	OB_RECORD_ANIMATION      = 1 << 23,
-};
-
-/* ob->gameflag2 */
-enum {
-	OB_NEVER_DO_ACTIVITY_CULLING    = 1 << 0,
-	OB_LOCK_RIGID_BODY_X_AXIS       = 1 << 2,
-	OB_LOCK_RIGID_BODY_Y_AXIS       = 1 << 3,
-	OB_LOCK_RIGID_BODY_Z_AXIS       = 1 << 4,
-	OB_LOCK_RIGID_BODY_X_ROT_AXIS   = 1 << 5,
-	OB_LOCK_RIGID_BODY_Y_ROT_AXIS   = 1 << 6,
-	OB_LOCK_RIGID_BODY_Z_ROT_AXIS   = 1 << 7,
-
-/*	OB_LIFE     = OB_PROP | OB_DYNAMIC | OB_ACTOR | OB_MAINACTOR | OB_CHILD, */
-};
-
-/* ob->body_type */
-enum {
-	OB_BODY_TYPE_NO_COLLISION   = 0,
-	OB_BODY_TYPE_STATIC         = 1,
-	OB_BODY_TYPE_DYNAMIC        = 2,
-	OB_BODY_TYPE_RIGID          = 3,
-	OB_BODY_TYPE_SOFT           = 4,
-	OB_BODY_TYPE_OCCLUDER       = 5,
-	OB_BODY_TYPE_SENSOR         = 6,
-	OB_BODY_TYPE_NAVMESH        = 7,
-	OB_BODY_TYPE_CHARACTER      = 8,
-};
-
-/* ob->scavisflag */
-enum {
-	OB_VIS_SENS     = 1 << 0,
-	OB_VIS_CONT     = 1 << 1,
-	OB_VIS_ACT      = 1 << 2,
-};
-
-/* ob->scaflag */
-enum {
-	OB_SHOWSENS     = 1 << 6,
-	OB_SHOWACT      = 1 << 7,
-	OB_ADDSENS      = 1 << 8,
-	OB_ADDCONT      = 1 << 9,
-	OB_ADDACT       = 1 << 10,
-	OB_SHOWCONT     = 1 << 11,
-	OB_ALLSTATE     = 1 << 12,
-	OB_INITSTBIT    = 1 << 13,
-	OB_DEBUGSTATE   = 1 << 14,
-	OB_SHOWSTATE    = 1 << 15,
-};
-
 /* ob->restrictflag */
 enum {
 	OB_RESTRICT_VIEW    = 1 << 0,
diff --git a/source/blender/makesdna/DNA_property_types.h b/source/blender/makesdna/DNA_property_types.h
deleted file mode 100644
index 77cd7c3e102..00000000000
--- a/source/blender/makesdna/DNA_property_types.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file DNA_property_types.h
- *  \ingroup DNA
- *  \since mar-2001
- *  \author nzc
- *  \attention Renderrecipe and scene decription. The fact that there is a
- *             hierarchy here is a bit strange, and not desirable.
- *
- * #bProperty type is specifically for use by Objects game-logic.
- */
-
-#ifndef __DNA_PROPERTY_TYPES_H__
-#define __DNA_PROPERTY_TYPES_H__
-
-/* ********************* PROPERTY ************************ */
-
-typedef struct bProperty {
-	struct bProperty *next, *prev;
-	char name[64];	/* MAX_NAME */
-	short type, flag;
-	int data;				/* data should be 4 bytes to store int,float stuff */
-	void *poin;				/* references data unless its a string which is malloc'd */
-	
-} bProperty;
-
-/* property->type XXX Game Property, not RNA */
-#define GPROP_BOOL		0
-#define GPROP_INT		1
-#define GPROP_FLOAT		2
-#define GPROP_STRING	3
-// #define GPROP_VECTOR	4  // UNUSED
-#define GPROP_TIME		5
-
-/* property->flag */
-#define PROP_DEBUG		1
-
-#define MAX_PROPSTRING	128
-
-#endif  /* __DNA_PROPERTY_TYPES_H__ */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 3b7875ea5b1..db997aed1cb 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -745,13 +745,6 @@ typedef struct RenderData {
 	short jp2_preset  DNA_DEPRECATED, jp2_depth  DNA_DEPRECATED;  /*deprecated*/
 	int rpad3;
 
-	/* Dome variables */ //  XXX deprecated since 2.5
-	short domeres  DNA_DEPRECATED, domemode  DNA_DEPRECATED;	//  XXX deprecated since 2.5
-	short domeangle  DNA_DEPRECATED, dometilt  DNA_DEPRECATED;	//  XXX deprecated since 2.5
-	float domeresbuf  DNA_DEPRECATED;	//  XXX deprecated since 2.5
-	float pad2;
-	struct Text *dometext  DNA_DEPRECATED;	//  XXX deprecated since 2.5
-
 	/* Freestyle line thickness options */
 	int line_thickness_mode;
 	float unit_line_thickness; /* in pixels */
@@ -803,180 +796,6 @@ typedef struct RenderProfile {
 	
 } RenderProfile;
 
-/* *************************************************************** */
-/* Game Engine - Dome */
-
-typedef struct GameDome {
-	short res, mode;
-	short angle, tilt;
-	float resbuf, pad2;
-	struct Text *warptext;
-} GameDome;
-
-/* GameDome.mode */
-#define DOME_FISHEYE			1
-#define DOME_TRUNCATED_FRONT	2
-#define DOME_TRUNCATED_REAR		3
-#define DOME_ENVMAP				4
-#define DOME_PANORAM_SPH		5
-#define DOME_NUM_MODES			6
-
-/* *************************************************************** */
-/* Game Engine */
-
-typedef struct GameFraming {
-	float col[3];
-	char type, pad1, pad2, pad3;
-} GameFraming;
-
-/* GameFraming.type */
-#define SCE_GAMEFRAMING_BARS   0
-#define SCE_GAMEFRAMING_EXTEND 1
-#define SCE_GAMEFRAMING_SCALE  2
-
-typedef struct RecastData {
-	float cellsize;
-	float cellheight;
-	float agentmaxslope;
-	float agentmaxclimb;
-	float agentheight;
-	float agentradius;
-	float edgemaxlen;
-	float edgemaxerror;
-	float regionminsize;
-	float regionmergesize;
-	int vertsperpoly;
-	float detailsampledist;
-	float detailsamplemaxerror;
-	char partitioning;
-	char pad1;
-	short pad2;
-} RecastData;
-
-/* RecastData.partitioning */
-#define RC_PARTITION_WATERSHED 0
-#define RC_PARTITION_MONOTONE 1
-#define RC_PARTITION_LAYERS 2
-
-typedef struct GameData {
-
-	/* standalone player */
-	struct GameFraming framing;
-	short playerflag, xplay, yplay, freqplay;
-	short depth, attrib, rt1, rt2;
-	short aasamples, pad4[3];
-
-	/* stereo/dome mode */
-	struct GameDome dome;
-	short stereoflag, stereomode;
-	float eyeseparation;
-	RecastData recastData;
-
-
-	/* physics (it was in world)*/
-	float gravity; /*Gravitation constant for the game world*/
-
-	/*
-	 * Radius of the activity bubble, in Manhattan length. Objects
-	 * outside the box are activity-culled. */
-	float activityBoxRadius;
-
-	/*
-	 * bit 3: (gameengine): Activity culling is enabled.
-	 * bit 5: (gameengine) : enable Bullet DBVT tree for view frustum culling
-	 */
-	int flag;
-	short mode, matmode;
-	short occlusionRes;		/* resolution of occlusion Z buffer in pixel */
-	short physicsEngine;
-	short exitkey;
-	short vsync; /* Controls vsync: off, on, or adaptive (if supported) */
-	short ticrate, maxlogicstep, physubstep, maxphystep;
-	short obstacleSimulation;
-	short raster_storage;
-	float levelHeight;
-	float deactivationtime, lineardeactthreshold, angulardeactthreshold;
-
-	/* Scene LoD */
-	short lodflag, pad2;
-	int scehysteresis, pad5;
-
-} GameData;
-
-/* GameData.stereoflag */
-#define STEREO_NOSTEREO		1
-#define STEREO_ENABLED		2
-#define STEREO_DOME			3
-
-/* GameData.stereomode */
-//#define STEREO_NOSTEREO		 1
-#define STEREO_QUADBUFFERED 2
-#define STEREO_ABOVEBELOW	 3
-#define STEREO_INTERLACED	 4
-#define STEREO_ANAGLYPH		5
-#define STEREO_SIDEBYSIDE	6
-#define STEREO_VINTERLACE	7
-//#define STEREO_DOME		8
-#define STEREO_3DTVTOPBOTTOM 9
-
-/* GameData.physicsEngine */
-#define WOPHY_NONE		0
-#define WOPHY_BULLET	5
-
-/* obstacleSimulation */
-#define OBSTSIMULATION_NONE		0
-#define OBSTSIMULATION_TOI_rays		1
-#define OBSTSIMULATION_TOI_cells	2
-
-/* GameData.raster_storage */
-#define RAS_STORE_AUTO		0
-/* #define RAS_STORE_IMMEDIATE	1 */  /* DEPRECATED */
-#define RAS_STORE_VA		2
-#define RAS_STORE_VBO		3
-
-/* GameData.vsync */
-#define VSYNC_ON	0
-#define VSYNC_OFF	1
-#define VSYNC_ADAPTIVE	2
-
-/* GameData.flag */
-#define GAME_RESTRICT_ANIM_UPDATES			(1 << 0)
-#define GAME_ENABLE_ALL_FRAMES				(1 << 1)
-#define GAME_SHOW_DEBUG_PROPS				(1 << 2)
-#define GAME_SHOW_FRAMERATE					(1 << 3)
-#define GAME_SHOW_PHYSICS					(1 << 4)
-// #define GAME_DISPLAY_LISTS					(1 << 5)   /* deprecated */
-#define GAME_GLSL_NO_LIGHTS					(1 << 6)
-#define GAME_GLSL_NO_SHADERS				(1 << 7)
-#define GAME_GLSL_NO_SHADOWS				(1 << 8)
-#define GAME_GLSL_NO_RAMPS					(1 << 9)
-#define GAME_GLSL_NO_NODES					(1 << 10)
-#define GAME_GLSL_NO_EXTRA_TEX				(1 << 11)
-#define GAME_IGNORE_DEPRECATION_WARNINGS	(1 << 12)
-#define GAME_ENABLE_ANIMATION_RECORD		(1 << 13)
-#define GAME_SHOW_MOUSE						(1 << 14)
-#define GAME_GLSL_NO_COLOR_MANAGEMENT		(1 << 15)
-#define GAME_SHOW_OBSTACLE_SIMULATION		(1 << 16)
-#define GAME_NO_MATERIAL_CACHING			(1 << 17)
-#define GAME_GLSL_NO_ENV_LIGHTING			(1 << 18)
-/* Note: GameData.flag is now an int (max 32 flags). A short could only take 16 flags */
-
-/* GameData.playerflag */
-#define GAME_PLAYER_FULLSCREEN				(1 << 0)
-#define GAME_PLAYER_DESKTOP_RESOLUTION		(1 << 1)
-
-/* GameData.matmode */
-enum {
-#ifdef DNA_DEPRECATED
-	GAME_MAT_TEXFACE    = 0, /* deprecated */
-#endif
-	GAME_MAT_MULTITEX   = 1,
-	GAME_MAT_GLSL       = 2,
-};
-
-/* GameData.lodflag */
-#define SCE_LOD_USE_HYST		(1 << 0)
-
 /* UV Paint */
 /* ToolSettings.uv_sculpt_settings */
 #define UV_SCULPT_LOCK_BORDERS				1
@@ -1678,10 +1497,6 @@ typedef struct Scene {
 	/* User-Defined KeyingSets */
 	int active_keyingset;			/* index of the active KeyingSet. first KeyingSet has index 1, 'none' active is 0, 'add new' is -1 */
 	ListBase keyingsets;			/* KeyingSets for this scene */
-	
-	/* Game Settings */
-	struct GameFraming framing  DNA_DEPRECATED; // XXX  deprecated since 2.5
-	struct GameData gm;
 
 	/* Units */
 	struct UnitSettings unit;
@@ -1716,8 +1531,6 @@ typedef struct Scene {
 	IDProperty *collection_properties;  /* settings to be overriden by layer collections */
 	IDProperty *layer_properties;  /* settings to be override by workspaces */
 
-	int pad5[2];
-
 	ViewRender view_render;
 } Scene;
 
@@ -1910,7 +1723,6 @@ enum {
 
 /* RenderData.engine (scene.c) */
 extern const char *RE_engine_id_BLENDER_RENDER;
-extern const char *RE_engine_id_BLENDER_GAME;
 extern const char *RE_engine_id_BLENDER_CLAY;
 extern const char *RE_engine_id_BLENDER_EEVEE;
 extern const char *RE_engine_id_BLENDER_WORKBENCH;
diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h
deleted file mode 100644
index 37064854920..00000000000
--- a/source/blender/makesdna/DNA_sensor_types.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file DNA_sensor_types.h
- *  \ingroup DNA
- *  \since mar-2001
- *  \author nzc
- *
- * #bSensor type is specifically for use by Object logic-bricks in the game-engine.
- */
-
-#ifndef __DNA_SENSOR_TYPES_H__
-#define __DNA_SENSOR_TYPES_H__
-
-struct Object;
-struct Material;
-
-/* ****************** SENSORS ********************* */
-
-typedef struct bNearSensor {
-	char name[64];	/* MAX_NAME */
-	float dist, resetdist;
-	int lastval, pad;
-} bNearSensor;
-
-/**
- * Defines the settings of a mouse sensor.
- */
-typedef struct bMouseSensor {
-	/**
-	 * The type of key this sensor listens to. 
-	 */
-	short type;
-	short flag;
-	short pad1;
-	short mode;			/* flag to choose material or property */
-	char propname[64];
-	char matname[64];
-} bMouseSensor;
-
-/* DEPRECATED */
-typedef struct bTouchSensor {
-	char name[64];	/* MAX_NAME */
-	struct Material *ma;
-	float dist, pad;
-} bTouchSensor;
-
-typedef struct bKeyboardSensor {
-	short key, qual;
-	short type, qual2;
-	/**
-	 * Name of the target property
-	 */
-	char targetName[64];	/* MAX_NAME */
-	/**
-	 * Name of the toggle property
-	 */
-	char toggleName[64];	/* MAX_NAME */
-} bKeyboardSensor;
-
-typedef struct bPropertySensor {
-	int type;
-	int pad;
-	char name[64];	/* MAX_NAME */
-	char value[64];
-	char maxvalue[64];
-} bPropertySensor;
-
-typedef struct bActuatorSensor {
-	int type;
-	int pad;
-	char name[64];	/* MAX_NAME */
-} bActuatorSensor;
-
-typedef struct bDelaySensor {
-	short delay;
-	short duration;
-	short flag;
-	short pad;
-} bDelaySensor;
-
-typedef struct bCollisionSensor {
-	char name[64];          /* property name. MAX_NAME */
-	char materialName[64];  /* material      */
-	// struct Material *ma; // XXX remove materialName
-	short damptimer, damp;
-	short mode;             /* flag to choose material or property */
-	short pad2;
-} bCollisionSensor;
-
-typedef struct bRadarSensor {
-	char name[64];	/* MAX_NAME */
-	float angle;
-	float range;
-	short flag, axis;
-} bRadarSensor;
-
-typedef struct bRandomSensor {
-	char name[64];	/* MAX_NAME */
-	int seed;
-	int delay;
-} bRandomSensor;
-
-typedef struct bRaySensor {
-	char name[64];	/* MAX_NAME */
-	float range;
-	char propname[64];
-	char matname[64];
-	//struct Material *ma; // XXX remove materialName
-	short mode;
-	short pad1;
-	int axisflag;
-} bRaySensor;
-
-typedef struct bArmatureSensor {
-	char posechannel[64];	/* MAX_NAME */
-	char constraint[64];	/* MAX_NAME */
-	int  type;
-	float value;
-} bArmatureSensor;
-
-typedef struct bMessageSensor {
-	/**
-	 * (Possible future use) pointer to a single sender object
-	 */
-	struct Object *fromObject;
-
-	/**
-	 * Can be used to filter on subjects like this
-	 */
-	char subject[64];
-
-	/**
-	 * (Possible future use) body to filter on
-	 */
-	char body[64];
-} bMessageSensor;
-
-typedef struct bSensor {
-	struct bSensor *next, *prev;
-	/* pulse and freq are the bool toggle and frame count for pulse mode */
-	short type, otype, flag, pulse;
-	short freq, totlinks, pad1, pad2; /* freq makes reference to skipped ticks between 2 active pulses */
-	char name[64];	/* MAX_NAME */
-	void *data;
-	
-	struct bController **links;
-	
-	struct Object *ob;
-
-	/* just add here, to avoid align errors... */
-	short invert; /* Whether or not to invert the output. */
-	short level;  /* Whether the sensor is level base (edge by default) */
-	short tap;
-	short pad;
-} bSensor;
-
-typedef struct bJoystickSensor {
-	char name[64];	/* MAX_NAME */
-	char type;
-	char joyindex;
-	short flag;
-	short axis;
-	short axis_single;
-	int axisf;
-	int button;
-	int hat;
-	int hatf;
-	int precision;
-} bJoystickSensor;
-
-/* bMouseSensor->type: uses blender event defines */
-
-/* bMouseSensor->flag: only pulse for now */
-#define SENS_MOUSE_FOCUS_PULSE	1
-
-/* propertysensor->type */
-#define SENS_PROP_EQUAL		0
-#define SENS_PROP_NEQUAL	1
-#define SENS_PROP_INTERVAL	2
-#define SENS_PROP_CHANGED	3
-#define SENS_PROP_EXPRESSION	4
-#define SENS_PROP_LESSTHAN	5
-#define SENS_PROP_GREATERTHAN	6
-
-/* raysensor->axisflag */
-/* flip x and y to make y default!!! */
-#define SENS_RAY_X_AXIS     1
-#define SENS_RAY_Y_AXIS     0
-#define SENS_RAY_Z_AXIS     2
-#define SENS_RAY_NEG_X_AXIS     3
-#define SENS_RAY_NEG_Y_AXIS     4
-#define SENS_RAY_NEG_Z_AXIS     5
-//#define SENS_RAY_NEGATIVE_AXIS     1
-
-/* bRadarSensor->axis */
-#define SENS_RADAR_X_AXIS     0
-#define SENS_RADAR_Y_AXIS     1
-#define SENS_RADAR_Z_AXIS     2
-#define SENS_RADAR_NEG_X_AXIS     3
-#define SENS_RADAR_NEG_Y_AXIS     4
-#define SENS_RADAR_NEG_Z_AXIS     5
-
-/* bMessageSensor->type */
-#define SENS_MESG_MESG		0
-#define SENS_MESG_PROP		1
-
-/* bArmatureSensor->type */
-#define SENS_ARM_STATE_CHANGED		0
-#define SENS_ARM_LIN_ERROR_BELOW	1
-#define SENS_ARM_LIN_ERROR_ABOVE	2
-#define SENS_ARM_ROT_ERROR_BELOW	3
-#define SENS_ARM_ROT_ERROR_ABOVE	4
-/* update this when adding new type */
-#define SENS_ARM_MAXTYPE			4
-
-/* sensor->type */
-#define SENS_ALWAYS		0
-#define SENS_TOUCH		1  /* DEPRECATED */
-#define SENS_NEAR		2
-#define SENS_KEYBOARD	3
-#define SENS_PROPERTY	4
-#define SENS_MOUSE		5
-#define SENS_COLLISION	6
-#define SENS_RADAR		7
-#define SENS_RANDOM     8
-#define SENS_RAY        9
-#define SENS_MESSAGE   10
-#define SENS_JOYSTICK  11
-#define SENS_ACTUATOR  12
-#define SENS_DELAY     13
-#define SENS_ARMATURE  14
-/* sensor->flag */
-#define SENS_SHOW		1
-#define SENS_DEL		2
-#define SENS_NEW		4
-#define SENS_NOT		8
-#define SENS_VISIBLE	16
-#define SENS_PIN		32
-#define SENS_DEACTIVATE	64
-
-/* sensor->pulse */
-#define SENS_PULSE_CONT 	0
-#define SENS_PULSE_REPEAT	1
-//#define SENS_PULSE_ONCE 	2
-#define SENS_NEG_PULSE_MODE 4
-
-/* sensor->suppress */
-#define SENS_SUPPRESS_POSITIVE (1 << 0)
-#define SENS_SUPPRESS_NEGATIVE (1 << 1)
-
-/* collision, ray sensor modes: */
-/* A little bit fake: when property is active, the first bit is
- * reset. Bite me :) So we don't actually use it, so we comment it out
- * ... The reason for this is that we need to be backward compatible,
- * and have a proper default value for this thing.
- * */
-#define SENS_COLLISION_PROPERTY 0
-#define SENS_COLLISION_MATERIAL 1
-#define SENS_COLLISION_PULSE 2
-
-/* ray specific mode */
-/* X-Ray means that the ray will traverse objects that don't have the property/material */
-#define SENS_RAY_PROPERTY		0
-#define SENS_RAY_MATERIAL		1
-#define SENS_RAY_XRAY			2
-
-/* Some stuff for the mouse sensor Type: */
-#define BL_SENS_MOUSE_LEFT_BUTTON    1
-#define BL_SENS_MOUSE_MIDDLE_BUTTON  2
-#define BL_SENS_MOUSE_RIGHT_BUTTON   4
-#define BL_SENS_MOUSE_WHEEL_UP       5
-#define BL_SENS_MOUSE_WHEEL_DOWN     6
-#define BL_SENS_MOUSE_MOVEMENT       8
-#define BL_SENS_MOUSE_MOUSEOVER      16
-#define BL_SENS_MOUSE_MOUSEOVER_ANY	 32
-
-/* Joystick sensor - sorted by axis types */
-#define SENS_JOY_ANY_EVENT		1
-
-#define SENS_JOY_BUTTON		0			/* axis type */
-
-#define SENS_JOY_AXIS			1		/* axis type */
-#define SENS_JOY_X_AXIS		0
-#define SENS_JOY_Y_AXIS		1
-#define SENS_JOY_NEG_X_AXIS     	2
-#define SENS_JOY_NEG_Y_AXIS     	3
-#define SENS_JOY_PRECISION		4
-
-#define SENS_JOY_HAT			2		/* axis type */
-#define SENS_JOY_HAT_DIR		0
-#define SENS_JOY_HAT_UP			1
-#define SENS_JOY_HAT_RIGHT		2
-#define SENS_JOY_HAT_DOWN		4
-#define SENS_JOY_HAT_LEFT		8
-
-#define SENS_JOY_HAT_UP_RIGHT	SENS_JOY_HAT_UP | SENS_JOY_HAT_RIGHT
-#define SENS_JOY_HAT_DOWN_RIGHT	SENS_JOY_HAT_DOWN | SENS_JOY_HAT_RIGHT
-#define SENS_JOY_HAT_UP_LEFT	SENS_JOY_HAT_UP | SENS_JOY_HAT_LEFT
-#define SENS_JOY_HAT_DOWN_LEFT	SENS_JOY_HAT_DOWN | SENS_JOY_HAT_LEFT
-
-
-#define SENS_JOY_AXIS_SINGLE	3		/* axis type */
-
-
-#define SENS_DELAY_REPEAT		1
-// should match JOYINDEX_MAX in SCA_JoystickDefines.h */
-#define SENS_JOY_MAXINDEX		8
-
-#endif  /* __DNA_SENSOR_TYPES_H__ */
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 077ac4f7aa3..d763c7ca4f9 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -146,7 +146,7 @@ typedef struct SpaceButs {
 #define CONTEXT_SHADING 3
 #define CONTEXT_EDITING 4
 #define CONTEXT_SCRIPT  5
-#define CONTEXT_LOGIC   6
+//#define CONTEXT_LOGIC   6
 
 /* sbuts->mainb old (deprecated) */
 #ifdef DNA_DEPRECATED_ALLOW
@@ -158,7 +158,7 @@ typedef struct SpaceButs {
 #define BUTS_WORLD          5
 #define BUTS_RENDER         6
 #define BUTS_EDIT           7
-#define BUTS_GAME           8
+// #define BUTS_GAME           8
 #define BUTS_FPAINT         9
 #define BUTS_RADIO          10
 #define BUTS_SCRIPT         11
@@ -1243,23 +1243,6 @@ enum {
 	SNODE_INSERTOFS_DIR_LEFT  = 1,
 };
 
-/* Game Logic Editor ===================================== */
-
-/* Logic Editor */
-typedef struct SpaceLogic {
-	SpaceLink *next, *prev;
-	ListBase regionbase;        /* storage of regions for inactive spaces */
-	int spacetype;
-	float blockscale DNA_DEPRECATED;
-	
-	short blockhandler[8]  DNA_DEPRECATED;
-	
-	short flag, scaflag;
-	int pad;
-	
-	struct bGPdata *gpd;        /* grease-pencil data */
-} SpaceLogic;
-
 /* Console ================================================ */
 
 /* Console content */
@@ -1432,7 +1415,7 @@ typedef enum eSpace_Type {
 	SPACE_SCRIPT   = 14, /* Deprecated */
 	SPACE_TIME     = 15,
 	SPACE_NODE     = 16,
-	SPACE_LOGIC    = 17,
+	SPACE_LOGIC    = 17, /* deprecated */
 	SPACE_CONSOLE  = 18,
 	SPACE_USERPREF = 19,
 	SPACE_CLIP     = 20,
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 3da0bdb6ca2..1eb17b49cfd 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -397,7 +397,6 @@ typedef struct bTheme {
 	ThemeSpace toops;
 	ThemeSpace ttime;
 	ThemeSpace tnode;
-	ThemeSpace tlogic;
 	ThemeSpace tuserpref;
 	ThemeSpace tconsole;
 	ThemeSpace tclip;
@@ -466,7 +465,7 @@ typedef struct UserDef {
 	short versions;
 	short dbl_click_time;
 	
-	short gameflags;
+	short pad;
 	short wheellinescroll;
 	int uiflag;   /* eUserpref_UI_Flag */
 	int uiflag2;  /* eUserpref_UI_Flag2 */
@@ -568,7 +567,7 @@ typedef struct UserDef {
 	float gpencil_new_layer_col[4]; /* default color for newly created Grease Pencil layers */
 
 	short tweak_threshold;
-	char navigation_mode, pad;
+	char navigation_mode, pad10;
 
 	char author[80];	/* author name for file formats supporting it */
 
@@ -787,15 +786,6 @@ typedef enum eDupli_ID_Flags {
 	USER_DUP_PSYS			= (1 << 11)
 } eDupli_ID_Flags;
 
-/* UserDef.gameflags */
-typedef enum eOpenGL_RenderingOptions {
-	USER_GL_RENDER_DEPRECATED_0			= (1 << 0),
-	USER_GL_RENDER_DEPRECATED_1			= (1 << 1),
-	USER_DISABLE_MIPMAP					= (1 << 2),
-	USER_GL_RENDER_DEPRECATED_3			= (1 << 3),
-	USER_GL_RENDER_DEPRECATED_4			= (1 << 4),
-} eOpenGL_RenderingOptions;
-
 /* selection method for opengl gpu_select_method */
 typedef enum eOpenGL_SelectOptions {
 	USER_SELECT_AUTO = 0,
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 619f9fd4f6e..cc0389ec568 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -270,7 +270,7 @@ typedef struct View3D {
 #define RV3D_CLIPPING				4
 #define RV3D_NAVIGATING				8
 #define RV3D_GPULIGHT_UPDATE		16
-#define RV3D_IS_GAME_ENGINE			32  /* runtime flag, used to check if LoD's should be used */
+/*#define RV3D_IS_GAME_ENGINE			32 *//* UNUSED */
 /**
  * Disable zbuffer offset, skip calls to #ED_view3d_polygon_offset.
  * Use when precise surface depth is needed and picking bias isn't, see T45434).
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 3361e50e257..f30ffa84b73 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -47,8 +47,7 @@ struct MTex;
 
 /**
  * World defines general modeling data such as a background fill,
- * gravity, color model etc. It mixes game-data, rendering
- * data and modeling data. */
+ * gravity, color model etc. It mixes rendering data and modeling data. */
 typedef struct World {
 	ID id;
 	struct AnimData *adt;	/* animation data (must be immediately after id for utilities to use it) */ 
@@ -67,16 +66,6 @@ typedef struct World {
 	 */
 	float exposure, exp, range;
 	float linfac, logfac;
-
-	/**
-	 * Gravitation constant for the game world
-	 */
-	float gravity; // XXX moved to scene->gamedata in 2.5
-
-	/**
-	 * Radius of the activity bubble, in Manhattan length. Objects
-	 * outside the box are activity-culled. */
-	float activityBoxRadius; // XXX moved to scene->gamedata in 2.5
 	
 	short skytype;
 	/**
@@ -89,16 +78,10 @@ typedef struct World {
 	 * bit 5: (gameengine) : enable Bullet DBVT tree for view frustum culling 
 	 */
 	short mode;												// partially moved to scene->gamedata in 2.5
-	short occlusionRes;		/* resolution of occlusion Z buffer in pixel */	// XXX moved to scene->gamedata in 2.5
-	short physicsEngine;	/* here it's aligned */					// XXX moved to scene->gamedata in 2.5
-	short ticrate, maxlogicstep, physubstep, maxphystep;	// XXX moved to scene->gamedata in 2.5
-	
+	short pad2[2];
+
 	float misi, miststa, mistdist, misthi;
-	
-	float starr  DNA_DEPRECATED, starg  DNA_DEPRECATED, starb  DNA_DEPRECATED, stark  DNA_DEPRECATED; /* Deprecated */
-	float starsize DNA_DEPRECATED, starmindist DNA_DEPRECATED;
-	float stardist DNA_DEPRECATED, starcolnoise DNA_DEPRECATED;
-	
+
 	/* unused now: DOF */
 	short dofsta, dofend, dofmin, dofmax;
 	
@@ -147,9 +130,9 @@ typedef struct World {
 #define WO_MIST	               1
 //#define WO_STARS               2 /* deprecated */
 /*#define WO_DOF                 4*/
-#define WO_ACTIVITY_CULLING	   8
+//#define WO_ACTIVITY_CULLING	   8 /* deprecated */
 #define WO_ENV_LIGHT   		  16
-#define WO_DBVT_CULLING		  32
+//#define WO_DBVT_CULLING		  32 /* deprecated */
 #define WO_AMB_OCC   		  64
 #define WO_INDIRECT_LIGHT	  128
 
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index f0f1c2210f0..d276e2c0859 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -100,10 +100,6 @@ static const char *includefiles[] = {
 	"DNA_sequence_types.h",
 	"DNA_effect_types.h",
 	"DNA_outliner_types.h",
-	"DNA_property_types.h",
-	"DNA_sensor_types.h",
-	"DNA_controller_types.h",
-	"DNA_actuator_types.h",
 	"DNA_sound_types.h",
 	"DNA_group_types.h",
 	"DNA_armature_types.h",
@@ -1327,10 +1323,6 @@ int main(int argc, char **argv)
 #include "DNA_sequence_types.h"
 #include "DNA_effect_types.h"
 #include "DNA_outliner_types.h"
-#include "DNA_property_types.h"
-#include "DNA_sensor_types.h"
-#include "DNA_controller_types.h"
-#include "DNA_actuator_types.h"
 #include "DNA_sound_types.h"
 #include "DNA_group_types.h"
 #include "DNA_armature_types.h"