Fix: corrected last statement use line
Fix: also add (unneccessary) use statements for non-namespaced files. this will help to prepare them for namespaces