diff --git a/gdb/config/i386/.Sanitize b/gdb/config/i386/.Sanitize
index e411b1763c7..15ef59fd818 100644
--- a/gdb/config/i386/.Sanitize
+++ b/gdb/config/i386/.Sanitize
@@ -23,6 +23,8 @@ Do-first:
 
 Things-to-keep:
 
+cygwin32.mh
+cygwin32.mt
 fbsd.mh
 fbsd.mt
 gdbserve.mt
@@ -85,6 +87,7 @@ sun386.mh
 sun386.mt
 symmetry.mh
 symmetry.mt
+tm-cygwin32.h
 tm-i386.h
 tm-i386aix.h
 tm-i386bsd.h
@@ -102,9 +105,8 @@ tm-ptx.h
 tm-ptx4.h
 tm-sun386.h
 tm-symmetry.h
-tm-cygwin32.h
-cygwin32.mh
-cygwin32.mt
+windows.mh
+xm-cygwin32.h
 xm-go32.h
 xm-i386aix.h
 xm-i386bsd.h
@@ -123,7 +125,7 @@ xm-ptx.h
 xm-ptx4.h
 xm-sun386.h
 xm-symmetry.h
-xm-cygwin32.h
+xm-windows.h
 
 Things-to-lose: