Updated #include's in Entity folder.