diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 341fa7f8da..c3efbe4c6e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -7,6 +7,12 @@
 
 1999-09-11  Donn Terry  <donn@interix.com>
 
+	* coffswap.h (IMAGE_BASE): Don't define.
+	* pei-arm.c (IMAGE_BASE): Don't define.
+	* pei-i386.c (IMAGE_BASE): Don't define.
+	* pei-mcore.c (IMAGE_BASE): Don't define.
+	* pei-ppc.c (IMAGE_BASE): Don't define.
+
 	* cofflink.c (_bfd_coff_link_input_bfd): When writing out a
 	symbol, switch on the class when determining whether to modify the
 	value.  For PE, don't modify the value of a C_FCN symbol not named
diff --git a/bfd/coffswap.h b/bfd/coffswap.h
index c9f25d62a5..c4a5f66bdd 100644
--- a/bfd/coffswap.h
+++ b/bfd/coffswap.h
@@ -27,10 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    Any file which uses this must first include "coff/internal.h" and
    "coff/CPU.h".  The functions will then be correct for that CPU.  */
 
-#ifndef IMAGE_BASE
-#define IMAGE_BASE 0
-#endif
-
 #define PUTWORD bfd_h_put_32
 #define PUTHALF bfd_h_put_16
 #define	PUTBYTE bfd_h_put_8
diff --git a/bfd/pei-arm.c b/bfd/pei-arm.c
index 4ba5b3a5cd..b7ae01e16b 100644
--- a/bfd/pei-arm.c
+++ b/bfd/pei-arm.c
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define TARGET_BIG_NAME    "pei-arm-big"
 #endif
 
-#define IMAGE_BASE         NT_IMAGE_BASE
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
 #define PCRELOFFSET        true
diff --git a/bfd/pei-i386.c b/bfd/pei-i386.c
index 8b52968370..6dcafd9655 100644
--- a/bfd/pei-i386.c
+++ b/bfd/pei-i386.c
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define TARGET_SYM i386pei_vec
 #define TARGET_NAME "pei-i386"
-#define IMAGE_BASE NT_IMAGE_BASE
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
 #define PCRELOFFSET true
diff --git a/bfd/pei-mcore.c b/bfd/pei-mcore.c
index d4a872cdfc..78c3b95aad 100644
--- a/bfd/pei-mcore.c
+++ b/bfd/pei-mcore.c
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define TARGET_LITTLE_NAME   "pei-mcore-little"
 #endif
 
-#define IMAGE_BASE         NT_IMAGE_BASE
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
 #define PCRELOFFSET        true
diff --git a/bfd/pei-ppc.c b/bfd/pei-ppc.c
index 839bc0f64a..b2d207b3b7 100644
--- a/bfd/pei-ppc.c
+++ b/bfd/pei-ppc.c
@@ -32,8 +32,6 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_BIG_SYM      bfd_powerpc_pei_vec
 #define TARGET_BIG_NAME    "pei-powerpc"
 
-#define IMAGE_BASE          NT_IMAGE_BASE
-
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE