moved the includes and define into the .h file