Poison specific functions
Change some header inclusion order