int64 --> int64_t
uint64 -->uint64_t
(and cleaned up in some build files that should have never been committed...)