diff --git a/Makefile.header b/Makefile.header
index 9d1fbddf..5d69111c 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_LIBXML2 -DARABICA_NO_WCHAR_T
+PARSER_CONFIG = -DUSE_GARDEN
 #PARSER_CONFIG = -DUSE_EXPAT -DUSE_LIBXML2 -DUSE_XERCES -DUSE_GARDEN
 
 ####################################
@@ -9,16 +9,12 @@ PARSER_CONFIG = -DUSE_LIBXML2 -DARABICA_NO_WCHAR_T
 #####
 MAKE = make
 # C++ compiler
-#CXX = /home/jez/gcc-3.4.2/bin/gcc 
 CXX = gcc 
 # preprocessor
-#CPP = /home/jez/gcc-3.4.2/bin/gcc -E
 CPP = gcc -E
 # linker
-#LD =  /home/jez/gcc-3.4.2/bin/gcc 
-LD = gcc 
+LD =  gcc 
 # archiver
-#AR = /home/jez/gcc-3.4.2/bin/ar r
 AR = ar r
 
 ###########
@@ -33,23 +29,21 @@ COPY = cp -f
 # your parser choice
 # eg DYNAMIC_LIBS = -lexpat
 
-CXXFLAGS = -Wall -g
+CXXFLAGS = -Wall 
 LDFLAGS = 
 
 # Includes and library directories 
-#INCS_DIRS = -I.. -I/home/jez/gcc-3.4.2/include -I/usr/include/libxml2
-INCS_DIRS = -I.. -I/usr/include/libxml2 -I/usr/local/include
-#LIBS_DIRS = -I/home/jez/gcc-3.4.2/lib 
-LIBS_DIRS =  
+INCS_DIRS = -I.. 
+LIBS_DIRS = 
 
 STATIC_LIBS =
-DYNAMIC_LIBS =  -lxml2 -lstdc++
+DYNAMIC_LIBS = -lstdc++ 
 
-# link flag to create a shared library
+# flag to create a shared library
 LINK_SHARED = -shared
 
-EXESUFFIX = .exe
-LIBSUFFIX = .dll
+EXESUFFIX = 
+LIBSUFFIX = .so
 
 
 
diff --git a/SAX/ParserConfig.S b/SAX/ParserConfig.S
index fe6ae1d0..c2015ded 100644
--- a/SAX/ParserConfig.S
+++ b/SAX/ParserConfig.S
@@ -51,7 +51,9 @@ comment(lib, "xerces-c_2.lib")
 #endif
 #endif
 #ifdef USE_GARDEN
+#ifdef _MSC_VER
 message("Including Garden")
+#endif
 include <SAX/parsers/saxgarden.h>
 undef DEF_SAX_P
 define DEF_SAX_P Garden
diff --git a/SAX/parsers/saxgarden.h b/SAX/parsers/saxgarden.h
index 49604426..4f59c04b 100644
--- a/SAX/parsers/saxgarden.h
+++ b/SAX/parsers/saxgarden.h
@@ -7,6 +7,7 @@
 #include <vector>
 #include <string>
 #include <stack>
+#include <map>
 #include <SAX/XMLReader.h>
 #include <SAX/SAXParseException.h>
 #include <SAX/SAXNotRecognizedException.h>
@@ -375,7 +376,9 @@ void Garden<string_type>::entityRef(iterator_t s, iterator_t e)
   {
     stringT name(str(s, e, 1));
 
-    std::map<stringT, stringT>::iterator ent = declaredEntities_.find(name);
+    typedef typename std::map<stringT, stringT>::iterator entity_iterator;
+
+    entity_iterator ent = declaredEntities_.find(name);
     if(ent != declaredEntities_.end())
     { 
       contentHandler_->characters((*ent).second);
diff --git a/SAX/saxlib.S b/SAX/saxlib.S
index 4e9a92ac..940a40a3 100644
--- a/SAX/saxlib.S
+++ b/SAX/saxlib.S
@@ -41,8 +41,10 @@ message("Pulling in Xerces wrappers.")
 #endif
 
 #ifdef USE_GARDEN
+#ifdef _MSC_VER
 message("Nothing to pull in for Garden.")
 #endif
+#endif
 
 #ifdef USE_EXPAT
 include <SAX/wrappers/saxexpat.cpp>