header file including fixups