Fix architectural issue with hinclude