ZVISION: Remove superfluous spacing and reorder some includes
ZVISION: Remove empty file