Includes fixed for Linux support