Optional include tweaks

Fixes #13