more include files and updates