I don't understand this comment. If anything, it makes us use `stdint.h` even _less_! All it does is remove all definitions of `uint` except the one consistent with `ushort` and `uchar`; and removes the C++11 branch, which I'm pretty sure didn't work anyway because `int64_t` and `uint64_t` are used below without an `std::` prefix. There's also a difficulty with `<cstdint>` on OS X, (see #1253), so that's another reason to remove it.