Merge pull request #2459 from joto/include-fixes #1526

Job	Run time
ubuntu-test-install (middle_schema)	3m 1s
ubuntu-test-install (public)	2m 50s
	5m 51s

Provide feedback