Added my patch that wasn't added before: everything should build now on Linux.