Improve pragma marks and move out header including out of header files