fixed #includes for cross compatibility