Remove extern statements
Use using declarations without namespace