diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h
index 3b16a16c2b5..3a9c7b22cde 100644
--- a/source/blender/makesdna/DNA_camera_types.h
+++ b/source/blender/makesdna/DNA_camera_types.h
@@ -51,14 +51,10 @@ typedef struct Camera {
 	float lens, ortho_scale, drawsize;
 	float shiftx, shifty;
 	
-	float pad;
-	
 	/* yafray: dof params */
 	/* qdn: yafray var 'YF_dofdist' now enabled for defocus composit node as well.
 			The name was not changed so that no other files need to be modified */
-	float YF_dofdist, YF_aperture;
-	short YF_bkhtype, YF_bkhbias;
-	float YF_bkhrot;
+	float YF_dofdist;
 
 	struct Ipo *ipo;			// XXX depreceated... old animation system
 	
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index b7975653c15..e6688060b22 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -344,16 +344,6 @@ typedef struct RenderData {
 	short bake_osa, bake_filter, bake_mode, bake_flag;
 	short bake_normal_space, bake_quad_split;
 	float bake_maxdist, bake_biasdist, bake_pad;
-	
-	/* yafray: global panel params. TODO: move elsewhere */
-	short GIquality, GIcache, GImethod, GIphotons, GIdirect;
-	short YF_AA, YFexportxml, YF_nobump, YF_clamprgb, yfpad1;
-	int GIdepth, GIcausdepth, GIpixelspersample;
-	int GIphotoncount, GImixphotons;
-	float GIphotonradius;
-	int YF_raydepth, YF_AApasses, YF_AAsamples, yfpad2;
-	float GIshadowquality, GIrefinement, GIpower, GIindirpower;
-	float YF_gamma, YF_exposure, YF_raybias, YF_AApixelsize, YF_AAthreshold;
 
 	/* paths to backbufffer, output, ftype */
 	char backbuf[160], pic[160];
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 1abc431fc6d..2da8570c3a0 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -564,13 +564,6 @@ typedef struct LampRen {
 	
 	/* passes & node shader support: all shadow info for a pixel */
 	LampShadowSample *shadsamp;
-		
-	/* yafray: photonlight params */
-	int YF_numphotons, YF_numsearch;
-	short YF_phdepth, YF_useqmc, YF_bufsize;
-	float YF_causticblur, YF_ltradius;
-	float YF_glowint, YF_glowofs;
-	short YF_glowtype;
 	
 	/* ray optim */
 	struct RayObject *last_hit[BLENDER_MAX_THREADS];