Fixed bugs related to header file flags.