@@ -7,12 +7,12 @@
 	while(sub(/\/\/*[^\/]*\/\.\.\/\/*/, "/", file)) {}
 
 	destfile = file;
 	if (!gsub(/^.*\/gcc\/.*\/include\//, "gcc/", destfile)) {
 		if (!gsub(/^.*\/include\//, "", destfile)) {
-			if (!gsub(/^.*\/include-fixed\//, "fix/", destfile)) {
-				next
+			if (!gsub(/^.*\/include-fixed\//, "", destfile)) {
+				next;
 			}
 		}
 	}
 
 	if (file ~ /</) {
@@ -21,13 +21,25 @@
 
 	if (file !~ /\.h$/) {
 		next;
 	}
 
+	count = 0;
+	origdestfile = destfile;
+	while (destfiles[destfile]) {
+		if (destfiles[destfile] == file) {
+			break;
+		}
+
+		destfile = count "/" origdestfile;
+		count++;
+	}
+
+	destfiles[destfile] = file;
 	copy[file] = destfile;
 }
 
 END{
 	for (key in copy) {
 		print key, copy[key];
 	}
 }