next header file inclusion consolidation