broken include files fixed