diff -urNp taskjuggler-2.4.0-orig/taskjuggler/FileToken.cpp taskjuggler-2.4.0/taskjuggler/FileToken.cpp
--- taskjuggler-2.4.0-orig/taskjuggler/FileToken.cpp	2007-07-01 17:32:12.000000000 +0200
+++ taskjuggler-2.4.0/taskjuggler/FileToken.cpp	2008-02-13 14:50:21.000000000 +0100
@@ -10,6 +10,7 @@
  * $Id: $
  */
 #include "FileToken.h"
+#include <cstdlib>
 
 #include "tjlib-internal.h"
 
diff -urNp taskjuggler-2.4.0-orig/taskjuggler/FileToken.h taskjuggler-2.4.0/taskjuggler/FileToken.h
--- taskjuggler-2.4.0-orig/taskjuggler/FileToken.h	2007-07-01 17:32:12.000000000 +0200
+++ taskjuggler-2.4.0/taskjuggler/FileToken.h	2008-02-13 13:35:13.000000000 +0100
@@ -15,6 +15,8 @@
 #include <qtextstream.h>
 #include <qptrlist.h>
 
+#include <memory>
+
 #include "MacroTable.h"
 #include "Token.h"
 
diff -urNp taskjuggler-2.4.0-orig/taskjuggler/ProjectFile.cpp taskjuggler-2.4.0/taskjuggler/ProjectFile.cpp
--- taskjuggler-2.4.0-orig/taskjuggler/ProjectFile.cpp	2007-07-01 17:32:12.000000000 +0200
+++ taskjuggler-2.4.0/taskjuggler/ProjectFile.cpp	2008-02-13 13:34:09.000000000 +0100
@@ -14,6 +14,7 @@
 #include "ProjectFile.h"
 
 #include <stdlib.h>
+#include <memory>
 
 #include <qtextstream.h>
 #include <qregexp.h>
diff -urNp taskjuggler-2.4.0-orig/taskjuggler/Scenario.h taskjuggler-2.4.0/taskjuggler/Scenario.h
--- taskjuggler-2.4.0-orig/taskjuggler/Scenario.h	2007-07-01 17:32:12.000000000 +0200
+++ taskjuggler-2.4.0/taskjuggler/Scenario.h	2008-02-13 14:12:27.000000000 +0100
@@ -23,7 +23,7 @@ class Scenario : public CoreAttributes
                                                CoreAttributes* c2,
                                                int level);
 public:
-    Scenario(Project* p, const QString& i, const QString& n, Scenario* p);
+    Scenario(Project* p, const QString& i, const QString& n, Scenario* pr);
     virtual ~Scenario();
 
     virtual CAType getType() const { return CA_Scenario; }
diff -urNp taskjuggler-2.4.0-orig/taskjuggler/XMLFile.h taskjuggler-2.4.0/taskjuggler/XMLFile.h
--- taskjuggler-2.4.0-orig/taskjuggler/XMLFile.h	2007-07-01 17:32:12.000000000 +0200
+++ taskjuggler-2.4.0/taskjuggler/XMLFile.h	2008-02-13 15:28:07.000000000 +0100
@@ -76,57 +76,57 @@ private:
 
     bool parseNode(const ParserNode* pn, QDomNode n, ParserTreeContext ptc);
 
