remove redundant usings
add missing includes