Changed includes to use the correct class