Fixed includes and forward declarations for 'entity' folder.