include_path hacks, round 2.1