diff --git a/examples/Makefile.am b/examples/Makefile.am
index b850401..f7fac16 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,18 +9,17 @@ endif
 noinst_PROGRAMS =           \
     exCompiledDoubleFunction\
     exDerivative            \
+    exFit                   \
+    exFitSample             \
     exIntegrator            \
     exInterp                \
     exMat                   \
     exMathInterpreter       \
+    exMin                   \
     exPlot                  \
     exRand                  \
     exRootFinder
 
-if HAVE_MINUIT
-noinst_PROGRAMS += exFit exFitSample exMin
-endif
-
 exCompiledDoubleFunction_SOURCES  = exCompiledDoubleFunction.cpp
 exCompiledDoubleFunction_CXXFLAGS = $(COM_CXXFLAGS)
 exCompiledDoubleFunction_LDFLAGS  = -L../lib/.libs -lLatAnalyze
@@ -29,7 +28,6 @@ exDerivative_SOURCES              = exDerivative.cpp
 exDerivative_CXXFLAGS             = $(COM_CXXFLAGS)
 exDerivative_LDFLAGS              = -L../lib/.libs -lLatAnalyze
 
-if HAVE_MINUIT
 exFit_SOURCES                     = exFit.cpp
 exFit_CXXFLAGS                    = $(COM_CXXFLAGS)
 exFit_LDFLAGS                     = -L../lib/.libs -lLatAnalyze
@@ -37,7 +35,6 @@ exFit_LDFLAGS                     = -L../lib/.libs -lLatAnalyze
 exFitSample_SOURCES               = exFitSample.cpp
 exFitSample_CXXFLAGS              = $(COM_CXXFLAGS)
 exFitSample_LDFLAGS               = -L../lib/.libs -lLatAnalyze
-endif
 
 exInterp_SOURCES                  = exInterp.cpp
 exInterp_CXXFLAGS                 = $(COM_CXXFLAGS)
@@ -51,11 +48,9 @@ exMat_SOURCES                     = exMat.cpp
 exMat_CXXFLAGS                    = $(COM_CXXFLAGS)
 exMat_LDFLAGS                     = -L../lib/.libs -lLatAnalyze
 
-if HAVE_MINUIT
 exMin_SOURCES                     = exMin.cpp
 exMin_CXXFLAGS                    = $(COM_CXXFLAGS)
 exMin_LDFLAGS                     = -L../lib/.libs -lLatAnalyze
-endif
 
 exMathInterpreter_SOURCES         = exMathInterpreter.cpp
 exMathInterpreter_CXXFLAGS        = $(COM_CXXFLAGS)
diff --git a/examples/exMat.cpp b/examples/exMat.cpp
index 03a657f..2a0fad2 100644
--- a/examples/exMat.cpp
+++ b/examples/exMat.cpp
@@ -8,7 +8,7 @@ using namespace Latan;
 int main(void)
 {
     DMat A(2, 3), B(3, 2), C = DMat::Random(6, 6);
-    const string fileName = "exMat.h5";
+    const string fileName = "exMat.dat";
     
     A << 1, 2, 3,
          4, 5, 6;
diff --git a/examples/exMin.cpp b/examples/exMin.cpp
index 676e89a..b902573 100644
--- a/examples/exMin.cpp
+++ b/examples/exMin.cpp
@@ -1,5 +1,5 @@
 #include <LatAnalyze/CompiledFunction.hpp>
-#include <LatAnalyze/MinuitMinimizer.hpp>
+#include <LatAnalyze/GslMinimizer.hpp>
 
 using namespace std;
 using namespace Latan;
@@ -16,8 +16,8 @@ int main(int argc, char* argv[])
     }
     source = argv[1];
     
-    DoubleFunction  f = compile(source, 1);
-    MinuitMinimizer minimize;
+    DoubleFunction f = compile(source, 1);
+    GslMinimizer   minimize;
     DVec init(1);
     double min;
 
diff --git a/lib/Io.cpp b/lib/Io.cpp
index 9c9f192..c02de7c 100644
--- a/lib/Io.cpp
+++ b/lib/Io.cpp
@@ -19,6 +19,10 @@
 
 #include <LatAnalyze/Io.hpp>
 #include <LatAnalyze/includes.hpp>
+#include <LatAnalyze/AsciiFile.hpp>
+#ifdef HAVE_HDF5
+#include <LatAnalyze/Hdf5File.hpp>
+#endif
 
 using namespace std;
 using namespace Latan;
@@ -34,14 +38,16 @@ unique_ptr<File> Io::open(const std::string &fileName, const unsigned int mode)
 {
     string ext = extension(fileName);
     
-    if (ext == "h5")
-    {
-        return unique_ptr<File>(new Hdf5File(fileName, mode));
-    }
-    else if ((ext == "dat")||(ext == "sample")||(ext == "seed"))
+    if ((ext == "dat")||(ext == "sample")||(ext == "seed"))
     {
         return unique_ptr<File>(new AsciiFile(fileName, mode));
     }
+#ifdef HAVE_HDF5
+    else if (ext == "h5")
+    {
+        return unique_ptr<File>(new Hdf5File(fileName, mode));
+    }
+#endif
     else
     {
         LATAN_ERROR(Io, "unknown file extension '" + ext + "'");
diff --git a/lib/Io.hpp b/lib/Io.hpp
index dee66ff..1ed747d 100644
--- a/lib/Io.hpp
+++ b/lib/Io.hpp
@@ -21,8 +21,7 @@
 #define Latan_Io_hpp_
 
 #include <LatAnalyze/Global.hpp>
-#include <LatAnalyze/AsciiFile.hpp>
-#include <LatAnalyze/Hdf5File.hpp>
+#include <LatAnalyze/File.hpp>
 
 BEGIN_LATAN_NAMESPACE
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9445b94..3865ab8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -34,7 +34,6 @@ libLatAnalyze_la_SOURCES = \
     GslHybridRootFinder.cpp\
 	GslMinimizer.cpp       \
     GslQagsIntegrator.cpp  \
-    Hdf5File.cpp           \
     Histogram.cpp          \
     includes.hpp           \
     Io.cpp                 \
@@ -67,7 +66,6 @@ libLatAnalyze_la_HEADERS = \
     GslHybridRootFinder.hpp\
 	GslMinimizer.hpp       \
     GslQagsIntegrator.hpp  \
-    Hdf5File.hpp           \
     Histogram.hpp          \
     Integrator.hpp         \
     Io.hpp                 \
@@ -86,6 +84,10 @@ libLatAnalyze_la_HEADERS = \
     StatArray.hpp          \
     XYSampleData.hpp       \
     XYStatData.hpp
+if HAVE_HDF5
+    libLatAnalyze_la_SOURCES += Hdf5File.cpp
+    libLatAnalyze_la_HEADERS += Hdf5File.hpp
+endif
 if HAVE_MINUIT
     libLatAnalyze_la_SOURCES += MinuitMinimizer.cpp
     libLatAnalyze_la_HEADERS += MinuitMinimizer.hpp