Index: trunk/Ohana/src/libohana/include/ohana.h
===================================================================
--- trunk/Ohana/src/libohana/include/ohana.h	(revision 12875)
+++ trunk/Ohana/src/libohana/include/ohana.h	(revision 14448)
@@ -33,12 +33,36 @@
 # endif 
 
-# define SIGN(X)  (((X) == 0) ? 0 : ((fabs((double)(X))) / (X)))
+// XXX these should probably use safe name-spaces (eg, OHANA_MIN)
+# ifndef SIGN
+# define SIGN(X) (((X) == 0) ? 0 : ((fabs((double)(X))) / (X)))
+# endif
+
+# ifndef ROUND
 # define ROUND(X) ((int) ((X) + 0.5*SIGN(X)))
+# endif
+
+# ifndef SQR
 # define SQR(X)   (double) (((double)(X))*((double)(X)))
+# endif
+
+# ifndef SQ
 # define SQ(X)    (double) (((double)(X))*((double)(X)))
+# endif
+
+# ifndef MIN
 # define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
+# endif
+
+# ifndef MAX
 # define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
+# endif
+
+# ifndef SWAP
 # define SWAP(X,Y) {double tmp=(X); (X) = (Y); (Y) = tmp;}
+# endif
+
+# ifndef DTIME
 # define DTIME(A,B) ((A.tv_sec - B.tv_sec) + 1e-6*(A.tv_usec - B.tv_usec))
+# endif
 
 enum {