minor include files movement