Correct a mistake LINUX/UNIX, mv some include to a proper place and add a debug message.