Use macro when looking for headers on unique scopes

Signed-off-by: Eduardo Silva <eduardo.silva@oracle.com>