diff --git a/gcc/fixincludes b/gcc/fixincludes
index a0413b4ff7c..987d4e48a7a 100755
--- a/gcc/fixincludes
+++ b/gcc/fixincludes
@@ -246,12 +246,12 @@ while [ $# != 0 ]; do
 	  /\/\/[^*]/			s|//\(.*\)$|/*\1*/|
 	  /[ 	]_IO[A-Z]*[ 	]*(/	s/(\(.\),/('\''\1'\'',/
 	  /[ 	]BSD43__IO[A-Z]*[ 	]*(/	s/(\(.\),/('\''\1'\'',/
-	  /#define._IO/			s/'\''x'\''/x/g
-	  /#define.BSD43__IO/		s/'\''x'\''/x/g
+	  /#define._IO/			s/'\''\([cgx]\)'\''/\1/g
+	  /#define.BSD43__IO/		s/'\''\(]cgx]\)'\''/\1/g
 	  /[^A-Z]CTRL[ 	]*(/		s/\([^'\'']\))/'\''\1'\'')/
-	  /#define.CTRL/		s/'\''c'\''/c/g
-	  /#define._CTRL/		s/'\''c'\''/c/g
-	  /#define.BSD43_CTRL/		s/'\''c'\''/c/g
+	  /#define.CTRL/		s/'\''\([cgx]\)'\''/\1/g
+	  /#define._CTRL/		s/'\''\([cgx]\)'\''/\1/g
+	  /#define.BSD43_CTRL/		s/'\''\([cgx]\)'\''/\1/g
 	  /#[a-z]*if.*[	 (]m68k/	s/\([^_]\)m68k/\1__m68k__/g
 	  /#[a-z]*if.*[	 (]__i386/	s/__i386/__i386__/g
 	  /#[a-z]*if.*[	 (]i386/	s/\([^_]\)i386/\1__i386__/g