diff --git a/include/openssl/mirdef.h b/include/openssl/mirdef.h
index 80cddc94..4ce88d50 100644
--- a/include/openssl/mirdef.h
+++ b/include/openssl/mirdef.h
@@ -1,30 +1,16 @@
-/* 
+/*
  *   MIRACL compiler/hardware definitions - mirdef.h
- *   This version suitable for use with most 32-bit computers
- *   e.g. 80386+ PC, VAX, ARM etc. Assembly language versions of muldiv,
- *   muldvm, muldvd and muldvd2 will be necessary. See mrmuldv.any 
- *
- *   Also suitable for DJGPP GNU C Compiler
- *   ... but change __int64 to long long
+ *   For C++ build of library
  */
 
-#define MIRACL 32
-#define MR_LITTLE_ENDIAN    /* This may need to be changed        */
-#define mr_utype int
-                            /* the underlying type is usually int *
-                             * but see mrmuldv.any                */
+#define MR_LITTLE_ENDIAN
+#define MIRACL 64
+#define mr_utype long
+#define mr_unsign64 unsigned long
+#define MR_IBITS 32
+#define MR_LBITS 64
 #define mr_unsign32 unsigned int
-                            /* 32 bit unsigned type               */
-#define MR_IBITS      32    /* bits in int  */
-#define MR_LBITS      32    /* bits in long */
-#define MR_FLASH      52      
-                            /* delete this definition if integer  *
-                             * only version of MIRACL required    */
-                            /* Number of bits per double mantissa */
-
-#define mr_dltype __int64   /* ... or long long for Unix/Linux */
-#define mr_unsign64 unsigned __int64
-
+#define MR_FLASH 52
 #define MAXBASE ((mr_small)1<<(MIRACL-1))
-
-
+#define MR_BITSINCHAR 8
+#define MR_CPP