include fixes

6 jobs for feature_tests in 8 minutes and 24 seconds (queued for 3 seconds)