diff -rU3 gtkmathview-0.8.0/mathmlps/main.cc gtkmathview-0.8.0.mine/mathmlps/main.cc
--- gtkmathview-0.8.0/mathmlps/main.cc	2007-08-17 12:02:46.000000000 +0200
+++ gtkmathview-0.8.0.mine/mathmlps/main.cc	2013-04-04 16:53:49.057401963 +0200
@@ -20,7 +20,8 @@
 
 #include <cassert>
 #include <fstream>
-
+#include <cstring>
+#include <getopt.h>
 #include <popt.h>
 
 // needed for old versions of GCC, must come before String.hh!
diff -rU3 gtkmathview-0.8.0/mathmlps/Makefile.in gtkmathview-0.8.0.mine/mathmlps/Makefile.in
--- gtkmathview-0.8.0/mathmlps/Makefile.in	2007-10-15 09:06:03.000000000 +0200
+++ gtkmathview-0.8.0.mine/mathmlps/Makefile.in	2013-04-04 16:28:32.308729585 +0200
@@ -263,7 +263,7 @@
   main.cc \
   $(NULL)
 
-mathmlps_LDADD = \
+mathmlps_LDADD = $(top_builddir)/src/libmathview.la \
   $(POPT_LIBS) \
   $(GLIB_LIBS) \
   $(top_builddir)/src/backend/ps/libmathview_backend_ps.la \
diff -rU3 gtkmathview-0.8.0/mathmlsvg/main.cc gtkmathview-0.8.0.mine/mathmlsvg/main.cc
--- gtkmathview-0.8.0/mathmlsvg/main.cc	2007-08-17 12:02:46.000000000 +0200
+++ gtkmathview-0.8.0.mine/mathmlsvg/main.cc	2013-04-04 17:06:07.067731629 +0200
@@ -20,7 +20,9 @@
 
 #include <cassert>
 #include <fstream>
+#include <cstring>
 
+#include <getopt.h>
 #include <popt.h>
 
 // needed for old versions of GCC, must come before String.hh!
diff -rU3 gtkmathview-0.8.0/mathmlsvg/Makefile.in gtkmathview-0.8.0.mine/mathmlsvg/Makefile.in
--- gtkmathview-0.8.0/mathmlsvg/Makefile.in	2007-10-15 09:06:04.000000000 +0200
+++ gtkmathview-0.8.0.mine/mathmlsvg/Makefile.in	2013-04-04 16:28:32.296729287 +0200
@@ -280,7 +280,7 @@
   main.cc \
   $(NULL)
 
-mathmlsvg_LDADD = \
+mathmlsvg_LDADD = -lxml2 $(top_builddir)/src/libmathview.la \
   $(POPT_LIBS) \
   $(GLIB_LIBS) \
   $(top_builddir)/src/backend/svg/libmathview_backend_svg.la \
diff -rU3 gtkmathview-0.8.0/mathmlsvg/SMS.cc gtkmathview-0.8.0.mine/mathmlsvg/SMS.cc
--- gtkmathview-0.8.0/mathmlsvg/SMS.cc	2007-08-17 12:02:46.000000000 +0200
+++ gtkmathview-0.8.0.mine/mathmlsvg/SMS.cc	2013-04-04 16:28:32.267728567 +0200
@@ -19,6 +19,7 @@
 #include <config.h>
 
 #include <sstream>
+#include <cstring>
 #include "defs.h"
 #include "AbstractLogger.hh"
 #include "ValueConversion.hh"
diff -rU3 gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc gtkmathview-0.8.0.mine/src/backend/ps/T1_FontDataBase.cc
--- gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc	2007-08-17 12:02:40.000000000 +0200
+++ gtkmathview-0.8.0.mine/src/backend/ps/T1_FontDataBase.cc	2013-04-04 16:28:32.269728617 +0200
@@ -23,6 +23,8 @@
 #include <stdlib.h>
 #include <iostream>
 #include <list>
+#include <stdio.h>
+#include <cstring>
 
 #include "String.hh"
 #include "T1_FontDataBase.hh"
diff -rU3 gtkmathview-0.8.0/src/common/AbstractLogger.cc gtkmathview-0.8.0.mine/src/common/AbstractLogger.cc
--- gtkmathview-0.8.0/src/common/AbstractLogger.cc	2007-08-17 12:02:45.000000000 +0200
+++ gtkmathview-0.8.0.mine/src/common/AbstractLogger.cc	2013-04-04 16:28:32.268728592 +0200
@@ -20,6 +20,10 @@
 
 #include <stdarg.h>
 
+#include <cstring>
+
+#include <stdio.h>
+
 #include "AbstractLogger.hh"
 
 AbstractLogger::AbstractLogger() : logLevel(LOG_WARNING)
diff -rU3 gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc gtkmathview-0.8.0.mine/src/engine/mathml/mathVariantAux.cc
--- gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc	2007-08-17 12:02:38.000000000 +0200
+++ gtkmathview-0.8.0.mine/src/engine/mathml/mathVariantAux.cc	2013-04-04 16:28:32.268728592 +0200
@@ -20,6 +20,8 @@
 
 #include <cassert>
 
+#include <cstring>
+
 #include "mathVariantAux.hh"
 
 static MathVariantAttributes vattr[] = {
diff -rU3 gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh gtkmathview-0.8.0.mine/src/frontend/common/TemplateBuilder.hh
--- gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh	2007-08-17 12:02:34.000000000 +0200
+++ gtkmathview-0.8.0.mine/src/frontend/common/TemplateBuilder.hh	2013-04-04 16:44:34.066619444 +0200
@@ -47,12 +47,12 @@
   SmartPtr<typename ElementBuilder::type>
   getElement(const typename Model::Element& el) const
   {
-    if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
+    if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
       return elem;
     else
       {
-	SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
-	linkerAdd(el, elem);
+	elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+	this->linkerAdd(el, elem);
 	return elem;
       }
   }
diff -rU3 gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh gtkmathview-0.8.0.mine/src/frontend/common/TemplateElementIterator.hh
--- gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh	2007-08-17 12:02:34.000000000 +0200
+++ gtkmathview-0.8.0.mine/src/frontend/common/TemplateElementIterator.hh	2013-04-04 16:45:54.485614297 +0200
@@ -43,7 +43,7 @@
   findValidNodeForward(const typename Model::Node& p0) const
   {
     for (typename Model::Node p = p0; p; p = Model::getNextSibling(p))
-      if (valid(p)) return Model::asElement(p);
+      if (this->valid(p)) return Model::asElement(p);
     return typename Model::Element();
   }
     
diff -rU3 gtkmathview-0.8.0/viewer/Makefile.in gtkmathview-0.8.0.mine/viewer/Makefile.in
--- gtkmathview-0.8.0/viewer/Makefile.in	2007-10-15 09:06:25.000000000 +0200
+++ gtkmathview-0.8.0.mine/viewer/Makefile.in	2013-04-04 16:28:32.285729014 +0200
@@ -380,7 +380,7 @@
 
 test_rendering_SOURCES = test_rendering.cc
 test_rendering_LDFLASG = -no-install -static
-test_rendering_LDADD = \
+test_rendering_LDADD = $(top_builddir)/src/libmathview.la \
   -lstdc++ \
   $(XML_LIBS) \
   $(GTK_LIBS) \