fix #264
cleanup includes