Remove TODO
Reorganize imports in _png.cpp