Fixed the include statements for helpers