diff --git a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_adt_api.h b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_adt_api.h
index 33babbd4b2aae13ac2a68cb918d3d3b11b9ba8cc..a103888b280e934ac7dfde1ec6dce7cc44c0fb39 100644
--- a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_adt_api.h
+++ b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_adt_api.h
@@ -26,18 +26,6 @@
 #include "stdlib.h"
 #include "stdbool.h"
 
-#if E_ACSL_MACHDEP == x86_64
-#define WORDBITS 64
-#elif E_ACSL_MACHDEP == x86_32
-#define WORDBITS 32
-#elif E_ACSL_MACHDEP == ppc_32
-#define WORDBITS 32
-#elif E_ACSL_MACHDEP == x86_16
-#define WORDBITS 16
-#else
-#define WORDBITS 32
-#endif
-
 /* Memory block allocated and may be deallocated */
 struct _block {
   size_t ptr;	/* begin address */
diff --git a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_bittree.h b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_bittree.h
index 655caa5ded3f96f1b1e8aab27cb8192a1671f81b..680006f7fb95b0118c607f57a15ab24150b2fa4a 100644
--- a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_bittree.h
+++ b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_bittree.h
@@ -31,6 +31,8 @@
 #include "e_acsl_assert.h"
 #include "e_acsl_adt_api.h"
 
+#define WORDBITS __WORDSIZE
+
 static size_t mask(size_t, size_t);
 
 #if WORDBITS == 16
@@ -79,7 +81,6 @@ static const size_t Tmasks[] = {
 0xffffffffffffff80,0xffffffffffffffc0,0xffffffffffffffe0,0xfffffffffffffff0,
 0xfffffffffffffff8,0xfffffffffffffffc,0xfffffffffffffffe,0xffffffffffffffff};
 
-
 static const int Teq[] =
   { 0,-1,3,-3,6,-5,7,-7,12,-9,11,-11,14,-13,15,-15,24,-17,19,-19,22,-21,23,-23,
     28,-25,27,-27,30,-29,31,-31,48,-33,35,-35,38,-37,39,-39,44,-41,43,-43,46,