diff --git a/source/blender/makesrna/intern/Makefile b/source/blender/makesrna/intern/Makefile
index aad4acdbf38..bb06bc51336 100644
--- a/source/blender/makesrna/intern/Makefile
+++ b/source/blender/makesrna/intern/Makefile
@@ -38,6 +38,10 @@ CSRCS = $(GENSRCS) rna_access.c rna_dependency.c
 
 include nan_compile.mk
 
+ifdef NAN_DEPEND
+-include $(MAKESRCS:%.c=$(DIR)/$(DEBUG_DIR)%.d)
+endif
+
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index c22522d51ba..77c9b227982 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -1684,7 +1684,6 @@ static void rna_generate_header_cpp(BlenderRNA *brna, FILE *f)
 
 		fprintf(f, "/**************** %s ****************/\n\n", srna->name);
 
-		srna= ds->srna;
 		fprintf(f, "class %s : public %s {\n", srna->identifier, (srna->base)? srna->base->identifier: "Pointer");
 		fprintf(f, "public:\n");
 		fprintf(f, "\t%s(const PointerRNA& ptr) :\n\t\t%s(ptr)", srna->identifier, (srna->base)? srna->base->identifier: "Pointer");
@@ -1747,6 +1746,8 @@ static int rna_preprocess(char *outfile)
 	strcpy(deffile, outfile);
 	strcat(deffile, "RNA_blender_cpp.h");
 
+	status= (DefRNA.error != 0);
+
 	if(status) {
 		make_bad_file(deffile);
 	}
@@ -1765,11 +1766,8 @@ static int rna_preprocess(char *outfile)
 		}
 	}
 
-
 	rna_sort(brna);
 
-	status= (DefRNA.error != 0);
-
 	/* create rna_gen_*.c files */
 	for(i=0; PROCESS_ITEMS[i].filename; i++) {
 		strcpy(deffile, outfile);