update db and file - delete includes that aren't used anymore
some more updates