Fixed linux build issues with templates and missing include