Index: tools/build/clean_hdr.awk
===================================================================
--- tools/build/clean_hdr.awk	(revision 84993ff2d0c2e9be024ccd3e382182f8a5e8c7d5)
+++ tools/build/clean_hdr.awk	(revision 84993ff2d0c2e9be024ccd3e382182f8a5e8c7d5)
@@ -0,0 +1,31 @@
+#!/usr/bin/awk -f
+
+BEGIN {
+	pattern = "^" path "[0-9A-z]*\\.(cc|h)"
+	complete_pattern = "^\\(" path "[0-9A-z]*\\.(cc|h)"
+	show = 0
+}
+
+$1 !~ /^(Makefile.*|Making.*|CXX)/ {
+	if( $1 ~ pattern ) {
+		show = 1
+	}
+
+	if( $1 ~ complete_pattern ) {
+		print
+	}
+
+	if( show > 0 )
+	{
+		print
+	}
+}
+
+$1 ~ /^---/ {
+	show = 0
+}
+
+$1 ~ /^CXX/ {
+	$1 = "  IWYU   "
+	print > "/dev/stderr"
+}
Index: tools/build/clean_hdrs
===================================================================
--- tools/build/clean_hdrs	(revision 84993ff2d0c2e9be024ccd3e382182f8a5e8c7d5)
+++ tools/build/clean_hdrs	(revision 84993ff2d0c2e9be024ccd3e382182f8a5e8c7d5)
@@ -0,0 +1,28 @@
+#!/bin/bash
+#                              -*- Mode: SH -*-
+#
+# Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+#
+# The contents of this file are covered under the licence agreement in the
+# file "LICENCE" distributed with Cforall.
+#
+# clean_hdrs --
+#
+# Author           : Thierry Delisle
+# Created On       : Tue Jul 11 16:26:46 2017
+# Last Modified By :
+# Last Modified On :
+# Update Count     : 0
+#
+
+set -x
+if [ -z "$IWYU_HOME" ]; then
+    echo "Need to set IWYU_HOME"
+    exit 1
+fi
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+cd src
+rm -f result.log
+make CXX="${IWYU_HOME}/build/include-what-you-use 2>&1" -ks 2> /dev/null | awk -f ${DIR}/clean_hdr.awk > result.log -v path=$@
+python ${IWYU_HOME}/src/fix_includes.py --nosafe_headers --comments --blank_lines < result.log
Index: tools/build/time_make
===================================================================
--- tools/build/time_make	(revision 84993ff2d0c2e9be024ccd3e382182f8a5e8c7d5)
+++ tools/build/time_make	(revision 84993ff2d0c2e9be024ccd3e382182f8a5e8c7d5)
@@ -0,0 +1,28 @@
+#!/bin/sh
+#                              -*- Mode: SH -*-
+#
+# Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+#
+# The contents of this file are covered under the licence agreement in the
+# file "LICENCE" distributed with Cforall.
+#
+# time_make --
+#
+# Author           : Thierry Delisle
+# Created On       : Tue Jul 11 15:55:44 2017
+# Last Modified By :
+# Last Modified On :
+# Update Count     : 0
+#
+
+set -x
+COMPILER=${CXX}
+SAFE_COMPILER=$(echo "${CXX}" | sed 's/+/\\+/g')
+TMP_FILE=$(mktemp)
+FILE=times.out
+
+make -s clean -C src
+make CXX="/usr/bin/time -f \"%E %C\" -o ${TMP_FILE} -a ${COMPILER}" -C src
+sed -r "s/([0-9]+:[0-9]+\.[0-9]+) ${SAFE_COMPILER} .* ([a-Z0-9/_\-]+\.o).*/\1 \2/" ${TMP_FILE} | \
+sed 's/driver_cfa_cpp-//' | \
+sort -r -o ${FILE}