--- branches/development/src/math/ConvexHull.cpp	2012/01/06 19:03:05	1668
+++ branches/development/src/math/ConvexHull.cpp	2012/11/16 21:18:42	1812
@@ -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") {
 }
@@ -97,6 +87,7 @@ void ConvexHull::computeHull(std::vector<StuntDouble*>
   // Copy the positon vector into a points vector for qhull.
   std::vector<StuntDouble*>::iterator SD;
   int i = 0;
+
   for (SD =bodydoubles.begin(); SD != bodydoubles.end(); ++SD){
     Vector3d pos = (*SD)->getPos();      
     ptArray[dim_ * i] = pos.x();
@@ -214,6 +205,7 @@ void ConvexHull::computeHull(std::vector<StuntDouble*>
   } //qh_new_qhull
 
 #endif
+
   intPoint = qh interior_point;
   RealType calcvol = 0.0;
   FORALLfacets {