Added missing include paths and fixed define quotings for shlex