diff -ur /tmp/povray-3.7.0.beta.25b/source/backend/parser/parse.cpp povray-3.7.0.beta.25b/source/backend/parser/parse.cpp
--- /tmp/povray-3.7.0.beta.25b/source/backend/parser/parse.cpp	2008-02-04 15:28:44.000000000 +0100
+++ povray-3.7.0.beta.25b/source/backend/parser/parse.cpp	2008-04-08 13:37:53.000000000 +0200
@@ -268,7 +268,7 @@
 		}
 	}
 
-// TODO FIXME IncludeHeader(opts.Header_File_Name);
+IncludeHeader(sceneData->headerFile); // opts.Header_File_Name);
 
 	Parse_Frame();
 
diff -ur /tmp/povray-3.7.0.beta.25b/source/backend/parser/tokenize.cpp povray-3.7.0.beta.25b/source/backend/parser/tokenize.cpp
--- /tmp/povray-3.7.0.beta.25b/source/backend/parser/tokenize.cpp	2008-02-26 15:46:49.000000000 +0100
+++ povray-3.7.0.beta.25b/source/backend/parser/tokenize.cpp	2008-04-08 13:25:16.000000000 +0200
@@ -3602,6 +3602,7 @@
 {
    UCS2String b;
 
+   if (temp.empty())
 // TODO FIXME  if (opts.Header_File_Name == NULL)
  //    return;
  //  if (opts.Header_File_Name[0] == '\0')
diff -ur /tmp/povray-3.7.0.beta.25b/source/backend/scene/scene.cpp povray-3.7.0.beta.25b/source/backend/scene/scene.cpp
--- /tmp/povray-3.7.0.beta.25b/source/backend/scene/scene.cpp	2008-02-04 15:28:45.000000000 +0100
+++ povray-3.7.0.beta.25b/source/backend/scene/scene.cpp	2008-04-08 13:40:50.000000000 +0200
@@ -491,6 +491,7 @@
 	sceneData->warningLevel = clip(parseOptions.TryGetInt(kPOVAttrib_WarningLevel, 9), 0, 9);
 
 	sceneData->inputFile = parseOptions.TryGetUCS2String(kPOVAttrib_InputFile, "object.pov");
+	sceneData->headerFile = parseOptions.TryGetUCS2String(kPOVAttrib_IncludeHeader, "");
 
 	sceneData->outputFileType = parseOptions.TryGetInt(kPOVAttrib_OutputFileType, 's'); // TODO - find a long term solution for this [trf]
 	sceneData->clocklessAnimation = parseOptions.TryGetBool(kPOVAttrib_ClocklessAnimation, false); // TODO - experimental code
diff -ur /tmp/povray-3.7.0.beta.25b/source/backend/scene/scene.h povray-3.7.0.beta.25b/source/backend/scene/scene.h
--- /tmp/povray-3.7.0.beta.25b/source/backend/scene/scene.h	2008-02-04 15:28:45.000000000 +0100
+++ povray-3.7.0.beta.25b/source/backend/scene/scene.h	2008-04-08 13:37:45.000000000 +0200
@@ -237,6 +237,7 @@
 
 		// name of the parsed file
 		UCS2String inputFile; // TODO - handle differently
+		UCS2String headerFile;
 
 		// TODO - need long term fix for this.
 		int outputFileType;