diff --git a/DOM/Simple/ElementByTagImpl.h b/DOM/Simple/ElementByTagImpl.h
index ea66ee5e..32f4e171 100644
--- a/DOM/Simple/ElementByTagImpl.h
+++ b/DOM/Simple/ElementByTagImpl.h
@@ -2,10 +2,14 @@
 #define JEZUK_SimpleDOM_ELEMENTBYTAGIMPL_H
 
 #include <DOM/Node.h>
+#include <DOM/Simple/NodeImpl.h>
 
 namespace SimpleDOM
 {
 
+template<class stringT, class string_adaptorT>
+class DocumentImpl;
+
 template<class stringT, class string_adaptorT>
 class ElementByTagList : public DOM::NodeList_impl<stringT>
 {
diff --git a/DOM/Simple/NamedNodeMapImpl.h b/DOM/Simple/NamedNodeMapImpl.h
index ce8fe44f..4a53f86b 100644
--- a/DOM/Simple/NamedNodeMapImpl.h
+++ b/DOM/Simple/NamedNodeMapImpl.h
@@ -11,11 +11,11 @@ namespace SimpleDOM
 {
 
 template<class stringT, class string_adaptorT>
-class nameIs : public std::unary_function<NodeImpl<stringT, string_adaptorT>*, bool>
+class nameIs : public std::unary_function<SimpleDOM::NodeImpl<stringT, string_adaptorT>*, bool>
 {
   public:
     nameIs(const stringT& name) : name_(name) { }
-    bool operator()(const NodeImpl<stringT, string_adaptorT>* node) const
+    bool operator()(const SimpleDOM::NodeImpl<stringT, string_adaptorT>* node) const
     {
       return (node->getNodeName() == name_);
     } // operator()
diff --git a/DOM/Simple/NodeImpl.h b/DOM/Simple/NodeImpl.h
index 40ea394c..74ecc50e 100644
--- a/DOM/Simple/NodeImpl.h
+++ b/DOM/Simple/NodeImpl.h
@@ -6,7 +6,9 @@
 //
 // $Id$
 ////////////////////////////
+
 #include <DOM/Node.h>
+#include <DOM/DOMException.h>
 #include <deque>
 #include <algorithm>
 
diff --git a/Makefile.header b/Makefile.header
index 3fba01fa..9c117d2e 100644
--- a/Makefile.header
+++ b/Makefile.header
@@ -1,7 +1,7 @@
 ####################################
 # ARABICA CONFIG
 # edit for your parser choice - may include more than one USE_*
-PARSER_CONFIG = -DUSE_EXPAT -DARABICA_NO_WCHAR_T
+PARSER_CONFIG = -DUSE_LIBXML2 -DARABICA_NO_WCHAR_T
 #PARSER_CONFIG = -DUSE_EXPAT -DUSE_LIBXML2 -DUSE_XERCES -DUSE_GARDEN
 
 ####################################
@@ -33,11 +33,11 @@ CXXFLAGS = -Wall
 LDFLAGS = 
 
 # Includes and library directories 
-INCS_DIRS = -I.. -I/home/jez/gcc-3.4.2/include
+INCS_DIRS = -I.. -I/home/jez/gcc-3.4.2/include -I/usr/include/libxml2
 LIBS_DIRS = -I/home/jez/gcc-3.4.2/lib 
 
 STATIC_LIBS =
-DYNAMIC_LIBS =  -lexpat -lstdc++
+DYNAMIC_LIBS =  -lxml2 -lstdc++
 
 # link flag to create a shared library
 LINK_SHARED = -shared