diff -rupN hydrogen.old/hydrogen.kdevelop hydrogen/hydrogen.kdevelop
--- hydrogen.old/hydrogen.kdevelop	2009-02-13 14:22:04.000000000 -0500
+++ hydrogen/hydrogen.kdevelop	2009-02-13 14:43:03.000000000 -0500
@@ -180,13 +180,6 @@
       <path>gui/src/widgets/moc_MidiActivityWidget.cc</path>
       <path>gui/src/widgets/moc_midiTable.cc</path>
       <path>gui/src/widgets/moc_Rotary.cc</path>
-      <path>libs/hydrogen/src/xml</path>
-      <path>libs/hydrogen/src/xml/tinystr.cpp</path>
-      <path>libs/hydrogen/src/xml/tinystr.h</path>
-      <path>libs/hydrogen/src/xml/tinyxml.cpp</path>
-      <path>libs/hydrogen/src/xml/tinyxmlerror.cpp</path>
-      <path>libs/hydrogen/src/xml/tinyxml.h</path>
-      <path>libs/hydrogen/src/xml/tinyxmlparser.cpp</path>
       <path>plugins</path>
       <path>plugins/wasp</path>
       <path>plugins/wasp/include</path>
diff -rupN hydrogen.old/libs/hydrogen/hydrogen.pro hydrogen/libs/hydrogen/hydrogen.pro
--- hydrogen.old/libs/hydrogen/hydrogen.pro	2009-02-13 14:22:01.000000000 -0500
+++ hydrogen/libs/hydrogen/hydrogen.pro	2009-02-13 14:43:03.000000000 -0500
@@ -82,9 +82,6 @@ HEADERS += \
 		include/hydrogen/smf/SMFEvent.h \
 		\
 		\
-		src/xml/tinystr.h \
-		src/xml/tinyxml.h \
-		\
 		src/IO/AlsaMidiDriver.h \
 		src/IO/DiskWriterDriver.h \
 		src/IO/FakeDriver.h \
@@ -99,11 +96,6 @@ HEADERS += \
 
 
 SOURCES += \
-		src/xml/tinystr.cpp \
-		src/xml/tinyxml.cpp \
-		src/xml/tinyxmlerror.cpp \
-		src/xml/tinyxmlparser.cpp \
-		\
 		src/IO/alsa_midi_driver.cpp \
 		src/IO/disk_writer_driver.cpp \
 		src/IO/fake_driver.cpp \
diff -rupN hydrogen.old/libs/hydrogen/src/local_file_mgr.cpp hydrogen/libs/hydrogen/src/local_file_mgr.cpp
--- hydrogen.old/libs/hydrogen/src/local_file_mgr.cpp	2009-02-13 14:22:01.000000000 -0500
+++ hydrogen/libs/hydrogen/src/local_file_mgr.cpp	2009-02-13 14:44:51.000000000 -0500
@@ -47,7 +47,7 @@
 #include <QApplication>
 #include <QVector>
 
-#include "xml/tinyxml.h"
+#include <tinyxml.h>
 
 #include <algorithm>
 //#include <cstdio>
diff -rupN hydrogen.old/libs/hydrogen/src/preferences.cpp hydrogen/libs/hydrogen/src/preferences.cpp
--- hydrogen.old/libs/hydrogen/src/preferences.cpp	2009-02-13 14:22:01.000000000 -0500
+++ hydrogen/libs/hydrogen/src/preferences.cpp	2009-02-13 14:43:03.000000000 -0500
@@ -42,7 +42,7 @@
 #include "config.h"
 #include "version.h"
 
-#include "xml/tinyxml.h"
+#include <tinyxml.h>
 #include <QDir>
 #include <QApplication>
 
diff -rupN hydrogen.old/libs/hydrogen/src/song.cpp hydrogen/libs/hydrogen/src/song.cpp
--- hydrogen.old/libs/hydrogen/src/song.cpp	2009-02-13 14:22:01.000000000 -0500
+++ hydrogen/libs/hydrogen/src/song.cpp	2009-02-13 14:43:03.000000000 -0500
@@ -25,7 +25,7 @@
 
 #include <cassert>
 
-#include "xml/tinyxml.h"
+#include <tinyxml.h>
 
 #include <hydrogen/adsr.h>
 #include <hydrogen/data_path.h>
diff -rupN hydrogen.old/Sconstruct hydrogen/Sconstruct
--- hydrogen.old/Sconstruct	2009-02-13 14:22:05.000000000 -0500
+++ hydrogen/Sconstruct	2009-02-13 14:43:03.000000000 -0500
@@ -72,7 +72,7 @@ def get_platform_flags( opts ):
 		if sys.platform == "darwin" and str(env['coreaudio']) == "1": cppflags.append('-DCOREAUDIO_SUPPORT')
 
 		cppflags.append('-DLADSPA_SUPPORT')
-		
+		ldflags.append('-ltinyxml')		
 
 
 	if str(env['libarchive']) == "1": cppflags.append('-DLIBARCHIVE_SUPPORT')
@@ -237,6 +237,7 @@ def get_hydrogen_gui( lib_hydrogen , opt
 
 	env.Append( LIBS = lib_hydrogen )
 	env.Append( LIBS = ["sndfile"] )
+	env.Append( LIBS = ["tinyxml"] )
 	
 	if str(env['lrdf']) == "1": env.Append( LIBS = ["lrdf"] )
 	if str(env['flac']) == "1": env.Append( LIBS = ["FLAC","FLAC++"] )
@@ -366,6 +367,11 @@ if platform == "darwin" or platform == "
 
 #Check if all required libraries are installed
 conf = Configure(env)
+
+if not conf.CheckCXXHeader('tinyxml.h'):
+    print 'tinyxml must be installed!'
+    Exit(1)
+
 if not conf.CheckCHeader('sndfile.h'):
     print 'libsndfile must be installed!'
     Exit(1)