Inconsistent header file use