diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h
index 064cdc4dee6..f3765b639db 100644
--- a/source/blender/include/blendef.h
+++ b/source/blender/include/blendef.h
@@ -141,7 +141,7 @@
 /* **************** MAX ********************* */
 
 
-#define MAXLAMP		256
+#define MAXLAMP		32766
 /* max length material array, 16 because of bits in matfrom */
 #define MAXPICKBUF	2000
 #define MAXSEQ		32
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index 3e3ca20134a..f9840e97ace 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -89,9 +89,5 @@ typedef struct Lamp {
 
 /* mapto */
 #define LAMAP_COL		1
-
-/* bit isolated... */
-#define MAXLAMP		256
-
 #endif
 
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index 50ff4ba802d..4aa8d5cf02d 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -46,6 +46,7 @@
 #include "BLI_winstuff.h"
 #endif
 
+#include "blendef.h"
 #include "MEM_guardedalloc.h"
 
 #include "PIL_time.h"
diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c
index 9e26d4986b0..e8acc2b9a8a 100644
--- a/source/blender/renderconverter/intern/convertBlenderScene.c
+++ b/source/blender/renderconverter/intern/convertBlenderScene.c
@@ -42,6 +42,7 @@
 #include <string.h>
 #include <limits.h>          /* for INT_MAX                 */
 
+#include "blendef.h"
 #include "MTC_matrixops.h"
 
 #include "MEM_guardedalloc.h"