Fixed two includes outside of header guard