adapted all nonfree header inclusion since it doesn't exist anymore as a module
Merge pull request #3149 from StevenPuttemans:fix_nonfree_includes