Updates to the Includes since splitting .h into decl and implementation