Just change some header file includes