[gh-553] Fix some file includes after the module breakup
Merge branch 'issue-553' into develop