--- branches/development/src/math/ConvexHull.cpp	2012/01/06 19:03:05	1668
+++ branches/development/src/math/ConvexHull.cpp	2012/05/15 13:02:10	1708
@@ -62,20 +62,10 @@
 #include <mpi.h>
 #endif
 
-using namespace OpenMD;
+#include "math/qhull.hpp"
 
 #ifdef HAVE_QHULL
-extern "C"
-{
-#include <qhull/libqhull.h>
-#include <qhull/mem.h>
-#include <qhull/qset.h>
-#include <qhull/geom.h>
-#include <qhull/merge.h>
-#include <qhull/poly.h>
-#include <qhull/io.h>
-#include <qhull/stat.h>
-}
+using namespace OpenMD;
 
 ConvexHull::ConvexHull() : Hull(), dim_(3), options_("qhull Qt Pp") {
 }
@@ -214,6 +204,7 @@ void ConvexHull::computeHull(std::vector<StuntDouble*>
   } //qh_new_qhull
 
 #endif
+
   intPoint = qh interior_point;
   RealType calcvol = 0.0;
   FORALLfacets {