Moved includes from header to CPP