Reorder includes for consistency
Use using-declarations instead of namspace using-directives