diff --git a/mpz/aors.h b/mpz/aors.h
index 9c66b9bb..6bb08847 100644
--- a/mpz/aors.h
+++ b/mpz/aors.h
@@ -23,21 +23,6 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 
-#ifdef BERKELEY_MP
-
-#include "mp.h"
-#ifdef OPERATION_add
-#define FUNCTION     madd
-#define VARIATION
-#endif
-#ifdef OPERATION_sub
-#define FUNCTION     msub
-#define VARIATION    -
-#endif
-#define ARGUMENTS    mpz_srcptr u, mpz_srcptr v, mpz_ptr w
-
-#else /* normal GMP */
-
 #ifdef OPERATION_add
 #define FUNCTION     mpz_add
 #define VARIATION
@@ -48,8 +33,6 @@ MA 02110-1301, USA. */
 #endif
 #define ARGUMENTS    mpz_ptr w, mpz_srcptr u, mpz_srcptr v
 
-#endif
-
 #ifndef FUNCTION
 Error, need OPERATION_add or OPERATION_sub
 #endif
diff --git a/mpz/cmp.c b/mpz/cmp.c
index 46c51c55..14723c62 100644
--- a/mpz/cmp.c
+++ b/mpz/cmp.c
@@ -20,18 +20,11 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 MA 02110-1301, USA. */
 
-#ifdef BERKELEY_MP
-#include "mp.h"
-#endif
 #include "mpir.h"
 #include "gmp-impl.h"
 
 int
-#ifdef BERKELEY_MP
-mcmp (mpz_srcptr u, mpz_srcptr v)
-#else
 mpz_cmp (mpz_srcptr u, mpz_srcptr v)
-#endif
 {
   mp_size_t  usize, vsize, dsize, asize;
   mp_srcptr  up, vp;
diff --git a/mpz/gcd.c b/mpz/gcd.c
index ed02cd8e..d08b09a6 100644
--- a/mpz/gcd.c
+++ b/mpz/gcd.c
@@ -156,11 +156,8 @@ MA 02111-1307, USA. */
 }
 
 void
-#ifndef BERKELEY_MP
 mpz_gcd (mpz_ptr g, mpz_srcptr u, mpz_srcptr v)
-#else /* BERKELEY_MP */
-gcd (mpz_srcptr u, mpz_srcptr v, mpz_ptr g)
-#endif /* BERKELEY_MP */
+
   GCD_BODY(mpn_gcd)
 
 void
diff --git a/mpz/mul.c b/mpz/mul.c
index 498e9b80..756cda29 100644
--- a/mpz/mul.c
+++ b/mpz/mul.c
@@ -23,17 +23,9 @@ MA 02110-1301, USA. */
 #include <stdio.h> /* for NULL */
 #include "mpir.h"
 #include "gmp-impl.h"
-#ifdef BERKELEY_MP
-#include "mp.h"
-#endif
-
 
 void
-#ifndef BERKELEY_MP
 mpz_mul (mpz_ptr w, mpz_srcptr u, mpz_srcptr v)
-#else /* BERKELEY_MP */
-mult (mpz_srcptr u, mpz_srcptr v, mpz_ptr w)
-#endif /* BERKELEY_MP */
 {
   mp_size_t usize = u->_mp_size;
   mp_size_t vsize = v->_mp_size;
diff --git a/mpz/powm.c b/mpz/powm.c
index 2fe7533b..bf695606 100644
--- a/mpz/powm.c
+++ b/mpz/powm.c
@@ -24,9 +24,6 @@ MA 02110-1301, USA. */
 #include "mpir.h"
 #include "gmp-impl.h"
 #include "longlong.h"
-#ifdef BERKELEY_MP
-#include "mp.h"
-#endif
 
 /* Compute t = a mod m, a is defined by (ap,an), m is defined by (mp,mn), and
    t is defined by (tp,mn).  */
@@ -119,11 +116,7 @@ phi (mp_limb_t t)
 #undef REDUCE_EXPONENT
 
 void
-#ifndef BERKELEY_MP
 mpz_powm (mpz_ptr r, mpz_srcptr b, mpz_srcptr e, mpz_srcptr m)
-#else /* BERKELEY_MP */
-pow (mpz_srcptr b, mpz_srcptr e, mpz_srcptr m, mpz_ptr r)
-#endif /* BERKELEY_MP */
 {
   mp_ptr xp, tp, qp, gp, this_gp;
   mp_srcptr bp, ep, mp;
diff --git a/mpz/set.c b/mpz/set.c
index d7dab36b..a7609c83 100644
--- a/mpz/set.c
+++ b/mpz/set.c
@@ -23,18 +23,9 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 
-#ifdef BERKELEY_MP
-#include "mp.h"
-#define FUNCTION   move
-#define ARGUMENTS  mpz_srcptr u, mpz_ptr w
-
-#else
 #define FUNCTION   mpz_set
 #define ARGUMENTS  mpz_ptr w, mpz_srcptr u
 
-#endif
-
-
 void
 FUNCTION (ARGUMENTS)
 {
diff --git a/mpz/sqrtrem.c b/mpz/sqrtrem.c
index 3bcc50e4..2ad45349 100644
--- a/mpz/sqrtrem.c
+++ b/mpz/sqrtrem.c
@@ -24,16 +24,9 @@ MA 02110-1301, USA. */
 #include <stdio.h> /* for NULL */
 #include "mpir.h"
 #include "gmp-impl.h"
-#ifdef BERKELEY_MP
-#include "mp.h"
-#endif
 
 void
-#ifndef BERKELEY_MP
 mpz_sqrtrem (mpz_ptr root, mpz_ptr rem, mpz_srcptr op)
-#else /* BERKELEY_MP */
-msqrt (mpz_srcptr op, mpz_ptr root, mpz_ptr rem)
-#endif /* BERKELEY_MP */
 {
   mp_size_t op_size, root_size, rem_size;
   mp_ptr root_ptr, op_ptr;
diff --git a/mpz/tdiv_qr.c b/mpz/tdiv_qr.c
index 1b6f7d3b..d717d264 100644
--- a/mpz/tdiv_qr.c
+++ b/mpz/tdiv_qr.c
@@ -23,16 +23,9 @@ MA 02110-1301, USA. */
 #include "mpir.h"
 #include "gmp-impl.h"
 #include "longlong.h"
-#ifdef BERKELEY_MP
-#include "mp.h"
-#endif
 
 void
-#ifndef BERKELEY_MP
 mpz_tdiv_qr (mpz_ptr quot, mpz_ptr rem, mpz_srcptr num, mpz_srcptr den)
-#else /* BERKELEY_MP */
-mdiv (mpz_srcptr num, mpz_srcptr den, mpz_ptr quot, mpz_ptr rem)
-#endif /* BERKELEY_MP */
 {
   mp_size_t ql;
   mp_size_t ns, ds, nl, dl;