Restored includes, fixes #20