Fix some mismatched tags
Changed some return types from gint to bool.
Cleaned up includes of tools / revert experimental casting macro replacements from r13061
Added some consts. Turned functions to member functions.
Moved and renamed some tool-related files.