Change includes for compatibility with official documentation