Moved around includes in lib.c/.h