Index: mpi-1.8.6/mpi.c
===================================================================
--- mpi-1.8.6.orig/mpi.c	2015-02-07 19:32:37.136895701 -0800
+++ mpi-1.8.6/mpi.c	2015-02-07 19:32:43.876775527 -0800
@@ -84,14 +84,6 @@
 
 /* }}} */
 
-/* {{{ Comparison constants */
-
-#define  MP_LT       -1
-#define  MP_EQ        0
-#define  MP_GT        1
-
-/* }}} */
-
 /* {{{ Constant strings */
 
 /* Constant strings returned by mp_strerror() */
Index: mpi-1.8.6/mpi.h
===================================================================
--- mpi-1.8.6.orig/mpi.h	2015-02-07 19:32:37.136895701 -0800
+++ mpi-1.8.6/mpi.h	2015-02-07 19:32:43.876775527 -0800
@@ -42,6 +42,10 @@
 #define  MP_UNDEF        -5 /* answer is undefined   */
 #define  MP_LAST_CODE    MP_UNDEF
 
+#define  MP_LT       -1
+#define  MP_EQ        0
+#define  MP_GT        1
+
 #include "mpi-types.h"
 
 /* Included for compatibility... */