Moved from include to require and removed unnecessary includes