Cleaned up includes of tools / revert experimental casting macro replacements from r13061
Moved and renamed some tool-related files.