Correct include paths (part II)