--- branches/development/src/math/AlphaHull.cpp	2012/01/06 19:03:05	1668
+++ branches/development/src/math/AlphaHull.cpp	2013/01/09 19:27:52	1825
@@ -58,25 +58,14 @@
 #include <utility>
 #include "math/AlphaHull.hpp"
 #include "utils/simError.h"
-
 #ifdef IS_MPI
 #include <mpi.h>
 #endif
+#include "math/qhull.hpp"
 
 using namespace OpenMD;
 
 #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>
-}
 double calculate_circumradius(pointT* p0,pointT* p1,pointT* p2, int dim);
 
 AlphaHull::AlphaHull(double alpha) : Hull(), dim_(3), alpha_(alpha), options_("qhull d QJ Tcv Pp") {
@@ -85,13 +74,14 @@ void AlphaHull::computeHull(std::vector<StuntDouble*> 
 void AlphaHull::computeHull(std::vector<StuntDouble*> bodydoubles) { 
  
   int numpoints = bodydoubles.size();
-  bool alphashape=true;
+  // bool alphashape=true;
   
   Triangles_.clear();
   
-  vertexT *vertex, **vertexp;
+  vertexT *vertex;
+  // vertexT **vertexp;
   facetT *facet, *neighbor;
-  setT *vertices, *verticestop, *verticesbottom;
+  // setT *vertices, *verticestop, *verticesbottom;
   int curlong, totlong;
   pointT *interiorPoint;