Fixed header file compilation errors. Still need to define a few functions