--- ./cudd/cudd.h.orig	2015-01-03 11:57:30.000000000 -0700
+++ ./cudd/cudd.h	2015-10-01 21:16:11.045396309 -0600
@@ -61,6 +61,7 @@
 /* Nested includes                                                           */
 /*---------------------------------------------------------------------------*/
 
+#include <bits/wordsize.h>
 #include "mtr.h"
 #include "epd.h"
 
@@ -75,14 +76,22 @@ extern "C" {
 #define CUDD_VERSION "2.5.1"
 
 #ifndef SIZEOF_VOID_P
+#if __WORDSIZE == 64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
 #ifndef SIZEOF_LONG
+#if __WORDSIZE == 64
+#define SIZEOF_LONG 8
+#else
 #define SIZEOF_LONG 4
 #endif
+#endif
 
 #define CUDD_TRUE 1
 #define CUDD_FALSE 0
--- ./epd/epd.h.orig	2004-08-24 15:33:13.000000000 -0600
+++ ./epd/epd.h	2012-02-20 13:36:44.064529084 -0700
@@ -76,7 +76,9 @@ extern "C" {
   SeeAlso     []
 
 ******************************************************************************/
-#ifdef	EPD_BIG_ENDIAN
+#include <endian.h>
+
+#if __BYTE_ORDER == __BIG_ENDIAN
 struct IeeeDoubleStruct {	/* BIG_ENDIAN */
   unsigned int sign: 1;
   unsigned int exponent: 11;
@@ -101,7 +103,7 @@ struct IeeeDoubleStruct {	/* LITTLE_ENDI
   SeeAlso     []
 
 ******************************************************************************/
-#ifdef	EPD_BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
 struct IeeeNanStruct {	/* BIG_ENDIAN */
   unsigned int sign: 1;
   unsigned int exponent: 11;
--- ./mtr/mtr.h.orig	2012-02-04 18:06:22.000000000 -0700
+++ ./mtr/mtr.h	2012-02-20 13:31:21.683858386 -0700
@@ -63,6 +63,8 @@
 /* Nested includes                                                           */
 /*---------------------------------------------------------------------------*/
 
+#include <bits/wordsize.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -72,8 +74,12 @@ extern "C" {
 /*---------------------------------------------------------------------------*/
 
 #ifndef SIZEOF_VOID_P
+#if __WORDSIZE == 64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
--- ./util/util.h.orig	2012-02-04 22:35:52.000000000 -0700
+++ ./util/util.h	2012-02-20 13:31:21.682858387 -0700
@@ -3,6 +3,8 @@
 #ifndef UTIL_H
 #define UTIL_H
 
+#include <bits/wordsize.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -20,14 +22,22 @@ extern "C" {
 #endif
 
 #ifndef SIZEOF_VOID_P
+#if __WORDSIZE == 64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
 #ifndef SIZEOF_LONG
+#if __WORDSIZE == 64
+#define SIZEOF_LONG 8
+#else
 #define SIZEOF_LONG 4
 #endif
+#endif
 
 #if SIZEOF_VOID_P == 8 && SIZEOF_INT == 4
 typedef long util_ptrint;