Fixed error introduced when moving headers into the include folder