New helper methods file, moved #includes to linker file