Make headers includable (revised)

This supersedes #70.