Feature #4977: Fix include issues