Remove a needless "#include"s and move "using"s from private to public.