fixed namespaces included across headers, especially re-opened namespaces