Instead of manually building the path to the Framework / Headers / PrivateHeaders directories by checking SHALLOW_BUNDLE we can take advantage of CONTENTS_FOLDER_PATH. Scripts that should probably be updated: shell> grep --files-with-matches -R SHALLOW_BUNDLE Tools/Scripts Tools/Scripts/check-for-inappropriate-files-in-framework Tools/Scripts/check-for-inappropriate-macros-in-external-headers Tools/Scripts/check-for-webkit-framework-include-consistency Tools/Scripts/webkitruby/check-for-inappropriate-macros-in-external-headers-tests/run-test.rb