more definitions, adding include blockers, removing stub functions for those we define