diff -Nurd octave-@OCTVERSION@/src/DLD-FUNCTIONS/oct-qhull.h octave-@OCTVERSION@.patched/src/DLD-FUNCTIONS/oct-qhull.h
--- octave-@OCTVERSION@/src/DLD-FUNCTIONS/oct-qhull.h	2012-01-15 13:05:02.000000000 -0500
+++ octave-@OCTVERSION@.patched/src/DLD-FUNCTIONS/oct-qhull.h	2012-02-07 13:19:49.000000000 -0500
@@ -27,27 +27,11 @@
 
 extern "C" {
 
-#if defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H)
-# if defined (HAVE_QHULL_LIBQHULL_H)
-#  include <qhull/libqhull.h>
-# else
-#  include <qhull/qhull.h>
-# endif
-# include <qhull/qset.h>
-# include <qhull/geom.h>
-# include <qhull/poly.h>
-# include <qhull/io.h>
-#elif defined (HAVE_LIBQHULL_H) || defined (HAVE_QHULL_H)
-# if defined (HAVE_LIBQHULL_H)
-#  include <libqhull.h>
-# else
-#  include <qhull.h>
-# endif
-# include <qset.h>
-# include <geom.h>
-# include <poly.h>
-# include <io.h>
-#endif
+#  include <libqhull/libqhull.h>
+# include <libqhull/qset.h>
+# include <libqhull/geom.h>
+# include <libqhull/poly.h>
+# include <libqhull/io.h>
 
 }