It seems we've settled on dir/dir/header.h includes, so let's use them consistently.
mentioned in issue #145 (closed)