Changed headers to import stuff as directly as possible (as per current coding guidelines).
Changed headers to import stuff as directly as possible (as per current coding guidelines).

jterhorst/Chameleon