Fixup member declarations and include into project