Ensure the include directory is created if passed in

This is #225 rebased on top of the latest master with a minor bug fix.