Refactor includes and constructors.