diff --git a/gcc/fixincludes b/gcc/fixincludes
index a435f24edc1..d46fc4f4f84 100755
--- a/gcc/fixincludes
+++ b/gcc/fixincludes
@@ -146,7 +146,7 @@ while [ $# != 0 ]; do
 	  /#[a-z]*if.*[	 (]ns32000/	s/\([^_]\)ns32000/\1__ns32000__/g
 	  /#[a-z]*if.*[	 (]pyr/		s/\([^_]\)pyr/\1__pyr__/g
 	  /#[a-z]*if.*[	 (]is68k/	s/\([^_]\)is68k/\1__is68k__/g
-	  /#define.NULL[ 	]/	i\
+	  /^#define.NULL[ 	]/	i\
 		#undef NULL
 	' $2/$file > $2/$file.sed
 	mv $2/$file.sed $2/$file
@@ -237,7 +237,7 @@ fi
 if [ -r ${LIB}/$file ]; then
   echo Fixing $file
   ex ${LIB}/$file <<EOF
-  /size_t.*;/
+  /typedef.*size_t.*;/
   i
 #ifndef _GCC_SIZE_T
 #define _GCC_SIZE_T
@@ -287,7 +287,7 @@ fi
 if [ -r ${LIB}/$file ]; then
   echo Fixing $file, definition of nodeent
   ex ${LIB}/$file <<EOF
-  g/na_addr/s//&;/
+  g/char.*na_addr *$/s//&;/
   wq
 EOF
   if cmp $file ${LIB}/$file >/dev/null 2>&1; then