Fixed header file definitions