move types around to get to compile after cleaning up the header file and function declarations