fixing some header includes