Fixed some header inclusion issues