major conversion to new include files