Better relic helper methods
Add missing includes