Clean up header files
Cleanup of .c files