Minor updates in image loading

- Renamed the PNG class to PNGImage.
- Added/moved/removed includes.