-    bool doTaskJuggler(QDomNode& n, ParserTreeContext& n);
-    bool doProject(QDomNode& n, ParserTreeContext& n);
-    bool doProjectStart(QDomNode& n, ParserTreeContext& n);
-    bool doProjectEnd(QDomNode& n, ParserTreeContext& n);
-    bool doProjectNow(QDomNode& n, ParserTreeContext& n);
-    bool doCurrencyFormat(QDomNode& n, ParserTreeContext& n);
-    bool doScenario(QDomNode& n, ParserTreeContext& n);
-    bool doExtend(QDomNode& n, ParserTreeContext& n);
-    bool doExtendAttribute(QDomNode& n, ParserTreeContext& n);
-    bool doProjectWeekdayWorkingHours(QDomNode& n, ParserTreeContext& n);
-    bool doProjectWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& n);
-    bool doShiftWeekdayWorkingHours(QDomNode& n, ParserTreeContext& n);
-    bool doShiftWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& n);
-    bool doResourceWeekdayWorkingHours(QDomNode& n, ParserTreeContext& n);
-    bool doResourceWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& n);
-    bool doTimeInterval(QDomNode& n, ParserTreeContext& n);
-    bool doTimeIntervalStart(QDomNode& n, ParserTreeContext& n);
-    bool doTimeIntervalEnd(QDomNode& n, ParserTreeContext& n);
-    bool doProjectVacation(QDomNode& n, ParserTreeContext& n);
-    bool doResourceVacation(QDomNode& n, ParserTreeContext& n);
-    bool doVacationStart(QDomNode& n, ParserTreeContext& n);
-    bool doVacationEnd(QDomNode& n, ParserTreeContext& n);
-    bool doCustomAttribute(QDomNode& n, ParserTreeContext& n);
-    bool doTextAttribute(QDomNode& n, ParserTreeContext& n);
-    bool doReferenceAttribute(QDomNode& n, ParserTreeContext& n);
-    bool doShiftList(QDomNode& n, ParserTreeContext& n);
-    bool doShift(QDomNode& n, ParserTreeContext& n);
-    bool doResourceList(QDomNode& n, ParserTreeContext& n);
-    bool doResource(QDomNode& n, ParserTreeContext& n);
-    bool doShiftSelection(QDomNode& n, ParserTreeContext& n);
-    bool doAccountList(QDomNode& n, ParserTreeContext& n);
-    bool doAccount(QDomNode& n, ParserTreeContext& n);
-    bool doTaskList(QDomNode& n, ParserTreeContext& n);
-    bool doTask(QDomNode& n, ParserTreeContext& n);
-    bool doTaskScenario(QDomNode& n, ParserTreeContext& n);
-    bool doTaskScenarioStart(QDomNode& n, ParserTreeContext& n);
-    bool doTaskScenarioEnd(QDomNode& n, ParserTreeContext& n);
-    bool doTaskScenarioMaxEnd(QDomNode& n, ParserTreeContext& n);
-    bool doTaskScenarioMinEnd(QDomNode& n, ParserTreeContext& n);
-    bool doTaskScenarioMaxStart(QDomNode& n, ParserTreeContext& n);
-    bool doTaskScenarioMinStart(QDomNode& n, ParserTreeContext& n);
-    bool doAllocate(QDomNode& n, ParserTreeContext& n);
-    bool doCandidate(QDomNode& n, ParserTreeContext& n);
-    bool doDepends(QDomNode& n, ParserTreeContext& n);
-    bool doPrecedes(QDomNode& n, ParserTreeContext& n);
+    bool doTaskJuggler(QDomNode& n, ParserTreeContext& ptc);
+    bool doProject(QDomNode& n, ParserTreeContext& ptc);
+    bool doProjectStart(QDomNode& n, ParserTreeContext& ptc);
+    bool doProjectEnd(QDomNode& n, ParserTreeContext& ptc);
+    bool doProjectNow(QDomNode& n, ParserTreeContext& ptc);
+    bool doCurrencyFormat(QDomNode& n, ParserTreeContext& ptc);
+    bool doScenario(QDomNode& n, ParserTreeContext& ptc);
+    bool doExtend(QDomNode& n, ParserTreeContext& ptc);
+    bool doExtendAttribute(QDomNode& n, ParserTreeContext& ptc);
+    bool doProjectWeekdayWorkingHours(QDomNode& n, ParserTreeContext& ptc);
+    bool doProjectWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& ptc);
+    bool doShiftWeekdayWorkingHours(QDomNode& n, ParserTreeContext& ptc);
+    bool doShiftWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& ptc);
+    bool doResourceWeekdayWorkingHours(QDomNode& n, ParserTreeContext& ptc);
+    bool doResourceWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& ptc);
+    bool doTimeInterval(QDomNode& n, ParserTreeContext& ptc);
+    bool doTimeIntervalStart(QDomNode& n, ParserTreeContext& ptc);
+    bool doTimeIntervalEnd(QDomNode& n, ParserTreeContext& ptc);
+    bool doProjectVacation(QDomNode& n, ParserTreeContext& ptc);
+    bool doResourceVacation(QDomNode& n, ParserTreeContext& ptc);
+    bool doVacationStart(QDomNode& n, ParserTreeContext& ptc);
+    bool doVacationEnd(QDomNode& n, ParserTreeContext& ptc);
+    bool doCustomAttribute(QDomNode& n, ParserTreeContext& ptc);
+    bool doTextAttribute(QDomNode& n, ParserTreeContext& ptc);
+    bool doReferenceAttribute(QDomNode& n, ParserTreeContext& ptc);
+    bool doShiftList(QDomNode& n, ParserTreeContext& ptc);
+    bool doShift(QDomNode& n, ParserTreeContext& ptc);
+    bool doResourceList(QDomNode& n, ParserTreeContext& ptc);
+    bool doResource(QDomNode& n, ParserTreeContext& ptc);
+    bool doShiftSelection(QDomNode& n, ParserTreeContext& ptc);
+    bool doAccountList(QDomNode& n, ParserTreeContext& ptc);
+    bool doAccount(QDomNode& n, ParserTreeContext& ptc);
+    bool doTaskList(QDomNode& n, ParserTreeContext& ptc);
+    bool doTask(QDomNode& n, ParserTreeContext& ptc);
+    bool doTaskScenario(QDomNode& n, ParserTreeContext& ptc);
+    bool doTaskScenarioStart(QDomNode& n, ParserTreeContext& ptc);
+    bool doTaskScenarioEnd(QDomNode& n, ParserTreeContext& ptc);
+    bool doTaskScenarioMaxEnd(QDomNode& n, ParserTreeContext& ptc);
+    bool doTaskScenarioMinEnd(QDomNode& n, ParserTreeContext& ptc);
+    bool doTaskScenarioMaxStart(QDomNode& n, ParserTreeContext& ptc);
+    bool doTaskScenarioMinStart(QDomNode& n, ParserTreeContext& ptc);
+    bool doAllocate(QDomNode& n, ParserTreeContext& ptc);
+    bool doCandidate(QDomNode& n, ParserTreeContext& ptc);
+    bool doDepends(QDomNode& n, ParserTreeContext& ptc);
+    bool doPrecedes(QDomNode& n, ParserTreeContext& ptc);
     bool doDependencyGapScenario(QDomNode& n, ParserTreeContext& ptc);
-    bool doNote(QDomNode& n, ParserTreeContext& n);
-    bool doFlag(QDomNode& n, ParserTreeContext& n);
-    bool doResourceBooking(QDomNode& n, ParserTreeContext& n);
-    bool doBooking(QDomNode& n, ParserTreeContext& n);
-    bool doBookingPost(QDomNode& n, ParserTreeContext& n);
+    bool doNote(QDomNode& n, ParserTreeContext& ptc);
+    bool doFlag(QDomNode& n, ParserTreeContext& ptc);
+    bool doResourceBooking(QDomNode& n, ParserTreeContext& ptc);
+    bool doBooking(QDomNode& n, ParserTreeContext& ptc);
+    bool doBookingPost(QDomNode& n, ParserTreeContext& ptc);
 
     QString masterFile;
     Project* project;