interface touchups, adjustment of include files