diff --git a/packages/bdd/cudd.c b/packages/bdd/cudd.c
index a401bb2ff..4bbfb7d2b 100644
--- a/packages/bdd/cudd.c
+++ b/packages/bdd/cudd.c
@@ -41,17 +41,15 @@ CUDD will generate better/faster code.
 #include "cudd_config.h"
 #include "YapInterface.h"
 
-#if HAVE_UTIL_H
-#include <util.h>
-#endif
 #if HAVE_CUDD_UTIL_H
 #include <cudd/util.h>
-#endif
-#if HAVE_CUDD_H
-#include "cudd.h"
+#elif HAVE_UTIL_H
+#include <util.h>
 #endif
 #if HAVE_CUDD_CUDD_H
 #include "cudd/cudd.h"
+#elif HAVE_CUDD_H
+#include "cudd.h"
 #endif
 
 static YAP_Functor FunctorDollarVar,
diff --git a/packages/bdd/cudd_config.h.cmake b/packages/bdd/cudd_config.h.cmake
index 1c6449c96..600579e6b 100644
--- a/packages/bdd/cudd_config.h.cmake
+++ b/packages/bdd/cudd_config.h.cmake
@@ -2,31 +2,31 @@
 
 /* Define to 1 if you have the <cuddInt.h> header file. */
 #ifndef HAVE_CUDDINT_H
-#cmakedefine HAVE_CUDDINT_H ${HAVE_CUDDINT_H}
+#define HAVE_CUDDINT_H ${HAVE_CUDDINT_H}
 #endif
 
 /* Define to 1 if you have the <cudd/cuddInt.h> header file. */
 #ifndef HAVE_CUDD_CUDDINT_H
-#cmakedefine HAVE_CUDD_CUDDINT_H ${HAVE_CUDD_CUDDINT_H}
+#define HAVE_CUDD_CUDDINT_H ${HAVE_CUDD_CUDDINT_H}
 #endif
 
 /* Define to 1 if you have the <cudd/cudd.h> header file. */
 #ifndef HAVE_CUDD_CUDD_H
-#cmakedefine HAVE_CUDD_CUDD_H ${HAVE_CUDD_CUDD_H}
+#define HAVE_CUDD_CUDD_H ${HAVE_CUDD_CUDD_H}
 #endif
 
 /* Define to 1 if you have the <cudd.h> header file. */
 #ifndef HAVE_CUDD_H
-#cmakedefine HAVE_CUDD_H ${HAVE_CUDD_H}
+#define HAVE_CUDD_H ${HAVE_CUDD_H}
 #endif
 
 /* Define to 1 if you have the <cudd/util.h> header file. */
 #ifndef HAVE_CUDD_UTIL_H
-#cmakedefine HAVE_CUDD_UTIL_H ${HAVE_CUDD_UTIL_H}
+#define HAVE_CUDD_UTIL_H ${HAVE_CUDD_UTIL_H}
 #endif
 
 /* Define to 1 if you have the <util.h> header file. */
 #ifndef HAVE_UTIL_H
-#cmakedefine HAVE_UTIL_H ${HAVE_UTIL_H}
+#define HAVE_UTIL_H ${HAVE_UTIL_H}
 #endif
 
diff --git a/packages/bdd/simplecudd/simplecudd.h b/packages/bdd/simplecudd/simplecudd.h
index edf815647..64a3f8ea0 100644
--- a/packages/bdd/simplecudd/simplecudd.h
+++ b/packages/bdd/simplecudd/simplecudd.h
@@ -194,24 +194,24 @@
 #include <time.h>
 #include "config.h"
 #include "../cudd_config.h"
-#if HAVE_UTIL_H
-#include <util.h>
-#endif
+
 #if HAVE_CUDD_UTIL_H
 #include <cudd/util.h>
-#endif
-#if HAVE_CUDD_H
-#include "cudd.h"
+#elif HAVE_UTIL_H
+#include <util.h>
 #endif
 #if HAVE_CUDD_CUDD_H
 #include "cudd/cudd.h"
+#elif HAVE_CUDD_H
+#include "cudd.h"
 #endif
-#if HAVE_CUDDINT_H
-#include "cuddInt.h"
-#endif
+
 #if HAVE_CUDD_CUDDINT_H
 #include "cudd/cuddInt.h"
+#elif HAVE_CUDDINT_H
+#include "cuddInt.h"
 #endif
+
 #include "general.h"
 
 #define IsHigh(manager, node)   HIGH(manager) == node
diff --git a/packages/bdd/simplecudd_lfi/simplecudd.h b/packages/bdd/simplecudd_lfi/simplecudd.h
index fed8c17d5..38ae6b8ca 100644
--- a/packages/bdd/simplecudd_lfi/simplecudd.h
+++ b/packages/bdd/simplecudd_lfi/simplecudd.h
@@ -193,24 +193,23 @@
 #include "pqueue.h"
 #include "config.h"
 #include "../cudd_config.h"
-#if HAVE_UTIL_H
-#include <util.h>
-#endif
 #if HAVE_CUDD_UTIL_H
 #include <cudd/util.h>
-#endif
-#if HAVE_CUDD_H
-#include "cudd.h"
+#elif HAVE_UTIL_H
+#include <util.h>
 #endif
 #if HAVE_CUDD_CUDD_H
 #include "cudd/cudd.h"
+#elif HAVE_CUDD_H
+#include "cudd.h"
 #endif
-#if HAVE_CUDDINT_H
-#include "cuddInt.h"
-#endif
+
 #if HAVE_CUDD_CUDDINT_H
 #include "cudd/cuddInt.h"
+#elif HAVE_CUDDINT_H
+#include "cuddInt.h"
 #endif
+
 #include "general.h"
 
 #define IsHigh(manager, node)   HIGH(manager) == node