diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f973ef2a346..437230aa8e8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -10,6 +10,7 @@ Fri Apr  2 11:53:37 1999  John Wehle  (john@feith.com)
 	from ./fixinc.interix.  Untested (needs interix box).
 	* fixinc/inclhack.def:
 	Complete the change to the 'fixinc.tmp' file
+	Fixed regex for finding C++ headers
 	* fixincl.x, fixincl.sh, inclhack.sh: regenerate
 
 Fri Apr  2 11:36:12 1999  Jan Hubicka  (hubicka@paru.cas.cz)
diff --git a/gcc/fixinc/fixincl.sh b/gcc/fixinc/fixincl.sh
index 149b39953ec..6efbb9e45a1 100755
--- a/gcc/fixinc/fixincl.sh
+++ b/gcc/fixinc/fixincl.sh
@@ -2,9 +2,9 @@
 #
 # DO NOT EDIT THIS FILE   (fixincl.sh)
 # 
-# It has been autogen-ed  Thursday April  1, 1999 at 02:04:52 AM MST
-# From the definitions    /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
-# and the template file   /puke/law//egcs/egcs/gcc/fixinc/inclhack.tpl
+# It has been autogen-ed  Friday April  2, 1999 at 11:01:59 AM PST
+# From the definitions    inclhack.def
+# and the template file   inclhack.tpl
 #
 # Install modified versions of certain ANSI-incompatible system header
 # files which are fixed to work correctly with ANSI C and placed in a
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 895f53c14c6..de3441c0587 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -1,9 +1,9 @@
 /*
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been autogen-ed  Thursday April  1, 1999 at 02:04:52 AM MST
- * From the definitions    /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
- * and the template file   /puke/law//egcs/egcs/gcc/fixinc/fixincl.tpl
+ * It has been autogen-ed  Friday April  2, 1999 at 11:01:59 AM PST
+ * From the definitions    inclhack.def
+ * and the template file   fixincl.tpl
  *
  * Install modified versions of certain ANSI-incompatible system header
  * files which are fixed to work correctly with ANSI C and placed in a
@@ -597,7 +597,7 @@ tSCC zNo_Double_SlashSelect0[] =
  *  content test pattern.  A shell will deal with it later.
  */
 tSCC zNo_Double_SlashTest0[] =
-       "-z \"`echo ${file}|egrep 'cxx/|++$|\\.hh$|\\.H$'`\"";
+       "-z \"`echo ${file}|egrep '(cxx/|\\+\\+$|\\.hh$|\\.H$|\\.hxx$)'`\"";
 
 #define    NO_DOUBLE_SLASH_TEST_CT  2
 tTestDesc aNo_Double_SlashTests[] = {
@@ -3556,7 +3556,7 @@ tTestDesc aZzz_Ki_IfaceTests[] = {
  */
 const char* apzZzz_Ki_IfacePatch[] = { "sh", "-c",
     "echo \"Removing incorrect fix to <$file>\" >&2\n"
-       "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
+       "rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n"
        "cat > /dev/null",
     (char*)NULL };
 
@@ -3591,7 +3591,7 @@ tTestDesc aZzz_KiTests[] = {
  */
 const char* apzZzz_KiPatch[] = { "sh", "-c",
     "echo \"Removing incorrect fix to <$file>\" >&2\n"
-       "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
+       "rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n"
        "cat > /dev/null",
     (char*)NULL };
 
@@ -3626,7 +3626,7 @@ tTestDesc aZzz_Ki_CallsTests[] = {
  */
 const char* apzZzz_Ki_CallsPatch[] = { "sh", "-c",
     "echo \"Removing incorrect fix to <$file>\" >&2\n"
-       "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
+       "rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n"
        "cat > /dev/null",
     (char*)NULL };
 
@@ -3661,7 +3661,7 @@ tTestDesc aZzz_Ki_DefsTests[] = {
  */
 const char* apzZzz_Ki_DefsPatch[] = { "sh", "-c",
     "echo \"Removing incorrect fix to <$file>\" >&2\n"
-       "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
+       "rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n"
        "cat > /dev/null",
     (char*)NULL };
 
@@ -3688,7 +3688,7 @@ tSCC zZzz_Bad_FixesList[] =
  */
 const char* apzZzz_Bad_FixesPatch[] = { "sh", "-c",
     "echo \"Removing incorrect fix to <$file>\" >&2\n"
-       "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
+       "rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n"
        "cat > /dev/null",
     (char*)NULL };
 
@@ -3723,7 +3723,7 @@ tTestDesc aZzz_TimeTests[] = {
  */
 const char* apzZzz_TimePatch[] = { "sh", "-c",
     "echo \"Removing incorrect fix to <$file>\" >&2\n"
-       "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
+       "rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n"
        "cat > /dev/null",
     (char*)NULL };
 
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index d82175c646a..83dc6d6a480 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -330,7 +330,7 @@ fix = {
     /*
      *  Test that the file-to-fix does not look like a C++ file
      */
-    test     = '-z "`echo ${file}|egrep \'cxx/|++$|\.hh$|\.H$\'`"';
+    test     = '-z "`echo ${file}|egrep \'(cxx/|\+\+$|\.hh$|\.H$|\.hxx$)\'`"';
     select = '//[^"*]';
     sed    = '/\/\/[^"*]/' "s|//.*$||g";
 };
diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index 68eb31f987f..9c4ee402dd0 100755
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -2,9 +2,9 @@
 #
 # DO NOT EDIT THIS FILE   (inclhack.sh)
 # 
-# It has been autogen-ed  Thursday April  1, 1999 at 02:04:52 AM MST
-# From the definitions    /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
-# and the template file   /puke/law//egcs/egcs/gcc/fixinc/inclhack.tpl
+# It has been autogen-ed  Friday April  2, 1999 at 11:01:59 AM PST
+# From the definitions    inclhack.def
+# and the template file   inclhack.tpl
 #
 # Install modified versions of certain ANSI-incompatible system header
 # files which are fixed to work correctly with ANSI C and placed in a
@@ -729,7 +729,7 @@ struct rusage;
     # Fix  17:  No_Double_Slash
     #
     if ( test -n "`egrep '//[^\"*]' ${file}`" -a \
-              '(' -z "`echo ${file}|egrep 'cxx/|++$|\.hh$|\.H$'`" ')'
+              '(' -z "`echo ${file}|egrep '(cxx/|\+\+$|\.hh$|\.H$|\.hxx$)'`" ')'
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
       no_double_slash"
@@ -2842,7 +2842,7 @@ extern char *	sprintf();\
     then infile=${file}
     else infile=${DESTFILE} ; fi 
     ( echo "Removing incorrect fix to <$file>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
+rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp
 cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
@@ -2869,7 +2869,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
     then infile=${file}
     else infile=${DESTFILE} ; fi 
     ( echo "Removing incorrect fix to <$file>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
+rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp
 cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
@@ -2896,7 +2896,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
     then infile=${file}
     else infile=${DESTFILE} ; fi 
     ( echo "Removing incorrect fix to <$file>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
+rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp
 cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
@@ -2923,7 +2923,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
     then infile=${file}
     else infile=${DESTFILE} ; fi 
     ( echo "Removing incorrect fix to <$file>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
+rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp
 cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
@@ -2948,7 +2948,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
     then infile=${file}
     else infile=${DESTFILE} ; fi 
     ( echo "Removing incorrect fix to <$file>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
+rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp
 cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
@@ -2974,7 +2974,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
     then infile=${file}
     else infile=${DESTFILE} ; fi 
     ( echo "Removing incorrect fix to <$file>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
+rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp
 cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output