- Constify + remove unused method
- Move clever_throw macro to proper file
- Added missing headers