Moved, and includes adapted. Looks strange to include a *.c file... :)