Moved the function pointer types to their rightful headers.