Revert "Use HEADER_SEARCH_PATHS instead, to catch bracket imports too"

This reverts commit 0017753c97a928770fe9fdc82f6e9792058897b4.