diff -ur qp7.4.orig/src/arithmetic.cc qp7.4/src/arithmetic.cc
--- qp7.4.orig/src/arithmetic.cc	2006-07-27 16:27:05.000000000 +1200
+++ qp7.4/src/arithmetic.cc	2006-08-06 16:24:01.000000000 +1200
@@ -102,7 +102,7 @@
 
 #define IS_ZERO(x) ((x.type == ARITH_INTEGER_TYPE) && (x.value.i == 0))
 
-number zero = {ARITH_INTEGER_TYPE, 0};
+number zero = {ARITH_INTEGER_TYPE, {0}};
 //
 // arithEvaluate is an auxilary function used by arithmetical pseudo
 //instructions to carry out the evaluation of expressions.
diff -ur qp7.4.orig/src/bind.h qp7.4/src/bind.h
--- qp7.4.orig/src/bind.h	2006-07-27 16:27:05.000000000 +1200
+++ qp7.4/src/bind.h	2006-08-06 16:24:01.000000000 +1200
@@ -138,7 +138,7 @@
 //
 // Update and trail an implicit parameter entry
 //
-inline void Thread::updateAndTrailIP(heapobject* ptr, Object* value,
+inline void updateAndTrailIP(heapobject* ptr, Object* value,
                                      u_int offset = 0)
 {
   assert(ptr != NULL);
diff -ur qp7.4.orig/src/trace_qp.h qp7.4/src/trace_qp.h
--- qp7.4.orig/src/trace_qp.h	2006-07-27 16:27:06.000000000 +1200
+++ qp7.4/src/trace_qp.h	2006-08-06 16:25:21.000000000 +1200
@@ -107,8 +107,8 @@
   void TraceConst2(AtomTable& atoms, Heap& heap, const char *s, Object* c,
 		   const int32 x, const int32 y);
 
-  void Trace::TraceInt0(const char *s, const int32 n);
-  void Trace::TraceInt1(const char *s, const int32 n, const int32 x);
+  void TraceInt0(const char *s, const int32 n);
+  void TraceInt1(const char *s, const int32 n, const int32 x);
 
   void TraceString1(const char *s, const char *t);
   void TraceString2(const char *s, const char *t, const int32 x);
diff -ur qp7.4.orig/src/unify.h qp7.4/src/unify.h
--- qp7.4.orig/src/unify.h	2006-07-27 16:27:06.000000000 +1200
+++ qp7.4/src/unify.h	2006-08-06 16:24:01.000000000 +1200
@@ -190,7 +190,7 @@
 //
 // Unify object variables.
 //
-bool Thread::unifyObjectVariables(PrologValue& objectVariable1,
+bool unifyObjectVariables(PrologValue& objectVariable1,
 				  PrologValue& objectVariable2);
 
 //
diff -ur qp7.4.orig/src/xqp/interact.h qp7.4/src/xqp/interact.h
--- qp7.4.orig/src/xqp/interact.h	2006-04-06 16:01:45.000000000 +1200
+++ qp7.4/src/xqp/interact.h	2006-08-06 16:24:01.000000000 +1200
@@ -23,7 +23,7 @@
 #include <qwidget.h>
 #include <qtextedit.h>
 #include <qstring.h>
-#include <fstream.h>
+#include <fstream>
 #include <qaccel.h>
 #include <qregexp.h>
 #include <qsocketnotifier.h>
diff -ur qp7.4.orig/src/xqp/main.cc qp7.4/src/xqp/main.cc
--- qp7.4.orig/src/xqp/main.cc	2006-04-06 16:01:45.000000000 +1200
+++ qp7.4/src/xqp/main.cc	2006-08-06 16:24:01.000000000 +1200
@@ -19,9 +19,9 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <iostream.h>
+#include <iostream>
 #include <unistd.h>
-#include <fstream.h>
+#include <fstream>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -30,6 +30,7 @@
 
 #include "xqp.h"
 
+using namespace std;
 
 // Create 2 sockets for unidirectional communication to and from qp
 int socket_main_to_qp[2], socket_qp_to_main[2];