Added nonfree headers that are required for using SURF features