diff --git a/include/coff/ChangeLog b/include/coff/ChangeLog
index cf17074ab1..2341019f7c 100644
--- a/include/coff/ChangeLog
+++ b/include/coff/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-23  Nick Clifton  <nickc@redhat.com>
+
+	* a29k.h: Fix compile time warning.
+	* external.h: Fix compile time warning.
+	* m88k.h: Fix compile time warning.
+
 2001-03-13  Nick Clifton  <nickc@redhat.com>
 
 	* external.h: New file. Common structure definitions found in
diff --git a/include/coff/a29k.h b/include/coff/a29k.h
index 3b601f8214..673e71696a 100644
--- a/include/coff/a29k.h
+++ b/include/coff/a29k.h
@@ -55,6 +55,7 @@
 #define NMAGIC		0410	/* separate i/d executable */
 #define SHMAGIC	0406		/* NYU/Ultra3 shared data executable 
 				   (writable text) */
+#undef  _ETEXT
 #define _ETEXT   	"_etext"
 
 /*--------------------------------------------------------------*/
diff --git a/include/coff/external.h b/include/coff/external.h
index b584f30f9e..6fd41f19cb 100644
--- a/include/coff/external.h
+++ b/include/coff/external.h
@@ -113,8 +113,8 @@ struct external_lineno
 #define	LINESZ	(4 + L_LNNO_SIZE)
 
 #if L_LNNO_SIZE == 4
-#define GET_LINENO_LNNO(abfd, ext)     bfd_h_get_32 (abfd, (bfd_byte *) (ext->l_lnno));
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_32 (abfd,val, (bfd_byte *) (ext->l_lnno));
+#define GET_LINENO_LNNO(abfd, ext)      bfd_h_get_32 (abfd,      (bfd_byte *) (ext->l_lnno));
+#define PUT_LINENO_LNNO(abfd, val, ext) bfd_h_put_32 (abfd, val, (bfd_byte *) (ext->l_lnno));
 #endif
 #if L_LNNO_SIZE == 2
 #define GET_LINENO_LNNO(abfd, ext)     bfd_h_get_16 (abfd, (bfd_byte *) (ext->l_lnno));
diff --git a/include/coff/m88k.h b/include/coff/m88k.h
index 44fbca4914..3863564a00 100644
--- a/include/coff/m88k.h
+++ b/include/coff/m88k.h
@@ -172,8 +172,6 @@ union external_auxent
 #define PUT_SCN_SCNLEN(abfd,in, ext) bfd_h_put_32(abfd, in, (bfd_byte *) ext->x_scn.x_scnlen)
 #define PUT_SCN_NRELOC(abfd,in, ext) bfd_h_put_32(abfd, in, (bfd_byte *)ext->x_scn.x_nreloc)
 #define PUT_SCN_NLINNO(abfd,in, ext)  bfd_h_put_32(abfd,in, (bfd_byte *) ext->x_scn.x_nlinno)
-#define GET_LINENO_LNNO(abfd, ext)  bfd_h_get_32(abfd, (bfd_byte *) (ext->l_lnno))
-#define PUT_LINENO_LNNO(abfd,val, ext)  bfd_h_put_32(abfd,val,  (bfd_byte *) (ext->l_lnno));
 
 #define	SYMENT	struct external_syment
 #define	SYMESZ	20