bug 1036401 - adjust includes to fix up some issues with complete types instead of forward declarations being required r=bz r=bjacob