From 26178124a4a84d79949ca53b73a5540c6e02681e Mon Sep 17 00:00:00 2001
From: aalexandre <aalexandre@fb.com>
Date: Tue, 5 Mar 2013 10:46:44 -0800
Subject: [PATCH] Eliminate int32, uint32, int16, uint16, int8, uint8.

This concludes the inttypes replacement.
These replacement have been mostly mechanical
with the use of cxx_replace.
---
 hphp/compiler/analysis/alias_manager.cpp      |   4 +-
 hphp/compiler/analysis/analysis_result.h      |   8 +-
 hphp/compiler/analysis/emitter.cpp            |  46 ++--
 hphp/compiler/analysis/emitter.h              |  16 +-
 hphp/compiler/builtin_symbols.cpp             |   8 +-
 hphp/compiler/compiler.cpp                    |   2 +-
 hphp/compiler/construct.cpp                   |   6 +-
 .../expression/binary_op_expression.cpp       |   4 +-
 .../expression/class_constant_expression.cpp  |   2 +-
 .../expression/constant_expression.cpp        |   2 +-
 hphp/compiler/expression/expression.cpp       |   4 +-
 .../compiler/expression/scalar_expression.cpp |  12 +-
 hphp/compiler/expression/scalar_expression.h  |   6 +-
 .../expression/static_member_expression.cpp   |   2 +-
 hphp/compiler/statement/break_statement.cpp   |   4 +-
 hphp/compiler/statement/break_statement.h     |   2 +-
 hphp/compiler/statement/case_statement.cpp    |   2 +-
 hphp/compiler/statement/case_statement.h      |   2 +-
 hphp/compiler/statement/switch_statement.h    |   2 +-
 hphp/runtime/base/array/array_data.cpp        |  14 +-
 hphp/runtime/base/array/array_data.h          |  30 +--
 hphp/runtime/base/array/array_init.h          |   6 +-
 hphp/runtime/base/array/array_inline.h        |   4 +-
 hphp/runtime/base/array/array_iterator.cpp    |  14 +-
 hphp/runtime/base/array/array_iterator.h      |  10 +-
 hphp/runtime/base/array/array_util.cpp        |  24 +-
 hphp/runtime/base/array/array_util.h          |   8 +-
 hphp/runtime/base/array/hphp_array.cpp        | 100 ++++----
 hphp/runtime/base/array/hphp_array.h          |  86 +++----
 hphp/runtime/base/array/hphp_array_sort.cpp   |   4 +-
 hphp/runtime/base/array/sort_helpers.h        |  14 +-
 hphp/runtime/base/binary_operations.h         |  10 +-
 hphp/runtime/base/builtin_functions.cpp       |  20 +-
 hphp/runtime/base/builtin_functions.h         |  36 +--
 hphp/runtime/base/class_info.cpp              |  36 +--
 hphp/runtime/base/class_info.h                |   2 +-
 hphp/runtime/base/code_coverage.cpp           |   2 +-
 hphp/runtime/base/comparisons.cpp             |  22 +-
 hphp/runtime/base/comparisons.h               | 196 +++++++-------
 hphp/runtime/base/debuggable.cpp              |   6 +-
 hphp/runtime/base/debuggable.h                |   6 +-
 hphp/runtime/base/execution_context.cpp       |   2 +-
 hphp/runtime/base/execution_context.h         |  14 +-
 hphp/runtime/base/file/bzip2_file.cpp         |   6 +-
 hphp/runtime/base/file/bzip2_file.h           |   6 +-
 hphp/runtime/base/file/file.cpp               |  58 ++---
 hphp/runtime/base/file/file.h                 |  32 +--
 hphp/runtime/base/file/mem_file.cpp           |  14 +-
 hphp/runtime/base/file/mem_file.h             |  14 +-
 hphp/runtime/base/file/output_file.cpp        |  10 +-
 hphp/runtime/base/file/output_file.h          |  10 +-
 hphp/runtime/base/file/plain_file.cpp         |  16 +-
 hphp/runtime/base/file/plain_file.h           |  12 +-
 hphp/runtime/base/file/socket.cpp             |  10 +-
 hphp/runtime/base/file/socket.h               |   8 +-
 hphp/runtime/base/file/ssl_socket.cpp         |  10 +-
 hphp/runtime/base/file/ssl_socket.h           |   6 +-
 hphp/runtime/base/file/url_file.cpp           |   2 +-
 hphp/runtime/base/file/url_file.h             |   2 +-
 hphp/runtime/base/file/user_file.cpp          |  14 +-
 hphp/runtime/base/file/user_file.h            |   8 +-
 hphp/runtime/base/file/zip_file.cpp           |  12 +-
 hphp/runtime/base/file/zip_file.h             |   8 +-
 hphp/runtime/base/hardware_counter.cpp        |  20 +-
 hphp/runtime/base/hardware_counter.h          |  24 +-
 hphp/runtime/base/hphp_ffi.cpp                |   2 +-
 hphp/runtime/base/hphp_value.h                |   2 +-
 hphp/runtime/base/ini_setting.cpp             |  20 +-
 hphp/runtime/base/md5.h                       |   8 +-
 hphp/runtime/base/memory/memory_manager.cpp   |   6 +-
 hphp/runtime/base/memory/memory_manager.h     |  18 +-
 hphp/runtime/base/memory/memory_usage_stats.h |  18 +-
 hphp/runtime/base/object_data.cpp             |   2 +-
 hphp/runtime/base/object_data.h               |   4 +-
 hphp/runtime/base/program_functions.cpp       |   2 +-
 hphp/runtime/base/resource_data.h             |   2 +-
 hphp/runtime/base/runtime_error.cpp           |   4 +-
 hphp/runtime/base/runtime_option.cpp          |  24 +-
 hphp/runtime/base/runtime_option.h            |  48 ++--
 hphp/runtime/base/server/access_log.cpp       |   2 +-
 hphp/runtime/base/server/access_log.h         |   2 +-
 .../base/server/admin_request_handler.cpp     |  12 +-
 hphp/runtime/base/server/http_server.cpp      |   4 +-
 hphp/runtime/base/server/libevent_server.cpp  |   4 +-
 .../base/server/libevent_transport.cpp        |   2 +-
 hphp/runtime/base/server/libevent_transport.h |   4 +-
 hphp/runtime/base/server/pagelet_server.cpp   |   8 +-
 hphp/runtime/base/server/pagelet_server.h     |   4 +-
 hphp/runtime/base/server/replay_transport.cpp |   4 +-
 hphp/runtime/base/server/replay_transport.h   |   2 +-
 hphp/runtime/base/server/server_stats.cpp     |  56 ++--
 hphp/runtime/base/server/server_stats.h       |  54 ++--
 hphp/runtime/base/server/transport.cpp        |   4 +-
 hphp/runtime/base/server/transport.h          |  14 +-
 hphp/runtime/base/server/virtual_host.cpp     |   8 +-
 hphp/runtime/base/server/virtual_host.h       |   8 +-
 hphp/runtime/base/server/xbox_server.cpp      |   2 +-
 .../base/shared/concurrent_shared_store.cpp   |  28 +-
 .../base/shared/concurrent_shared_store.h     |  10 +-
 hphp/runtime/base/shared/immutable_map.cpp    |   2 +-
 hphp/runtime/base/shared/immutable_map.h      |   2 +-
 hphp/runtime/base/shared/immutable_obj.cpp    |   4 +-
 hphp/runtime/base/shared/immutable_obj.h      |   2 +-
 hphp/runtime/base/shared/shared_map.cpp       |  18 +-
 hphp/runtime/base/shared/shared_map.h         |  18 +-
 .../runtime/base/shared/shared_store_base.cpp |  20 +-
 hphp/runtime/base/shared/shared_store_base.h  |  30 +--
 .../base/shared/shared_store_stats.cpp        |  22 +-
 hphp/runtime/base/shared/shared_store_stats.h |  28 +-
 hphp/runtime/base/shared/shared_string.h      |   2 +-
 hphp/runtime/base/shared/shared_variant.cpp   |   6 +-
 hphp/runtime/base/shared/shared_variant.h     |  32 +--
 hphp/runtime/base/string_data.cpp             |  36 +--
 hphp/runtime/base/string_data.h               |  28 +-
 hphp/runtime/base/string_util.cpp             |   2 +-
 hphp/runtime/base/string_util.h               |   2 +-
 hphp/runtime/base/time/dateinterval.h         |  30 +--
 hphp/runtime/base/time/datetime.cpp           |   8 +-
 hphp/runtime/base/time/datetime.h             |  10 +-
 hphp/runtime/base/time/timestamp.cpp          |   4 +-
 hphp/runtime/base/time/timestamp.h            |   4 +-
 hphp/runtime/base/tv_helpers.cpp              |   2 +-
 hphp/runtime/base/type_array.cpp              |  28 +-
 hphp/runtime/base/type_array.h                |  72 +++---
 hphp/runtime/base/type_conversions.h          |  54 ++--
 hphp/runtime/base/type_object.cpp             |   2 +-
 hphp/runtime/base/type_object.h               |  20 +-
 hphp/runtime/base/type_string.cpp             |  14 +-
 hphp/runtime/base/type_string.h               |  48 ++--
 hphp/runtime/base/type_variant.cpp            | 190 +++++++-------
 hphp/runtime/base/type_variant.h              | 144 +++++------
 hphp/runtime/base/util/string_buffer.cpp      |   4 +-
 hphp/runtime/base/util/string_buffer.h        |   2 +-
 hphp/runtime/base/util/thrift_buffer.cpp      |  32 +--
 hphp/runtime/base/util/thrift_buffer.h        |  30 +--
 hphp/runtime/base/variable_serializer.cpp     |   4 +-
 hphp/runtime/base/variable_serializer.h       |   8 +-
 hphp/runtime/base/variable_unserializer.cpp   |   4 +-
 hphp/runtime/base/variable_unserializer.h     |   2 +-
 hphp/runtime/base/zend/zend_collator.cpp      |   6 +-
 hphp/runtime/base/zend/zend_functions.cpp     |  14 +-
 hphp/runtime/base/zend/zend_functions.h       |   4 +-
 hphp/runtime/base/zend/zend_ini.tab.cpp       |   2 +-
 hphp/runtime/base/zend/zend_math.h            |   8 +-
 hphp/runtime/base/zend/zend_pack.cpp          |  18 +-
 hphp/runtime/base/zend/zend_pack.h            |   2 +-
 hphp/runtime/base/zend/zend_printf.cpp        |  22 +-
 hphp/runtime/base/zend/zend_rand.cpp          |  38 +--
 hphp/runtime/base/zend/zend_string.cpp        |   4 +-
 hphp/runtime/eval/debugger/break_point.cpp    |   6 +-
 hphp/runtime/eval/debugger/break_point.h      |  30 +--
 hphp/runtime/eval/debugger/cmd/cmd_example.h  |   2 +-
 .../eval/debugger/cmd/cmd_flow_control.h      |   2 +-
 hphp/runtime/eval/debugger/cmd/cmd_info.cpp   |   4 +-
 hphp/runtime/eval/debugger/cmd/cmd_info.h     |   2 +-
 .../eval/debugger/cmd/cmd_instrument.cpp      |   2 +-
 .../eval/debugger/cmd/cmd_instrument.h        |   2 +-
 .../runtime/eval/debugger/cmd/cmd_interrupt.h |   8 +-
 hphp/runtime/eval/debugger/cmd/cmd_jump.h     |   2 +-
 hphp/runtime/eval/debugger/cmd/cmd_list.cpp   |   2 +-
 hphp/runtime/eval/debugger/cmd/cmd_list.h     |   4 +-
 hphp/runtime/eval/debugger/cmd/cmd_print.cpp  |   4 +-
 hphp/runtime/eval/debugger/cmd/cmd_signal.h   |   2 +-
 hphp/runtime/eval/debugger/cmd/cmd_thread.cpp |   2 +-
 hphp/runtime/eval/debugger/debugger.cpp       |   6 +-
 hphp/runtime/eval/debugger/debugger.h         |   6 +-
 hphp/runtime/eval/debugger/debugger_base.cpp  |   4 +-
 hphp/runtime/eval/debugger/debugger_base.h    |   4 +-
 .../runtime/eval/debugger/debugger_client.cpp |  12 +-
 hphp/runtime/eval/debugger/debugger_client.h  |   8 +-
 .../eval/debugger/debugger_command.cpp        |   4 +-
 hphp/runtime/eval/debugger/debugger_proxy.cpp |  12 +-
 hphp/runtime/eval/debugger/debugger_proxy.h   |   6 +-
 hphp/runtime/eval/debugger/inst_point.cpp     |   4 +-
 hphp/runtime/eval/debugger/inst_point.h       |   2 +-
 hphp/runtime/eval/runtime/file_repository.h   |   4 +-
 hphp/runtime/ext/asio/wait_handle.cpp         |   2 +-
 hphp/runtime/ext/ext_apc.cpp                  |  86 +++----
 hphp/runtime/ext/ext_apc.h                    |  44 ++--
 hphp/runtime/ext/ext_array.cpp                |  72 +++---
 hphp/runtime/ext/ext_array.h                  |  52 ++--
 hphp/runtime/ext/ext_asio.h                   |   2 +-
 hphp/runtime/ext/ext_bcmath.cpp               |  20 +-
 hphp/runtime/ext/ext_bcmath.h                 |  18 +-
 hphp/runtime/ext/ext_bzip2.cpp                |   4 +-
 hphp/runtime/ext/ext_bzip2.h                  |   2 +-
 hphp/runtime/ext/ext_collection.cpp           | 106 ++++----
 hphp/runtime/ext/ext_collection.h             |  90 +++----
 hphp/runtime/ext/ext_continuation.cpp         |  16 +-
 hphp/runtime/ext/ext_continuation.h           |  20 +-
 hphp/runtime/ext/ext_ctype.cpp                |   2 +-
 hphp/runtime/ext/ext_curl.cpp                 |  18 +-
 hphp/runtime/ext/ext_curl.h                   |   6 +-
 hphp/runtime/ext/ext_datetime.cpp             |  44 ++--
 hphp/runtime/ext/ext_datetime.h               |  80 +++---
 hphp/runtime/ext/ext_debugger.cpp             |  38 +--
 hphp/runtime/ext/ext_debugger.h               |  36 +--
 hphp/runtime/ext/ext_domdocument.cpp          |  56 ++--
 hphp/runtime/ext/ext_domdocument.h            |  46 ++--
 hphp/runtime/ext/ext_error.cpp                |   2 +-
 hphp/runtime/ext/ext_error.h                  |   2 +-
 hphp/runtime/ext/ext_fb.cpp                   |  50 ++--
 hphp/runtime/ext/ext_fb.h                     |  44 ++--
 hphp/runtime/ext/ext_file.cpp                 | 110 ++++----
 hphp/runtime/ext/ext_file.h                   |  28 +-
 hphp/runtime/ext/ext_function.cpp             |   2 +-
 hphp/runtime/ext/ext_function.h               |   2 +-
 hphp/runtime/ext/ext_hash.cpp                 |   6 +-
 hphp/runtime/ext/ext_hash.h                   |   6 +-
 hphp/runtime/ext/ext_hotprofiler.cpp          | 150 +++++------
 hphp/runtime/ext/ext_iconv.cpp                |   2 +-
 hphp/runtime/ext/ext_icu.cpp                  |  14 +-
 hphp/runtime/ext/ext_icu.h                    |  14 +-
 hphp/runtime/ext/ext_icu_ucnv.cpp             |  20 +-
 hphp/runtime/ext/ext_icu_ucnv.h               | 100 ++++----
 hphp/runtime/ext/ext_icu_ucsdet.cpp           |   2 +-
 hphp/runtime/ext/ext_icu_ucsdet.h             |   2 +-
 hphp/runtime/ext/ext_icu_uspoof.cpp           |  14 +-
 hphp/runtime/ext/ext_icu_uspoof.h             |  14 +-
 hphp/runtime/ext/ext_image.cpp                |  18 +-
 hphp/runtime/ext/ext_image.h                  |   6 +-
 hphp/runtime/ext/ext_imagesprite.cpp          |  12 +-
 hphp/runtime/ext/ext_imap.cpp                 | 146 +++++------
 hphp/runtime/ext/ext_imap.h                   |  54 ++--
 hphp/runtime/ext/ext_intl.cpp                 | 122 ++++-----
 hphp/runtime/ext/ext_intl.h                   | 120 ++++-----
 hphp/runtime/ext/ext_ipc.cpp                  |  62 ++---
 hphp/runtime/ext/ext_ipc.h                    |  30 +--
 hphp/runtime/ext/ext_iterator.cpp             |  20 +-
 hphp/runtime/ext/ext_iterator.h               |   8 +-
 hphp/runtime/ext/ext_json.cpp                 |  28 +-
 hphp/runtime/ext/ext_json.h                   |  24 +-
 hphp/runtime/ext/ext_ldap.cpp                 |  10 +-
 hphp/runtime/ext/ext_ldap.h                   |   4 +-
 hphp/runtime/ext/ext_magick.cpp               |  56 ++--
 hphp/runtime/ext/ext_magick.h                 |  56 ++--
 hphp/runtime/ext/ext_mailparse.cpp            |   2 +-
 hphp/runtime/ext/ext_mailparse.h              |   2 +-
 hphp/runtime/ext/ext_math.cpp                 |  26 +-
 hphp/runtime/ext/ext_math.h                   |  28 +-
 hphp/runtime/ext/ext_mb.cpp                   |   4 +-
 hphp/runtime/ext/ext_mb.h                     |   2 +-
 hphp/runtime/ext/ext_mcrypt.cpp               |  22 +-
 hphp/runtime/ext/ext_mcrypt.h                 |  16 +-
 hphp/runtime/ext/ext_memcache.cpp             |  18 +-
 hphp/runtime/ext/ext_memcache.h               |  14 +-
 hphp/runtime/ext/ext_memcached.cpp            | 194 +++++++-------
 hphp/runtime/ext/ext_memcached.h              | 120 ++++-----
 hphp/runtime/ext/ext_misc.cpp                 |  16 +-
 hphp/runtime/ext/ext_misc.h                   |  12 +-
 hphp/runtime/ext/ext_mysql.cpp                |  38 +--
 hphp/runtime/ext/ext_mysql.h                  |  34 +--
 hphp/runtime/ext/ext_network.cpp              |  10 +-
 hphp/runtime/ext/ext_network.h                |   4 +-
 hphp/runtime/ext/ext_openssl.cpp              |   8 +-
 hphp/runtime/ext/ext_openssl.h                |   6 +-
 hphp/runtime/ext/ext_options.cpp              |  46 ++--
 hphp/runtime/ext/ext_options.h                |  30 +--
 hphp/runtime/ext/ext_output.cpp               |   4 +-
 hphp/runtime/ext/ext_output.h                 |  10 +-
 hphp/runtime/ext/ext_pdo.cpp                  | 242 +++++++++---------
 hphp/runtime/ext/ext_pdo.h                    | 190 +++++++-------
 hphp/runtime/ext/ext_posix.h                  |  18 +-
 hphp/runtime/ext/ext_preg.cpp                 |   2 +-
 hphp/runtime/ext/ext_preg.h                   |   2 +-
 hphp/runtime/ext/ext_process.cpp              |  10 +-
 hphp/runtime/ext/ext_process.h                |  16 +-
 hphp/runtime/ext/ext_server.cpp               |  18 +-
 hphp/runtime/ext/ext_server.h                 |  18 +-
 hphp/runtime/ext/ext_session.cpp              |  22 +-
 hphp/runtime/ext/ext_session.h                |   4 +-
 hphp/runtime/ext/ext_simplexml.cpp            |  16 +-
 hphp/runtime/ext/ext_simplexml.h              |  10 +-
 hphp/runtime/ext/ext_soap.cpp                 |  20 +-
 hphp/runtime/ext/ext_soap.h                   |   8 +-
 hphp/runtime/ext/ext_socket.cpp               |   6 +-
 hphp/runtime/ext/ext_socket.h                 |   2 +-
 hphp/runtime/ext/ext_spl.cpp                  |   8 +-
 hphp/runtime/ext/ext_spl.h                    |   2 +-
 hphp/runtime/ext/ext_splfile.cpp              |  40 +--
 hphp/runtime/ext/ext_splfile.h                |  40 +--
 hphp/runtime/ext/ext_sqlite3.cpp              |  62 ++---
 hphp/runtime/ext/ext_sqlite3.h                |  54 ++--
 hphp/runtime/ext/ext_stream.cpp               |   4 +-
 hphp/runtime/ext/ext_stream.h                 |   4 +-
 hphp/runtime/ext/ext_string.cpp               |   4 +-
 hphp/runtime/ext/ext_string.h                 |  32 +--
 hphp/runtime/ext/ext_thread.cpp               |   4 +-
 hphp/runtime/ext/ext_thread.h                 |   4 +-
 hphp/runtime/ext/ext_thrift.h                 |   4 +-
 hphp/runtime/ext/ext_url.cpp                  |   2 +-
 hphp/runtime/ext/ext_variable.cpp             |   2 +-
 hphp/runtime/ext/ext_variable.h               |  34 +--
 hphp/runtime/ext/ext_xml.cpp                  |  12 +-
 hphp/runtime/ext/ext_xml.h                    |  12 +-
 hphp/runtime/ext/ext_xmlreader.cpp            |  56 ++--
 hphp/runtime/ext/ext_xmlreader.h              |  56 ++--
 hphp/runtime/ext/ext_zlib.cpp                 |   4 +-
 hphp/runtime/ext/ext_zlib.h                   |  12 +-
 hphp/runtime/ext/hash/hash_sha.cpp            |  46 ++--
 hphp/runtime/ext/hash/hash_tiger.cpp          |  22 +-
 hphp/runtime/ext/hash/hash_whirlpool.cpp      |  30 +--
 hphp/runtime/ext/hash/php_hash_tiger_tables.h |   2 +-
 .../ext/hash/php_hash_whirlpool_tables.h      |  18 +-
 hphp/runtime/ext/pdo_driver.cpp               |  12 +-
 hphp/runtime/ext/pdo_driver.h                 |  16 +-
 hphp/runtime/ext/pdo_mysql.cpp                |  28 +-
 hphp/runtime/ext/pdo_sqlite.cpp               |  20 +-
 hphp/runtime/ext/soap/encoding.cpp            |  20 +-
 hphp/runtime/ext/soap/soap.h                  |   4 +-
 hphp/runtime/ext/thrift/binary.cpp            |  10 +-
 hphp/runtime/ext/thrift/compact.cpp           |   2 +-
 hphp/runtime/ext/thrift/transport.h           |   2 +-
 hphp/runtime/ext_hhvm/ext_hhvm_noinline.cpp   |  64 ++---
 hphp/runtime/vm/as.cpp                        |   4 +-
 hphp/runtime/vm/bytecode.cpp                  |  46 ++--
 hphp/runtime/vm/bytecode.h                    |  10 +-
 hphp/runtime/vm/class.cpp                     |  10 +-
 hphp/runtime/vm/class.h                       |   6 +-
 hphp/runtime/vm/func.cpp                      |  12 +-
 hphp/runtime/vm/func.h                        |   6 +-
 hphp/runtime/vm/hhbc.cpp                      |  10 +-
 hphp/runtime/vm/hhbc.h                        |   8 +-
 hphp/runtime/vm/instrumentation.h             |   4 +-
 hphp/runtime/vm/instrumentation_hook.h        |   6 +-
 hphp/runtime/vm/member_operations.h           |  36 +--
 hphp/runtime/vm/name_value_table_wrapper.cpp  |  16 +-
 hphp/runtime/vm/name_value_table_wrapper.h    |  16 +-
 hphp/runtime/vm/repo_helpers.cpp              |   6 +-
 hphp/runtime/vm/repo_helpers.h                |   6 +-
 hphp/runtime/vm/runtime.cpp                   |  50 ++--
 hphp/runtime/vm/runtime.h                     |  30 +--
 hphp/runtime/vm/stats.cpp                     |   2 +-
 hphp/runtime/vm/translator/fixup.h            |   4 +-
 hphp/runtime/vm/translator/hopt/codegen.cpp   | 174 ++++++-------
 hphp/runtime/vm/translator/hopt/codegen.h     |  18 +-
 hphp/runtime/vm/translator/hopt/dce.cpp       |   4 +-
 .../vm/translator/hopt/hhbctranslator.cpp     | 158 ++++++------
 .../vm/translator/hopt/hhbctranslator.h       | 138 +++++-----
 hphp/runtime/vm/translator/hopt/ir.cpp        |  18 +-
 hphp/runtime/vm/translator/hopt/ir.h          |  64 ++---
 .../vm/translator/hopt/irtranslator.cpp       |   6 +-
 .../runtime/vm/translator/hopt/linearscan.cpp |  66 ++---
 .../runtime/vm/translator/hopt/simplifier.cpp |  20 +-
 hphp/runtime/vm/translator/hopt/simplifier.h  |   2 +-
 .../vm/translator/hopt/tracebuilder.cpp       | 198 +++++++-------
 .../runtime/vm/translator/hopt/tracebuilder.h | 110 ++++----
 .../vm/translator/hopt/vectortranslator.cpp   |   2 +-
 hphp/runtime/vm/translator/regalloc.cpp       |   6 +-
 hphp/runtime/vm/translator/regalloc.h         |  19 +-
 hphp/runtime/vm/translator/runtime-type.cpp   |  10 +-
 hphp/runtime/vm/translator/runtime-type.h     |  12 +-
 hphp/runtime/vm/translator/targetcache.cpp    |  14 +-
 hphp/runtime/vm/translator/targetcache.h      |   6 +-
 hphp/runtime/vm/translator/trans-data.h       |   4 +-
 .../vm/translator/translator-runtime.cpp      |   2 +-
 .../vm/translator/translator-runtime.h        |   2 +-
 .../vm/translator/translator-x64-internal.h   |   2 +-
 .../vm/translator/translator-x64-vector.cpp   |   2 +-
 hphp/runtime/vm/translator/translator-x64.cpp | 138 +++++-----
 hphp/runtime/vm/translator/translator-x64.h   |   4 +-
 hphp/runtime/vm/translator/translator.cpp     |  36 +--
 hphp/runtime/vm/translator/translator.h       |  44 ++--
 hphp/runtime/vm/translator/writelease.cpp     |   8 +-
 hphp/runtime/vm/translator/writelease.h       |  10 +-
 hphp/runtime/vm/type_profile.cpp              |   2 +-
 hphp/runtime/vm/unit.cpp                      |  44 ++--
 hphp/runtime/vm/unit.h                        |  54 ++--
 hphp/runtime/vm/verifier/check_func.cpp       |  10 +-
 hphp/test/test_cpp_base.cpp                   |   4 +-
 hphp/test/test_ext_array.cpp                  |   4 +-
 hphp/test/test_ext_fb.cpp                     |   4 +-
 hphp/test/test_ext_ipc.cpp                    |   4 +-
 hphp/test/test_ext_math.cpp                   |   2 +-
 hphp/test/test_ext_sqlite3.cpp                |   4 +-
 hphp/test/test_ext_stream.cpp                 |   2 +-
 hphp/test/test_server.cpp                     |   2 +-
 hphp/test/test_util.cpp                       |   4 +-
 hphp/util/asm-x64.h                           |   2 +-
 hphp/util/base.h                              |  14 +-
 hphp/util/compatibility.cpp                   |   6 +-
 hphp/util/compatibility.h                     |   2 +-
 hphp/util/disasm.cpp                          |   6 +-
 hphp/util/file_cache.cpp                      |   2 +-
 hphp/util/file_cache.h                        |   2 +-
 hphp/util/hdf.cpp                             |  50 ++--
 hphp/util/hdf.h                               | 150 +++++------
 hphp/util/lfu_table.h                         |   2 +-
 hphp/util/light_process.cpp                   |  26 +-
 hphp/util/light_process.h                     |   2 +-
 hphp/util/lock.cpp                            |   4 +-
 hphp/util/lock.h                              |   2 +-
 hphp/util/parser/parser.cpp                   |   4 +-
 hphp/util/parser/parser.h                     |   2 +-
 hphp/util/stack_trace.cpp                     |   4 +-
 hphp/util/timer.cpp                           |  18 +-
 hphp/util/timer.h                             |  14 +-
 hphp/util/vdso.cpp                            |   6 +-
 hphp/util/vdso.h                              |   6 +-
 hphp/util/zend/zend_html.h                    |   2 +-
 400 files changed, 4507 insertions(+), 4510 deletions(-)

diff --git a/hphp/compiler/analysis/alias_manager.cpp b/hphp/compiler/analysis/alias_manager.cpp
index 455910e017cb4..7637ea6e5d61f 100644
--- a/hphp/compiler/analysis/alias_manager.cpp
+++ b/hphp/compiler/analysis/alias_manager.cpp
@@ -4146,9 +4146,9 @@ void AliasManager::stringOptsRecur(StatementPtr s) {
   case Statement::KindOfBreakStatement:
     {
       BreakStatementPtr b = spc(BreakStatement, s);
-      int64 depth = b->getDepth();
+      int64_t depth = b->getDepth();
       if (depth != 1) {
-        int64 s = m_loopInfo.size() - 1;
+        int64_t s = m_loopInfo.size() - 1;
         if (s >= 0) {
           if (!depth || depth > s) depth = s;
           while (depth--) {
diff --git a/hphp/compiler/analysis/analysis_result.h b/hphp/compiler/analysis/analysis_result.h
index 6ff5db17f15c9..a2a3f51548d6d 100644
--- a/hphp/compiler/analysis/analysis_result.h
+++ b/hphp/compiler/analysis/analysis_result.h
@@ -275,8 +275,8 @@ class AnalysisResult : public BlockScope, public FunctionContainer {
   /**
    * Literal string to String precomputation
    */
-  std::string getLiteralStringName(int64 hash, int index, bool iproxy = false);
-  std::string getLitVarStringName(int64 hash, int index, bool iproxy = false);
+  std::string getLiteralStringName(int64_t hash, int index, bool iproxy = false);
+  std::string getLitVarStringName(int64_t hash, int index, bool iproxy = false);
   int getLiteralStringId(const std::string &s, int &index);
 
   /**
@@ -290,12 +290,12 @@ class AnalysisResult : public BlockScope, public FunctionContainer {
   int m_arrayLitstrKeyMaxSize;
   int m_arrayIntegerKeyMaxSize;
 
-  std::string getHashedName(int64 hash, int index, const char *prefix,
+  std::string getHashedName(int64_t hash, int index, const char *prefix,
                             bool longName = false);
   void addNamedLiteralVarString(const std::string &s);
   void addNamedScalarVarArray(const std::string &s);
   StringToClassScopePtrVecMap getExtensionClasses();
-  void addInteger(int64 n);
+  void addInteger(int64_t n);
 private:
   Package *m_package;
   bool m_parseOnDemand;
diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp
index 8051621d06e09..590dee68cd38d 100644
--- a/hphp/compiler/analysis/emitter.cpp
+++ b/hphp/compiler/analysis/emitter.cpp
@@ -296,10 +296,10 @@ static int32_t countStackValues(const std::vector<uchar>& immVec) {
 #define DEC_MA std::vector<uchar>
 #define DEC_BLA std::vector<Label*>&
 #define DEC_SLA std::vector<StrOff>&
-#define DEC_IVA int32
-#define DEC_HA int32
-#define DEC_IA int32
-#define DEC_I64A int64
+#define DEC_IVA int32_t
+#define DEC_HA int32_t
+#define DEC_IA int32_t
+#define DEC_I64A int64_t
 #define DEC_DA double
 #define DEC_SA const StringData*
 #define DEC_AA ArrayData*
@@ -786,7 +786,7 @@ bool SymbolicStack::getNotRef() const {
   return se.notRef;
 }
 
-void SymbolicStack::setInt(int64 v) {
+void SymbolicStack::setInt(int64_t v) {
   assert(m_symStack.size());
   m_symStack.back().intval = v;
 }
@@ -932,7 +932,7 @@ int SymbolicStack::getLoc(int index) const {
   return m_symStack[index].intval;
 }
 
-int64 SymbolicStack::getInt(int index) const {
+int64_t SymbolicStack::getInt(int index) const {
   assert(m_symStack.size() > size_t(index));
   assert(StackSym::GetSymFlavor(m_symStack[index].sym) == StackSym::I);
   return m_symStack[index].intval;
@@ -1094,7 +1094,7 @@ void MetaInfoBuilder::setForUnit(UnitEmitter& target) const {
 
   vector<Offset> index1;
   vector<Offset> index2;
-  vector<uint8> data;
+  vector<uint8_t> data;
   index1.push_back(entries);
 
   size_t sz1 = (2 + entries) * sizeof(Offset);
@@ -1114,8 +1114,8 @@ void MetaInfoBuilder::setForUnit(UnitEmitter& target) const {
         data.push_back(mi.m_data << 1);
       } else {
         union {
-          uint32 val;
-          uint8  bytes[4];
+          uint32_t val;
+          uint8_t  bytes[4];
         } u;
         u.val = (mi.m_data << 1) | 1;
         for (int j = 0; j < 4; j++) {
@@ -1128,7 +1128,7 @@ void MetaInfoBuilder::setForUnit(UnitEmitter& target) const {
   index2.push_back(sz1 + sz2 + data.size());
 
   size_t size = sz1 + sz2 + data.size();
-  uint8* meta = (uint8*)malloc(size);
+  uint8_t* meta = (uint8_t*)malloc(size);
   memcpy(meta, &index1[0], sz1);
   memcpy(meta + sz1, &index2[0], sz2);
   memcpy(meta + sz1 + sz2, &data[0], data.size());
@@ -1953,7 +1953,7 @@ bool EmitterVisitor::visitImpl(ConstructPtr node) {
       case Statement::KindOfContinueStatement:
       case Statement::KindOfBreakStatement: {
         BreakStatementPtr bs(static_pointer_cast<BreakStatement>(s));
-        int64 n = bs->getDepth();
+        int64_t n = bs->getDepth();
         if (n == 1) {
           // Plain old "break;" or "continue;"
           if (m_contTargets.empty()) {
@@ -1985,7 +1985,7 @@ bool EmitterVisitor::visitImpl(ConstructPtr node) {
           emitConvertToCell(e);
         } else {
           // Dynamic break/continue with statically known depth.
-          if (n > (int64)m_contTargets.size()) {
+          if (n > (int64_t)m_contTargets.size()) {
             std::ostringstream msg;
             msg << "Cannot break/continue " << n << " levels";
             e.String(StringData::GetStaticString(msg.str()));
@@ -3684,11 +3684,11 @@ bool EmitterVisitor::visitImpl(ConstructPtr node) {
               ScalarExpressionPtr sval(
                 static_pointer_cast<ScalarExpression>(key));
               const std::string* s;
-              int64 i;
+              int64_t i;
               double d;
               if (sval->getString(s)) {
                 StringData* sd = StringData::GetStaticString(*s);
-                int64 n = 0;
+                int64_t n = 0;
                 if (sd->isStrictlyInteger(n)) {
                   tvKey.m_data.num = n;
                   tvKey.m_type = KindOfInt64;
@@ -4101,9 +4101,9 @@ void EmitterVisitor::buildVectorImm(std::vector<uchar>& vectorImm,
       encodeIvaToVector(vectorImm, m_evalStack.getLoc(i));
     } else if (symFlavor == StackSym::T) {
       assert(strid != -1);
-      encodeToVector<int32>(vectorImm, strid);
+      encodeToVector<int32_t>(vectorImm, strid);
     } else if (symFlavor == StackSym::I) {
-      encodeToVector<int64>(vectorImm, m_evalStack.getInt(i));
+      encodeToVector<int64_t>(vectorImm, m_evalStack.getInt(i));
     }
 
     ++i;
@@ -4968,7 +4968,7 @@ DataType EmitterVisitor::analyzeSwitch(SwitchStatementPtr sw,
       } else {
         return KindOfInvalid;
       }
-      int64 n;
+      int64_t n;
       bool isNonZero;
       if (t == KindOfInt64) {
         n = cval.asInt64Val();
@@ -5002,8 +5002,8 @@ DataType EmitterVisitor::analyzeSwitch(SwitchStatementPtr sw,
   }
 
   if (t == KindOfInt64) {
-    int64 base = caseMap.begin()->first;
-    int64 nTargets = caseMap.rbegin()->first - base + 1;
+    int64_t base = caseMap.begin()->first;
+    int64_t nTargets = caseMap.rbegin()->first - base + 1;
     // Fail if the cases are too sparse
     if ((float)caseMap.size() / nTargets < 0.5) {
       return KindOfInvalid;
@@ -5021,8 +5021,8 @@ void EmitterVisitor::emitIntegerSwitch(Emitter& e, SwitchStatementPtr sw,
                                        std::vector<Label>& caseLabels,
                                        Label& done, const SwitchState& state) {
   auto& caseMap = state.cases;
-  int64 base = caseMap.begin()->first;
-  int64 nTargets = caseMap.rbegin()->first - base + 1;
+  int64_t base = caseMap.begin()->first;
+  int64_t nTargets = caseMap.rbegin()->first - base + 1;
 
   // It's on. Map case values to Labels, filling in the blanks as
   // appropriate.
@@ -6913,7 +6913,7 @@ void EmitterVisitor::initScalar(TypedValue& tvVal, ExpressionPtr val) {
         tvVal.m_type = KindOfString;
         break;
       }
-      int64 i;
+      int64_t i;
       if (sval->getInt(i)) {
         tvVal.m_data.num = i;
         tvVal.m_type = KindOfInt64;
@@ -7388,7 +7388,7 @@ static UnitEmitter* emitHHBCVisitor(AnalysisResultPtr ar, FileScopeRawPtr fsp) {
       Logger::Error("Unable to open %s for write", fullPath.c_str());
     } else {
       CodeGenerator cg(&f, CodeGenerator::TextHHBC);
-      cg.printf("Hash: %llx%016llx\n", md5.q[0], md5.q[1]);
+      cg.printf("Hash: %" PRIx64 "%016" PRIx64 "\n", md5.q[0], md5.q[1]);
       cg.printRaw(unit->toString().c_str());
       f.close();
     }
diff --git a/hphp/compiler/analysis/emitter.h b/hphp/compiler/analysis/emitter.h
index f38c4da2c01c5..deb6857c5df9f 100644
--- a/hphp/compiler/analysis/emitter.h
+++ b/hphp/compiler/analysis/emitter.h
@@ -110,10 +110,10 @@ class Emitter {
 #define MA std::vector<uchar>
 #define BLA std::vector<Label*>&
 #define SLA std::vector<StrOff>&
-#define IVA int32
-#define HA int32
-#define IA int32
-#define I64A int64
+#define IVA int32_t
+#define HA int32_t
+#define IA int32_t
+#define I64A int64_t
 #define DA double
 #define SA const StringData*
 #define AA ArrayData*
@@ -200,7 +200,7 @@ struct SymbolicStack {
       DataType dt;              // META_DATA_TYPE
     }   metaData;
     const StringData* className;
-    int64 intval; // used for L and I symbolic flavors
+    int64_t intval; // used for L and I symbolic flavors
 
     // If intval is an unnamed local temporary, this offset is the start
     // of the region we are using it (which we will need to have a
@@ -237,7 +237,7 @@ struct SymbolicStack {
   std::string pretty() const;
 
   void push(char sym);
-  void setInt(int64 v);
+  void setInt(int64_t v);
   void setString(const StringData* s);
   void setKnownCls(const StringData* s, bool nonNull);
   void setNotRef();
@@ -274,7 +274,7 @@ struct SymbolicStack {
 
   ClassBaseType getClsBaseType(int index) const;
   int getLoc(int index) const;
-  int64 getInt(int index) const;
+  int64_t getInt(int index) const;
   Offset getUnnamedLocStart(int index) const;
 
   void pushFDesc();
@@ -502,7 +502,7 @@ class EmitterVisitor {
   typedef std::pair<Id, int> StrCase;
   struct SwitchState : private boost::noncopyable {
     SwitchState() : nonZeroI(-1), defI(-1) {}
-    std::map<int64, int> cases; // a map from int (or litstr id) to case index
+    std::map<int64_t, int> cases; // a map from int (or litstr id) to case index
     std::vector<StrCase> caseOrder; // for string switches, a list of the
                                     // <litstr id, case index> in the order
                                     // they appear in the source
diff --git a/hphp/compiler/builtin_symbols.cpp b/hphp/compiler/builtin_symbols.cpp
index 86ef1381098a4..68494a09d691e 100644
--- a/hphp/compiler/builtin_symbols.cpp
+++ b/hphp/compiler/builtin_symbols.cpp
@@ -183,7 +183,7 @@ void BuiltinSymbols::ParseExtClasses(AnalysisResultPtr ar, const char **p,
       if (sep) {
         fs->setSepExtension();
       }
-      int flags = (int)(int64)(*p++);
+      int flags = (int)(int64_t)(*p++);
       if (flags & ClassInfo::IsAbstract) {
         fs->addModifier(T_ABSTRACT);
       }
@@ -209,7 +209,7 @@ void BuiltinSymbols::ParseExtClasses(AnalysisResultPtr ar, const char **p,
     p++;
     // Parse properties
     while (*p) {
-      int flags = (int)(int64)(*p++);
+      int flags = (int)(int64_t)(*p++);
       ModifierExpressionPtr modifiers(
         new ModifierExpression(BlockScopePtr(), LocationPtr()));
       if (flags & ClassInfo::IsProtected) {
@@ -233,7 +233,7 @@ void BuiltinSymbols::ParseExtClasses(AnalysisResultPtr ar, const char **p,
     }
     p++;
 
-    int flags = (int)(int64)(*p++);
+    int flags = (int)(int64_t)(*p++);
     cl->setClassInfoAttribute(flags);
     if (flags & ClassInfo::HasDocComment) {
       cl->setDocComment(*p++);
@@ -295,7 +295,7 @@ FunctionScopePtr BuiltinSymbols::ParseExtFunction(AnalysisResultPtr ar,
     index++;
   }
 
-  int flags = (int)(int64)(*p++);
+  int flags = (int)(int64_t)(*p++);
   f->setClassInfoAttribute(flags);
   if (flags & ClassInfo::HasDocComment) {
     f->setDocComment(*p++);
diff --git a/hphp/compiler/compiler.cpp b/hphp/compiler/compiler.cpp
index c7a9d84694328..5b71197c882b1 100644
--- a/hphp/compiler/compiler.cpp
+++ b/hphp/compiler/compiler.cpp
@@ -124,7 +124,7 @@ class AsyncFileCacheSaver : public AsyncFunc<AsyncFileCacheSaver> {
 
     struct stat sb;
     stat(m_name, &sb);
-    Logger::Info("%dMB %s saved", (int64)sb.st_size/(1024*1024), m_name);
+    Logger::Info("%dMB %s saved", (int64_t)sb.st_size/(1024*1024), m_name);
   }
 
 private:
diff --git a/hphp/compiler/construct.cpp b/hphp/compiler/construct.cpp
index 71f885ee93872..6c03dd82f89aa 100644
--- a/hphp/compiler/construct.cpp
+++ b/hphp/compiler/construct.cpp
@@ -313,7 +313,7 @@ void Construct::dumpNode(int spc) {
   }
 
   std::cout << "-> 0x" << std::hex << std::setfill('0')
-            << std::setw(10) << (int64)this << std::dec;
+            << std::setw(10) << (int64_t)this << std::dec;
 
   std::cout << " " << name << "(" << type << ") ";
   if (id) {
@@ -322,12 +322,12 @@ void Construct::dumpNode(int spc) {
   if (idPtr) {
     std::cout << "idp=0x" <<
       std::hex << std::setfill('0') << std::setw(10) <<
-      (int64)idPtr.get() << " ";
+      (int64_t)idPtr.get() << " ";
   }
   if (idCsePtr) {
     std::cout << "idcsep=0x" <<
       std::hex << std::setfill('0') << std::setw(10) <<
-      (int64)idCsePtr.get() << " ";
+      (int64_t)idCsePtr.get() << " ";
   }
 
   if (value != "") {
diff --git a/hphp/compiler/expression/binary_op_expression.cpp b/hphp/compiler/expression/binary_op_expression.cpp
index 9c279bef19192..9219376a38398 100644
--- a/hphp/compiler/expression/binary_op_expression.cpp
+++ b/hphp/compiler/expression/binary_op_expression.cpp
@@ -284,7 +284,7 @@ ExpressionPtr BinaryOpExpression::simplifyArithmetic(
   Variant v2;
   if (m_exp1->getScalarValue(v1)) {
     if (v1.isInteger()) {
-      int64 ival1 = v1.toInt64();
+      int64_t ival1 = v1.toInt64();
       // 1 * $a => $a, 0 + $a => $a
       if ((ival1 == 1 && m_op == '*') || (ival1 == 0 && m_op == '+')) {
         TypePtr actType2 = m_exp2->getActualType();
@@ -317,7 +317,7 @@ ExpressionPtr BinaryOpExpression::simplifyArithmetic(
   }
   if (m_exp2->getScalarValue(v2)) {
     if (v2.isInteger()) {
-      int64 ival2 = v2.toInt64();
+      int64_t ival2 = v2.toInt64();
       // $a * 1 => $a, $a + 0 => $a
       if ((ival2 == 1 && m_op == '*') || (ival2 == 0 && m_op == '+')) {
         TypePtr actType1 = m_exp1->getActualType();
diff --git a/hphp/compiler/expression/class_constant_expression.cpp b/hphp/compiler/expression/class_constant_expression.cpp
index 3f7153187dba6..dbabb2670d13e 100644
--- a/hphp/compiler/expression/class_constant_expression.cpp
+++ b/hphp/compiler/expression/class_constant_expression.cpp
@@ -199,7 +199,7 @@ TypePtr ClassConstantExpression::inferTypes(AnalysisResultPtr ar,
 }
 
 unsigned ClassConstantExpression::getCanonHash() const {
-  int64 val =
+  int64_t val =
     hash_string(Util::toLower(m_varName).c_str(), m_varName.size()) -
     hash_string(Util::toLower(m_className).c_str(), m_className.size());
   return ~unsigned(val) ^ unsigned(val >> 32);
diff --git a/hphp/compiler/expression/constant_expression.cpp b/hphp/compiler/expression/constant_expression.cpp
index 7df7d7c8e3bab..4422b843de2ce 100644
--- a/hphp/compiler/expression/constant_expression.cpp
+++ b/hphp/compiler/expression/constant_expression.cpp
@@ -100,7 +100,7 @@ bool ConstantExpression::getScalarValue(Variant &value) {
 }
 
 unsigned ConstantExpression::getCanonHash() const {
-  int64 val = hash_string(Util::toLower(m_name).c_str(), m_name.size());
+  int64_t val = hash_string(Util::toLower(m_name).c_str(), m_name.size());
   return ~unsigned(val) ^ unsigned(val >> 32);
 }
 
diff --git a/hphp/compiler/expression/expression.cpp b/hphp/compiler/expression/expression.cpp
index 977bcac3f13d0..9edb06b2878ea 100644
--- a/hphp/compiler/expression/expression.cpp
+++ b/hphp/compiler/expression/expression.cpp
@@ -547,11 +547,11 @@ void Expression::CheckPassByReference(AnalysisResultPtr ar,
 }
 
 unsigned Expression::getCanonHash() const {
-  int64 val = hash_int64(getKindOf());
+  int64_t val = hash_int64(getKindOf());
   for (int i = getKidCount(); i--; ) {
     ExpressionPtr k = getNthExpr(i);
     if (k) {
-      val = hash_int64(val ^ (((int64)k->getKindOf()<<32)+k->getCanonID()));
+      val = hash_int64(val ^ (((int64_t)k->getKindOf()<<32)+k->getCanonID()));
     }
   }
 
diff --git a/hphp/compiler/expression/scalar_expression.cpp b/hphp/compiler/expression/scalar_expression.cpp
index 9552490a99671..47734a9d122c9 100644
--- a/hphp/compiler/expression/scalar_expression.cpp
+++ b/hphp/compiler/expression/scalar_expression.cpp
@@ -160,7 +160,7 @@ void ScalarExpression::analyzeProgram(AnalysisResultPtr ar) {
 }
 
 unsigned ScalarExpression::getCanonHash() const {
-  int64 val = getHash();
+  int64_t val = getHash();
   if (val == -1) {
     val = hash_string(m_value.c_str(), m_value.size());
   }
@@ -284,7 +284,7 @@ bool ScalarExpression::isLiteralInteger() const {
   return false;
 }
 
-int64 ScalarExpression::getLiteralInteger() const {
+int64_t ScalarExpression::getLiteralInteger() const {
   assert(isLiteralInteger());
   return strtoll(m_value.c_str(), nullptr, 0);
 }
@@ -401,13 +401,13 @@ void ScalarExpression::outputPHP(CodeGenerator &cg, AnalysisResultPtr ar) {
   }
 }
 
-int64 ScalarExpression::getHash() const {
-  int64 hash = -1;
+int64_t ScalarExpression::getHash() const {
+  int64_t hash = -1;
   if (isLiteralInteger()) {
     hash = hash_int64(getLiteralInteger());
   } else if (isLiteralString()) {
     string scs = getLiteralString();
-    int64 res;
+    int64_t res;
     if (is_strictly_integer(scs.c_str(), scs.size(), res)) {
       hash = hash_int64(res);
     } else {
@@ -471,7 +471,7 @@ bool ScalarExpression::getString(const std::string *&s) const {
   }
 }
 
-bool ScalarExpression::getInt(int64 &i) const {
+bool ScalarExpression::getInt(int64_t &i) const {
   if (m_type == T_LNUMBER) {
     i = strtoll(m_value.c_str(), nullptr, 0);
     return true;
diff --git a/hphp/compiler/expression/scalar_expression.h b/hphp/compiler/expression/scalar_expression.h
index 09378ccaa91d7..4cc1e63fd11ae 100644
--- a/hphp/compiler/expression/scalar_expression.h
+++ b/hphp/compiler/expression/scalar_expression.h
@@ -63,17 +63,17 @@ class ScalarExpression : public Expression {
   void appendEncapString(const std::string &value);
   bool isLiteralInteger() const;
 
-  int64 getLiteralInteger() const;
+  int64_t getLiteralInteger() const;
   std::string getIdentifier() const;
   Variant getVariant() const;
-  int64 getHash() const;
+  int64_t getHash() const;
 
   void setComment(const std::string &comment) { m_comment = comment;}
   const std::string getComment() { return m_comment;}
 
 
   bool getString(const std::string *&s) const;
-  bool getInt(int64 &i) const;
+  bool getInt(int64_t &i) const;
   bool getDouble(double &d) const;
 private:
   int m_type;
diff --git a/hphp/compiler/expression/static_member_expression.cpp b/hphp/compiler/expression/static_member_expression.cpp
index ddfc13547345c..733d9a4c0d8b6 100644
--- a/hphp/compiler/expression/static_member_expression.cpp
+++ b/hphp/compiler/expression/static_member_expression.cpp
@@ -319,7 +319,7 @@ TypePtr StaticMemberExpression::inferTypes(AnalysisResultPtr ar,
 }
 
 unsigned StaticMemberExpression::getCanonHash() const {
-  int64 val = Expression::getCanonHash() +
+  int64_t val = Expression::getCanonHash() +
     hash_string(Util::toLower(m_className).c_str(), m_className.size());
   return ~unsigned(val) ^ unsigned(val >> 32);
 }
diff --git a/hphp/compiler/statement/break_statement.cpp b/hphp/compiler/statement/break_statement.cpp
index 452fc36b88aa9..5e2318e7dc65c 100644
--- a/hphp/compiler/statement/break_statement.cpp
+++ b/hphp/compiler/statement/break_statement.cpp
@@ -109,12 +109,12 @@ void BreakStatement::outputPHP(CodeGenerator &cg, AnalysisResultPtr ar) {
   }
 }
 
-int64 BreakStatement::getDepth() {
+int64_t BreakStatement::getDepth() {
   if (!m_exp) return 1;
   Variant v;
   if (m_exp->getScalarValue(v) &&
       v.isInteger()) {
-    int64 depth = v.toInt64();
+    int64_t depth = v.toInt64();
     return depth >= 1 ? depth : 1;
   }
   return 0;
diff --git a/hphp/compiler/statement/break_statement.h b/hphp/compiler/statement/break_statement.h
index 4f5704b226294..020801d93a491 100644
--- a/hphp/compiler/statement/break_statement.h
+++ b/hphp/compiler/statement/break_statement.h
@@ -32,7 +32,7 @@ class BreakStatement : public Statement {
 
   DECLARE_STATEMENT_VIRTUAL_FUNCTIONS;
   StatementPtr preOptimize(AnalysisResultConstPtr ar);
-  int64 getDepth();
+  int64_t getDepth();
   ExpressionPtr getExp();
 protected:
   const char *m_name;
diff --git a/hphp/compiler/statement/case_statement.cpp b/hphp/compiler/statement/case_statement.cpp
index 3eee9d39f1e18..6f073f92ffa1c 100644
--- a/hphp/compiler/statement/case_statement.cpp
+++ b/hphp/compiler/statement/case_statement.cpp
@@ -58,7 +58,7 @@ bool CaseStatement::isLiteralString() const {
   return exp->isLiteralString();
 }
 
-int64 CaseStatement::getLiteralInteger() const {
+int64_t CaseStatement::getLiteralInteger() const {
   assert(m_condition->is(Expression::KindOfScalarExpression));
   ScalarExpressionPtr exp =
     dynamic_pointer_cast<ScalarExpression>(m_condition);
diff --git a/hphp/compiler/statement/case_statement.h b/hphp/compiler/statement/case_statement.h
index 50668ff98d6ed..33c7dbe877c27 100644
--- a/hphp/compiler/statement/case_statement.h
+++ b/hphp/compiler/statement/case_statement.h
@@ -42,7 +42,7 @@ class CaseStatement : public Statement {
    */
   bool isLiteralInteger() const;
   bool isLiteralString() const;
-  int64 getLiteralInteger() const;
+  int64_t getLiteralInteger() const;
   std::string getLiteralString() const;
 
   bool getScalarConditionValue(Variant &v) const {
diff --git a/hphp/compiler/statement/switch_statement.h b/hphp/compiler/statement/switch_statement.h
index b4e521ed09371..be95280d96c93 100644
--- a/hphp/compiler/statement/switch_statement.h
+++ b/hphp/compiler/statement/switch_statement.h
@@ -43,7 +43,7 @@ class SwitchStatement : public Statement {
   typedef std::vector<StatementPtrWithPos> StatementPtrWithPosVec;
   typedef boost::shared_ptr<StatementPtrWithPosVec> 
     StatementPtrWithPosVecPtr;
-	typedef std::map<uint64, StatementPtrWithPosVecPtr> 
+	typedef std::map<uint64_t, StatementPtrWithPosVecPtr> 
     MapIntToStatementPtrWithPosVec; 
   ExpressionPtr m_exp;
   StatementListPtr m_cases;
diff --git a/hphp/runtime/base/array/array_data.cpp b/hphp/runtime/base/array/array_data.cpp
index ab4c65b8b17f9..2bf3d0d3c8653 100644
--- a/hphp/runtime/base/array/array_data.cpp
+++ b/hphp/runtime/base/array/array_data.cpp
@@ -200,12 +200,12 @@ ArrayData *ArrayData::lvalPtr(StringData* k, Variant *&ret, bool copy,
   throw FatalErrorException("Unimplemented ArrayData::lvalPtr");
 }
 
-ArrayData *ArrayData::lvalPtr(int64 k, Variant *&ret, bool copy,
+ArrayData *ArrayData::lvalPtr(int64_t k, Variant *&ret, bool copy,
                               bool create) {
   throw FatalErrorException("Unimplemented ArrayData::lvalPtr");
 }
 
-ArrayData *ArrayData::add(int64 k, CVarRef v, bool copy) {
+ArrayData *ArrayData::add(int64_t k, CVarRef v, bool copy) {
   assert(!exists(k));
   return set(k, v, copy);
 }
@@ -215,7 +215,7 @@ ArrayData *ArrayData::add(StringData* k, CVarRef v, bool copy) {
   return set(k, v, copy);
 }
 
-ArrayData *ArrayData::addLval(int64 k, Variant *&ret, bool copy) {
+ArrayData *ArrayData::addLval(int64_t k, Variant *&ret, bool copy) {
   assert(!exists(k));
   return lval(k, ret, copy);
 }
@@ -501,7 +501,7 @@ bool ArrayData::hasInternalReference(PointerSet &vars,
 // conflate no-key with have-key && value == null_varaint.  Subclasses
 // can easily do this with one key search.
 
-TypedValue* ArrayData::nvGet(int64 k) const {
+TypedValue* ArrayData::nvGet(int64_t k) const {
   return exists(k) ? (TypedValue*)&get(k, false) :
          nullptr;
 }
@@ -523,7 +523,7 @@ TypedValue* ArrayData::nvGetValueRef(ssize_t pos) {
   return const_cast<TypedValue*>(getValueRef(pos).asTypedValue());
 }
 
-TypedValue* ArrayData::nvGetCell(int64 k) const {
+TypedValue* ArrayData::nvGetCell(int64_t k) const {
   TypedValue* tv = (TypedValue*)&get(k, false);
   return LIKELY(tv != (TypedValue*)&null_variant) ? tvToCell(tv) :
          nvGetNotFound(k);
@@ -535,7 +535,7 @@ TypedValue* ArrayData::nvGetCell(const StringData* key) const {
          nvGetNotFound(key);
 }
 
-CVarRef ArrayData::getNotFound(int64 k) {
+CVarRef ArrayData::getNotFound(int64_t k) {
   raise_notice("Undefined index: %" PRId64, k);
   return null_variant;
 }
@@ -560,7 +560,7 @@ CVarRef ArrayData::getNotFound(CVarRef k) {
   return null_variant;
 }
 
-TypedValue* ArrayData::nvGetNotFound(int64 k) {
+TypedValue* ArrayData::nvGetNotFound(int64_t k) {
   raise_notice("Undefined index: %" PRId64, k);
   return (TypedValue*)&init_null_variant;
 }
diff --git a/hphp/runtime/base/array/array_data.h b/hphp/runtime/base/array/array_data.h
index 0068b8d144699..a778298f3829c 100644
--- a/hphp/runtime/base/array/array_data.h
+++ b/hphp/runtime/base/array/array_data.h
@@ -175,38 +175,38 @@ class ArrayData : public Countable {
   /**
    * Testing whether a key exists.
    */
-  virtual bool exists(int64 k) const = 0;
+  virtual bool exists(int64_t k) const = 0;
   virtual bool exists(const StringData* k) const = 0;
 
   /**
    * Getting value at specified key.
    */
-  virtual CVarRef get(int64 k, bool error = false) const = 0;
+  virtual CVarRef get(int64_t k, bool error = false) const = 0;
   virtual CVarRef get(const StringData* k, bool error = false) const = 0;
 
   /**
    * Interface for VM helpers.  ArrayData implements generic versions
    * using the other ArrayData api; subclasses may do better.
    */
-  virtual TypedValue* nvGet(int64 k) const;
+  virtual TypedValue* nvGet(int64_t k) const;
   virtual TypedValue* nvGet(const StringData* k) const;
   virtual void nvGetKey(TypedValue* out, ssize_t pos);
   virtual TypedValue* nvGetValueRef(ssize_t pos);
-  virtual TypedValue* nvGetCell(int64 ki) const;
+  virtual TypedValue* nvGetCell(int64_t ki) const;
   virtual TypedValue* nvGetCell(const StringData* k) const;
 
   /**
    * Get the numeric index for a key. Only these need to be
    * in ArrayData.
    */
-  virtual ssize_t getIndex(int64 k) const = 0;
+  virtual ssize_t getIndex(int64_t k) const = 0;
   virtual ssize_t getIndex(const StringData* k) const = 0;
 
   /**
    * Getting l-value (that Variant pointer) at specified key. Return NULL if
    * escalation is not needed, or an escalated array data.
    */
-  virtual ArrayData *lval(int64 k, Variant *&ret, bool copy,
+  virtual ArrayData *lval(int64_t k, Variant *&ret, bool copy,
                           bool checkExist = false) = 0;
   virtual ArrayData *lval(StringData* k, Variant *&ret, bool copy,
                           bool checkExist = false) = 0;
@@ -225,7 +225,7 @@ class ArrayData : public Countable {
    * the dynamic property array in ObjectData or the local cache array
    * in ShardMap.
    */
-  virtual ArrayData *lvalPtr(int64 k, Variant *&ret, bool copy, bool create);
+  virtual ArrayData *lvalPtr(int64_t k, Variant *&ret, bool copy, bool create);
   virtual ArrayData *lvalPtr(StringData* k, Variant *&ret, bool copy,
                              bool create);
 
@@ -234,10 +234,10 @@ class ArrayData : public Countable {
    * then set the value. Return NULL if escalation is not needed, or an
    * escalated array data.
    */
-  virtual ArrayData *set(int64 k, CVarRef v, bool copy) = 0;
+  virtual ArrayData *set(int64_t k, CVarRef v, bool copy) = 0;
   virtual ArrayData *set(StringData* k, CVarRef v, bool copy) = 0;
 
-  virtual ArrayData *setRef(int64 k, CVarRef v, bool copy) = 0;
+  virtual ArrayData *setRef(int64_t k, CVarRef v, bool copy) = 0;
   virtual ArrayData *setRef(StringData* k, CVarRef v, bool copy) = 0;
 
   /**
@@ -245,14 +245,14 @@ class ArrayData : public Countable {
    * not already exist in this array.  (This is to allow more
    * efficient implementation of this case in some derived classes.)
    */
-  virtual ArrayData *add(int64 k, CVarRef v, bool copy);
+  virtual ArrayData *add(int64_t k, CVarRef v, bool copy);
   virtual ArrayData *add(StringData* k, CVarRef v, bool copy);
 
   /*
    * Same semantics as lval(), except with the precondition that the
    * key doesn't already exist in the array.
    */
-  virtual ArrayData *addLval(int64 k, Variant *&ret, bool copy);
+  virtual ArrayData *addLval(int64_t k, Variant *&ret, bool copy);
   virtual ArrayData *addLval(StringData* k, Variant *&ret, bool copy);
 
   /**
@@ -260,7 +260,7 @@ class ArrayData : public Countable {
    * then remove the value. Return NULL if escalation is not needed, or an
    * escalated array data.
    */
-  virtual ArrayData *remove(int64 k, bool copy) = 0;
+  virtual ArrayData *remove(int64_t k, bool copy) = 0;
   virtual ArrayData *remove(const StringData* k, bool copy) = 0;
 
   /**
@@ -297,7 +297,7 @@ class ArrayData : public Countable {
   /*
    * Inline wrappers that just use tvAsCVarRef on the value
    */
-  ArrayData* nvSet(int64 ki, const TypedValue* v, bool copy);
+  ArrayData* nvSet(int64_t ki, const TypedValue* v, bool copy);
   ArrayData* nvSet(StringData* k, const TypedValue* v, bool copy);
 
   virtual ssize_t iter_begin() const;
@@ -464,12 +464,12 @@ class ArrayData : public Countable {
     m_strongIterators = p;
   }
   // error-handling helpers
-  static CVarRef getNotFound(int64 k);
+  static CVarRef getNotFound(int64_t k);
   static CVarRef getNotFound(litstr k);
   static CVarRef getNotFound(const StringData* k);
   static CVarRef getNotFound(CStrRef k);
   static CVarRef getNotFound(CVarRef k);
-  static TypedValue* nvGetNotFound(int64 k);
+  static TypedValue* nvGetNotFound(int64_t k);
   static TypedValue* nvGetNotFound(const StringData* k);
 
   static bool IsValidKey(litstr k);
diff --git a/hphp/runtime/base/array/array_init.h b/hphp/runtime/base/array/array_init.h
index 3fc5928400777..3cccc67651b51 100644
--- a/hphp/runtime/base/array/array_init.h
+++ b/hphp/runtime/base/array/array_init.h
@@ -103,7 +103,7 @@ class ArrayInit {
     return *this;
   }
 
-  ArrayInit &set(int64 name, CVarRef v, bool keyConverted = false) {
+  ArrayInit &set(int64_t name, CVarRef v, bool keyConverted = false) {
     m_data->set(name, v, false);
     return *this;
   }
@@ -194,7 +194,7 @@ class ArrayInit {
     return *this;
   }
 
-  ArrayInit &add(int64 name, CVarRef v, bool keyConverted = false) {
+  ArrayInit &add(int64_t name, CVarRef v, bool keyConverted = false) {
     m_data->add(name, v, false);
     return *this;
   }
@@ -237,7 +237,7 @@ class ArrayInit {
     return *this;
   }
 
-  ArrayInit &setRef(int64 name, CVarRef v, bool keyConverted = false) {
+  ArrayInit &setRef(int64_t name, CVarRef v, bool keyConverted = false) {
     m_data->setRef(name, v, false);
     return *this;
   }
diff --git a/hphp/runtime/base/array/array_inline.h b/hphp/runtime/base/array/array_inline.h
index 569f23800a699..cd6ec34091407 100644
--- a/hphp/runtime/base/array/array_inline.h
+++ b/hphp/runtime/base/array/array_inline.h
@@ -30,7 +30,7 @@ inline static bool isIntKey(TypedValueAccessor tva) {
     return Variant::GetAccessorType(tva) <= KindOfInt64;
 }
 
-inline static int64 getIntKey(TypedValueAccessor tva) {
+inline static int64_t getIntKey(TypedValueAccessor tva) {
     return Variant::GetInt64(tva);
 }
 
@@ -138,7 +138,7 @@ inline ArrayData* ArrayData::set(CVarRef k, CVarRef v, bool copy) {
          set(getStringKey(tvk), v, copy);
 }
 
-inline ArrayData* ArrayData::nvSet(int64 ki, const TypedValue* v, bool copy) {
+inline ArrayData* ArrayData::nvSet(int64_t ki, const TypedValue* v, bool copy) {
   return set(ki, tvAsCVarRef(v), copy);
 }
 
diff --git a/hphp/runtime/base/array/array_iterator.cpp b/hphp/runtime/base/array/array_iterator.cpp
index fb953227dd77c..7b00673a308b0 100644
--- a/hphp/runtime/base/array/array_iterator.cpp
+++ b/hphp/runtime/base/array/array_iterator.cpp
@@ -757,7 +757,7 @@ static inline void iter_key_cell_local_impl(Iter* iter, TypedValue* out) {
  * iterator, it decRefs the array.
  */
 static NEVER_INLINE
-int64 new_iter_array_cold(Iter* dest, ArrayData* arr, TypedValue* valOut,
+int64_t new_iter_array_cold(Iter* dest, ArrayData* arr, TypedValue* valOut,
                           TypedValue* keyOut) {
   TRACE(2, "%s: I %p, arr %p\n", __func__, dest, arr);
   if (!arr->empty()) {
@@ -787,7 +787,7 @@ static inline void getHphpArrayElm(HphpArray::Elm* elm, TypedValue* valOut,
 }
 
 HOT_FUNC
-int64 new_iter_array(Iter* dest, ArrayData* ad, TypedValue* valOut) {
+int64_t new_iter_array(Iter* dest, ArrayData* ad, TypedValue* valOut) {
   TRACE(2, "%s: I %p, ad %p\n", __func__, dest, ad);
   valOut = tvToCell(valOut);
   if (UNLIKELY(!IsHphpArray(ad))) {
@@ -821,7 +821,7 @@ int64 new_iter_array(Iter* dest, ArrayData* ad, TypedValue* valOut) {
 }
 
 HOT_FUNC
-int64 new_iter_array_key(Iter* dest, ArrayData* ad, TypedValue* valOut,
+int64_t new_iter_array_key(Iter* dest, ArrayData* ad, TypedValue* valOut,
                          TypedValue* keyOut) {
   TRACE(2, "%s: I %p, ad %p\n", __func__, dest, ad);
   valOut = tvToCell(valOut);
@@ -876,7 +876,7 @@ class FreeObj {
  * If exceptions are thrown, new_iter_object takes care of decRefing the object.
  */
 HOT_FUNC
-int64 new_iter_object(Iter* dest, ObjectData* obj, Class* ctx,
+int64_t new_iter_object(Iter* dest, ObjectData* obj, Class* ctx,
                       TypedValue* valOut, TypedValue* keyOut) {
   valOut = tvToCell(valOut);
   if (keyOut) {
@@ -966,7 +966,7 @@ int64 new_iter_object(Iter* dest, ObjectData* obj, Class* ctx,
  * you're likely to get a performance regression.
  */
 static NEVER_INLINE
-int64 iter_next_cold(Iter* iter, TypedValue* valOut, TypedValue* keyOut) {
+int64_t iter_next_cold(Iter* iter, TypedValue* valOut, TypedValue* keyOut) {
   TRACE(2, "iter_next_cold: I %p\n", iter);
   assert(iter->arr().getIterType() == ArrayIter::TypeArray ||
          iter->arr().getIterType() == ArrayIter::TypeIterator);
@@ -992,7 +992,7 @@ int64 iter_next_cold(Iter* iter, TypedValue* valOut, TypedValue* keyOut) {
 }
 
 HOT_FUNC
-int64 iter_next(Iter* iter, TypedValue* valOut) {
+int64_t iter_next(Iter* iter, TypedValue* valOut) {
   TRACE(2, "iter_next: I %p\n", iter);
   assert(iter->arr().getIterType() == ArrayIter::TypeArray ||
          iter->arr().getIterType() == ArrayIter::TypeIterator);
@@ -1036,7 +1036,7 @@ int64 iter_next(Iter* iter, TypedValue* valOut) {
 }
 
 HOT_FUNC
-int64 iter_next_key(Iter* iter, TypedValue* valOut, TypedValue* keyOut) {
+int64_t iter_next_key(Iter* iter, TypedValue* valOut, TypedValue* keyOut) {
   TRACE(2, "iter_next: I %p\n", iter);
   assert(iter->arr().getIterType() == ArrayIter::TypeArray ||
          iter->arr().getIterType() == ArrayIter::TypeIterator);
diff --git a/hphp/runtime/base/array/array_iterator.h b/hphp/runtime/base/array/array_iterator.h
index 2b23fb6758cd8..784cf0e829259 100644
--- a/hphp/runtime/base/array/array_iterator.h
+++ b/hphp/runtime/base/array/array_iterator.h
@@ -470,14 +470,14 @@ namespace VM {
   bool interp_iter_next(Iter* it);
   bool interp_iter_next_m(Iter* it);
 
-  int64 new_iter_array(HPHP::VM::Iter* dest, ArrayData* arr,
+  int64_t new_iter_array(HPHP::VM::Iter* dest, ArrayData* arr,
                        TypedValue* val);
-  int64 new_iter_array_key(HPHP::VM::Iter* dest, ArrayData* arr,
+  int64_t new_iter_array_key(HPHP::VM::Iter* dest, ArrayData* arr,
                            TypedValue* val, TypedValue* key);
-  int64 new_iter_object(HPHP::VM::Iter* dest, ObjectData* obj, Class* ctx,
+  int64_t new_iter_object(HPHP::VM::Iter* dest, ObjectData* obj, Class* ctx,
                         TypedValue* val, TypedValue* key);
-  int64 iter_next(HPHP::VM::Iter* dest, TypedValue* val);
-  int64 iter_next_key(HPHP::VM::Iter* dest, TypedValue* val, TypedValue* key);
+  int64_t iter_next(HPHP::VM::Iter* dest, TypedValue* val);
+  int64_t iter_next_key(HPHP::VM::Iter* dest, TypedValue* val, TypedValue* key);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/base/array/array_util.cpp b/hphp/runtime/base/array/array_util.cpp
index 63958d0d74760..795572f068d62 100644
--- a/hphp/runtime/base/array/array_util.cpp
+++ b/hphp/runtime/base/array/array_util.cpp
@@ -218,7 +218,7 @@ Variant ArrayUtil::Pad(CArrRef input, CVarRef pad_value, int pad_size,
 }
 
 Variant ArrayUtil::Range(unsigned char low, unsigned char high,
-                         int64 step /* = 1 */) {
+                         int64_t step /* = 1 */) {
   if (step <= 0) {
     throw_invalid_argument("step exceeds the specified range");
     return false;
@@ -271,7 +271,7 @@ Variant ArrayUtil::Range(double low, double high, double step /* = 1.0 */) {
   return ret;
 }
 
-Variant ArrayUtil::Range(double low, double high, int64 step /* = 1 */) {
+Variant ArrayUtil::Range(double low, double high, int64_t step /* = 1 */) {
   Array ret;
   if (low > high) { // Negative steps
     if (low - high < step || step <= 0) {
@@ -279,7 +279,7 @@ Variant ArrayUtil::Range(double low, double high, int64 step /* = 1 */) {
       return false;
     }
     for (; low >= high; low -= step) {
-      ret.append((int64)low);
+      ret.append((int64_t)low);
     }
   } else if (high > low) { // Positive steps
     if (high - low < step || step <= 0) {
@@ -287,10 +287,10 @@ Variant ArrayUtil::Range(double low, double high, int64 step /* = 1 */) {
       return false;
     }
     for (; low <= high; low += step) {
-      ret.append((int64)low);
+      ret.append((int64_t)low);
     }
   } else {
-    ret.append((int64)low);
+    ret.append((int64_t)low);
   }
   return ret;
 }
@@ -322,7 +322,7 @@ Variant ArrayUtil::FromHdf(const Hdf &hdf) {
     return true;
   }
 
-  int64 lval; double dval;
+  int64_t lval; double dval;
   int len = strlen(value);
   DataType ret = is_numeric_string(value, len, &lval, &dval, 0);
   switch (ret) {
@@ -351,8 +351,8 @@ void ArrayUtil::ToHdf(const Array &arr, Hdf &hdf) {
 ///////////////////////////////////////////////////////////////////////////////
 // information and calculations
 
-DataType ArrayUtil::Sum(CArrRef input, int64 *isum, double *dsum) {
-  int64 i = 0;
+DataType ArrayUtil::Sum(CArrRef input, int64_t *isum, double *dsum) {
+  int64_t i = 0;
   ArrayIter iter(input);
   for (; iter; ++iter) {
     CVarRef entry(iter.secondRef());
@@ -362,7 +362,7 @@ DataType ArrayUtil::Sum(CArrRef input, int64 *isum, double *dsum) {
     }
     case KindOfStaticString:
     case KindOfString: {
-      int64 ti;
+      int64_t ti;
       double td;
       if (entry.getStringData()->isNumericWithVal(ti, td, 1) ==
           KindOfInt64) {
@@ -397,8 +397,8 @@ DataType ArrayUtil::Sum(CArrRef input, int64 *isum, double *dsum) {
   return KindOfDouble;
 }
 
-DataType ArrayUtil::Product(CArrRef input, int64 *iprod, double *dprod) {
-  int64 i = 1;
+DataType ArrayUtil::Product(CArrRef input, int64_t *iprod, double *dprod) {
+  int64_t i = 1;
   ArrayIter iter(input);
   for (; iter; ++iter) {
     CVarRef entry(iter.secondRef());
@@ -408,7 +408,7 @@ DataType ArrayUtil::Product(CArrRef input, int64 *iprod, double *dprod) {
     }
     case KindOfStaticString:
     case KindOfString: {
-      int64 ti;
+      int64_t ti;
       double td;
       if (entry.getStringData()->isNumericWithVal(ti, td, 1) ==
           KindOfInt64) {
diff --git a/hphp/runtime/base/array/array_util.h b/hphp/runtime/base/array/array_util.h
index 9b465bcfc3d98..b88bf768a76f6 100644
--- a/hphp/runtime/base/array/array_util.h
+++ b/hphp/runtime/base/array/array_util.h
@@ -80,9 +80,9 @@ class ArrayUtil {
    * Create an array containing the range of integers or characters from low
    * to high (inclusive).
    */
-  static Variant Range(unsigned char low, unsigned char high, int64 step = 1);
+  static Variant Range(unsigned char low, unsigned char high, int64_t step = 1);
   static Variant Range(double low, double high, double step = 1.0);
-  static Variant Range(double low, double high, int64 step = 1);
+  static Variant Range(double low, double high, int64_t step = 1);
 
   /**
    * Conversion between HDF and array.
@@ -96,12 +96,12 @@ class ArrayUtil {
   /**
    * Computes the sum of the array entries as int64 or double.
    */
-  static DataType Sum(CArrRef input, int64 *isum, double *dsum);
+  static DataType Sum(CArrRef input, int64_t *isum, double *dsum);
 
   /**
    * Computes the product of the array entries as int64 or double.
    */
-  static DataType Product(CArrRef input, int64 *iprod, double *dprod);
+  static DataType Product(CArrRef input, int64_t *iprod, double *dprod);
 
   /**
    * Return the value as key and the frequency of that value in input
diff --git a/hphp/runtime/base/array/hphp_array.cpp b/hphp/runtime/base/array/hphp_array.cpp
index 131c4e9ffe30d..a6f14d034ab8f 100644
--- a/hphp/runtime/base/array/hphp_array.cpp
+++ b/hphp/runtime/base/array/hphp_array.cpp
@@ -75,7 +75,7 @@ HphpArray HphpArray::s_theEmptyArray(StaticEmptyArray);
 //=============================================================================
 // Helpers.
 
-static inline size_t computeMaskFromNumElms(uint32 numElms) {
+static inline size_t computeMaskFromNumElms(uint32_t numElms) {
   assert(numElms <= 0x7fffffffU);
   size_t lgSize = HphpArray::MinLgTableSize;
   size_t maxElms = (size_t(3U)) << (lgSize-2);
@@ -317,7 +317,7 @@ bool HphpArray::isVectorData() const {
     return true;
   }
   Elm* elms = m_data;
-  int64 i = 0;
+  int64_t i = 0;
   for (ElmInd pos = 0; pos <= m_lastE; ++pos) {
     Elm* e = &elms[pos];
     if (e->data.m_type == KindOfTombstone) {
@@ -417,9 +417,9 @@ Variant HphpArray::each() {
     ArrayInit init(4);
     Variant key = HphpArray::getKey(m_pos);
     Variant value = HphpArray::getValue(m_pos);
-    init.set(int64(1), value);
+    init.set(int64_t(1), value);
     init.set(s_value, value, true);
-    init.set(int64(0), key);
+    init.set(int64_t(0), key);
     init.set(s_key, key, true);
     m_pos = nextElm(m_data, m_pos);
     return Array(init.create());
@@ -454,7 +454,7 @@ static bool hitStringKey(const HphpArray::Elm* e, const StringData* s,
                           && (memcmp(data, sdata, slen) == 0));
 }
 
-static bool hitIntKey(const HphpArray::Elm* e, int64 ki) {
+static bool hitIntKey(const HphpArray::Elm* e, int64_t ki) {
   // hitIntKey() should only be called on an Elm that is referenced by a
   // hash table entry. HphpArray guarantees that when it adds a hash table
   // entry that it always sets it to refer to a valid element. Likewise when
@@ -492,7 +492,7 @@ static bool hitIntKey(const HphpArray::Elm* e, int64 ki) {
   }
 
 NEVER_INLINE
-ssize_t /*ElmInd*/ HphpArray::find(int64 ki) const {
+ssize_t /*ElmInd*/ HphpArray::find(int64_t ki) const {
   if (uint64_t(ki) < m_size) {
     // Try to get at it without dirtying a data cache line.
     Elm* e = m_data + uint64_t(ki);
@@ -558,7 +558,7 @@ HphpArray::ElmInd* warnUnbalanced(size_t n, HphpArray::ElmInd* ei) {
   }
 
 NEVER_INLINE
-HphpArray::ElmInd* HphpArray::findForInsert(int64 ki) const {
+HphpArray::ElmInd* HphpArray::findForInsert(int64_t ki) const {
   FIND_FOR_INSERT_BODY(ki, hitIntKey(&elms[pos], ki));
 }
 
@@ -586,7 +586,7 @@ HphpArray::findForNewInsertLoop(size_t tableMask, size_t h0) const {
   }
 }
 
-bool HphpArray::exists(int64 k) const {
+bool HphpArray::exists(int64_t k) const {
   return find(k) != (ssize_t)ElmIndEmpty;
 }
 
@@ -595,7 +595,7 @@ bool HphpArray::exists(const StringData* k) const {
   return pos != ssize_t(ElmIndEmpty);
 }
 
-CVarRef HphpArray::get(int64 k, bool error /* = false */) const {
+CVarRef HphpArray::get(int64_t k, bool error /* = false */) const {
   ElmInd pos = find(k);
   if (pos != ElmIndEmpty) {
     Elm* e = &m_data[pos];
@@ -613,7 +613,7 @@ CVarRef HphpArray::get(const StringData* key, bool error /* = false */) const {
   return error ? getNotFound(key) : null_variant;
 }
 
-ssize_t HphpArray::getIndex(int64 k) const {
+ssize_t HphpArray::getIndex(int64_t k) const {
   return ssize_t(find(k));
 }
 
@@ -625,10 +625,10 @@ ssize_t HphpArray::getIndex(const StringData* k) const {
 // Append/insert/update.
 
 inline ALWAYS_INLINE bool HphpArray::isFull() const {
-  uint32 maxElms = computeMaxElms(m_tableMask);
-  assert(m_lastE == ElmIndEmpty || uint32(m_lastE) + 1 <= maxElms);
+  uint32_t maxElms = computeMaxElms(m_tableMask);
+  assert(m_lastE == ElmIndEmpty || uint32_t(m_lastE) + 1 <= maxElms);
   assert(m_hLoad <= maxElms);
-  return uint32(m_lastE) + 1 == maxElms || m_hLoad == maxElms;
+  return uint32_t(m_lastE) + 1 == maxElms || m_hLoad == maxElms;
 }
 
 inline ALWAYS_INLINE HphpArray::Elm* HphpArray::allocElmFast(ElmInd* ei) {
@@ -757,8 +757,8 @@ inline ALWAYS_INLINE void HphpArray::resizeIfNeeded() {
 }
 
 NEVER_INLINE void HphpArray::resize() {
-  uint32 maxElms = computeMaxElms(m_tableMask);
-  assert(m_lastE == ElmIndEmpty || uint32(m_lastE)+1 <= maxElms);
+  uint32_t maxElms = computeMaxElms(m_tableMask);
+  assert(m_lastE == ElmIndEmpty || uint32_t(m_lastE)+1 <= maxElms);
   assert(m_hLoad <= maxElms);
   // At a minimum, compaction is required.  If the load factor would be >0.5
   // even after compaction, grow instead, in order to avoid the possibility
@@ -785,7 +785,7 @@ NEVER_INLINE void HphpArray::resize() {
 
 void HphpArray::grow() {
   assert(m_tableMask <= 0x7fffffffU);
-  uint32 oldMask = m_tableMask;
+  uint32_t oldMask = m_tableMask;
   m_tableMask = (uint)(size_t(m_tableMask) + size_t(m_tableMask) + size_t(1));
   size_t tableSize = computeTableSize(m_tableMask);
   size_t maxElms = computeMaxElms(m_tableMask);
@@ -910,7 +910,7 @@ bool HphpArray::nextInsert(CVarRef data) {
     return false;
   }
   resizeIfNeeded();
-  int64 ki = m_nextKI;
+  int64_t ki = m_nextKI;
   // The check above enforces an invariant that allows us to always
   // know that m_nextKI is not present in the array, so it is safe
   // to use findForNewInsert()
@@ -930,7 +930,7 @@ void HphpArray::nextInsertRef(CVarRef data) {
     return;
   }
   resizeIfNeeded();
-  int64 ki = m_nextKI;
+  int64_t ki = m_nextKI;
   // The check above enforces an invariant that allows us to always
   // know that m_nextKI is not present in the array, so it is safe
   // to use findForNewInsert()
@@ -942,7 +942,7 @@ void HphpArray::nextInsertRef(CVarRef data) {
 
 void HphpArray::nextInsertWithRef(CVarRef data) {
   resizeIfNeeded();
-  int64 ki = m_nextKI;
+  int64_t ki = m_nextKI;
   ElmInd* ei = findForInsert(ki);
   assert(!validElmInd(*ei));
 
@@ -956,7 +956,7 @@ void HphpArray::nextInsertWithRef(CVarRef data) {
   ++m_nextKI;
 }
 
-void HphpArray::addLvalImpl(int64 ki, Variant** pDest) {
+void HphpArray::addLvalImpl(int64_t ki, Variant** pDest) {
   assert(pDest != nullptr);
   ElmInd* ei = findForInsert(ki);
   if (validElmInd(*ei)) {
@@ -992,7 +992,7 @@ void HphpArray::addLvalImpl(StringData* key, strhash_t h, Variant** pDest) {
   *pDest = &(tvAsVariant(&e->data));
 }
 
-inline void HphpArray::addVal(int64 ki, CVarRef data) {
+inline void HphpArray::addVal(int64_t ki, CVarRef data) {
   assert(!exists(ki));
   resizeIfNeeded();
   ElmInd* ei = findForNewInsert(ki);
@@ -1021,7 +1021,7 @@ inline void HphpArray::addVal(StringData* key, CVarRef data) {
   e->key->incRefCount();
 }
 
-inline void HphpArray::addValWithRef(int64 ki, CVarRef data) {
+inline void HphpArray::addValWithRef(int64_t ki, CVarRef data) {
   resizeIfNeeded();
   ElmInd* ei = findForInsert(ki);
   if (validElmInd(*ei)) {
@@ -1051,7 +1051,7 @@ inline void HphpArray::addValWithRef(StringData* key, CVarRef data) {
 }
 
 inline INLINE_SINGLE_CALLER
-void HphpArray::update(int64 ki, CVarRef data) {
+void HphpArray::update(int64_t ki, CVarRef data) {
   ElmInd* ei = findForInsert(ki);
   if (validElmInd(*ei)) {
     Elm* e = &m_data[*ei];
@@ -1076,7 +1076,7 @@ void HphpArray::update(StringData* key, CVarRef data) {
   newElmStr(ei, h, key, data);
 }
 
-void HphpArray::updateRef(int64 ki, CVarRef data) {
+void HphpArray::updateRef(int64_t ki, CVarRef data) {
   ElmInd* ei = findForInsert(ki);
   if (validElmInd(*ei)) {
     Elm* e = &m_data[*ei];
@@ -1100,7 +1100,7 @@ void HphpArray::updateRef(StringData* key, CVarRef data) {
   newElmStr(ei, h, key, data, true /*byRef*/);
 }
 
-ArrayData* HphpArray::lval(int64 k, Variant*& ret, bool copy,
+ArrayData* HphpArray::lval(int64_t k, Variant*& ret, bool copy,
                            bool checkExist /* = false */) {
   if (!copy) {
     addLvalImpl(k, &ret);
@@ -1174,7 +1174,7 @@ ArrayData *HphpArray::lvalPtr(StringData* key, Variant*& ret, bool copy,
   return a;
 }
 
-ArrayData *HphpArray::lvalPtr(int64 k, Variant*& ret, bool copy,
+ArrayData *HphpArray::lvalPtr(int64_t k, Variant*& ret, bool copy,
                               bool create) {
   HphpArray* a = 0;
   HphpArray* t = this;
@@ -1207,7 +1207,7 @@ ArrayData* HphpArray::lvalNew(Variant*& ret, bool copy) {
   return a;
 }
 
-ArrayData* HphpArray::set(int64 k, CVarRef v, bool copy) {
+ArrayData* HphpArray::set(int64_t k, CVarRef v, bool copy) {
   HphpArray *a = this, *t = 0;
   if (copy) a = t = copyImpl();
   a->update(k, v);
@@ -1221,7 +1221,7 @@ ArrayData* HphpArray::set(StringData* k, CVarRef v, bool copy) {
   return t;
 }
 
-ArrayData* HphpArray::setRef(int64 k, CVarRef v, bool copy) {
+ArrayData* HphpArray::setRef(int64_t k, CVarRef v, bool copy) {
   HphpArray *a = this, *t = 0;
   if (copy) a = t = copyImpl();
   a->updateRef(k, v);
@@ -1235,7 +1235,7 @@ ArrayData* HphpArray::setRef(StringData* k, CVarRef v, bool copy) {
   return t;
 }
 
-ArrayData* HphpArray::add(int64 k, CVarRef v, bool copy) {
+ArrayData* HphpArray::add(int64_t k, CVarRef v, bool copy) {
   HphpArray *a = this, *t = 0;
   if (copy) a = t = copyImpl();
   a->addVal(k, v);
@@ -1250,7 +1250,7 @@ ArrayData* HphpArray::add(StringData* k, CVarRef v, bool copy) {
   return t;
 }
 
-ArrayData* HphpArray::addLval(int64 k, Variant*& ret, bool copy) {
+ArrayData* HphpArray::addLval(int64_t k, Variant*& ret, bool copy) {
   assert(!exists(k));
   HphpArray *a = this, *t = 0;
   if (copy) a = t = copyImpl();
@@ -1333,7 +1333,7 @@ void HphpArray::erase(ElmInd* ei, bool updateNext /* = false */) {
   // Mark the hash entry as "deleted".
   *ei = ElmIndTombstone;
   assert(m_lastE == ElmIndEmpty ||
-         uint32(m_lastE)+1 <= computeMaxElms(m_tableMask));
+         uint32_t(m_lastE)+1 <= computeMaxElms(m_tableMask));
   assert(m_hLoad <= computeMaxElms(m_tableMask));
 
   // Finally, decref the old value
@@ -1345,7 +1345,7 @@ void HphpArray::erase(ElmInd* ei, bool updateNext /* = false */) {
   }
 }
 
-ArrayData* HphpArray::remove(int64 k, bool copy) {
+ArrayData* HphpArray::remove(int64_t k, bool copy) {
   HphpArray *a = this, *t = 0;
   if (copy) a = t = copyImpl();
   a->erase(a->findForInsert(k));
@@ -1372,7 +1372,7 @@ ArrayData* HphpArray::copyWithStrongIterators() const {
 //=============================================================================
 // non-variant interface
 
-TypedValue* HphpArray::nvGetCell(int64 k) const {
+TypedValue* HphpArray::nvGetCell(int64_t k) const {
   ElmInd pos = find(k);
   return LIKELY(pos != ElmIndEmpty) ? tvToCell(&m_data[pos].data) :
          nvGetNotFound(k);
@@ -1384,7 +1384,7 @@ TypedValue* HphpArray::nvGetCell(const StringData* k) const {
          nvGetNotFound(k);
 }
 
-TypedValue* HphpArray::nvGet(int64 ki) const {
+TypedValue* HphpArray::nvGet(int64_t ki) const {
   ElmInd pos = find(ki);
   if (LIKELY(pos != ElmIndEmpty)) {
     Elm* e = &m_data[pos];
@@ -1534,7 +1534,7 @@ ArrayData* HphpArray::AddNewElemC(ArrayData* a, TypedValue value) {
   assert(a->getCount() <= 1 && value.m_type != KindOfRef);
   HphpArray* h;
   ElmInd* ei;
-  int64 k;
+  int64_t k;
   if (LIKELY(IsHphpArray(a)) &&
       ((h = (HphpArray*)a), LIKELY(h->m_pos >= 0)) &&
       LIKELY(!h->isFull()) &&
@@ -1755,16 +1755,16 @@ namespace VM {
 // Helpers for array_setm.
 ArrayData* nvCheckedSet(ArrayData* a, StringData* key, TypedValue* value,
            bool copy) {
-  int64 i;
+  int64_t i;
   return UNLIKELY(key->isStrictlyInteger(i)) ? a->nvSet(i, value, copy) :
          a->nvSet(key, value, copy);
 }
 
-ArrayData* nvCheckedSet(ArrayData* a, int64 key, TypedValue* value, bool copy) {
+ArrayData* nvCheckedSet(ArrayData* a, int64_t key, TypedValue* value, bool copy) {
   return a->nvSet(key, value, copy);
 }
 
-void setmDecRef(int64 i) { /* nop */ }
+void setmDecRef(int64_t i) { /* nop */ }
 void setmDecRef(StringData* sd) { decRefStr(sd); }
 
 static inline ArrayData*
@@ -1804,14 +1804,14 @@ array_setm(TypedValue* cell, ArrayData* ad, Key key, TypedValue* value) {
  *    array_setm_ik1_v0 --
  *       Don't count the array's reference to the polymorphic value.
  */
-ArrayData* array_setm_ik1_v(TypedValue* cell, ArrayData* ad, int64 key,
+ArrayData* array_setm_ik1_v(TypedValue* cell, ArrayData* ad, int64_t key,
                             TypedValue* value) {
-  return array_setm<int64, false, false, false>(cell, ad, key, value);
+  return array_setm<int64_t, false, false, false>(cell, ad, key, value);
 }
 
-ArrayData* array_setm_ik1_v0(TypedValue* cell, ArrayData* ad, int64 key,
+ArrayData* array_setm_ik1_v0(TypedValue* cell, ArrayData* ad, int64_t key,
                              TypedValue* value) {
-  return array_setm<int64, true, false, false>(cell, ad, key, value);
+  return array_setm<int64_t, true, false, false>(cell, ad, key, value);
 }
 
 /**
@@ -1884,7 +1884,7 @@ ArrayData* array_setm_wk1_v0(ArrayData* ad, TypedValue* value) {
  */
 
 ArrayData*
-array_getm_i(void* dptr, int64 key, TypedValue* out) {
+array_getm_i(void* dptr, int64_t key, TypedValue* out) {
   assert(dptr);
   ArrayData* ad = (ArrayData*)dptr;
   TRACE(2, "array_getm_ik1: (%p) <- %p[%" PRId64 "]\n", out, dptr, key);
@@ -1900,7 +1900,7 @@ ArrayData* array_getm_s(ArrayData* ad, StringData* sd, TypedValue* out,
                            int flags) {
   bool drKey = flags & DecRefKey;
   bool checkInts = flags & CheckInts;
-  int64 ikey;
+  int64_t ikey;
   TypedValue* ret = checkInts && UNLIKELY(sd->isStrictlyInteger(ikey)) ?
                     ad->nvGetCell(ikey) :
                     ad->nvGetCell(sd);
@@ -1916,7 +1916,7 @@ static bool
 issetMUnary(const void* dptr, StringData* sd, bool decRefKey, bool checkInt) {
   const ArrayData* ad = (const ArrayData*)dptr;
   bool retval;
-  int64 keyAsInt;
+  int64_t keyAsInt;
 
   TypedValue* c;
   if (checkInt && sd->isStrictlyInteger(keyAsInt)) {
@@ -1934,16 +1934,16 @@ issetMUnary(const void* dptr, StringData* sd, bool decRefKey, bool checkInt) {
   return retval;
 }
 
-uint64 array_issetm_s(const void* dptr, StringData* sd)
+uint64_t array_issetm_s(const void* dptr, StringData* sd)
 { return issetMUnary(dptr, sd, true  /*decRefKey*/, true  /*checkInt*/); }
-uint64 array_issetm_s0(const void* dptr, StringData* sd)
+uint64_t array_issetm_s0(const void* dptr, StringData* sd)
 { return issetMUnary(dptr, sd, false /*decRefKey*/, true  /*checkInt*/); }
-uint64 array_issetm_s_fast(const void* dptr, StringData* sd)
+uint64_t array_issetm_s_fast(const void* dptr, StringData* sd)
 { return issetMUnary(dptr, sd, true  /*decRefKey*/, false /*checkInt*/); }
-uint64 array_issetm_s0_fast(const void* dptr, StringData* sd)
+uint64_t array_issetm_s0_fast(const void* dptr, StringData* sd)
 { return issetMUnary(dptr, sd, false /*decRefKey*/, false /*checkInt*/); }
 
-uint64 array_issetm_i(const void* dptr, int64_t key) {
+uint64_t array_issetm_i(const void* dptr, int64_t key) {
   ArrayData* ad = (ArrayData*)dptr;
   TypedValue* ret = ad->nvGet(key);
   // Variant.isNull unboxes ret if its KindOfRef.
diff --git a/hphp/runtime/base/array/hphp_array.h b/hphp/runtime/base/array/hphp_array.h
index 8b1beed95e92c..3c5a5adfdf76c 100644
--- a/hphp/runtime/base/array/hphp_array.h
+++ b/hphp/runtime/base/array/hphp_array.h
@@ -125,44 +125,44 @@ class HphpArray : public ArrayData {
   Variant each();
 
   // implements ArrayData
-  bool exists(int64 k) const;
+  bool exists(int64_t k) const;
   bool exists(const StringData* k) const;
 
   // implements ArrayData
-  CVarRef get(int64 k, bool error=false) const FLATTEN;
+  CVarRef get(int64_t k, bool error=false) const FLATTEN;
   CVarRef get(const StringData* k, bool error=false) const FLATTEN;
 
   // implements ArrayData
-  ssize_t getIndex(int64 k) const;
+  ssize_t getIndex(int64_t k) const;
   ssize_t getIndex(const StringData* k) const;
 
   // implements ArrayData
-  ArrayData* lval(int64 k, Variant*& ret, bool copy, bool checkExist=false);
+  ArrayData* lval(int64_t k, Variant*& ret, bool copy, bool checkExist=false);
   ArrayData* lval(StringData* k, Variant*& ret, bool copy,
                   bool checkExist=false);
   ArrayData* lvalNew(Variant*& ret, bool copy);
 
   // overrides ArrayData
-  ArrayData* lvalPtr(int64 k, Variant*& ret, bool copy, bool create);
+  ArrayData* lvalPtr(int64_t k, Variant*& ret, bool copy, bool create);
   ArrayData* lvalPtr(StringData* k, Variant*& ret, bool copy,
                      bool create);
 
   // implements ArrayData
-  ArrayData* set(int64 k, CVarRef v, bool copy);
+  ArrayData* set(int64_t k, CVarRef v, bool copy);
   ArrayData* set(StringData* k, CVarRef v, bool copy);
 
   // implements ArrayData
-  ArrayData* setRef(int64 k, CVarRef v, bool copy);
+  ArrayData* setRef(int64_t k, CVarRef v, bool copy);
   ArrayData* setRef(StringData* k, CVarRef v, bool copy);
 
   // overrides ArrayData
-  ArrayData *add(int64 k, CVarRef v, bool copy);
+  ArrayData *add(int64_t k, CVarRef v, bool copy);
   ArrayData *add(StringData* k, CVarRef v, bool copy);
-  ArrayData *addLval(int64 k, Variant*& ret, bool copy);
+  ArrayData *addLval(int64_t k, Variant*& ret, bool copy);
   ArrayData *addLval(StringData* k, Variant*& ret, bool copy);
 
   // implements ArrayData
-  ArrayData* remove(int64 k, bool copy);
+  ArrayData* remove(int64_t k, bool copy);
   ArrayData* remove(const StringData* k, bool copy);
 
   // overrides/implements ArrayData
@@ -195,15 +195,15 @@ class HphpArray : public ArrayData {
 
   // nvGet returns a pointer to the value if the specified key is in the
   // array, NULL otherwise.
-  TypedValue* nvGet(int64 ki) const;
+  TypedValue* nvGet(int64_t ki) const;
   TypedValue* nvGet(const StringData* k) const;
 
   // nvGetCell is a variation of get, however it unwraps a KindOfRef,
   // returns KindOfNull if the key doesn't exist, and always warns.
-  TypedValue* nvGetCell(int64 ki) const;
+  TypedValue* nvGetCell(int64_t ki) const;
   TypedValue* nvGetCell(const StringData* k) const;
 
-  void nvBind(int64 ki, const TypedValue* v) {
+  void nvBind(int64_t ki, const TypedValue* v) {
     updateRef(ki, tvAsCVarRef(v));
   }
   void nvBind(StringData* k, const TypedValue* v) {
@@ -283,7 +283,7 @@ class HphpArray : public ArrayData {
      * It is critical that when we return &data to clients, that they not
      * read or write the _count field! */
     union {
-      int64       ikey;
+      int64_t       ikey;
       StringData* key;
     };
     union {
@@ -304,7 +304,7 @@ class HphpArray : public ArrayData {
       key = k;
       hash = int32_t(h) | 0x80000000;
     }
-    void setIntKey(int64 k) {
+    void setIntKey(int64_t k) {
       ikey = k;
       hash = 0;
     }
@@ -312,14 +312,14 @@ class HphpArray : public ArrayData {
 
   struct ElmKey {
     ElmKey() {}
-    ElmKey(int32 hash, StringData* key) {
+    ElmKey(int32_t hash, StringData* key) {
       this->hash = hash;
       this->key = key;
     }
-    int32       hash;
+    int32_t       hash;
     union {
       StringData* key;
-      int64 ikey;
+      int64_t ikey;
     };
   };
 
@@ -328,14 +328,14 @@ class HphpArray : public ArrayData {
   // 32-bit ints than it does for 64-bit ints. As such, we have deliberately
   // chosen to use ssize_t in some places where ideally we *should* have used
   // ElmInd.
-  typedef int32 ElmInd;
+  typedef int32_t ElmInd;
   static const ElmInd ElmIndEmpty      = -1; // == ArrayData::invalid_index
   static const ElmInd ElmIndTombstone  = -2;
 
   // Use a minimum of an 4-element hash table.  Valid range: [2..32]
-  static const uint32 MinLgTableSize = 2;
-  static const uint32 SmallHashSize = 1 << MinLgTableSize;
-  static const uint32 SmallSize = SmallHashSize - SmallHashSize / LoadScale;
+  static const uint32_t MinLgTableSize = 2;
+  static const uint32_t SmallHashSize = 1 << MinLgTableSize;
+  static const uint32_t SmallSize = SmallHashSize - SmallHashSize / LoadScale;
 
   struct InlineSlots {
     Elm slots[SmallSize];
@@ -398,9 +398,9 @@ class HphpArray : public ArrayData {
   ElmInd  m_lastE;       // Index of last used element.
   Elm*    m_data;        // Contains elements and hash table.
   ElmInd* m_hash;        // Hash table.
-  int64   m_nextKI;      // Next integer key to use for append.
-  uint32  m_tableMask;   // Bitmask used when indexing into the hash table.
-  uint32  m_hLoad;       // Hash table load (# of non-empty slots).
+  int64_t   m_nextKI;      // Next integer key to use for append.
+  uint32_t  m_tableMask;   // Bitmask used when indexing into the hash table.
+  uint32_t  m_hLoad;       // Hash table load (# of non-empty slots).
   union {
     InlineSlots m_inline_data;
     ElmInd m_inline_hash[sizeof(m_inline_data) / sizeof(ElmInd)];
@@ -419,9 +419,9 @@ class HphpArray : public ArrayData {
   }
   ssize_t /*ElmInd*/ prevElm(Elm* elms, ssize_t /*ElmInd*/ ei) const;
 
-  ssize_t /*ElmInd*/ find(int64 ki) const;
+  ssize_t /*ElmInd*/ find(int64_t ki) const;
   ssize_t /*ElmInd*/ find(const StringData* s, strhash_t prehash) const;
-  ElmInd* findForInsert(int64 ki) const;
+  ElmInd* findForInsert(int64_t ki) const;
   ElmInd* findForInsert(const StringData* k, strhash_t prehash) const;
 
   ssize_t iter_advance_helper(ssize_t prev) const ATTRIBUTE_COLD;
@@ -445,16 +445,16 @@ class HphpArray : public ArrayData {
   bool nextInsert(CVarRef data);
   void nextInsertRef(CVarRef data);
   void nextInsertWithRef(CVarRef data);
-  void addLvalImpl(int64 ki, Variant** pDest);
+  void addLvalImpl(int64_t ki, Variant** pDest);
   void addLvalImpl(StringData* key, strhash_t h, Variant** pDest);
-  void addVal(int64 ki, CVarRef data);
+  void addVal(int64_t ki, CVarRef data);
   void addVal(StringData* key, CVarRef data);
-  void addValWithRef(int64 ki, CVarRef data);
+  void addValWithRef(int64_t ki, CVarRef data);
   void addValWithRef(StringData* key, CVarRef data);
 
-  void update(int64 ki, CVarRef data);
+  void update(int64_t ki, CVarRef data);
   void update(StringData* key, CVarRef data);
-  void updateRef(int64 ki, CVarRef data);
+  void updateRef(int64_t ki, CVarRef data);
   void updateRef(StringData* key, CVarRef data);
 
   void erase(ElmInd* ei, bool updateNext = false);
@@ -529,15 +529,15 @@ class HphpArray : public ArrayData {
     return (ei > ssize_t(HphpArray::ElmIndEmpty));
   }
 
-  static size_t computeTableSize(uint32 tableMask) {
+  static size_t computeTableSize(uint32_t tableMask) {
     return size_t(tableMask) + size_t(1U);
   }
 
-  static size_t computeMaxElms(uint32 tableMask) {
+  static size_t computeMaxElms(uint32_t tableMask) {
     return size_t(tableMask) - size_t(tableMask) / HphpArray::LoadScale;
   }
 
-  static size_t computeDataSize(uint32 tableMask) {
+  static size_t computeDataSize(uint32_t tableMask) {
     return computeTableSize(tableMask) * sizeof(HphpArray::ElmInd) +
       computeMaxElms(tableMask) * sizeof(HphpArray::Elm);
   }
@@ -556,9 +556,9 @@ enum ArrayGetFlags {
   CheckInts = 2
 };
 
-ArrayData* array_setm_ik1_v(TypedValue* cell, ArrayData* ad, int64 key,
+ArrayData* array_setm_ik1_v(TypedValue* cell, ArrayData* ad, int64_t key,
                             TypedValue* value);
-ArrayData* array_setm_ik1_v0(TypedValue* cell, ArrayData* ad, int64 key,
+ArrayData* array_setm_ik1_v0(TypedValue* cell, ArrayData* ad, int64_t key,
                              TypedValue* value);
 ArrayData* array_setm_sk1_v(TypedValue* cell, ArrayData* ad, StringData* key,
                             TypedValue* value);
@@ -573,19 +573,19 @@ ArrayData* array_setm_s0k1nc_v(TypedValue* cell, ArrayData* ad, StringData* key,
 ArrayData* array_setm_s0k1nc_v0(TypedValue* cell, ArrayData* ad,
                                 StringData* key, TypedValue* value);
 ArrayData* array_setm_wk1_v0(ArrayData* ad, TypedValue* value);
-ArrayData* array_getm_i(void* hphpArray, int64 key, TypedValue* out);
+ArrayData* array_getm_i(void* hphpArray, int64_t key, TypedValue* out);
 
 ArrayData* array_getm_s(ArrayData* a, StringData* key, TypedValue* out,
                         int flags);
-uint64 array_issetm_s(const void* hphpArray, StringData* sd)
+uint64_t array_issetm_s(const void* hphpArray, StringData* sd)
   FLATTEN;
-uint64 array_issetm_s0(const void* hphpArray, StringData* sd)
+uint64_t array_issetm_s0(const void* hphpArray, StringData* sd)
   FLATTEN;
-uint64 array_issetm_s_fast(const void* hphpArray, StringData* sd)
+uint64_t array_issetm_s_fast(const void* hphpArray, StringData* sd)
   FLATTEN;
-uint64 array_issetm_s0_fast(const void* hphpArray, StringData* sd)
+uint64_t array_issetm_s0_fast(const void* hphpArray, StringData* sd)
   FLATTEN;
-uint64 array_issetm_i(const void* hphpArray, int64_t key)
+uint64_t array_issetm_i(const void* hphpArray, int64_t key)
   FLATTEN;
 ArrayData* array_add(ArrayData* a1, ArrayData* a2);
 
diff --git a/hphp/runtime/base/array/hphp_array_sort.cpp b/hphp/runtime/base/array/hphp_array_sort.cpp
index 3828699c9b274..99c726a558376 100644
--- a/hphp/runtime/base/array/hphp_array_sort.cpp
+++ b/hphp/runtime/base/array/hphp_array_sort.cpp
@@ -28,7 +28,7 @@ struct KeyAccessor {
   typedef const HphpArray::Elm& ElmT;
   bool isInt(ElmT elm) const { return elm.hasIntKey(); }
   bool isStr(ElmT elm) const { return elm.hasStrKey(); }
-  int64 getInt(ElmT elm) const { return elm.ikey; }
+  int64_t getInt(ElmT elm) const { return elm.ikey; }
   StringData* getStr(ElmT elm) const { return elm.key; }
   Variant getValue(ElmT elm) const {
     if (isInt(elm)) {
@@ -43,7 +43,7 @@ struct ValAccessor {
   typedef const HphpArray::Elm& ElmT;
   bool isInt(ElmT elm) const { return elm.data.m_type == KindOfInt64; }
   bool isStr(ElmT elm) const { return IS_STRING_TYPE(elm.data.m_type); }
-  int64 getInt(ElmT elm) const { return elm.data.m_data.num; }
+  int64_t getInt(ElmT elm) const { return elm.data.m_data.num; }
   StringData* getStr(ElmT elm) const { return elm.data.m_data.pstr; }
   Variant getValue(ElmT elm) const { return tvAsCVarRef(&elm.data); }
 };
diff --git a/hphp/runtime/base/array/sort_helpers.h b/hphp/runtime/base/array/sort_helpers.h
index 3fd772fa8d7e2..0b94d2edb0e7f 100644
--- a/hphp/runtime/base/array/sort_helpers.h
+++ b/hphp/runtime/base/array/sort_helpers.h
@@ -32,8 +32,8 @@ struct IntElmCompare {
   typedef typename AccessorT::ElmT ElmT;
   AccessorT acc;
   bool operator()(ElmT left, ElmT right) const {
-    int64 iLeft = acc.getInt(left);
-    int64 iRight = acc.getInt(right);
+    int64_t iLeft = acc.getInt(left);
+    int64_t iRight = acc.getInt(right);
     if (sort_flags == SORT_REGULAR || sort_flags == SORT_NUMERIC) {
       return ascending ? (iLeft < iRight) : (iLeft > iRight);
     }
@@ -145,8 +145,8 @@ struct ElmCompare {
         }
       } else if (acc.isInt(left)) {
         if (LIKELY(acc.isInt(right))) {
-          int64 iLeft = acc.getInt(left);
-          int64 iRight = acc.getInt(right);
+          int64_t iLeft = acc.getInt(left);
+          int64_t iRight = acc.getInt(right);
           return ascending ? (iLeft < iRight) : (iLeft > iRight);
         }
       }
@@ -154,8 +154,8 @@ struct ElmCompare {
     if (sort_flags == SORT_NUMERIC) {
       if (acc.isInt(left)) {
         if (LIKELY(acc.isInt(right))) {
-          int64 iLeft = acc.getInt(left);
-          int64 iRight = acc.getInt(right);
+          int64_t iLeft = acc.getInt(left);
+          int64_t iRight = acc.getInt(right);
           return ascending ? (iLeft < iRight) : (iLeft > iRight);
         }
       }
@@ -252,7 +252,7 @@ struct ElmUCompare {
       return ret.toDouble() < 0.0;
     }
     if (ret.isString()) {
-      int64 lval; double dval;
+      int64_t lval; double dval;
       switch (ret.getStringData()->isNumericWithVal(lval, dval, 0)) {
         case KindOfInt64: return lval < 0;
         case KindOfDouble: return dval < 0;
diff --git a/hphp/runtime/base/binary_operations.h b/hphp/runtime/base/binary_operations.h
index a6e30104fe5af..57ce76a9aedbf 100644
--- a/hphp/runtime/base/binary_operations.h
+++ b/hphp/runtime/base/binary_operations.h
@@ -32,7 +32,7 @@ inline Variant operator+(bool    n, CVarRef v) { return Variant(v) += n;}
 inline Variant operator+(char    n, CVarRef v) { return Variant(v) += n;}
 inline Variant operator+(short   n, CVarRef v) { return Variant(v) += n;}
 inline Variant operator+(int     n, CVarRef v) { return Variant(v) += n;}
-inline Variant operator+(int64   n, CVarRef v) { return Variant(v) += n;}
+inline Variant operator+(int64_t   n, CVarRef v) { return Variant(v) += n;}
 inline Variant operator+(double  n, CVarRef v) { return Variant(v) += n;}
 
 // String + Variant means string concatenation
@@ -71,7 +71,7 @@ inline Variant operator-(bool    n, CVarRef v) { return v.negate() += n;}
 inline Variant operator-(char    n, CVarRef v) { return v.negate() += n;}
 inline Variant operator-(short   n, CVarRef v) { return v.negate() += n;}
 inline Variant operator-(int     n, CVarRef v) { return v.negate() += n;}
-inline Variant operator-(int64   n, CVarRef v) { return v.negate() += n;}
+inline Variant operator-(int64_t   n, CVarRef v) { return v.negate() += n;}
 inline Variant operator-(double  n, CVarRef v) { return v.negate() += n;}
 inline Variant operator-(CStrRef n, CVarRef v) { return v.negate() += n;}
 inline Variant operator-(litstr  n, CVarRef v) { return v.negate() += n;}
@@ -82,7 +82,7 @@ inline Variant operator-(CVarRef v, bool    n) { return Variant(v) -= n;}
 inline Variant operator-(CVarRef v, char    n) { return Variant(v) -= n;}
 inline Variant operator-(CVarRef v, short   n) { return Variant(v) -= n;}
 inline Variant operator-(CVarRef v, int     n) { return Variant(v) -= n;}
-inline Variant operator-(CVarRef v, int64   n) { return Variant(v) -= n;}
+inline Variant operator-(CVarRef v, int64_t   n) { return Variant(v) -= n;}
 inline Variant operator-(CVarRef v, double  n) { return Variant(v) -= n;}
 inline Variant operator-(CVarRef v, CStrRef n) { return Variant(v) -= n;}
 inline Variant operator-(CVarRef v, litstr  n) { return Variant(v) -= n;}
@@ -93,7 +93,7 @@ inline Variant operator*(bool    n, CVarRef v) { return Variant(v) *= n;}
 inline Variant operator*(char    n, CVarRef v) { return Variant(v) *= n;}
 inline Variant operator*(short   n, CVarRef v) { return Variant(v) *= n;}
 inline Variant operator*(int     n, CVarRef v) { return Variant(v) *= n;}
-inline Variant operator*(int64   n, CVarRef v) { return Variant(v) *= n;}
+inline Variant operator*(int64_t   n, CVarRef v) { return Variant(v) *= n;}
 inline Variant operator*(double  n, CVarRef v) { return Variant(v) *= n;}
 inline Variant operator*(CStrRef n, CVarRef v) { return Variant(v) *= n;}
 inline Variant operator*(litstr  n, CVarRef v) { return Variant(v) *= n;}
@@ -104,7 +104,7 @@ inline Variant operator*(CVarRef v, bool    n) { return Variant(v) *= n;}
 inline Variant operator*(CVarRef v, char    n) { return Variant(v) *= n;}
 inline Variant operator*(CVarRef v, short   n) { return Variant(v) *= n;}
 inline Variant operator*(CVarRef v, int     n) { return Variant(v) *= n;}
-inline Variant operator*(CVarRef v, int64   n) { return Variant(v) *= n;}
+inline Variant operator*(CVarRef v, int64_t   n) { return Variant(v) *= n;}
 inline Variant operator*(CVarRef v, double  n) { return Variant(v) *= n;}
 inline Variant operator*(CVarRef v, CStrRef n) { return Variant(v) *= n;}
 inline Variant operator*(CVarRef v, litstr  n) { return Variant(v) *= n;}
diff --git a/hphp/runtime/base/builtin_functions.cpp b/hphp/runtime/base/builtin_functions.cpp
index 5d45ef90c1c0a..874de5506ecb6 100644
--- a/hphp/runtime/base/builtin_functions.cpp
+++ b/hphp/runtime/base/builtin_functions.cpp
@@ -1003,7 +1003,7 @@ String concat6(CStrRef s1, CStrRef s2, CStrRef s3, CStrRef s4, CStrRef s5,
 bool empty(CVarRef v, bool    offset) {
   return empty(v, Variant(offset));
 }
-bool empty(CVarRef v, int64   offset) {
+bool empty(CVarRef v, int64_t   offset) {
   Variant::TypedValueAccessor tva = v.getTypedAccessor();
   if (LIKELY(Variant::GetAccessorType(tva) == KindOfArray)) {
     return empty(Variant::GetArrayData(tva)->get(offset));
@@ -1054,15 +1054,15 @@ bool empty(CVarRef v, CVarRef offset) {
       return empty(v.rvalAt(offset));
     }
   } else if (Variant::IsString(tva)) {
-    uint64 pos = offset.toInt64();
-    if (pos >= (uint64)Variant::GetStringData(tva)->size()) {
+    uint64_t pos = offset.toInt64();
+    if (pos >= (uint64_t)Variant::GetStringData(tva)->size()) {
       return true;
     }
   }
   return empty(v.rvalAt(offset));
 }
 
-bool isset(CArrRef v, int64 offset) {
+bool isset(CArrRef v, int64_t offset) {
   return isset(v.rvalAtRef(offset));
 }
 bool isset(CArrRef v, CArrRef offset) {
@@ -1084,7 +1084,7 @@ bool isset(CArrRef v, CVarRef offset) {
 bool isset(CVarRef v, bool    offset) {
   return isset(v, VarNR(offset));
 }
-bool isset(CVarRef v, int64   offset) {
+bool isset(CVarRef v, int64_t   offset) {
   Variant::TypedValueAccessor tva = v.getTypedAccessor();
   if (LIKELY(Variant::GetAccessorType(tva) == KindOfArray)) {
     return isset(Variant::GetArrayData(tva)->get(offset));
@@ -1099,7 +1099,7 @@ bool isset(CVarRef v, int64   offset) {
     }
   }
   if (Variant::IsString(tva)) {
-    return (uint64)offset < (uint64)Variant::GetStringData(tva)->size();
+    return (uint64_t)offset < (uint64_t)Variant::GetStringData(tva)->size();
   }
   return false;
 }
@@ -1127,8 +1127,8 @@ bool isset(CVarRef v, CVarRef offset) {
     }
   }
   if (Variant::IsString(tva)) {
-    uint64 pos = offset.toInt64();
-    return pos < (uint64)Variant::GetStringData(tva)->size();
+    uint64_t pos = offset.toInt64();
+    return pos < (uint64_t)Variant::GetStringData(tva)->size();
   }
   return false;
 }
@@ -1548,13 +1548,13 @@ String AutoloadHandler::getSignature(CVarRef handler) {
     Variant first = handler.getArrayData()->get(int64_t(0));
     if (first.isObject()) {
       // Add the object address as part of the signature
-      int64 data = (int64)first.getObjectData();
+      int64_t data = (int64_t)first.getObjectData();
       lName += String((const char *)&data, sizeof(data), CopyString);
     }
   } else if (handler.isObject()) {
     // "lName" will just be "classname::__invoke",
     // add object address to differentiate the signature
-    int64 data = (int64)handler.getObjectData();
+    int64_t data = (int64_t)handler.getObjectData();
     lName += String((const char*)&data, sizeof(data), CopyString);
   }
   return lName;
diff --git a/hphp/runtime/base/builtin_functions.h b/hphp/runtime/base/builtin_functions.h
index f4ea4d6327163..76b9b15c3f22a 100644
--- a/hphp/runtime/base/builtin_functions.h
+++ b/hphp/runtime/base/builtin_functions.h
@@ -71,7 +71,7 @@ inline bool empty(bool    v) { return !v;}
 inline bool empty(char    v) { return !v;}
 inline bool empty(short   v) { return !v;}
 inline bool empty(int     v) { return !v;}
-inline bool empty(int64   v) { return !v;}
+inline bool empty(int64_t   v) { return !v;}
 inline bool empty(double  v) { return !v;}
 inline bool empty(litstr  v) { return !v || !*v;}
 inline bool empty(const StringData *v) { return v ? v->toBoolean() : false;}
@@ -81,8 +81,8 @@ inline bool empty(CObjRef v) { return !v.toBoolean();}
 inline bool empty(CVarRef v) { return !v.toBoolean();}
 
 bool empty(CVarRef v, bool    offset);
-bool empty(CVarRef v, int64   offset);
-inline bool empty(CVarRef v, int  offset) { return empty(v, (int64)offset); }
+bool empty(CVarRef v, int64_t   offset);
+inline bool empty(CVarRef v, int  offset) { return empty(v, (int64_t)offset); }
 bool empty(CVarRef v, double  offset);
 bool empty(CVarRef v, CArrRef offset);
 bool empty(CVarRef v, CObjRef offset);
@@ -106,23 +106,23 @@ inline Numeric multiply(CVarRef v1, CVarRef v2)    { return v1 * v2;}
 inline Variant plus(CVarRef v1, CVarRef v2)        { return v1 + v2;}
 inline Numeric minus(CVarRef v1, CVarRef v2)       { return v1 - v2;}
 inline Numeric divide(CVarRef v1, CVarRef v2)      { return v1 / v2; }
-inline Numeric modulo(int64 v1, int64 v2) {
+inline Numeric modulo(int64_t v1, int64_t v2) {
   if (UNLIKELY(v2 == 0)) {
     raise_warning("Division by zero");
     return false;
   }
-  if (UNLIKELY(uint64(v2+1) <= 2u)) {
+  if (UNLIKELY(uint64_t(v2+1) <= 2u)) {
     return 0;
   }
   return v1 % v2;
 }
-inline int64 shift_left(int64 v1, int64 v2)        { return v1 << v2; }
-inline int64 shift_right(int64 v1, int64 v2)       { return v1 >> v2; }
+inline int64_t shift_left(int64_t v1, int64_t v2)        { return v1 << v2; }
+inline int64_t shift_right(int64_t v1, int64_t v2)       { return v1 >> v2; }
 
 inline char    negate(char v)    { return -v; }
 inline short   negate(short v)   { return -v; }
 inline int     negate(int v)     { return -v; }
-inline int64   negate(int64 v)   { return -v; }
+inline int64_t   negate(int64_t v)   { return -v; }
 inline double  negate(double v)  { return -v; }
 inline Variant negate(CVarRef v) { return -(Variant)v; }
 
@@ -195,7 +195,7 @@ inline bool instanceOf(bool    v, CStrRef s) { return false;}
 inline bool instanceOf(char    v, CStrRef s) { return false;}
 inline bool instanceOf(short   v, CStrRef s) { return false;}
 inline bool instanceOf(int     v, CStrRef s) { return false;}
-inline bool instanceOf(int64   v, CStrRef s) { return false;}
+inline bool instanceOf(int64_t   v, CStrRef s) { return false;}
 inline bool instanceOf(double  v, CStrRef s) { return false;}
 inline bool instanceOf(litstr  v, CStrRef s) { return false;}
 inline bool instanceOf(CStrRef v, CStrRef s) { return false;}
@@ -257,7 +257,7 @@ inline bool isset(bool v)    { return true; }
 inline bool isset(char v)    { return true; }
 inline bool isset(short v)   { return true; }
 inline bool isset(int v)     { return true; }
-inline bool isset(int64 v)   { return true; }
+inline bool isset(int64_t v)   { return true; }
 inline bool isset(double v)  { return true; }
 inline bool isset(CVarRef v) { return !v.isNull();}
 inline bool isset(CObjRef v) { return !v.isNull();}
@@ -265,8 +265,8 @@ inline bool isset(CStrRef v) { return !v.isNull();}
 inline bool isset(CArrRef v) { return !v.isNull();}
 
 bool isset(CVarRef v, bool    offset);
-bool isset(CVarRef v, int64   offset);
-inline bool isset(CVarRef v, int  offset) { return isset(v, (int64)offset); }
+bool isset(CVarRef v, int64_t   offset);
+inline bool isset(CVarRef v, int  offset) { return isset(v, (int64_t)offset); }
 bool isset(CVarRef v, double  offset);
 bool isset(CVarRef v, CArrRef offset);
 bool isset(CVarRef v, CObjRef offset);
@@ -274,10 +274,10 @@ bool isset(CVarRef v, CVarRef offset);
 bool isset(CVarRef v, litstr  offset, bool isString = false);
 bool isset(CVarRef v, CStrRef offset, bool isString = false);
 
-bool isset(CArrRef v, int64   offset);
-inline bool isset(CArrRef v, bool   offset) { return isset(v, (int64)offset); }
-inline bool isset(CArrRef v, int    offset) { return isset(v, (int64)offset); }
-inline bool isset(CArrRef v, double offset) { return isset(v, (int64)offset); }
+bool isset(CArrRef v, int64_t   offset);
+inline bool isset(CArrRef v, bool   offset) { return isset(v, (int64_t)offset); }
+inline bool isset(CArrRef v, int    offset) { return isset(v, (int64_t)offset); }
+inline bool isset(CArrRef v, double offset) { return isset(v, (int64_t)offset); }
 bool isset(CArrRef v, CArrRef offset);
 bool isset(CArrRef v, CObjRef offset);
 bool isset(CArrRef v, CVarRef offset);
@@ -528,8 +528,8 @@ inline bool    id(bool    v) { return v; }
 inline char    id(char    v) { return v; }
 inline short   id(short   v) { return v; }
 inline int     id(int     v) { return v; }
-inline int64   id(int64   v) { return v; }
-inline uint64  id(uint64  v) { return v; }
+inline int64_t   id(int64_t   v) { return v; }
+inline uint64_t  id(uint64_t  v) { return v; }
 inline double  id(double  v) { return v; }
 inline litstr  id(litstr  v) { return v; }
 inline CStrRef id(CStrRef v) { return v; }
diff --git a/hphp/runtime/base/class_info.cpp b/hphp/runtime/base/class_info.cpp
index a2d62dd59a7d1..12042a03e1dba 100644
--- a/hphp/runtime/base/class_info.cpp
+++ b/hphp/runtime/base/class_info.cpp
@@ -738,7 +738,7 @@ void ClassInfo::ReadUserAttributes(const char **&p,
 
     const char *len = *p++;
     const char *valueText = *p++;
-    int64 valueLen = (int64)len;
+    int64_t valueLen = (int64_t)len;
     VariableUnserializer vu(valueText,
                             valueLen,
                             VariableUnserializer::Serialize);
@@ -755,21 +755,21 @@ ClassInfo::MethodInfo *ClassInfo::MethodInfo::getDeclared() {
 }
 
 ClassInfo::MethodInfo::MethodInfo(const char **&p) {
-  attribute = (Attribute)(int64)(*p++);
+  attribute = (Attribute)(int64_t)(*p++);
   name = makeStaticString(*p++);
   docComment = 0;
   if (attribute & ClassInfo::IsRedeclared) {
-    volatile_redec_offset = (int)(int64)(*p++);
+    volatile_redec_offset = (int)(int64_t)(*p++);
     while (*p) {
       MethodInfo *m = new MethodInfo(p);
       parameters.push_back((ParameterInfo*)(void*)m);
     }
   } else {
     file = *p++;
-    line1 = (int)(int64)(*p++);
-    line2 = (int)(int64)(*p++);
+    line1 = (int)(int64_t)(*p++);
+    line2 = (int)(int64_t)(*p++);
     if (attribute & IsVolatile) {
-      volatile_redec_offset = (int)(int64)(*p++);
+      volatile_redec_offset = (int)(int64_t)(*p++);
     }
 
     if (attribute & HasDocComment) {
@@ -777,15 +777,15 @@ ClassInfo::MethodInfo::MethodInfo(const char **&p) {
     }
 
     if (attribute & IsSystem) {
-      returnType = (DataType)(int64)(*p++);
+      returnType = (DataType)(int64_t)(*p++);
     }
     while (*p) {
       ParameterInfo *parameter = new ParameterInfo();
-      parameter->attribute = (Attribute)(int64)(*p++);
+      parameter->attribute = (Attribute)(int64_t)(*p++);
       parameter->name = *p++;
       parameter->type = *p++;
       if (attribute & IsSystem) {
-        parameter->argType = (DataType)(int64)(*p++);
+        parameter->argType = (DataType)(int64_t)(*p++);
       }
       parameter->value = *p++;
       parameter->valueText = *p++;
@@ -800,7 +800,7 @@ ClassInfo::MethodInfo::MethodInfo(const char **&p) {
     while (*p) {
       ConstantInfo *staticVariable = new ConstantInfo();
       staticVariable->name = makeStaticString(*p++);
-      staticVariable->valueLen = (int64)(*p++);
+      staticVariable->valueLen = (int64_t)(*p++);
       staticVariable->valueText = *p++;
       VariableUnserializer vu(staticVariable->valueText,
                               staticVariable->valueLen,
@@ -821,7 +821,7 @@ ClassInfo::MethodInfo::MethodInfo(const char **&p) {
 }
 
 ClassInfoUnique::ClassInfoUnique(const char **&p) {
-  m_attribute = (Attribute)(int64)(*p++);
+  m_attribute = (Attribute)(int64_t)(*p++);
   assert(!(m_attribute & IsRedeclared));
 
   // ClassInfoUnique is only created by ClassInfo::Load(), which is called
@@ -833,11 +833,11 @@ ClassInfoUnique::ClassInfoUnique(const char **&p) {
   m_parentInfo = 0;
 
   m_file = *p++;
-  m_line1 = (int)(int64)(*p++);
-  m_line2 = (int)(int64)(*p++);
+  m_line1 = (int)(int64_t)(*p++);
+  m_line2 = (int)(int64_t)(*p++);
 
   if (m_attribute & IsVolatile) {
-    m_cdec_offset = (int)(int64)(*p++);
+    m_cdec_offset = (int)(int64_t)(*p++);
   }
 
   if (m_attribute & HasDocComment) {
@@ -883,7 +883,7 @@ ClassInfoUnique::ClassInfoUnique(const char **&p) {
 
   while (*p) {
     PropertyInfo *property = new PropertyInfo();
-    property->attribute = (Attribute)(int64)(*p++);
+    property->attribute = (Attribute)(int64_t)(*p++);
     property->name = makeStaticString(*p++);
     property->owner = this;
     assert(m_properties.find(property->name) == m_properties.end());
@@ -899,7 +899,7 @@ ClassInfoUnique::ClassInfoUnique(const char **&p) {
     constant->valueText = *p++;
 
     if (uintptr_t(constant->valueText) > 0x100) {
-      constant->valueLen = (int64)len_or_cw;
+      constant->valueLen = (int64_t)len_or_cw;
       VariableUnserializer vu(constant->valueText,
                               constant->valueLen,
                               VariableUnserializer::Serialize);
@@ -935,7 +935,7 @@ ClassInfoUnique::ClassInfoUnique(const char **&p) {
 
     const char *len = *p++;
     const char *valueText = *p++;
-    int64 valueLen = (int64)len;
+    int64_t valueLen = (int64_t)len;
     VariableUnserializer vu(valueText,
                             valueLen,
                             VariableUnserializer::Serialize);
@@ -973,7 +973,7 @@ void ClassInfo::Load() {
   if (s_loaded) return;
   const char **p = g_class_map;
   while (*p) {
-    Attribute attribute = (Attribute)(int64)*p;
+    Attribute attribute = (Attribute)(int64_t)*p;
     always_assert(!(attribute & IsRedeclared));
     ClassInfo *info = new ClassInfoUnique(p);
 
diff --git a/hphp/runtime/base/class_info.h b/hphp/runtime/base/class_info.h
index 66b0738676781..731f9793f7ad5 100644
--- a/hphp/runtime/base/class_info.h
+++ b/hphp/runtime/base/class_info.h
@@ -324,7 +324,7 @@ class ClassInfo {
       case KindOfBoolean:
         return *(bool*)addr;
       case KindOfInt64:
-        return *(int64*)addr;
+        return *(int64_t*)addr;
       case KindOfDouble:
         return *(double*)addr;
       case KindOfString:
diff --git a/hphp/runtime/base/code_coverage.cpp b/hphp/runtime/base/code_coverage.cpp
index e4c4bc07d9c1d..fe088bba6b4cd 100644
--- a/hphp/runtime/base/code_coverage.cpp
+++ b/hphp/runtime/base/code_coverage.cpp
@@ -111,7 +111,7 @@ Array CodeCoverage::Report() {
     Array tmp = Array::Create();
     for (int i = 1; i < (int)lines.size(); i++) {
       if (lines[i]) {
-        tmp.set(i, Variant((int64)lines[i]));
+        tmp.set(i, Variant((int64_t)lines[i]));
       }
     }
     ret.set(String(iter->first), Variant(tmp));
diff --git a/hphp/runtime/base/comparisons.cpp b/hphp/runtime/base/comparisons.cpp
index d83c58cb86d29..2e49134d2bd20 100644
--- a/hphp/runtime/base/comparisons.cpp
+++ b/hphp/runtime/base/comparisons.cpp
@@ -54,11 +54,11 @@ bool more_or_equal(CVarRef v1, CVarRef v2) {
 }
 
 bool equal(int v1, const StringData *v2) {
-  return equal((int64)v1, v2);
+  return equal((int64_t)v1, v2);
 }
 
-bool equal(int64 v1, const StringData *v2) {
-  int64 lval; double dval;
+bool equal(int64_t v1, const StringData *v2) {
+  int64_t lval; double dval;
   DataType ret = v2->isNumericWithVal(lval, dval, 1);
   if (ret == KindOfInt64) {
     return v1 == lval;
@@ -91,7 +91,7 @@ bool equalAsStr(int v1, const StringData *v2) {
   return memcmp(p, v2->data(), len) == 0;
 }
 
-bool equalAsStr(int64 v1, const StringData *v2) {
+bool equalAsStr(int64_t v1, const StringData *v2) {
   char tmpbuf[21];
   char *p;
   int is_negative;
@@ -109,7 +109,7 @@ bool equalAsStr(int64 v1, const StringData *v2) {
   return memcmp(p, v2->data(), len) == 0;
 }
 
-bool equalAsStr(int64 v1, litstr  v2) {
+bool equalAsStr(int64_t v1, litstr  v2) {
   char tmpbuf[21];
   char *p;
   int is_negative;
@@ -134,11 +134,11 @@ bool equalAsStr(double v1, litstr  v2) {
 }
 
 bool less(int v1, const StringData *v2) {
-  return less((int64)v1, v2);
+  return less((int64_t)v1, v2);
 }
 
-bool less(int64 v1, const StringData *v2) {
-  int64 lval; double dval;
+bool less(int64_t v1, const StringData *v2) {
+  int64_t lval; double dval;
   DataType ret = v2->isNumericWithVal(lval, dval, 1);
   if (ret == KindOfInt64) {
     return v1 < lval;
@@ -150,11 +150,11 @@ bool less(int64 v1, const StringData *v2) {
 }
 
 bool more(int v1, const StringData *v2) {
-  return more((int64)v1, v2);
+  return more((int64_t)v1, v2);
 }
 
-bool more(int64 v1, const StringData *v2) {
-  int64 lval; double dval;
+bool more(int64_t v1, const StringData *v2) {
+  int64_t lval; double dval;
   DataType ret = v2->isNumericWithVal(lval, dval, 1);
   if (ret == KindOfInt64) {
     return v1 > lval;
diff --git a/hphp/runtime/base/comparisons.h b/hphp/runtime/base/comparisons.h
index 28e08a4eb4910..dd7c1b22cf941 100644
--- a/hphp/runtime/base/comparisons.h
+++ b/hphp/runtime/base/comparisons.h
@@ -27,7 +27,7 @@ namespace HPHP {
 
 inline bool same(CVarRef v1, bool    v2)  { return v1.same(v2);}
 inline bool same(CVarRef v1, int     v2)  { return v1.same(v2);}
-inline bool same(CVarRef v1, int64   v2)  { return v1.same(v2);}
+inline bool same(CVarRef v1, int64_t   v2)  { return v1.same(v2);}
 inline bool same(CVarRef v1, double  v2)  { return v1.same(v2);}
 inline bool same(CVarRef v1, const StringData *v2)  { return v1.same(v2);}
 inline bool same(CVarRef v1, CStrRef v2)  { return v1.same(v2);}
@@ -38,7 +38,7 @@ inline bool same(CVarRef v1, CVarRef v2)  { return v1.same(v2);}
 
 inline bool equal(CVarRef v1, bool    v2) { return v1.equal(v2);}
 inline bool equal(CVarRef v1, int     v2) { return v1.equal(v2);}
-inline bool equal(CVarRef v1, int64   v2) { return v1.equal(v2);}
+inline bool equal(CVarRef v1, int64_t   v2) { return v1.equal(v2);}
 inline bool equal(CVarRef v1, double  v2) { return v1.equal(v2);}
 inline bool equal(CVarRef v1, const StringData *v2) { return v1.equal(v2);}
 inline bool equal(CVarRef v1, CStrRef v2) { return v1.equal(v2);}
@@ -49,7 +49,7 @@ inline bool equal(CVarRef v1, CVarRef v2) { return v1.equal(v2);}
 
 inline bool equalAsStr(CVarRef v1, bool    v2) { return v1.equalAsStr(v2);}
 inline bool equalAsStr(CVarRef v1, int     v2) { return v1.equalAsStr(v2);}
-inline bool equalAsStr(CVarRef v1, int64   v2) { return v1.equalAsStr(v2);}
+inline bool equalAsStr(CVarRef v1, int64_t   v2) { return v1.equalAsStr(v2);}
 inline bool equalAsStr(CVarRef v1, double  v2) { return v1.equalAsStr(v2);}
 inline bool equalAsStr(CVarRef v1, const StringData  *v2) {
   return v1.equalAsStr(v2);
@@ -63,7 +63,7 @@ inline bool equalAsStr(CVarRef v1, CVarRef v2) { return v1.equalAsStr(v2);}
 
 inline bool less(CVarRef v1, bool    v2)  { return v1.less(v2);}
 inline bool less(CVarRef v1, int     v2)  { return v1.less(v2);}
-inline bool less(CVarRef v1, int64   v2)  { return v1.less(v2);}
+inline bool less(CVarRef v1, int64_t   v2)  { return v1.less(v2);}
 inline bool less(CVarRef v1, double  v2)  { return v1.less(v2);}
 inline bool less(CVarRef v1, const StringData *v2)  { return v1.less(v2);}
 inline bool less(CVarRef v1, CStrRef v2)  { return v1.less(v2);}
@@ -74,7 +74,7 @@ inline bool less(CVarRef v1, CVarRef v2)  { return v1.less(v2);}
 
 inline bool more(CVarRef v1, bool    v2)  { return v1.more(v2);}
 inline bool more(CVarRef v1, int     v2)  { return v1.more(v2);}
-inline bool more(CVarRef v1, int64   v2)  { return v1.more(v2);}
+inline bool more(CVarRef v1, int64_t   v2)  { return v1.more(v2);}
 inline bool more(CVarRef v1, double  v2)  { return v1.more(v2);}
 inline bool more(CVarRef v1, const StringData *v2)  { return v1.more(v2);}
 inline bool more(CVarRef v1, CStrRef v2)  { return v1.more(v2);}
@@ -88,7 +88,7 @@ inline bool more(CVarRef v1, CVarRef v2)  { return v1.more(v2);}
 
 inline bool same(bool v1, bool    v2)  { return v1 == v2;}
 inline bool same(bool v1, int     v2)  { return false;}
-inline bool same(bool v1, int64   v2)  { return false;}
+inline bool same(bool v1, int64_t   v2)  { return false;}
 inline bool same(bool v1, double  v2)  { return false;}
 inline bool same(bool v1, const StringData *v2)  { return false;}
 inline bool same(bool v1, CStrRef v2)  { return false;}
@@ -99,7 +99,7 @@ inline bool same(bool v1, CVarRef v2)  { return same(v2, v1);}
 
 inline bool equal(bool v1, bool    v2) { return v1 == v2;}
 inline bool equal(bool v1, int     v2) { return v1 == (v2 != 0);}
-inline bool equal(bool v1, int64   v2) { return v1 == (v2 != 0);}
+inline bool equal(bool v1, int64_t   v2) { return v1 == (v2 != 0);}
 inline bool equal(bool v1, double  v2) { return v1 == (v2 != 0.0);}
 inline bool equal(bool v1, const StringData *v2) { return v1 == toBoolean(v2);}
 inline bool equal(bool v1, CStrRef v2) { return v1 == v2.toBoolean();}
@@ -110,7 +110,7 @@ inline bool equal(bool v1, CVarRef v2) { return equal(v2, v1);}
 
 inline bool equalAsStr(bool v1, bool    v2) { return v1 == v2;}
 inline bool equalAsStr(bool v1, int     v2) { return v1 && v2 == 1;}
-inline bool equalAsStr(bool v1, int64   v2) { return v1 && v2 == 1;}
+inline bool equalAsStr(bool v1, int64_t   v2) { return v1 && v2 == 1;}
 inline bool equalAsStr(bool v1, double  v2) { return v1 && v2 == 1;}
 bool equalAsStr(bool v1, const StringData *v2);
 inline bool equalAsStr(bool v1, CStrRef v2) { return equalAsStr(v1, v2.get());}
@@ -124,7 +124,7 @@ inline bool equalAsStr(bool v1, CVarRef v2) { return equalAsStr(v2, v1);}
 
 inline bool less(bool v1, bool    v2)  { return (v1?1:0) < (v2?1:0);}
 inline bool less(bool v1, int     v2)  { return less(v1,(v2 != 0));}
-inline bool less(bool v1, int64   v2)  { return less(v1,(v2 != 0));}
+inline bool less(bool v1, int64_t   v2)  { return less(v1,(v2 != 0));}
 inline bool less(bool v1, double  v2)  { return less(v1,(v2 != 0.0));}
 inline bool less(bool v1, const StringData *v2)  {
   return less(v1,toBoolean(v2));
@@ -137,7 +137,7 @@ inline bool less(bool v1, CVarRef v2)  { return more(v2,v1);}
 
 inline bool more(bool v1, bool    v2)  { return (v1?1:0) > (v2?1:0);}
 inline bool more(bool v1, int     v2)  { return more(v1,(v2 != 0));}
-inline bool more(bool v1, int64   v2)  { return more(v1,(v2 != 0));}
+inline bool more(bool v1, int64_t   v2)  { return more(v1,(v2 != 0));}
 inline bool more(bool v1, double  v2)  { return more(v1,(v2 != 0.0));}
 inline bool more(bool v1, const StringData *v2)  {
   return more(v1,toBoolean(v2));
@@ -153,7 +153,7 @@ inline bool more(bool v1, CVarRef v2)  { return less(v2,v1);}
 
 inline bool same(int v1, bool    v2)  { return same(v2, v1);}
 inline bool same(int v1, int     v2)  { return v1 == v2;}
-inline bool same(int v1, int64   v2)  { return v1 == v2;}
+inline bool same(int v1, int64_t   v2)  { return v1 == v2;}
 inline bool same(int v1, double  v2)  { return (double)v1 == v2;}
 inline bool same(int v1, const StringData *v2)  { return false;}
 inline bool same(int v1, CStrRef v2)  { return false;}
@@ -164,7 +164,7 @@ inline bool same(int v1, CVarRef v2)  { return same(v2, v1);}
 
 inline bool equal(int v1, bool    v2) { return equal(v2, v1);}
 inline bool equal(int v1, int     v2) { return v1 == v2;}
-inline bool equal(int v1, int64   v2) { return v1 == v2;}
+inline bool equal(int v1, int64_t   v2) { return v1 == v2;}
 inline bool equal(int v1, double  v2) { return (double)v1 == v2;}
 bool equal(int v1, const StringData *v2);
 inline bool equal(int v1, CStrRef v2) { return equal(v1, v2.get());}
@@ -177,7 +177,7 @@ inline bool equal(int v1, CVarRef v2) { return equal(v2, v1);}
 
 inline bool equalAsStr(int v1, bool    v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(int v1, int     v2) { return v1 == v2;}
-inline bool equalAsStr(int v1, int64   v2) { return v1 == v2;}
+inline bool equalAsStr(int v1, int64_t   v2) { return v1 == v2;}
 inline bool equalAsStr(int v1, double  v2) { return v1 == v2;}
 bool equalAsStr(int v1, const StringData *v2);
 inline bool equalAsStr(int v1, CStrRef v2) { return equalAsStr(v1, v2.get());}
@@ -190,7 +190,7 @@ inline bool equalAsStr(int v1, CVarRef v2) { return equalAsStr(v2, v1);}
 
 inline bool less(int v1, bool    v2)  { return more(v2, v1);}
 inline bool less(int v1, int     v2)  { return v1 < v2;}
-inline bool less(int v1, int64   v2)  { return v1 < v2;}
+inline bool less(int v1, int64_t   v2)  { return v1 < v2;}
 inline bool less(int v1, double  v2)  { return v1 < v2;}
 bool less(int v1, const StringData *v2);
 inline bool less(int v1, CStrRef v2) { return less(v1, v2.get());}
@@ -203,7 +203,7 @@ inline bool less(int v1, CVarRef v2)  { return more(v2, v1);}
 
 inline bool more(int v1, bool    v2)  { return less(v2, v1);}
 inline bool more(int v1, int     v2)  { return v1 > v2;}
-inline bool more(int v1, int64   v2)  { return v1 > v2;}
+inline bool more(int v1, int64_t   v2)  { return v1 > v2;}
 inline bool more(int v1, double  v2)  { return v1 > v2;}
 bool more(int v1, const StringData *v2);
 inline bool more(int v1, CStrRef v2) { return more(v1, v2.get());}
@@ -217,78 +217,78 @@ inline bool more(int v1, CVarRef v2)  { return less(v2, v1);}
 ///////////////////////////////////////////////////////////////////////////////
 // int64
 
-inline bool same(int64 v1, bool    v2)  { return same(v2, v1);}
-inline bool same(int64 v1, int     v2)  { return same(v2, v1);}
-inline bool same(int64 v1, int64   v2)  { return v1 == v2;}
-inline bool same(int64 v1, double  v2)  { return (double)v1 == v2;}
-inline bool same(int64 v1, const StringData *v2)  { return false;}
-inline bool same(int64 v1, CStrRef v2)  { return false;}
-inline bool same(int64 v1, litstr  v2)  { return false;}
-inline bool same(int64 v1, CArrRef v2)  { return false;}
-inline bool same(int64 v1, CObjRef v2)  { return false;}
-inline bool same(int64 v1, CVarRef v2)  { return same(v2, v1);}
-
-inline bool equal(int64 v1, bool    v2) { return equal(v2, v1);}
-inline bool equal(int64 v1, int     v2) { return equal(v2, v1);}
-inline bool equal(int64 v1, int64   v2) { return v1 == v2;}
-inline bool equal(int64 v1, double  v2) { return (double)v1 == v2;}
-bool equal(int64 v1, const StringData *v2);
-inline bool equal(int64 v1, CStrRef v2) { return equal(v1, v2.get());}
-inline bool equal(int64 v1, litstr  v2) { return equal(v1, String(v2));}
-inline bool equal(int64 v1, CArrRef v2) { return false;}
-inline bool equal(int64 v1, CObjRef v2) {
+inline bool same(int64_t v1, bool    v2)  { return same(v2, v1);}
+inline bool same(int64_t v1, int     v2)  { return same(v2, v1);}
+inline bool same(int64_t v1, int64_t   v2)  { return v1 == v2;}
+inline bool same(int64_t v1, double  v2)  { return (double)v1 == v2;}
+inline bool same(int64_t v1, const StringData *v2)  { return false;}
+inline bool same(int64_t v1, CStrRef v2)  { return false;}
+inline bool same(int64_t v1, litstr  v2)  { return false;}
+inline bool same(int64_t v1, CArrRef v2)  { return false;}
+inline bool same(int64_t v1, CObjRef v2)  { return false;}
+inline bool same(int64_t v1, CVarRef v2)  { return same(v2, v1);}
+
+inline bool equal(int64_t v1, bool    v2) { return equal(v2, v1);}
+inline bool equal(int64_t v1, int     v2) { return equal(v2, v1);}
+inline bool equal(int64_t v1, int64_t   v2) { return v1 == v2;}
+inline bool equal(int64_t v1, double  v2) { return (double)v1 == v2;}
+bool equal(int64_t v1, const StringData *v2);
+inline bool equal(int64_t v1, CStrRef v2) { return equal(v1, v2.get());}
+inline bool equal(int64_t v1, litstr  v2) { return equal(v1, String(v2));}
+inline bool equal(int64_t v1, CArrRef v2) { return false;}
+inline bool equal(int64_t v1, CObjRef v2) {
   return v2->isCollection() ? false : equal(v1, v2.toInt64());
 }
-inline bool equal(int64 v1, CVarRef v2) { return equal(v2, v1);}
+inline bool equal(int64_t v1, CVarRef v2) { return equal(v2, v1);}
 
-inline bool equalAsStr(int64 v1, bool    v2) { return equalAsStr(v2, v1);}
-inline bool equalAsStr(int64 v1, int     v2) { return equalAsStr(v2, v1);}
-inline bool equalAsStr(int64 v1, int64   v2) { return v1 == v2;}
-inline bool equalAsStr(int64 v1, double  v2) {
-  return v1 == v2 && v1 == (int64)v2;
+inline bool equalAsStr(int64_t v1, bool    v2) { return equalAsStr(v2, v1);}
+inline bool equalAsStr(int64_t v1, int     v2) { return equalAsStr(v2, v1);}
+inline bool equalAsStr(int64_t v1, int64_t   v2) { return v1 == v2;}
+inline bool equalAsStr(int64_t v1, double  v2) {
+  return v1 == v2 && v1 == (int64_t)v2;
 }
-bool equalAsStr(int64 v1, const StringData *v2);
-inline bool equalAsStr(int64 v1, CStrRef v2) { return equalAsStr(v1, v2.get());}
-bool equalAsStr(int64 v1, litstr  v2);
-inline bool equalAsStr(int64 v1, CArrRef v2) { return false;}
-inline bool equalAsStr(int64 v1, CObjRef v2) {
+bool equalAsStr(int64_t v1, const StringData *v2);
+inline bool equalAsStr(int64_t v1, CStrRef v2) { return equalAsStr(v1, v2.get());}
+bool equalAsStr(int64_t v1, litstr  v2);
+inline bool equalAsStr(int64_t v1, CArrRef v2) { return false;}
+inline bool equalAsStr(int64_t v1, CObjRef v2) {
   return equalAsStr(v1, v2.toString());
 }
-inline bool equalAsStr(int64 v1, CVarRef v2) { return equalAsStr(v2, v1);}
+inline bool equalAsStr(int64_t v1, CVarRef v2) { return equalAsStr(v2, v1);}
 
 
-inline bool less(int64 v1, bool    v2)  { return more(v2, v1);}
-inline bool less(int64 v1, int     v2)  { return more(v2, v1);}
-inline bool less(int64 v1, int64   v2)  { return v1 < v2;}
-inline bool less(int64 v1, double  v2)  { return v1 < v2;}
-bool less(int64 v1, const StringData *v2);
-inline bool less(int64 v1, CStrRef v2) { return less(v1, v2.get());}
-inline bool less(int64 v1, litstr  v2)  { return less(v1, String(v2));}
-inline bool less(int64 v1, CArrRef v2)  { return true;}
-inline bool less(int64 v1, CObjRef v2)  {
+inline bool less(int64_t v1, bool    v2)  { return more(v2, v1);}
+inline bool less(int64_t v1, int     v2)  { return more(v2, v1);}
+inline bool less(int64_t v1, int64_t   v2)  { return v1 < v2;}
+inline bool less(int64_t v1, double  v2)  { return v1 < v2;}
+bool less(int64_t v1, const StringData *v2);
+inline bool less(int64_t v1, CStrRef v2) { return less(v1, v2.get());}
+inline bool less(int64_t v1, litstr  v2)  { return less(v1, String(v2));}
+inline bool less(int64_t v1, CArrRef v2)  { return true;}
+inline bool less(int64_t v1, CObjRef v2)  {
   return less(v1, v2.toInt64ForCompare());
 }
-inline bool less(int64 v1, CVarRef v2)  { return more(v2, v1);}
-
-inline bool more(int64 v1, bool    v2)  { return less(v2, v1);}
-inline bool more(int64 v1, int     v2)  { return less(v2, v1);}
-inline bool more(int64 v1, int64   v2)  { return v1 > v2;}
-inline bool more(int64 v1, double  v2)  { return v1 > v2;}
-bool more(int64 v1, const StringData *v2);
-inline bool more(int64 v1, CStrRef v2) { return more(v1, v2.get());}
-inline bool more(int64 v1, litstr  v2)  { return more(v1, String(v2));}
-inline bool more(int64 v1, CArrRef v2)  { return false;}
-inline bool more(int64 v1, CObjRef v2)  {
+inline bool less(int64_t v1, CVarRef v2)  { return more(v2, v1);}
+
+inline bool more(int64_t v1, bool    v2)  { return less(v2, v1);}
+inline bool more(int64_t v1, int     v2)  { return less(v2, v1);}
+inline bool more(int64_t v1, int64_t   v2)  { return v1 > v2;}
+inline bool more(int64_t v1, double  v2)  { return v1 > v2;}
+bool more(int64_t v1, const StringData *v2);
+inline bool more(int64_t v1, CStrRef v2) { return more(v1, v2.get());}
+inline bool more(int64_t v1, litstr  v2)  { return more(v1, String(v2));}
+inline bool more(int64_t v1, CArrRef v2)  { return false;}
+inline bool more(int64_t v1, CObjRef v2)  {
   return more(v1, v2.toInt64ForCompare());
 }
-inline bool more(int64 v1, CVarRef v2)  { return less(v2, v1);}
+inline bool more(int64_t v1, CVarRef v2)  { return less(v2, v1);}
 
 ///////////////////////////////////////////////////////////////////////////////
 // double
 
 inline bool same(double v1, bool    v2)  { return same(v2, v1);}
 inline bool same(double v1, int     v2)  { return same(v2, v1);}
-inline bool same(double v1, int64   v2)  { return same(v2, v1);}
+inline bool same(double v1, int64_t   v2)  { return same(v2, v1);}
 inline bool same(double v1, double  v2)  { return v1 == v2;}
 inline bool same(double v1, const StringData *v2)  { return false;}
 inline bool same(double v1, CStrRef v2)  { return false;}
@@ -299,7 +299,7 @@ inline bool same(double v1, CVarRef v2)  { return same(v2, v1);}
 
 inline bool equal(double v1, bool    v2) { return equal(v2, v1);}
 inline bool equal(double v1, int     v2) { return equal(v2, v1);}
-inline bool equal(double v1, int64   v2) { return equal(v2, v1);}
+inline bool equal(double v1, int64_t   v2) { return equal(v2, v1);}
 inline bool equal(double v1, double  v2) { return v1 == v2;}
 inline bool equal(double v1, const StringData *v2) {
   return v1 == toDouble(v2);
@@ -315,7 +315,7 @@ inline bool equal(double v1, CVarRef v2) { return equal(v2, v1);}
 
 inline bool equalAsStr(double v1, bool    v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(double v1, int     v2) { return equalAsStr(v2, v1);}
-inline bool equalAsStr(double v1, int64   v2) { return equalAsStr(v2, v1);}
+inline bool equalAsStr(double v1, int64_t   v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(double v1, double  v2) { return v1 == v2;}
 bool equalAsStr(double v1, const StringData *v2);
 inline bool equalAsStr(double v1, CStrRef v2) {
@@ -331,7 +331,7 @@ inline bool equalAsStr(double v1, CVarRef v2) { return equalAsStr(v2, v1);}
 
 inline bool less(double v1, bool    v2)  { return more(v2, v1);}
 inline bool less(double v1, int     v2)  { return more(v2, v1);}
-inline bool less(double v1, int64   v2)  { return more(v2, v1);}
+inline bool less(double v1, int64_t   v2)  { return more(v2, v1);}
 inline bool less(double v1, double  v2)  { return v1 < v2;}
 inline bool less(double v1, const StringData *v2)  {
   return less(v1,toDouble(v2));
@@ -346,7 +346,7 @@ inline bool less(double v1, CVarRef v2)  { return more(v2, v1);}
 
 inline bool more(double v1, bool    v2)  { return less(v2, v1);}
 inline bool more(double v1, int     v2)  { return less(v2, v1);}
-inline bool more(double v1, int64   v2)  { return less(v2, v1);}
+inline bool more(double v1, int64_t   v2)  { return less(v2, v1);}
 inline bool more(double v1, double  v2)  { return v1 > v2;}
 inline bool more(double v1, const StringData *v2)  {
   return more(v1,toDouble(v2));
@@ -364,7 +364,7 @@ inline bool more(double v1, CVarRef v2)  { return less(v2, v1);}
 
 inline bool same(const StringData *v1, bool    v2)  { return same(v2, v1);}
 inline bool same(const StringData *v1, int     v2)  { return same(v2, v1);}
-inline bool same(const StringData *v1, int64   v2)  { return same(v2, v1);}
+inline bool same(const StringData *v1, int64_t   v2)  { return same(v2, v1);}
 inline bool same(const StringData *v1, double  v2)  { return same(v2, v1);}
 inline bool same(const StringData *v1, const StringData *v2) {
   if (v1 == v2) return true;
@@ -384,7 +384,7 @@ inline bool same(const StringData *v1, CVarRef v2)  { return same(v2, v1);}
 
 inline bool equal(const StringData *v1, bool    v2) { return equal(v2, v1);}
 inline bool equal(const StringData *v1, int     v2) { return equal(v2, v1);}
-inline bool equal(const StringData *v1, int64   v2) { return equal(v2, v1);}
+inline bool equal(const StringData *v1, int64_t   v2) { return equal(v2, v1);}
 inline bool equal(const StringData *v1, double  v2) { return equal(v2, v1);}
 inline bool equal(const StringData *v1, const StringData *v2) {
   if (v1 == v2) return true;
@@ -426,7 +426,7 @@ inline bool equalAsStr(const StringData *v1, bool    v2) {
 inline bool equalAsStr(const StringData *v1, int     v2) {
   return equalAsStr(v2, v1);
 }
-inline bool equalAsStr(const StringData *v1, int64   v2) {
+inline bool equalAsStr(const StringData *v1, int64_t   v2) {
   return equalAsStr(v2, v1);
 }
 inline bool equalAsStr(const StringData *v1, double  v2) {
@@ -453,7 +453,7 @@ inline bool equalAsStr(const StringData *v1, CVarRef v2) {
 
 inline bool less(const StringData *v1, bool    v2)  { return more(v2, v1);}
 inline bool less(const StringData *v1, int     v2)  { return more(v2, v1);}
-inline bool less(const StringData *v1, int64   v2)  { return more(v2, v1);}
+inline bool less(const StringData *v1, int64_t   v2)  { return more(v2, v1);}
 inline bool less(const StringData *v1, double  v2)  { return more(v2, v1);}
 inline bool less(const StringData *v1, const StringData *v2) {
   if (v1 == v2 || v2 == nullptr) return false;
@@ -490,7 +490,7 @@ inline bool less(const StringData *v1, CVarRef v2)  { return more(v2, v1);}
 
 inline bool more(const StringData *v1, bool    v2)  { return less(v2, v1);}
 inline bool more(const StringData *v1, int     v2)  { return less(v2, v1);}
-inline bool more(const StringData *v1, int64   v2)  { return less(v2, v1);}
+inline bool more(const StringData *v1, int64_t   v2)  { return less(v2, v1);}
 inline bool more(const StringData *v1, double  v2)  { return less(v2, v1);}
 inline bool more(const StringData *v1, const StringData *v2)  {
   if (v1 == nullptr) return false;
@@ -530,7 +530,7 @@ inline bool more(const StringData *v1, CVarRef v2)  { return less(v2, v1);}
 
 inline bool same(CStrRef v1, bool    v2)  { return same(v2, v1);}
 inline bool same(CStrRef v1, int     v2)  { return same(v2, v1);}
-inline bool same(CStrRef v1, int64   v2)  { return same(v2, v1);}
+inline bool same(CStrRef v1, int64_t   v2)  { return same(v2, v1);}
 inline bool same(CStrRef v1, double  v2)  { return same(v2, v1);}
 inline bool same(CStrRef v1, const StringData *v2)  {
   return same(v2, v1.get());
@@ -543,7 +543,7 @@ inline bool same(CStrRef v1, CVarRef v2)  { return same(v2, v1);}
 
 inline bool equal(CStrRef v1, bool    v2) { return equal(v2, v1);}
 inline bool equal(CStrRef v1, int     v2) { return equal(v2, v1);}
-inline bool equal(CStrRef v1, int64   v2) { return equal(v2, v1);}
+inline bool equal(CStrRef v1, int64_t   v2) { return equal(v2, v1);}
 inline bool equal(CStrRef v1, double  v2) { return equal(v2, v1);}
 inline bool equal(CStrRef v1, const StringData *v2) {
   return equal(v2, v1.get());
@@ -556,7 +556,7 @@ inline bool equal(CStrRef v1, CVarRef v2) { return equal(v2, v1);}
 
 inline bool equalAsStr(CStrRef v1, bool    v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(CStrRef v1, int     v2) { return equalAsStr(v2, v1);}
-inline bool equalAsStr(CStrRef v1, int64   v2) { return equalAsStr(v2, v1);}
+inline bool equalAsStr(CStrRef v1, int64_t   v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(CStrRef v1, double  v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(CStrRef v1, const StringData *v2) {
   return equalAsStr(v2, v1);
@@ -575,7 +575,7 @@ inline bool equalAsStr(CStrRef v1, CVarRef v2) { return equalAsStr(v2, v1);}
 
 inline bool less(CStrRef v1, bool    v2)  { return more(v2, v1);}
 inline bool less(CStrRef v1, int     v2)  { return more(v2, v1);}
-inline bool less(CStrRef v1, int64   v2)  { return more(v2, v1);}
+inline bool less(CStrRef v1, int64_t   v2)  { return more(v2, v1);}
 inline bool less(CStrRef v1, double  v2)  { return more(v2, v1);}
 inline bool less(CStrRef v1, const StringData *v2)  {
   return more(v2, v1.get());
@@ -588,7 +588,7 @@ inline bool less(CStrRef v1, CVarRef v2)  { return more(v2, v1);}
 
 inline bool more(CStrRef v1, bool    v2)  { return less(v2, v1);}
 inline bool more(CStrRef v1, int     v2)  { return less(v2, v1);}
-inline bool more(CStrRef v1, int64   v2)  { return less(v2, v1);}
+inline bool more(CStrRef v1, int64_t   v2)  { return less(v2, v1);}
 inline bool more(CStrRef v1, double  v2)  { return less(v2, v1);}
 inline bool more(CStrRef v1, const StringData *v2)  {
   return less(v2, v1.get());
@@ -604,7 +604,7 @@ inline bool more(CStrRef v1, CVarRef v2)  { return less(v2, v1);}
 
 inline bool same(litstr v1, bool    v2)  { return same(String(v1), v2);}
 inline bool same(litstr v1, int     v2)  { return same(String(v1), v2);}
-inline bool same(litstr v1, int64   v2)  { return same(String(v1), v2);}
+inline bool same(litstr v1, int64_t   v2)  { return same(String(v1), v2);}
 inline bool same(litstr v1, double  v2)  { return same(String(v1), v2);}
 inline bool same(litstr v1, const StringData *v2)  {
   StackStringData sd1(v1);
@@ -618,7 +618,7 @@ inline bool same(litstr v1, CVarRef v2)  { return same(String(v1), v2);}
 
 inline bool equal(litstr v1, bool    v2) { return equal(String(v1),v2);}
 inline bool equal(litstr v1, int     v2) { return equal(String(v1),v2);}
-inline bool equal(litstr v1, int64   v2) { return equal(String(v1),v2);}
+inline bool equal(litstr v1, int64_t   v2) { return equal(String(v1),v2);}
 inline bool equal(litstr v1, double  v2) { return equal(String(v1),v2);}
 inline bool equal(litstr v1, const StringData *v2) {
   StackStringData sd1(v1);
@@ -632,7 +632,7 @@ inline bool equal(litstr v1, CVarRef v2) { return equal(String(v1),v2);}
 
 inline bool equalAsStr(litstr v1, bool    v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(litstr v1, int     v2) { return equalAsStr(v2, v1);}
-inline bool equalAsStr(litstr v1, int64   v2) { return equalAsStr(v2, v1);}
+inline bool equalAsStr(litstr v1, int64_t   v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(litstr v1, double  v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(litstr v1, const StringData *v2) {
   return equalAsStr(v2, v1);
@@ -650,7 +650,7 @@ inline bool equalAsStr(litstr v1, CVarRef v2) { return equalAsStr(v2, v1);}
 
 inline bool less(litstr v1, bool    v2)  { return less(String(v1), v2);}
 inline bool less(litstr v1, int     v2)  { return less(String(v1), v2);}
-inline bool less(litstr v1, int64   v2)  { return less(String(v1), v2);}
+inline bool less(litstr v1, int64_t   v2)  { return less(String(v1), v2);}
 inline bool less(litstr v1, double  v2)  { return less(String(v1), v2);}
 inline bool less(litstr v1, const StringData *v2)  {
   StackStringData sd1(v1);
@@ -664,7 +664,7 @@ inline bool less(litstr v1, CVarRef v2)  { return less(String(v1), v2);}
 
 inline bool more(litstr v1, bool    v2)  { return more(String(v1), v2);}
 inline bool more(litstr v1, int     v2)  { return more(String(v1), v2);}
-inline bool more(litstr v1, int64   v2)  { return more(String(v1), v2);}
+inline bool more(litstr v1, int64_t   v2)  { return more(String(v1), v2);}
 inline bool more(litstr v1, double  v2)  { return more(String(v1), v2);}
 inline bool more(litstr v1, const StringData *v2)  {
   StackStringData sd1(v1);
@@ -681,7 +681,7 @@ inline bool more(litstr v1, CVarRef v2)  { return more(String(v1), v2);}
 
 inline bool same(CArrRef v1, bool    v2)  { return same(v2, v1);}
 inline bool same(CArrRef v1, int     v2)  { return same(v2, v1);}
-inline bool same(CArrRef v1, int64   v2)  { return same(v2, v1);}
+inline bool same(CArrRef v1, int64_t   v2)  { return same(v2, v1);}
 inline bool same(CArrRef v1, double  v2)  { return same(v2, v1);}
 inline bool same(CArrRef v1, const StringData *v2)  { return same(v2, v1);}
 inline bool same(CArrRef v1, CStrRef v2)  { return same(v2, v1);}
@@ -692,7 +692,7 @@ inline bool same(CArrRef v1, CVarRef v2)  { return same(v2, v1);}
 
 inline bool equal(CArrRef v1, bool    v2) { return equal(v2, v1);}
 inline bool equal(CArrRef v1, int     v2) { return equal(v2, v1);}
-inline bool equal(CArrRef v1, int64   v2) { return equal(v2, v1);}
+inline bool equal(CArrRef v1, int64_t   v2) { return equal(v2, v1);}
 inline bool equal(CArrRef v1, double  v2) { return equal(v2, v1);}
 inline bool equal(CArrRef v1, const StringData *v2) { return equal(v2, v1);}
 inline bool equal(CArrRef v1, CStrRef v2) { return equal(v2, v1);}
@@ -703,7 +703,7 @@ inline bool equal(CArrRef v1, CVarRef v2) { return equal(v2, v1);}
 
 inline bool equalAsStr(CArrRef v1, bool    v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(CArrRef v1, int     v2) { return equalAsStr(v2, v1);}
-inline bool equalAsStr(CArrRef v1, int64   v2) { return equalAsStr(v2, v1);}
+inline bool equalAsStr(CArrRef v1, int64_t   v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(CArrRef v1, double  v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(CArrRef v1, const StringData *v2) {
   return equalAsStr(v2, v1);
@@ -718,7 +718,7 @@ inline bool equalAsStr(CArrRef v1, CVarRef v2) { return equalAsStr(v2, v1);}
 
 inline bool less(CArrRef v1, bool    v2)  { return more(v2, v1);}
 inline bool less(CArrRef v1, int     v2)  { return more(v2, v1);}
-inline bool less(CArrRef v1, int64   v2)  { return more(v2, v1);}
+inline bool less(CArrRef v1, int64_t   v2)  { return more(v2, v1);}
 inline bool less(CArrRef v1, double  v2)  { return more(v2, v1);}
 inline bool less(CArrRef v1, const StringData *v2)  { return more(v2, v1);}
 inline bool less(CArrRef v1, CStrRef v2)  { return more(v2, v1);}
@@ -729,7 +729,7 @@ inline bool less(CArrRef v1, CVarRef v2)  { return v1.less(v2);}
 
 inline bool more(CArrRef v1, bool    v2)  { return less(v2, v1);}
 inline bool more(CArrRef v1, int     v2)  { return less(v2, v1);}
-inline bool more(CArrRef v1, int64   v2)  { return less(v2, v1);}
+inline bool more(CArrRef v1, int64_t   v2)  { return less(v2, v1);}
 inline bool more(CArrRef v1, double  v2)  { return less(v2, v1);}
 inline bool more(CArrRef v1, const StringData *v2)  { return less(v2, v1);}
 inline bool more(CArrRef v1, CStrRef v2)  { return less(v2, v1);}
@@ -743,7 +743,7 @@ inline bool more(CArrRef v1, CVarRef v2)  { return v1.more(v2);}
 
 inline bool same(CObjRef v1, bool    v2)  { return same(v2, v1);}
 inline bool same(CObjRef v1, int     v2)  { return same(v2, v1);}
-inline bool same(CObjRef v1, int64   v2)  { return same(v2, v1);}
+inline bool same(CObjRef v1, int64_t   v2)  { return same(v2, v1);}
 inline bool same(CObjRef v1, double  v2)  { return same(v2, v1);}
 inline bool same(CObjRef v1, const StringData *v2)  { return same(v2, v1);}
 inline bool same(CObjRef v1, CStrRef v2)  { return same(v2, v1);}
@@ -754,7 +754,7 @@ inline bool same(CObjRef v1, CVarRef v2)  { return same(v2, v1);}
 
 inline bool equal(CObjRef v1, bool    v2) { return equal(v2, v1);}
 inline bool equal(CObjRef v1, int     v2) { return equal(v2, v1);}
-inline bool equal(CObjRef v1, int64   v2) { return equal(v2, v1);}
+inline bool equal(CObjRef v1, int64_t   v2) { return equal(v2, v1);}
 inline bool equal(CObjRef v1, double  v2) { return equal(v2, v1);}
 inline bool equal(CObjRef v1, const StringData *v2) { return equal(v2, v1);}
 inline bool equal(CObjRef v1, CStrRef v2) { return equal(v2, v1);}
@@ -765,7 +765,7 @@ inline bool equal(CObjRef v1, CVarRef v2) { return equal(v2, v1);}
 
 inline bool equalAsStr(CObjRef v1, bool    v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(CObjRef v1, int     v2) { return equalAsStr(v2, v1);}
-inline bool equalAsStr(CObjRef v1, int64   v2) { return equalAsStr(v2, v1);}
+inline bool equalAsStr(CObjRef v1, int64_t   v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(CObjRef v1, double  v2) { return equalAsStr(v2, v1);}
 inline bool equalAsStr(CObjRef v1, const StringData *v2) {
   return equalAsStr(v2, v1);
@@ -780,7 +780,7 @@ inline bool equalAsStr(CObjRef v1, CVarRef v2) { return equalAsStr(v2, v1);}
 
 inline bool less(CObjRef v1, bool    v2)  { return more(v2, v1);}
 inline bool less(CObjRef v1, int     v2)  { return more(v2, v1);}
-inline bool less(CObjRef v1, int64   v2)  { return more(v2, v1);}
+inline bool less(CObjRef v1, int64_t   v2)  { return more(v2, v1);}
 inline bool less(CObjRef v1, double  v2)  { return more(v2, v1);}
 inline bool less(CObjRef v1, const StringData *v2)  { return more(v2, v1);}
 inline bool less(CObjRef v1, CStrRef v2)  { return more(v2, v1);}
@@ -791,7 +791,7 @@ inline bool less(CObjRef v1, CVarRef v2)  { return more(v2, v1);}
 
 inline bool more(CObjRef v1, bool    v2)  { return less(v2, v1);}
 inline bool more(CObjRef v1, int     v2)  { return less(v2, v1);}
-inline bool more(CObjRef v1, int64   v2)  { return less(v2, v1);}
+inline bool more(CObjRef v1, int64_t   v2)  { return less(v2, v1);}
 inline bool more(CObjRef v1, double  v2)  { return less(v2, v1);}
 inline bool more(CObjRef v1, const StringData *v2)  { return less(v2, v1);}
 inline bool more(CObjRef v1, CStrRef v2)  { return less(v2, v1);}
diff --git a/hphp/runtime/base/debuggable.cpp b/hphp/runtime/base/debuggable.cpp
index cd93e96a43f69..db64fb415ea08 100644
--- a/hphp/runtime/base/debuggable.cpp
+++ b/hphp/runtime/base/debuggable.cpp
@@ -20,13 +20,13 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-std::string IDebuggable::FormatNumber(const char *fmt, int64 n) {
+std::string IDebuggable::FormatNumber(const char *fmt, int64_t n) {
   char buf[64];
   snprintf(buf, sizeof(buf), fmt, n);
   return buf;
 }
 
-std::string IDebuggable::FormatSize(int64 size) {
+std::string IDebuggable::FormatSize(int64_t size) {
   char buf[64];
   double n = size;
   if (n >= 1024) {
@@ -48,7 +48,7 @@ std::string IDebuggable::FormatSize(int64 size) {
   return buf;
 }
 
-std::string IDebuggable::FormatTime(int64 milliSeconds) {
+std::string IDebuggable::FormatTime(int64_t milliSeconds) {
   char buf[64];
   double n = milliSeconds;
   if (n >= 1000) {
diff --git a/hphp/runtime/base/debuggable.h b/hphp/runtime/base/debuggable.h
index 6315bd1cecc57..db0161d8bf7d4 100644
--- a/hphp/runtime/base/debuggable.h
+++ b/hphp/runtime/base/debuggable.h
@@ -43,9 +43,9 @@ class IDebuggable {
   static void AddServerStats(InfoVec &out, const char *name,
                              const char *statsName = nullptr);
 
-  static std::string FormatNumber(const char *fmt, int64 n);
-  static std::string FormatSize(int64 size);
-  static std::string FormatTime(int64 milliSeconds);
+  static std::string FormatNumber(const char *fmt, int64_t n);
+  static std::string FormatSize(int64_t size);
+  static std::string FormatTime(int64_t milliSeconds);
 
 public:
   virtual ~IDebuggable() {}
diff --git a/hphp/runtime/base/execution_context.cpp b/hphp/runtime/base/execution_context.cpp
index c8399e44c572e..12127a86933cf 100644
--- a/hphp/runtime/base/execution_context.cpp
+++ b/hphp/runtime/base/execution_context.cpp
@@ -211,7 +211,7 @@ void BaseExecutionContext::setContentType(CStrRef mimetype, CStrRef charset) {
   }
 }
 
-void BaseExecutionContext::setRequestMemoryMaxBytes(int64 max) {
+void BaseExecutionContext::setRequestMemoryMaxBytes(int64_t max) {
   if (max <= 0) {
     max = INT64_MAX;
   }
diff --git a/hphp/runtime/base/execution_context.h b/hphp/runtime/base/execution_context.h
index dee0a023380bc..e39874e1af270 100644
--- a/hphp/runtime/base/execution_context.h
+++ b/hphp/runtime/base/execution_context.h
@@ -187,7 +187,7 @@ class BaseExecutionContext : public IDebuggable {
   HPHP::VM::Stack m_stack;
   HPHP::VM::ActRec* m_fp;
   HPHP::VM::PC m_pc;
-  uint32 m_isValid; /* Debug-only: non-zero iff m_fp/m_stack are trustworthy */
+  uint32_t m_isValid; /* Debug-only: non-zero iff m_fp/m_stack are trustworthy */
   HPHP::VM::EventHook* m_eventHook;
   int64_t m_currentThreadIdx;
 public:
@@ -231,10 +231,10 @@ class BaseExecutionContext : public IDebuggable {
   std::string getRequestUrl(size_t szLimit = std::string::npos);
   String getMimeType() const;
   void setContentType(CStrRef mimetype, CStrRef charset);
-  int64 getRequestMemoryMaxBytes() const { return m_maxMemory; }
-  void setRequestMemoryMaxBytes(int64 max);
-  int64 getRequestTimeLimit() const { return m_maxTime; }
-  void setRequestTimeLimit(int64 limit) { m_maxTime = limit;}
+  int64_t getRequestMemoryMaxBytes() const { return m_maxMemory; }
+  void setRequestMemoryMaxBytes(int64_t max);
+  int64_t getRequestTimeLimit() const { return m_maxTime; }
+  void setRequestTimeLimit(int64_t limit) { m_maxTime = limit;}
   String getCwd() const { return m_cwd;}
   void setCwd(CStrRef cwd) { m_cwd = cwd;}
 
@@ -357,8 +357,8 @@ class BaseExecutionContext : public IDebuggable {
 private:
   // system settings
   Transport *m_transport;
-  int64 m_maxMemory;
-  int64 m_maxTime;
+  int64_t m_maxMemory;
+  int64_t m_maxTime;
   String m_cwd;
 
   // output buffering
diff --git a/hphp/runtime/base/file/bzip2_file.cpp b/hphp/runtime/base/file/bzip2_file.cpp
index 8a8b99cf90de8..0190914961a01 100644
--- a/hphp/runtime/base/file/bzip2_file.cpp
+++ b/hphp/runtime/base/file/bzip2_file.cpp
@@ -46,7 +46,7 @@ bool BZ2File::close() {
   return closeImpl();
 }
 
-int64 BZ2File::errnu() {
+int64_t BZ2File::errnu() {
   assert(m_bzFile);
   int errnum = 0;
   BZ2_bzerror(m_bzFile, &errnum);
@@ -72,7 +72,7 @@ bool BZ2File::flush() {
   return BZ2_bzflush(m_bzFile);
 }
 
-int64 BZ2File::readImpl(char * buf, int64 length) {
+int64_t BZ2File::readImpl(char * buf, int64_t length) {
   assert(m_bzFile);
   int len = BZ2_bzread(m_bzFile, buf, length);
   if (len < length)
@@ -80,7 +80,7 @@ int64 BZ2File::readImpl(char * buf, int64 length) {
   return len;
 }
 
-int64 BZ2File::writeImpl(const char * buf, int64 length) {
+int64_t BZ2File::writeImpl(const char * buf, int64_t length) {
   assert(m_bzFile);
   return BZ2_bzwrite(m_bzFile, (char *)buf, length);
 }
diff --git a/hphp/runtime/base/file/bzip2_file.h b/hphp/runtime/base/file/bzip2_file.h
index 562beba5d3079..b41b7505c15be 100644
--- a/hphp/runtime/base/file/bzip2_file.h
+++ b/hphp/runtime/base/file/bzip2_file.h
@@ -39,12 +39,12 @@ class BZ2File : public File {
 
   bool open(CStrRef filename, CStrRef mode);
   bool close();
-  int64 errnu();
+  int64_t errnu();
   String errstr();
   Variant error();
   virtual bool flush();
-  virtual int64 readImpl(char * buf, int64 length);
-  virtual int64 writeImpl(const char * buf, int64 length);
+  virtual int64_t readImpl(char * buf, int64_t length);
+  virtual int64_t writeImpl(const char * buf, int64_t length);
   virtual bool eof();
 
 private:
diff --git a/hphp/runtime/base/file/file.cpp b/hphp/runtime/base/file/file.cpp
index bbc1ce69cce3a..8d14fc813ea4b 100644
--- a/hphp/runtime/base/file/file.cpp
+++ b/hphp/runtime/base/file/file.cpp
@@ -159,7 +159,7 @@ int File::getc() {
   }
 
   char buffer[1];
-  int64 len = readImpl(buffer, 1);
+  int64_t len = readImpl(buffer, 1);
   if (len != 1) {
     return EOF;
   }
@@ -167,7 +167,7 @@ int File::getc() {
   return (int)(unsigned char)buffer[0];
 }
 
-String File::read(int64 length) {
+String File::read(int64_t length) {
   if (length <= 0) {
     raise_notice("Invalid length %" PRId64, length);
     return "";
@@ -175,8 +175,8 @@ String File::read(int64 length) {
 
   String s = String(length, ReserveString);
   char *ret = s.mutableSlice().ptr;
-  int64 copied = 0;
-  int64 avail = m_writepos - m_readpos;
+  int64_t copied = 0;
+  int64_t avail = m_writepos - m_readpos;
 
   while (avail < length && !eof()) {
     if (m_buffer == nullptr) {
@@ -201,7 +201,7 @@ String File::read(int64 length) {
 
   avail = m_writepos - m_readpos;
   if (avail > 0) {
-    int64 n = length < avail ? length : avail;
+    int64_t n = length < avail ? length : avail;
     memcpy(ret + copied, m_buffer + m_readpos, n);
     m_readpos += n;
     copied += n;
@@ -211,9 +211,9 @@ String File::read(int64 length) {
   return s.setSize(copied);
 }
 
-int64 File::write(CStrRef data, int64 length /* = 0 */) {
+int64_t File::write(CStrRef data, int64_t length /* = 0 */) {
   if (seekable()) {
-    int64 offset = m_readpos - m_writepos;
+    int64_t offset = m_readpos - m_writepos;
     m_readpos = m_writepos = 0; // invalidating read buffer
     seek(offset, SEEK_CUR);
   }
@@ -221,7 +221,7 @@ int64 File::write(CStrRef data, int64 length /* = 0 */) {
     length = data.size();
   }
   if (length) {
-    int64 written = writeImpl(data.data(), length);
+    int64_t written = writeImpl(data.data(), length);
     m_position += written;
     return written;
   }
@@ -236,7 +236,7 @@ int File::putc(char c) {
   return ret;
 }
 
-bool File::seek(int64 offset, int whence /* = SEEK_SET */) {
+bool File::seek(int64_t offset, int whence /* = SEEK_SET */) {
   if (whence != SEEK_CUR) {
     throw NotSupportedException(__func__, "cannot seek other than SEEK_CUR");
   }
@@ -244,7 +244,7 @@ bool File::seek(int64 offset, int whence /* = SEEK_SET */) {
     throw NotSupportedException(__func__, "cannot seek backwards");
   }
   if (offset > 0) {
-    int64 avail = m_writepos - m_readpos;
+    int64_t avail = m_writepos - m_readpos;
     assert(avail >= 0);
     if (avail >= offset) {
       m_readpos += offset;
@@ -257,7 +257,7 @@ bool File::seek(int64 offset, int whence /* = SEEK_SET */) {
 
     while (offset) {
       char tmp[1024];
-      int64 nread = offset > (int64)sizeof(tmp) ? (int64)sizeof(tmp) : offset;
+      int64_t nread = offset > (int64_t)sizeof(tmp) ? (int64_t)sizeof(tmp) : offset;
       nread = readImpl(tmp, nread);
       if (nread <= 0) {
         return false;
@@ -268,7 +268,7 @@ bool File::seek(int64 offset, int whence /* = SEEK_SET */) {
   return true;
 }
 
-int64 File::tell() {
+int64_t File::tell() {
   throw NotSupportedException(__func__, "cannot tell");
 }
 
@@ -284,7 +284,7 @@ bool File::flush() {
   return true;
 }
 
-bool File::truncate(int64 size) {
+bool File::truncate(int64_t size) {
   throw NotSupportedException(__func__, "cannot truncate");
 }
 
@@ -324,14 +324,14 @@ Array File::getMetaData() {
 ///////////////////////////////////////////////////////////////////////////////
 // utility functions
 
-String File::readLine(int64 maxlen /* = 0 */) {
+String File::readLine(int64_t maxlen /* = 0 */) {
   size_t current_buf_size = 0;
   size_t total_copied = 0;
   char *ret = nullptr;
   for (;;) {
-    int64 avail = m_writepos - m_readpos;
+    int64_t avail = m_writepos - m_readpos;
     if (avail > 0) {
-      int64 cpysz = 0;
+      int64_t cpysz = 0;
       bool done = false;
 
       char *readptr = m_buffer + m_readpos;
@@ -400,7 +400,7 @@ String File::readLine(int64 maxlen /* = 0 */) {
   return String(ret, total_copied, AttachString);
 }
 
-String File::readRecord(CStrRef delimiter, int64 maxlen /* = 0 */) {
+String File::readRecord(CStrRef delimiter, int64_t maxlen /* = 0 */) {
   if (eof() && m_writepos == m_readpos) {
     return empty_string;
   }
@@ -409,7 +409,7 @@ String File::readRecord(CStrRef delimiter, int64 maxlen /* = 0 */) {
     maxlen = CHUNK_SIZE;
   }
 
-  int64 avail = m_writepos - m_readpos;
+  int64_t avail = m_writepos - m_readpos;
   if (m_buffer == nullptr) {
     m_buffer = (char *)malloc(CHUNK_SIZE * 3);
   }
@@ -424,7 +424,7 @@ String File::readRecord(CStrRef delimiter, int64 maxlen /* = 0 */) {
     m_readpos = 0;
   }
 
-  int64 toread;
+  int64_t toread;
   const char *e;
   bool skip = false;
   if (delimiter.empty()) {
@@ -434,7 +434,7 @@ String File::readRecord(CStrRef delimiter, int64 maxlen /* = 0 */) {
       e = (const char *)memchr(m_buffer + m_readpos, delimiter.charAt(0),
                                m_writepos - m_readpos);
     } else {
-      int64 pos = string_find(m_buffer + m_readpos, m_writepos - m_readpos,
+      int64_t pos = string_find(m_buffer + m_readpos, m_writepos - m_readpos,
                               delimiter.data(), delimiter.size(), 0, true);
       if (pos >= 0) {
         e = m_buffer + m_readpos + pos;
@@ -473,11 +473,11 @@ String File::readRecord(CStrRef delimiter, int64 maxlen /* = 0 */) {
   return empty_string;
 }
 
-int64 File::print() {
-  int64 total = 0;
+int64_t File::print() {
+  int64_t total = 0;
   while (true) {
     char buffer[1024];
-    int64 len = readImpl(buffer, 1024);
+    int64_t len = readImpl(buffer, 1024);
     if (len == 0) break;
     total += len;
     g_context->write(buffer, len);
@@ -485,7 +485,7 @@ int64 File::print() {
   return total;
 }
 
-int64 File::printf(CStrRef format, CArrRef args) {
+int64_t File::printf(CStrRef format, CArrRef args) {
   int len = 0;
   char *output = string_printf(format.data(), format.size(), args, &len);
   return write(String(output, len, AttachString));
@@ -494,7 +494,7 @@ int64 File::printf(CStrRef format, CArrRef args) {
 ///////////////////////////////////////////////////////////////////////////////
 // csv functions
 
-int64 File::writeCSV(CArrRef fields, char delimiter_char /* = ',' */,
+int64_t File::writeCSV(CArrRef fields, char delimiter_char /* = ',' */,
                      char enclosure_char /* = '"' */) {
   int line = 0;
   int count = fields.size();
@@ -558,7 +558,7 @@ static const char *lookup_trailing_spaces(const char *ptr, int len) {
   return ptr;
 }
 
-Array File::readCSV(int64 length /* = 0 */, char delimiter_char /* = ',' */,
+Array File::readCSV(int64_t length /* = 0 */, char delimiter_char /* = ',' */,
                     char enclosure_char /* = '"' */) {
   String line = readLine(length);
   if (line.empty()) {
@@ -567,13 +567,13 @@ Array File::readCSV(int64 length /* = 0 */, char delimiter_char /* = ',' */,
 
   String new_line;
   const char *buf = line.data();
-  int64 buf_len = line.size();
+  int64_t buf_len = line.size();
 
   char *temp, *tptr, *line_end, *limit;
   const char *bptr;
   const char escape_char = '\\';
 
-  int64 temp_len, line_end_len;
+  int64_t temp_len, line_end_len;
   bool first_field = true;
 
   /* Now into new section that parses buf for delimiter/enclosure fields */
@@ -651,7 +651,7 @@ Array File::readCSV(int64 length /* = 0 */, char delimiter_char /* = ',' */,
 
               new_line = readLine(length);
               const char *new_buf = new_line.data();
-              int64 new_len = new_line.size();
+              int64_t new_len = new_line.size();
               if (new_len == 0) {
                 /* we've got an unterminated enclosure,
                  * assign all the data from the start of
diff --git a/hphp/runtime/base/file/file.h b/hphp/runtime/base/file/file.h
index 838296d183ccc..b750b567ef739 100644
--- a/hphp/runtime/base/file/file.h
+++ b/hphp/runtime/base/file/file.h
@@ -93,27 +93,27 @@ class File : public SweepableResourceData {
   /**
    * Read one chunk of input. Returns a null string on failure or eof.
    */
-  virtual int64 readImpl(char *buffer, int64 length) = 0;
+  virtual int64_t readImpl(char *buffer, int64_t length) = 0;
   virtual int getc();
-  virtual String read(int64 length = 0);
+  virtual String read(int64_t length = 0);
 
   /**
    * Write one chunk of output. Returns bytes written.
    */
-  virtual int64 writeImpl(const char *buffer, int64 length) = 0;
-  virtual int64 write(CStrRef str, int64 length = 0);
+  virtual int64_t writeImpl(const char *buffer, int64_t length) = 0;
+  virtual int64_t write(CStrRef str, int64_t length = 0);
   int putc(char c);
 
   /**
    * Optional virtual functions to implement.
    */
   virtual bool seekable() { return false;}
-  virtual bool seek(int64 offset, int whence = SEEK_SET);
-  virtual int64 tell();
+  virtual bool seek(int64_t offset, int whence = SEEK_SET);
+  virtual int64_t tell();
   virtual bool eof();
   virtual bool rewind();
   virtual bool flush();
-  virtual bool truncate(int64 size);
+  virtual bool truncate(int64_t size);
   virtual bool lock(int operation);
   virtual bool lock(int operation, bool &wouldblock);
 
@@ -124,32 +124,32 @@ class File : public SweepableResourceData {
   /**
    * Read one line a time. Returns a null string on failure or eof.
    */
-  String readLine(int64 maxlen = 0);
+  String readLine(int64_t maxlen = 0);
 
   /**
    * Read one record a time. Returns a null string on failure or eof.
    */
-  String readRecord(CStrRef delimiter, int64 maxlen = 0);
+  String readRecord(CStrRef delimiter, int64_t maxlen = 0);
 
   /**
    * Read entire file and print it out.
    */
-  int64 print();
+  int64_t print();
 
   /**
    * Write to file with specified format and arguments.
    */
-  int64 printf(CStrRef format, CArrRef args);
+  int64_t printf(CStrRef format, CArrRef args);
 
   /**
    * Write one line of csv record.
    */
-  int64 writeCSV(CArrRef fields, char delimiter = ',', char enclosure = '"');
+  int64_t writeCSV(CArrRef fields, char delimiter = ',', char enclosure = '"');
 
   /**
    * Read one line of csv record.
    */
-  Array readCSV(int64 length = 0, char delimiter = ',', char enclosure = '"');
+  Array readCSV(int64_t length = 0, char delimiter = ',', char enclosure = '"');
 
   /**
    * Return the last error we know about
@@ -162,11 +162,11 @@ class File : public SweepableResourceData {
   bool m_nonblocking;
 
   // fields only useful for buffered reads
-  int64 m_writepos; // where we have read from lower level
-  int64 m_readpos;  // where we have given to upper level
+  int64_t m_writepos; // where we have read from lower level
+  int64_t m_readpos;  // where we have given to upper level
 
   // fields useful for both reads and writes
-  int64 m_position; // the current cursor position
+  int64_t m_position; // the current cursor position
 
   std::string m_name;
   std::string m_mode;
diff --git a/hphp/runtime/base/file/mem_file.cpp b/hphp/runtime/base/file/mem_file.cpp
index 54217a05c07d2..8166d9ebff2c0 100644
--- a/hphp/runtime/base/file/mem_file.cpp
+++ b/hphp/runtime/base/file/mem_file.cpp
@@ -35,7 +35,7 @@ MemFile::MemFile()
   : File(false), m_data(nullptr), m_len(-1), m_cursor(0), m_malloced(false) {
 }
 
-MemFile::MemFile(const char *data, int64 len)
+MemFile::MemFile(const char *data, int64_t len)
   : File(false), m_data(nullptr), m_len(len), m_cursor(0), m_malloced(true) {
   m_data = (char*)malloc(len + 1);
   if (m_data && len) {
@@ -101,10 +101,10 @@ bool MemFile::closeImpl() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-int64 MemFile::readImpl(char *buffer, int64 length) {
+int64_t MemFile::readImpl(char *buffer, int64_t length) {
   assert(m_len != -1);
   assert(length > 0);
-  int64 remaining = m_len - m_cursor;
+  int64_t remaining = m_len - m_cursor;
   if (remaining < length) length = remaining;
   if (length > 0) {
     memcpy(buffer, (const void *)(m_data + m_cursor), length);
@@ -118,7 +118,7 @@ int MemFile::getc() {
   return File::getc();
 }
 
-bool MemFile::seek(int64 offset, int whence /* = SEEK_SET */) {
+bool MemFile::seek(int64_t offset, int whence /* = SEEK_SET */) {
   assert(m_len != -1);
   if (whence == SEEK_CUR) {
     if (offset > 0 && offset < m_writepos - m_readpos) {
@@ -143,14 +143,14 @@ bool MemFile::seek(int64 offset, int whence /* = SEEK_SET */) {
   return true;
 }
 
-int64 MemFile::tell() {
+int64_t MemFile::tell() {
   assert(m_len != -1);
   return m_position;
 }
 
 bool MemFile::eof() {
   assert(m_len != -1);
-  int64 avail = m_writepos - m_readpos;
+  int64_t avail = m_writepos - m_readpos;
   if (avail > 0) {
     return false;
   }
@@ -166,7 +166,7 @@ bool MemFile::rewind() {
   return true;
 }
 
-int64 MemFile::writeImpl(const char *buffer, int64 length) {
+int64_t MemFile::writeImpl(const char *buffer, int64_t length) {
   throw FatalErrorException((string("cannot write a mem stream: ") +
                              m_name).c_str());
 }
diff --git a/hphp/runtime/base/file/mem_file.h b/hphp/runtime/base/file/mem_file.h
index 33d88ca9c3863..1cde94848b9eb 100644
--- a/hphp/runtime/base/file/mem_file.h
+++ b/hphp/runtime/base/file/mem_file.h
@@ -31,7 +31,7 @@ class MemFile : public File {
   DECLARE_OBJECT_ALLOCATION(MemFile);
 
   MemFile();
-  MemFile(const char *data, int64 len);
+  MemFile(const char *data, int64_t len);
   virtual ~MemFile();
 
   static StaticString s_class_name;
@@ -40,12 +40,12 @@ class MemFile : public File {
 
   virtual bool open(CStrRef filename, CStrRef mode);
   virtual bool close();
-  virtual int64 readImpl(char *buffer, int64 length);
+  virtual int64_t readImpl(char *buffer, int64_t length);
   virtual int getc();
-  virtual int64 writeImpl(const char *buffer, int64 length);
+  virtual int64_t writeImpl(const char *buffer, int64_t length);
   virtual bool seekable() { return true;}
-  virtual bool seek(int64 offset, int whence = SEEK_SET);
-  virtual int64 tell();
+  virtual bool seek(int64_t offset, int whence = SEEK_SET);
+  virtual int64_t tell();
   virtual bool eof();
   virtual bool rewind();
   virtual bool flush();
@@ -55,8 +55,8 @@ class MemFile : public File {
 protected:
   std::string m_name; // name of the memory file
   char *m_data;       // data of the memory file
-  int64 m_len;        // length of the memory file
-  int64 m_cursor;     // m_data's read position
+  int64_t m_len;        // length of the memory file
+  int64_t m_cursor;     // m_data's read position
   bool m_malloced;    // whether to free m_data on delete
 
   bool closeImpl();
diff --git a/hphp/runtime/base/file/output_file.cpp b/hphp/runtime/base/file/output_file.cpp
index fa21325360209..9155ee72c83ce 100644
--- a/hphp/runtime/base/file/output_file.cpp
+++ b/hphp/runtime/base/file/output_file.cpp
@@ -59,7 +59,7 @@ bool OutputFile::closeImpl() {
 ///////////////////////////////////////////////////////////////////////////////
 // virtual functions
 
-int64 OutputFile::readImpl(char *buffer, int64 length) {
+int64_t OutputFile::readImpl(char *buffer, int64_t length) {
   raise_warning("cannot read from a php://output stream");
   return -1;
 }
@@ -69,19 +69,19 @@ int OutputFile::getc() {
   return -1;
 }
 
-int64 OutputFile::writeImpl(const char *buffer, int64 length) {
+int64_t OutputFile::writeImpl(const char *buffer, int64_t length) {
   assert(length > 0);
   if (m_closed) return 0;
   g_context->write(buffer, length);
   return length;
 }
 
-bool OutputFile::seek(int64 offset, int whence /* = SEEK_SET */) {
+bool OutputFile::seek(int64_t offset, int whence /* = SEEK_SET */) {
   raise_warning("cannot seek a php://output stream");
   return false;
 }
 
-int64 OutputFile::tell() {
+int64_t OutputFile::tell() {
   raise_warning("cannot tell a php://output stream");
   return -1;
 }
@@ -103,7 +103,7 @@ bool OutputFile::flush() {
   return false;
 }
 
-bool OutputFile::truncate(int64 size) {
+bool OutputFile::truncate(int64_t size) {
   raise_warning("cannot truncate a php://output stream");
   return false;
 }
diff --git a/hphp/runtime/base/file/output_file.h b/hphp/runtime/base/file/output_file.h
index 6a6597a26fea7..e28681aa820c7 100644
--- a/hphp/runtime/base/file/output_file.h
+++ b/hphp/runtime/base/file/output_file.h
@@ -41,15 +41,15 @@ class OutputFile : public File {
   // implementing File
   virtual bool open(CStrRef filename, CStrRef mode);
   virtual bool close();
-  virtual int64 readImpl(char *buffer, int64 length);
+  virtual int64_t readImpl(char *buffer, int64_t length);
   virtual int getc();
-  virtual int64 writeImpl(const char *buffer, int64 length);
-  virtual bool seek(int64 offset, int whence = SEEK_SET);
-  virtual int64 tell();
+  virtual int64_t writeImpl(const char *buffer, int64_t length);
+  virtual bool seek(int64_t offset, int whence = SEEK_SET);
+  virtual int64_t tell();
   virtual bool eof();
   virtual bool rewind();
   virtual bool flush();
-  virtual bool truncate(int64 size);
+  virtual bool truncate(int64_t size);
 
 protected:
   bool closeImpl();
diff --git a/hphp/runtime/base/file/plain_file.cpp b/hphp/runtime/base/file/plain_file.cpp
index 9e27b644a1ea3..382f5b2f1f08b 100644
--- a/hphp/runtime/base/file/plain_file.cpp
+++ b/hphp/runtime/base/file/plain_file.cpp
@@ -122,7 +122,7 @@ bool PlainFile::closeImpl() {
 ///////////////////////////////////////////////////////////////////////////////
 // virtual functions
 
-int64 PlainFile::readImpl(char *buffer, int64 length) {
+int64_t PlainFile::readImpl(char *buffer, int64_t length) {
   assert(valid());
   assert(length > 0);
   // use read instead of fread to handle EOL in stdin
@@ -140,22 +140,22 @@ int PlainFile::getc() {
   return File::getc();
 }
 
-String PlainFile::read(int64 length) {
+String PlainFile::read(int64_t length) {
   if (length) m_eof = false;
   return File::read(length);
 }
 
-int64 PlainFile::writeImpl(const char *buffer, int64 length) {
+int64_t PlainFile::writeImpl(const char *buffer, int64_t length) {
   assert(valid());
   assert(length > 0);
 
   // use write instead of fwrite to be consistent with read
   // o.w., read-and-write files would not work
-  int64 written = ::write(m_fd, buffer, length);
+  int64_t written = ::write(m_fd, buffer, length);
   return written < 0 ? 0 : written;
 }
 
-bool PlainFile::seek(int64 offset, int whence /* = SEEK_SET */) {
+bool PlainFile::seek(int64_t offset, int whence /* = SEEK_SET */) {
   assert(valid());
 
   if (whence == SEEK_CUR) {
@@ -184,14 +184,14 @@ bool PlainFile::seek(int64 offset, int whence /* = SEEK_SET */) {
   return result != (off_t)-1;
 }
 
-int64 PlainFile::tell() {
+int64_t PlainFile::tell() {
   assert(valid());
   return m_position;
 }
 
 bool PlainFile::eof() {
   assert(valid());
-  int64 avail = m_writepos - m_readpos;
+  int64_t avail = m_writepos - m_readpos;
   if (avail > 0) {
     return false;
   }
@@ -216,7 +216,7 @@ bool PlainFile::flush() {
   return true;
 }
 
-bool PlainFile::truncate(int64 size) {
+bool PlainFile::truncate(int64_t size) {
   assert(valid());
   return ftruncate(m_fd, size) == 0;
 }
diff --git a/hphp/runtime/base/file/plain_file.h b/hphp/runtime/base/file/plain_file.h
index baa605e9311e3..3c5865ac8b5c6 100644
--- a/hphp/runtime/base/file/plain_file.h
+++ b/hphp/runtime/base/file/plain_file.h
@@ -41,17 +41,17 @@ class PlainFile : public File {
   // implementing File
   virtual bool open(CStrRef filename, CStrRef mode);
   virtual bool close();
-  virtual int64 readImpl(char *buffer, int64 length);
+  virtual int64_t readImpl(char *buffer, int64_t length);
   virtual int getc();
-  virtual String read(int64 length = 0);
-  virtual int64 writeImpl(const char *buffer, int64 length);
+  virtual String read(int64_t length = 0);
+  virtual int64_t writeImpl(const char *buffer, int64_t length);
   virtual bool seekable() { return true;}
-  virtual bool seek(int64 offset, int whence = SEEK_SET);
-  virtual int64 tell();
+  virtual bool seek(int64_t offset, int whence = SEEK_SET);
+  virtual int64_t tell();
   virtual bool eof();
   virtual bool rewind();
   virtual bool flush();
-  virtual bool truncate(int64 size);
+  virtual bool truncate(int64_t size);
 
   FILE *getStream() { return m_stream;}
   virtual const char *getStreamType() const { return "STDIO";}
diff --git a/hphp/runtime/base/file/socket.cpp b/hphp/runtime/base/file/socket.cpp
index 4200ef4ed1ea3..bd0660dbcab30 100644
--- a/hphp/runtime/base/file/socket.cpp
+++ b/hphp/runtime/base/file/socket.cpp
@@ -159,7 +159,7 @@ bool Socket::waitForData() {
   return false;
 }
 
-int64 Socket::readImpl(char *buffer, int64 length) {
+int64_t Socket::readImpl(char *buffer, int64_t length) {
   assert(m_fd);
   assert(length > 0);
 
@@ -177,19 +177,19 @@ int64 Socket::readImpl(char *buffer, int64 length) {
     }
   }
 
-  int64 ret = recv(m_fd, buffer, length, recvFlags);
+  int64_t ret = recv(m_fd, buffer, length, recvFlags);
   if (ret == 0 || (ret == -1 && errno != EWOULDBLOCK)) {
     m_eof = true;
   }
   return (ret < 0) ? 0 : ret;
 }
 
-int64 Socket::writeImpl(const char *buffer, int64 length) {
+int64_t Socket::writeImpl(const char *buffer, int64_t length) {
   assert(m_fd);
   assert(length > 0);
   m_eof = false;
   IOStatusHelper io("socket::send", m_address.c_str(), m_port);
-  int64 ret = send(m_fd, buffer, length, 0);
+  int64_t ret = send(m_fd, buffer, length, 0);
   if (ret >= 0) {
     m_bytesSent += ret;
   }
@@ -207,7 +207,7 @@ Array Socket::getMetaData() {
   return ret;
 }
 
-int64 Socket::tell() {
+int64_t Socket::tell() {
   return m_bytesSent;
 }
 
diff --git a/hphp/runtime/base/file/socket.h b/hphp/runtime/base/file/socket.h
index c1904701f7974..db9d3eda215dd 100644
--- a/hphp/runtime/base/file/socket.h
+++ b/hphp/runtime/base/file/socket.h
@@ -48,11 +48,11 @@ class Socket : public File {
   // implementing File
   virtual bool open(CStrRef filename, CStrRef mode);
   virtual bool close();
-  virtual int64 readImpl(char *buffer, int64 length);
-  virtual int64 writeImpl(const char *buffer, int64 length);
+  virtual int64_t readImpl(char *buffer, int64_t length);
+  virtual int64_t writeImpl(const char *buffer, int64_t length);
   virtual bool eof();
   virtual Array getMetaData();
-  virtual int64 tell();
+  virtual int64_t tell();
 
   // check if the socket is still open
   virtual bool checkLiveness();
@@ -81,7 +81,7 @@ class Socket : public File {
   int m_timeout; // in micro-seconds;
   bool m_timedOut;
 
-  int64 m_bytesSent;
+  int64_t m_bytesSent;
 
   bool closeImpl();
   bool waitForData();
diff --git a/hphp/runtime/base/file/ssl_socket.cpp b/hphp/runtime/base/file/ssl_socket.cpp
index cadcc6ce2a085..27c65f4f5e67b 100644
--- a/hphp/runtime/base/file/ssl_socket.cpp
+++ b/hphp/runtime/base/file/ssl_socket.cpp
@@ -103,7 +103,7 @@ SSL *SSLSocket::createSSL(SSL_CTX *ctx) {
       }
     }
 
-    int64 depth = m_context["verify_depth"].toInt64();
+    int64_t depth = m_context["verify_depth"].toInt64();
     if (depth) {
       SSL_CTX_set_verify_depth(ctx, depth);
     }
@@ -214,7 +214,7 @@ bool SSLSocket::onAccept() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool SSLSocket::handleError(int64 nr_bytes, bool is_init) {
+bool SSLSocket::handleError(int64_t nr_bytes, bool is_init) {
   char esbuf[512];
   string ebuf;
   unsigned long ecode;
@@ -330,8 +330,8 @@ bool SSLSocket::closeImpl() {
   return Socket::closeImpl();
 }
 
-int64 SSLSocket::readImpl(char *buffer, int64 length) {
-  int64 nr_bytes = 0;
+int64_t SSLSocket::readImpl(char *buffer, int64_t length) {
+  int64_t nr_bytes = 0;
   if (m_ssl_active) {
     bool retry = true;
     do {
@@ -353,7 +353,7 @@ int64 SSLSocket::readImpl(char *buffer, int64 length) {
   return nr_bytes < 0 ? 0 : nr_bytes;
 }
 
-int64 SSLSocket::writeImpl(const char *buffer, int64 length) {
+int64_t SSLSocket::writeImpl(const char *buffer, int64_t length) {
   int didwrite;
   if (m_ssl_active) {
     bool retry = true;
diff --git a/hphp/runtime/base/file/ssl_socket.h b/hphp/runtime/base/file/ssl_socket.h
index ba4e3b06d1f57..2123396f471fb 100644
--- a/hphp/runtime/base/file/ssl_socket.h
+++ b/hphp/runtime/base/file/ssl_socket.h
@@ -61,8 +61,8 @@ class SSLSocket : public Socket {
 
   // overriding Socket
   virtual bool close();
-  virtual int64 readImpl(char *buffer, int64 length);
-  virtual int64 writeImpl(const char *buffer, int64 length);
+  virtual int64_t readImpl(char *buffer, int64_t length);
+  virtual int64_t writeImpl(const char *buffer, int64_t length);
   virtual bool checkLiveness();
 
   Array &getContext() { return m_context;}
@@ -81,7 +81,7 @@ class SSLSocket : public Socket {
   bool m_is_blocked;
 
   bool closeImpl();
-  bool handleError(int64 nr_bytes, bool is_init);
+  bool handleError(int64_t nr_bytes, bool is_init);
 
   bool setupCrypto(SSLSocket *session = nullptr);
   bool enableCrypto(bool activate = true);
diff --git a/hphp/runtime/base/file/url_file.cpp b/hphp/runtime/base/file/url_file.cpp
index 0103b5508e3ad..3c5cdcc6e2616 100644
--- a/hphp/runtime/base/file/url_file.cpp
+++ b/hphp/runtime/base/file/url_file.cpp
@@ -88,7 +88,7 @@ bool UrlFile::open(CStrRef url, CStrRef mode) {
   }
 }
 
-int64 UrlFile::writeImpl(const char *buffer, int64 length) {
+int64_t UrlFile::writeImpl(const char *buffer, int64_t length) {
   assert(m_len != -1);
   throw FatalErrorException((string("cannot write a url stream: ") +
                              m_name).c_str());
diff --git a/hphp/runtime/base/file/url_file.h b/hphp/runtime/base/file/url_file.h
index 93efd879a1602..1b8934ae96533 100644
--- a/hphp/runtime/base/file/url_file.h
+++ b/hphp/runtime/base/file/url_file.h
@@ -39,7 +39,7 @@ class UrlFile : public MemFile {
   CStrRef o_getClassNameHook() const { return s_class_name; }
 
   virtual bool open(CStrRef filename, CStrRef mode);
-  virtual int64 writeImpl(const char *buffer, int64 length);
+  virtual int64_t writeImpl(const char *buffer, int64_t length);
   virtual bool flush();
   virtual Array getWrapperMetaData() { return m_responseHeaders; }
   String getLastError();
diff --git a/hphp/runtime/base/file/user_file.cpp b/hphp/runtime/base/file/user_file.cpp
index 0bf97d82d3eae..58e8c52858e77 100644
--- a/hphp/runtime/base/file/user_file.cpp
+++ b/hphp/runtime/base/file/user_file.cpp
@@ -176,7 +176,7 @@ bool UserFile::close() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-int64 UserFile::readImpl(char *buffer, int64 length) {
+int64_t UserFile::readImpl(char *buffer, int64_t length) {
   // String stread_read($count)
   bool success = false;
   String str = invoke(m_StreamRead, s_stream_read,
@@ -187,7 +187,7 @@ int64 UserFile::readImpl(char *buffer, int64 length) {
     return 0;
   }
 
-  int64 didread = str.size();
+  int64_t didread = str.size();
   if (didread > length) {
     raise_warning("%s::stream_read - read %ld bytes more data than requested "
                   "(%ld read, %ld max) - excess data will be lost",
@@ -200,10 +200,10 @@ int64 UserFile::readImpl(char *buffer, int64 length) {
   return didread;
 }
 
-int64 UserFile::writeImpl(const char *buffer, int64 length) {
+int64_t UserFile::writeImpl(const char *buffer, int64_t length) {
   // stream_write($data)
   bool success = false;
-  int64 didWrite = invoke(m_StreamWrite, s_stream_write,
+  int64_t didWrite = invoke(m_StreamWrite, s_stream_write,
                           CREATE_VECTOR1(String(buffer, length, CopyString)),
                           success);
   if (!success) {
@@ -225,7 +225,7 @@ int64 UserFile::writeImpl(const char *buffer, int64 length) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool UserFile::seek(int64 offset, int whence /* = SEEK_SET */) {
+bool UserFile::seek(int64_t offset, int whence /* = SEEK_SET */) {
   // bool stream_seek($offset, $whence)
   bool success = false;
   bool sought  = invoke(m_StreamSeek, s_stream_seek,
@@ -233,7 +233,7 @@ bool UserFile::seek(int64 offset, int whence /* = SEEK_SET */) {
   return success ? sought : false;
 }
 
-int64 UserFile::tell() {
+int64_t UserFile::tell() {
   // int stream_tell()
   bool success = false;
   Variant ret = invoke(m_StreamTell, s_stream_tell, Array::Create(), success);
@@ -271,7 +271,7 @@ bool UserFile::flush() {
 }
 
 bool UserFile::lock(int operation, bool &wouldBlock) {
-  int64 op = 0;
+  int64_t op = 0;
   if (operation & LOCK_NB) {
     op |= k_LOCK_NB;
   }
diff --git a/hphp/runtime/base/file/user_file.h b/hphp/runtime/base/file/user_file.h
index be706c2232e95..1b0ea051b1684 100644
--- a/hphp/runtime/base/file/user_file.h
+++ b/hphp/runtime/base/file/user_file.h
@@ -35,7 +35,7 @@ class UserFile : public File {
 
   virtual bool open(CStrRef filename, CStrRef mode);
   virtual bool close();
-  virtual int64 readImpl(char *buffer, int64 length);
+  virtual int64_t readImpl(char *buffer, int64_t length);
   virtual int getc() {
     char buf[1];
     if (readImpl(buf, 1) == 1) {
@@ -43,10 +43,10 @@ class UserFile : public File {
     }
     return 0;
   }
-  virtual int64 writeImpl(const char *buffer, int64 length);
+  virtual int64_t writeImpl(const char *buffer, int64_t length);
   virtual bool seekable() { return m_StreamSeek || m_Call; }
-  virtual bool seek(int64 offset, int whence = SEEK_SET);
-  virtual int64 tell();
+  virtual bool seek(int64_t offset, int whence = SEEK_SET);
+  virtual int64_t tell();
   virtual bool eof();
   virtual bool rewind() { return seek(0, SEEK_SET); }
   virtual bool flush();
diff --git a/hphp/runtime/base/file/zip_file.cpp b/hphp/runtime/base/file/zip_file.cpp
index 0d91745277897..89eee6f6f3905 100644
--- a/hphp/runtime/base/file/zip_file.cpp
+++ b/hphp/runtime/base/file/zip_file.cpp
@@ -77,24 +77,24 @@ bool ZipFile::closeImpl() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-int64 ZipFile::readImpl(char *buffer, int64 length) {
+int64_t ZipFile::readImpl(char *buffer, int64_t length) {
   assert(m_gzFile);
-  int64 nread = gzread(m_gzFile, buffer, length);
+  int64_t nread = gzread(m_gzFile, buffer, length);
   return (nread < 0) ? 0 : nread;
 }
 
-int64 ZipFile::writeImpl(const char *buffer, int64 length) {
+int64_t ZipFile::writeImpl(const char *buffer, int64_t length) {
   assert(m_gzFile);
   return gzwrite(m_gzFile, buffer, length);
 }
 
-bool ZipFile::seek(int64 offset, int whence /* = SEEK_SET */) {
+bool ZipFile::seek(int64_t offset, int whence /* = SEEK_SET */) {
   assert(m_gzFile);
-  int64 newoffset = gzseek(m_gzFile, offset, whence);
+  int64_t newoffset = gzseek(m_gzFile, offset, whence);
   return (newoffset < 0) ? -1 : 0;
 }
 
-int64 ZipFile::tell() {
+int64_t ZipFile::tell() {
   assert(m_gzFile);
   return gztell(m_gzFile);
 }
diff --git a/hphp/runtime/base/file/zip_file.h b/hphp/runtime/base/file/zip_file.h
index dcdb548af632c..de9a30a163b09 100644
--- a/hphp/runtime/base/file/zip_file.h
+++ b/hphp/runtime/base/file/zip_file.h
@@ -39,11 +39,11 @@ class ZipFile : public File {
 
   virtual bool open(CStrRef filename, CStrRef mode);
   virtual bool close();
-  virtual int64 readImpl(char *buffer, int64 length);
-  virtual int64 writeImpl(const char *buffer, int64 length);
+  virtual int64_t readImpl(char *buffer, int64_t length);
+  virtual int64_t writeImpl(const char *buffer, int64_t length);
   virtual bool seekable() { return true;}
-  virtual bool seek(int64 offset, int whence = SEEK_SET);
-  virtual int64 tell();
+  virtual bool seek(int64_t offset, int whence = SEEK_SET);
+  virtual int64_t tell();
   virtual bool eof();
   virtual bool rewind();
   virtual bool flush();
diff --git a/hphp/runtime/base/hardware_counter.cpp b/hphp/runtime/base/hardware_counter.cpp
index f79b7e080b1c9..e99a7bbf1b311 100644
--- a/hphp/runtime/base/hardware_counter.cpp
+++ b/hphp/runtime/base/hardware_counter.cpp
@@ -90,13 +90,13 @@ class HardwareCounterImpl {
     close();
   }
 
-  int64 read() {
+  int64_t read() {
     if (!useCounters()) return 0;
 
-    int64 count = 0;
+    int64_t count = 0;
 
     if (m_fd > 0) {
-      int64 values[3];
+      int64_t values[3];
       int ret;
 
       /*
@@ -114,7 +114,7 @@ class HardwareCounterImpl {
          * values[2] = TIME_RUNNING
          */
         if (values[2]) {
-          count = (int64) ((double) values[0] * values[1] / values[2]);
+          count = (int64_t) ((double) values[0] * values[1] / values[2]);
         }
       }
     }
@@ -203,27 +203,27 @@ void HardwareCounter::reset(void) {
   }
 }
 
-int64 HardwareCounter::GetInstructionCount() {
+int64_t HardwareCounter::GetInstructionCount() {
   return s_counter->getInstructionCount();
 }
 
-int64 HardwareCounter::getInstructionCount() {
+int64_t HardwareCounter::getInstructionCount() {
   return m_instructionCounter->read();
 }
 
-int64 HardwareCounter::GetLoadCount() {
+int64_t HardwareCounter::GetLoadCount() {
   return s_counter->getLoadCount();
 }
 
-int64 HardwareCounter::getLoadCount() {
+int64_t HardwareCounter::getLoadCount() {
   return m_loadCounter->read();
 }
 
-int64 HardwareCounter::GetStoreCount() {
+int64_t HardwareCounter::GetStoreCount() {
   return s_counter->getStoreCount();
 }
 
-int64 HardwareCounter::getStoreCount() {
+int64_t HardwareCounter::getStoreCount() {
   return m_storeCounter->read();
 }
 
diff --git a/hphp/runtime/base/hardware_counter.h b/hphp/runtime/base/hardware_counter.h
index c2f7d6456fd44..460e766516b86 100644
--- a/hphp/runtime/base/hardware_counter.h
+++ b/hphp/runtime/base/hardware_counter.h
@@ -43,17 +43,17 @@ class HardwareCounter {
   ~HardwareCounter();
 
   static void  Reset(void);
-  static int64 GetInstructionCount(void);
-  static int64 GetLoadCount(void);
-  static int64 GetStoreCount(void);
+  static int64_t GetInstructionCount(void);
+  static int64_t GetLoadCount(void);
+  static int64_t GetStoreCount(void);
   static bool SetPerfEvents(CStrRef events);
   static void GetPerfEvents(Array& ret);
   static void ClearPerfEvents();
 
   void  reset(void);
-  int64 getInstructionCount(void);
-  int64 getLoadCount(void);
-  int64 getStoreCount(void);
+  int64_t getInstructionCount(void);
+  int64_t getLoadCount(void);
+  int64_t getStoreCount(void);
   bool eventExists(char *event);
   bool addPerfEvent(char* event);
   bool setPerfEvents(CStrRef events);
@@ -84,11 +84,11 @@ class HardwareCounter {
 
   static void  Reset(void)
          { s_counter.reset(); }
-  static int64 GetInstructionCount(void)
+  static int64_t GetInstructionCount(void)
          { return s_counter.getInstructionCount(); }
-  static int64 GetLoadCount(void)
+  static int64_t GetLoadCount(void)
          { return s_counter.getLoadCount(); }
-  static int64 GetStoreCount(void)
+  static int64_t GetStoreCount(void)
          { return s_counter.getStoreCount(); }
   static bool SetPerfEvents(CStrRef events)
          { return s_counter.setPerfEvents(events); }
@@ -98,11 +98,11 @@ class HardwareCounter {
          { s_counter.clearPerfEvents(); }
 
   void  reset(void) { }
-  int64 getInstructionCount(void)
+  int64_t getInstructionCount(void)
         { return 0; }
-  int64 getLoadCount(void)
+  int64_t getLoadCount(void)
         { return 0; }
-  int64 getStoreCount(void)
+  int64_t getStoreCount(void)
         { return 0; }
   bool  eventExists(char *event)
         { return false; }
diff --git a/hphp/runtime/base/hphp_ffi.cpp b/hphp/runtime/base/hphp_ffi.cpp
index d84538c5b8309..f204959ccd487 100644
--- a/hphp/runtime/base/hphp_ffi.cpp
+++ b/hphp/runtime/base/hphp_ffi.cpp
@@ -90,7 +90,7 @@ Variant *hphp_ffi_buildVariant(int t, void* v, int len) {
   switch (t) {
   case 0: return NEW(Variant)();
   case 1: return NEW(Variant)((bool)v);
-  case 2: return NEW(Variant)((int64)v);
+  case 2: return NEW(Variant)((int64_t)v);
   case 3: {
     union {
       double d;
diff --git a/hphp/runtime/base/hphp_value.h b/hphp/runtime/base/hphp_value.h
index 3e0eb68b41d86..05d5c515674ed 100644
--- a/hphp/runtime/base/hphp_value.h
+++ b/hphp/runtime/base/hphp_value.h
@@ -36,7 +36,7 @@ struct TypedValue;
 
 struct Value {
   mutable union {
-    int64       num;  // KindOfInt64, KindOfBool
+    int64_t       num;  // KindOfInt64, KindOfBool
     double      dbl;  // KindOfDouble
     StringData *pstr; // KindOfString, KindOfStaticString
     ArrayData  *parr; // KindOfArray
diff --git a/hphp/runtime/base/ini_setting.cpp b/hphp/runtime/base/ini_setting.cpp
index e4222e8580466..1e7e65081feb4 100644
--- a/hphp/runtime/base/ini_setting.cpp
+++ b/hphp/runtime/base/ini_setting.cpp
@@ -52,18 +52,18 @@ bool ini_on_update_bool(CStrRef value, void *p) {
 
 bool ini_on_update_long(CStrRef value, void *p) {
   if (p) {
-    *((int64*)p) = value.toInt64();
+    *((int64_t*)p) = value.toInt64();
   }
   return true;
 }
 
 bool ini_on_update_non_negative(CStrRef value, void *p) {
-  int64 v = value.toInt64();
+  int64_t v = value.toInt64();
   if (v < 0) {
     return false;
   }
   if (p) {
-    *((int64*)p) = v;
+    *((int64_t*)p) = v;
   }
   return true;
 }
@@ -210,17 +210,17 @@ void IniSetting::Unbind(const char *name) {
 
 bool IniSetting::Get(CStrRef name, String &value) {
   if (name == "error_reporting") {
-    value = String((int64)g_context->getErrorReportingLevel());
+    value = String((int64_t)g_context->getErrorReportingLevel());
     return true;
   }
   if (name == "memory_limit") {
-    int64 v = g_context->getRequestMemoryMaxBytes();
+    int64_t v = g_context->getRequestMemoryMaxBytes();
     if (v == INT64_MAX) v = -1;
     value = String(v);
     return true;
   }
   if (name == "max_execution_time" || name == "maximum_execution_time") {
-    value = String((int64)g_context->getRequestTimeLimit());
+    value = String((int64_t)g_context->getRequestTimeLimit());
     return true;
   }
   if (name == "hphp.build_id") {
@@ -258,11 +258,11 @@ bool IniSetting::Get(CStrRef name, String &value) {
     return true;
   }
   if (name == "notice_frequency") {
-    value = String((int64)RuntimeOption::NoticeFrequency);
+    value = String((int64_t)RuntimeOption::NoticeFrequency);
     return true;
   }
   if (name == "warning_frequency") {
-    value = String((int64)RuntimeOption::WarningFrequency);
+    value = String((int64_t)RuntimeOption::WarningFrequency);
     return true;
   }
   if (name == "include_path") {
@@ -286,7 +286,7 @@ bool IniSetting::Set(CStrRef name, CStrRef value) {
   }
   if (name == "memory_limit") {
     if (!value.empty()) {
-      int64 newInt = value.toInt64();
+      int64_t newInt = value.toInt64();
       char lastChar = value.charAt(value.size() - 1);
       if (lastChar == 'K' || lastChar == 'k') {
         newInt <<= 10;
@@ -299,7 +299,7 @@ bool IniSetting::Set(CStrRef name, CStrRef value) {
       return true;
     }
   } else if (name == "max_execution_time" || name == "maximum_execution_time"){
-    int64 limit = value.toInt64();
+    int64_t limit = value.toInt64();
     TimeoutThread::DeferTimeout(limit);
     // Just for ini_get
     g_context->setRequestTimeLimit(limit);
diff --git a/hphp/runtime/base/md5.h b/hphp/runtime/base/md5.h
index 93e2aa5ef5205..3d324467717fc 100644
--- a/hphp/runtime/base/md5.h
+++ b/hphp/runtime/base/md5.h
@@ -28,7 +28,7 @@ namespace HPHP {
 
 static const char* kDefaultMD5 = "00000000000000000000000000000000";
 struct MD5 {
-  uint64 q[2];
+  uint64_t q[2];
   MD5(const char* str = kDefaultMD5) {
     if (str == kDefaultMD5) {
       q[0] = q[1] = 0;
@@ -57,8 +57,8 @@ struct MD5 {
 
   // blob is assumed to be in network byte order.
   MD5(const void* blob) {
-    q[0] = ntohq(((const uint64*)blob)[0]);
-    q[1] = ntohq(((const uint64*)blob)[1]);
+    q[0] = ntohq(((const uint64_t*)blob)[0]);
+    q[1] = ntohq(((const uint64_t*)blob)[1]);
   }
 
   // Copy out in network byte order.
@@ -89,7 +89,7 @@ struct MD5 {
     return !operator==(r);
   }
 
-  uint64 hash() const {
+  uint64_t hash() const {
     // hash_int64_pair does way more work than necessary; all the bits here
     // are fantastically good.
     return q[0];
diff --git a/hphp/runtime/base/memory/memory_manager.cpp b/hphp/runtime/base/memory/memory_manager.cpp
index a3d7256d4ad78..d665113e9f19b 100644
--- a/hphp/runtime/base/memory/memory_manager.cpp
+++ b/hphp/runtime/base/memory/memory_manager.cpp
@@ -81,7 +81,7 @@ static void threadStatsInit() {
   }
 }
 
-static inline void threadStats(uint64*& allocated, uint64*& deallocated,
+static inline void threadStats(uint64_t*& allocated, uint64_t*& deallocated,
                                size_t*& cactive, size_t& cactiveLimit) {
   pthread_once(&threadStatsOnce, threadStatsInit);
   if (!MemoryManager::s_statsEnabled) return;
@@ -179,8 +179,8 @@ void MemoryManager::resetStats() {
 #ifdef USE_JEMALLOC
   if (s_statsEnabled) {
     m_stats.jemallocDebt = 0;
-    m_prevAllocated = int64(*m_allocated);
-    m_delta = m_prevAllocated - int64(*m_deallocated);
+    m_prevAllocated = int64_t(*m_allocated);
+    m_delta = m_prevAllocated - int64_t(*m_deallocated);
   }
 #endif
 }
diff --git a/hphp/runtime/base/memory/memory_manager.h b/hphp/runtime/base/memory/memory_manager.h
index 65e5b25c7f49d..770a8fdfa379b 100644
--- a/hphp/runtime/base/memory/memory_manager.h
+++ b/hphp/runtime/base/memory/memory_manager.h
@@ -264,8 +264,8 @@ class MemoryManager : boost::noncopyable {
     // double-counting the malloced memory. Thus musage in the example
     // code may well substantially exceed m_stats.usage.
     if (s_statsEnabled) {
-      int64 delta = int64(*m_allocated) - int64(*m_deallocated);
-      int64 deltaAllocated = int64(*m_allocated) - m_prevAllocated;
+      int64_t delta = int64_t(*m_allocated) - int64_t(*m_deallocated);
+      int64_t deltaAllocated = int64_t(*m_allocated) - m_prevAllocated;
       if (hhvm) {
         stats.usage += delta - m_delta - stats.jemallocDebt;
         stats.jemallocDebt = 0;
@@ -275,7 +275,7 @@ class MemoryManager : boost::noncopyable {
       stats.totalAlloc += deltaAllocated;
       if (live) {
         m_delta = delta;
-        m_prevAllocated = int64(*m_allocated);
+        m_prevAllocated = int64_t(*m_allocated);
       }
     }
 #endif
@@ -319,8 +319,8 @@ class MemoryManager : boost::noncopyable {
 #ifdef USE_JEMALLOC
       // exclude mallocs and frees since construction
       if (s_statsEnabled) {
-        m_mm->m_prevAllocated = int64(*m_mm->m_allocated);
-        m_mm->m_delta = int64(*m_mm->m_allocated) - int64(*m_mm->m_deallocated);
+        m_mm->m_prevAllocated = int64_t(*m_mm->m_allocated);
+        m_mm->m_delta = int64_t(*m_mm->m_allocated) - int64_t(*m_mm->m_deallocated);
       }
 #endif
     }
@@ -363,10 +363,10 @@ class MemoryManager : boost::noncopyable {
   std::vector<char*> m_slabs;
 
 #ifdef USE_JEMALLOC
-  uint64* m_allocated;
-  uint64* m_deallocated;
-  int64  m_delta;
-  int64  m_prevAllocated;
+  uint64_t* m_allocated;
+  uint64_t* m_deallocated;
+  int64_t  m_delta;
+  int64_t  m_prevAllocated;
   size_t* m_cactive;
   size_t m_cactiveLimit;
 
diff --git a/hphp/runtime/base/memory/memory_usage_stats.h b/hphp/runtime/base/memory/memory_usage_stats.h
index 47eccb1558f41..2f0ec4371d7a1 100644
--- a/hphp/runtime/base/memory/memory_usage_stats.h
+++ b/hphp/runtime/base/memory/memory_usage_stats.h
@@ -25,21 +25,21 @@ namespace HPHP {
  * Usage stats, all in bytes.
  */
 struct MemoryUsageStats {
-  int64 maxBytes;   // what's request's max bytes allowed
-  int64 usage;      // how many bytes are currently being used
+  int64_t maxBytes;   // what's request's max bytes allowed
+  int64_t usage;      // how many bytes are currently being used
 #if defined(USE_JEMALLOC)
-  int64 jemallocDebt; // how many bytes of jemalloced memory have not
+  int64_t jemallocDebt; // how many bytes of jemalloced memory have not
                       // been processed by MemoryManager::refreshStats
-  int64 alloc;      // how many bytes are currently malloc-ed
+  int64_t alloc;      // how many bytes are currently malloc-ed
 #else
   union {
-    int64 jemallocDebt; // unused
-    int64 alloc;    // how many bytes are currently malloc-ed
+    int64_t jemallocDebt; // unused
+    int64_t alloc;    // how many bytes are currently malloc-ed
   };
 #endif
-  int64 peakUsage;  // how many bytes have been dispensed at maximum
-  int64 peakAlloc;  // how many bytes malloc-ed at maximum
-  int64 totalAlloc; // how many bytes allocated, in total.
+  int64_t peakUsage;  // how many bytes have been dispensed at maximum
+  int64_t peakAlloc;  // how many bytes malloc-ed at maximum
+  int64_t totalAlloc; // how many bytes allocated, in total.
 };
 
 #define JEMALLOC_STATS_ADJUST(stats, amt) \
diff --git a/hphp/runtime/base/object_data.cpp b/hphp/runtime/base/object_data.cpp
index 9d2af05d00531..5a0a36adcb421 100644
--- a/hphp/runtime/base/object_data.cpp
+++ b/hphp/runtime/base/object_data.cpp
@@ -117,7 +117,7 @@ bool ObjectData::o_isClass(const char *s) const {
   return strcasecmp(s, o_getClassName()) == 0;
 }
 
-int64 ObjectData::o_toInt64() const {
+int64_t ObjectData::o_toInt64() const {
   raise_notice("Object of class %s could not be converted to int",
                o_getClassName().data());
   return 1;
diff --git a/hphp/runtime/base/object_data.h b/hphp/runtime/base/object_data.h
index a18a022e1b698..aca311142da07 100644
--- a/hphp/runtime/base/object_data.h
+++ b/hphp/runtime/base/object_data.h
@@ -160,7 +160,7 @@ class ObjectData : public CountableNF {
 
   // overridable casting
   virtual bool   o_toBoolean() const { return true;}
-  virtual int64  o_toInt64() const;
+  virtual int64_t  o_toInt64() const;
   virtual double o_toDouble()  const { return o_toInt64();}
 
   void setDummy();
@@ -292,7 +292,7 @@ class ObjectData : public CountableNF {
 
   // this will be hopefully packed together with _count from parent class
  private:
-  mutable int16 o_attribute;     // various flags
+  mutable int16_t o_attribute;     // various flags
  protected:
   // 16 bits of unused memory that can be reused by subclasses
   union {
diff --git a/hphp/runtime/base/program_functions.cpp b/hphp/runtime/base/program_functions.cpp
index ecbd769415ace..4666d3a9485ce 100644
--- a/hphp/runtime/base/program_functions.cpp
+++ b/hphp/runtime/base/program_functions.cpp
@@ -1183,7 +1183,7 @@ void hphp_process_init() {
   for (InitFiniNode *in = extra_process_init; in; in = in->next) {
     in->func();
   }
-  int64 save = RuntimeOption::SerializationSizeLimit;
+  int64_t save = RuntimeOption::SerializationSizeLimit;
   RuntimeOption::SerializationSizeLimit = StringData::MaxSize;
   apc_load(RuntimeOption::ApcLoadThread);
   RuntimeOption::SerializationSizeLimit = save;
diff --git a/hphp/runtime/base/resource_data.h b/hphp/runtime/base/resource_data.h
index ed2fd99af0c6e..295534480787d 100644
--- a/hphp/runtime/base/resource_data.h
+++ b/hphp/runtime/base/resource_data.h
@@ -38,7 +38,7 @@ class ResourceData : public VM::Instance {
   virtual bool o_instanceof(CStrRef s) const { return false;}
   virtual bool isResource() const { return true;}
   virtual String t___tostring();
-  virtual int64 o_toInt64() const { return o_getId();}
+  virtual int64_t o_toInt64() const { return o_getId();}
   void o_setId(int id); // only for BuiltinFiles
   virtual void serializeImpl(VariableSerializer *serializer) const;
   virtual CStrRef o_getResourceName() const;
diff --git a/hphp/runtime/base/runtime_error.cpp b/hphp/runtime/base/runtime_error.cpp
index e772a60fcbdcf..b05bca15bea5a 100644
--- a/hphp/runtime/base/runtime_error.cpp
+++ b/hphp/runtime/base/runtime_error.cpp
@@ -99,7 +99,7 @@ void raise_strict_warning(const char *fmt, ...) {
                          "HipHop Strict Warning:  ");
 }
 
-static int64 g_warning_counter = 0;
+static int64_t g_warning_counter = 0;
 
 void raise_warning(const std::string &msg) {
   if (RuntimeOption::WarningFrequency <= 0 ||
@@ -151,7 +151,7 @@ void raise_debugging(const char *fmt, ...) {
   raise_debugging(msg);
 }
 
-static int64 g_notice_counter = 0;
+static int64_t g_notice_counter = 0;
 
 void raise_notice(const std::string &msg) {
   if (RuntimeOption::NoticeFrequency <= 0 ||
diff --git a/hphp/runtime/base/runtime_option.cpp b/hphp/runtime/base/runtime_option.cpp
index 4fef02ac2ea56..8e428b8339e0b 100644
--- a/hphp/runtime/base/runtime_option.cpp
+++ b/hphp/runtime/base/runtime_option.cpp
@@ -78,8 +78,8 @@ bool RuntimeOption::AssertActive = false;
 bool RuntimeOption::AssertWarning = false;
 int RuntimeOption::NoticeFrequency = 1;
 int RuntimeOption::WarningFrequency = 1;
-int64 RuntimeOption::SerializationSizeLimit = StringData::MaxSize;
-int64 RuntimeOption::StringOffsetLimit = 10 * 1024 * 1024; // 10MB
+int64_t RuntimeOption::SerializationSizeLimit = StringData::MaxSize;
+int64_t RuntimeOption::StringOffsetLimit = 10 * 1024 * 1024; // 10MB
 
 std::string RuntimeOption::AccessLogDefaultFormat;
 std::vector<AccessLogFileData> RuntimeOption::AccessLogs;
@@ -114,8 +114,8 @@ bool RuntimeOption::PageletServerThreadDropStack = false;
 int RuntimeOption::FiberCount = 1;
 int RuntimeOption::RequestTimeoutSeconds = 0;
 size_t RuntimeOption::ServerMemoryHeadRoom = 0;
-int64 RuntimeOption::RequestMemoryMaxBytes = INT64_MAX;
-int64 RuntimeOption::ImageMemoryMaxBytes = 0;
+int64_t RuntimeOption::RequestMemoryMaxBytes = INT64_MAX;
+int64_t RuntimeOption::ImageMemoryMaxBytes = 0;
 int RuntimeOption::ResponseQueueCount;
 int RuntimeOption::ServerGracefulShutdownWait;
 bool RuntimeOption::ServerHarshShutdown = true;
@@ -139,9 +139,9 @@ std::string RuntimeOption::OutputHandler;
 bool RuntimeOption::ImplicitFlush = false;
 bool RuntimeOption::EnableEarlyFlush = true;
 bool RuntimeOption::ForceChunkedEncoding = false;
-int64 RuntimeOption::MaxPostSize;
+int64_t RuntimeOption::MaxPostSize;
 bool RuntimeOption::AlwaysPopulateRawPostData = true;
-int64 RuntimeOption::UploadMaxFileSize;
+int64_t RuntimeOption::UploadMaxFileSize;
 std::string RuntimeOption::UploadTmpDir;
 bool RuntimeOption::EnableFileUploads;
 bool RuntimeOption::EnableUploadProgress;
@@ -297,11 +297,11 @@ bool RuntimeOption::EnableAPCSizeDetail = false;
 bool RuntimeOption::EnableAPCFetchStats = false;
 bool RuntimeOption::APCSizeCountPrime = false;
 
-int64 RuntimeOption::MaxRSS = 0;
-int64 RuntimeOption::MaxRSSPollingCycle = 0;
-int64 RuntimeOption::DropCacheCycle = 0;
-int64 RuntimeOption::MaxSQLRowCount = 10000;
-int64 RuntimeOption::MaxMemcacheKeyCount = 0;
+int64_t RuntimeOption::MaxRSS = 0;
+int64_t RuntimeOption::MaxRSSPollingCycle = 0;
+int64_t RuntimeOption::DropCacheCycle = 0;
+int64_t RuntimeOption::MaxSQLRowCount = 10000;
+int64_t RuntimeOption::MaxMemcacheKeyCount = 0;
 int RuntimeOption::SocketDefaultTimeout = 5;
 bool RuntimeOption::LockCodeMemory = false;
 bool RuntimeOption::EnableMemoryManager = true;
@@ -1118,11 +1118,13 @@ void RuntimeOption::Load(Hdf &config, StringVec *overwrites /* = NULL */,
 #define get_string getString
 #define get_int16 getInt16
 #define get_int32 getInt32
+#define get_int32_t getInt32
 #define get_int64 getInt64
 #define get_uint16 getUInt16
 #define get_uint32 getUInt32
 #define get_uint32_t getUInt32
 #define get_uint64 getUInt64
+#define get_uint64_t getUInt64
 #define F(type, name, defaultVal) \
     Eval ## name = eval[#name].get_ ##type(defaultVal);
     EVALFLAGS()
diff --git a/hphp/runtime/base/runtime_option.h b/hphp/runtime/base/runtime_option.h
index 3ff38f51bf668..0016056cba742 100644
--- a/hphp/runtime/base/runtime_option.h
+++ b/hphp/runtime/base/runtime_option.h
@@ -76,8 +76,8 @@ class RuntimeOption {
   static bool AssertWarning;
   static int NoticeFrequency; // output 1 out of NoticeFrequency notices
   static int WarningFrequency;
-  static int64 SerializationSizeLimit;
-  static int64 StringOffsetLimit;
+  static int64_t SerializationSizeLimit;
+  static int64_t StringOffsetLimit;
 
   static std::string AccessLogDefaultFormat;
   static std::vector<AccessLogFileData> AccessLogs;
@@ -112,8 +112,8 @@ class RuntimeOption {
   static int FiberCount;
   static int RequestTimeoutSeconds;
   static size_t ServerMemoryHeadRoom;
-  static int64 RequestMemoryMaxBytes;
-  static int64 ImageMemoryMaxBytes;
+  static int64_t RequestMemoryMaxBytes;
+  static int64_t ImageMemoryMaxBytes;
   static int ResponseQueueCount;
   static int ServerGracefulShutdownWait;
   static int ServerDanglingWait;
@@ -137,9 +137,9 @@ class RuntimeOption {
   static bool ImplicitFlush;
   static bool EnableEarlyFlush;
   static bool ForceChunkedEncoding;
-  static int64 MaxPostSize;
+  static int64_t MaxPostSize;
   static bool AlwaysPopulateRawPostData;
-  static int64 UploadMaxFileSize;
+  static int64_t UploadMaxFileSize;
   static std::string UploadTmpDir;
   static bool EnableFileUploads;
   static bool EnableUploadProgress;
@@ -291,15 +291,15 @@ class RuntimeOption {
   static bool EnableAPCFetchStats;
   static bool APCSizeCountPrime;
   static bool EnableHotProfiler;
-  static int32 ProfilerTraceBuffer;
+  static int32_t ProfilerTraceBuffer;
   static double ProfilerTraceExpansion;
-  static int32 ProfilerMaxTraceBuffer;
+  static int32_t ProfilerMaxTraceBuffer;
 
-  static int64 MaxRSS;
-  static int64 MaxRSSPollingCycle;
-  static int64 DropCacheCycle;
-  static int64 MaxSQLRowCount;
-  static int64 MaxMemcacheKeyCount;
+  static int64_t MaxRSS;
+  static int64_t MaxRSSPollingCycle;
+  static int64_t DropCacheCycle;
+  static int64_t MaxSQLRowCount;
+  static int64_t MaxMemcacheKeyCount;
   static int  SocketDefaultTimeout;
   static bool LockCodeMemory;
   static bool EnableMemoryManager;
@@ -328,8 +328,8 @@ class RuntimeOption {
   static bool ApcAllowObj;
   static int ApcTTLLimit;
   static bool ApcUseFileStorage;
-  static int64 ApcFileStorageChunkSize;
-  static int64 ApcFileStorageMaxSize;
+  static int64_t ApcFileStorageChunkSize;
+  static int64_t ApcFileStorageMaxSize;
   static std::string ApcFileStoragePrefix;
   static int ApcFileStorageAdviseOutPeriod;
   static std::string ApcFileStorageFlagKey;
@@ -379,7 +379,7 @@ class RuntimeOption {
   /*
    * Maximum number of elements on the VM execution stack.
    */ \
-  F(uint64, VMStackElms, kEvalVMStackElmsDefault) \
+  F(uint64_t, VMStackElms, kEvalVMStackElmsDefault) \
   /*
    * Initial space reserved for the global variable environment (in
    * number of global variables).
@@ -390,16 +390,16 @@ class RuntimeOption {
   F(bool, AllowHhas,                   false) \
   F(bool, JitNoGdb,                    true) \
   F(bool, PerfPidMap,                  true) \
-  F(uint32, JitTargetCacheSize,        64 << 20) \
+  F(uint32_t, JitTargetCacheSize,        64 << 20) \
   F(bool, ProfileBC,                   false) \
   F(bool, ProfileHWEnable,             true) \
   F(string, ProfileHWEvents,           string("")) \
   F(bool, JitTrampolines,              true) \
   F(string, JitProfilePath,            string("")) \
-  F(int32, JitStressTypePredPercent,   0) \
-  F(uint32, JitWarmupRequests,         kDefaultWarmupRequests) \
+  F(int32_t, JitStressTypePredPercent,   0) \
+  F(uint32_t, JitWarmupRequests,         kDefaultWarmupRequests) \
   F(bool, JitProfileRecord,            false) \
-  F(uint32, GdbSyncChunks,             128) \
+  F(uint32_t, GdbSyncChunks,             128) \
   F(bool, JitStressLease,              false) \
   F(bool, JitKeepDbgFiles,             false) \
   F(bool, JitEnableRenameFunction,     false) \
@@ -418,7 +418,7 @@ class RuntimeOption {
   F(bool, HHIRJumpOpts,                true) \
   F(bool, HHIRExtraOptPass,            true) \
   F(bool, HHIRMemOpt,                  true) \
-  F(uint32, HHIRNumFreeRegs,           -1) \
+  F(uint32_t, HHIRNumFreeRegs,           -1) \
   F(bool, HHIREnableRematerialization, true) \
   F(bool, HHIREnableCalleeSavedOpt,    true) \
   F(bool, HHIREnablePreColoring,       true) \
@@ -429,14 +429,14 @@ class RuntimeOption {
   F(bool, HHIRGenerateAsserts,         debug) \
   F(bool, HHIRDirectExit,              true) \
   F(bool, HHIRDisableTx64,             false) \
-  F(uint64, MaxHHIRTrans,              -1) \
+  F(uint64_t, MaxHHIRTrans,              -1) \
   F(bool, HHIRDeadCodeElim,            true) \
   F(bool, DumpBytecode,                false) \
-  F(uint32, DumpIR,                    0) \
+  F(uint32_t, DumpIR,                    0) \
   F(bool, DumpTC,                      false) \
   F(bool, DumpAst,                     false) \
   F(bool, MapTCHuge,                   true) \
-  F(uint32, ConstEstimate,             10000) \
+  F(uint32_t, ConstEstimate,             10000) \
 
 #define F(type, name, unused) \
   static type Eval ## name;
diff --git a/hphp/runtime/base/server/access_log.cpp b/hphp/runtime/base/server/access_log.cpp
index b6273c4a1df33..f58811ef0c717 100644
--- a/hphp/runtime/base/server/access_log.cpp
+++ b/hphp/runtime/base/server/access_log.cpp
@@ -394,7 +394,7 @@ bool AccessLog::genField(std::ostringstream &out, const char* &format,
     break;
   case 'Y':
     {
-      int64 now = HardwareCounter::GetInstructionCount();
+      int64_t now = HardwareCounter::GetInstructionCount();
       out << now - transport->getInstructions();
     }
     break;
diff --git a/hphp/runtime/base/server/access_log.h b/hphp/runtime/base/server/access_log.h
index d7a252511a695..ca9d122f6588e 100644
--- a/hphp/runtime/base/server/access_log.h
+++ b/hphp/runtime/base/server/access_log.h
@@ -42,7 +42,7 @@ class AccessLog {
   public:
     ThreadData() : log(nullptr), bytesWritten(0), prevBytesWritten(0) {}
     FILE *log;
-    int64 startTime;
+    int64_t startTime;
     int bytesWritten;
     int prevBytesWritten;
   };
diff --git a/hphp/runtime/base/server/admin_request_handler.cpp b/hphp/runtime/base/server/admin_request_handler.cpp
index 2e7ba8e1d13c7..1e6f646becc66 100644
--- a/hphp/runtime/base/server/admin_request_handler.cpp
+++ b/hphp/runtime/base/server/admin_request_handler.cpp
@@ -526,8 +526,8 @@ static bool toggle_switch(Transport *transport, bool &setting) {
 
 static bool send_report(Transport *transport, ServerStats::Format format,
                         const char *mime) {
-  int64  from   = transport->getInt64Param ("from");
-  int64  to     = transport->getInt64Param ("to");
+  int64_t  from   = transport->getInt64Param ("from");
+  int64_t  to     = transport->getInt64Param ("to");
   string agg    = transport->getParam      ("agg");
   string keys   = transport->getParam      ("keys");
   string url    = transport->getParam      ("url");
@@ -574,7 +574,7 @@ bool AdminRequestHandler::handleCheckRequest(const std::string &cmd,
     std::stringstream out;
     bool first = true;
     out << "{" << endl;
-    auto appendStat = [&](const char* name, int64 value) {
+    auto appendStat = [&](const char* name, int64_t value) {
        out << (!first ? "," : "") << "  \"" << name << "\":" << value << endl;
        first = false;
     };
@@ -681,8 +681,8 @@ bool AdminRequestHandler::handleStatsRequest(const std::string &cmd,
   }
 
   if (cmd == "stats.keys") {
-    int64 from = transport->getInt64Param("from");
-    int64 to = transport->getInt64Param("to");
+    int64_t from = transport->getInt64Param("from");
+    int64_t to = transport->getInt64Param("to");
     string out;
     ServerStats::GetKeys(out, from, to);
     transport->sendString(out);
@@ -997,7 +997,7 @@ bool AdminRequestHandler::handleVMRequest(const std::string &cmd,
     return true;
   }
   if (cmd == "vm-tcreset") {
-    int64 start = Timer::GetCurrentTimeMicros();
+    int64_t start = Timer::GetCurrentTimeMicros();
     if (HPHP::VM::Transl::tx64->replace()) {
       string msg;
       Util::string_printf(msg, "Done %ld ms",
diff --git a/hphp/runtime/base/server/http_server.cpp b/hphp/runtime/base/server/http_server.cpp
index f7143f4a5e2a1..0c42bb6fb4fa4 100644
--- a/hphp/runtime/base/server/http_server.cpp
+++ b/hphp/runtime/base/server/http_server.cpp
@@ -331,7 +331,7 @@ void HttpServer::createPid() {
     if (f) {
       pid_t pid = Process::GetProcessId();
       char buf[64];
-      snprintf(buf, sizeof(buf), "%" PRId64, (int64)pid);
+      snprintf(buf, sizeof(buf), "%" PRId64, (int64_t)pid);
       fwrite(buf, strlen(buf), 1, f);
       fclose(f);
     } else {
@@ -351,7 +351,7 @@ void HttpServer::killPid() {
   if (!RuntimeOption::PidFile.empty()) {
     CstrBuffer sb(RuntimeOption::PidFile.c_str());
     if (sb.size()) {
-      int64 pid = sb.detach().toInt64();
+      int64_t pid = sb.detach().toInt64();
       if (pid) {
         kill((pid_t)pid, SIGKILL);
         return;
diff --git a/hphp/runtime/base/server/libevent_server.cpp b/hphp/runtime/base/server/libevent_server.cpp
index 8fda41bfdf484..4976b33cdfe8f 100644
--- a/hphp/runtime/base/server/libevent_server.cpp
+++ b/hphp/runtime/base/server/libevent_server.cpp
@@ -58,7 +58,7 @@ void LibEventJob::stopTimer() {
     gettime(CLOCK_MONOTONIC, &end);
     time_t dsec = end.tv_sec - start.tv_sec;
     long dnsec = end.tv_nsec - start.tv_nsec;
-    int64 dusec = dsec * 1000000 + dnsec / 1000;
+    int64_t dusec = dsec * 1000000 + dnsec / 1000;
     ServerStats::Log("page.wall.queuing", dusec);
 
 #ifdef EVHTTP_CONNECTION_GET_START
@@ -421,7 +421,7 @@ void LibEventServer::onResponse(int worker, evhttp_request *request,
     nwritten = evhttp_send_reply_sync_begin(request, code, reason, nullptr);
 #endif
     gettime(CLOCK_MONOTONIC, &end);
-    int64 delay = gettime_diff_us(begin, end);
+    int64_t delay = gettime_diff_us(begin, end);
     transport->onFlushBegin(totalSize);
     transport->onFlushProgress(nwritten, delay);
   }
diff --git a/hphp/runtime/base/server/libevent_transport.cpp b/hphp/runtime/base/server/libevent_transport.cpp
index 12b0bd4df8778..49045bba6165d 100644
--- a/hphp/runtime/base/server/libevent_transport.cpp
+++ b/hphp/runtime/base/server/libevent_transport.cpp
@@ -97,7 +97,7 @@ const char *LibEventTransport::getRemoteHost() {
   return m_remote_host.c_str();
 }
 
-uint16 LibEventTransport::getRemotePort() {
+uint16_t LibEventTransport::getRemotePort() {
   return m_remote_port;
 }
 
diff --git a/hphp/runtime/base/server/libevent_transport.h b/hphp/runtime/base/server/libevent_transport.h
index 95aad6ccf6c38..df990cf5b1e7f 100644
--- a/hphp/runtime/base/server/libevent_transport.h
+++ b/hphp/runtime/base/server/libevent_transport.h
@@ -34,7 +34,7 @@ class LibEventTransport : public Transport {
    */
   virtual const char *getUrl();
   virtual const char *getRemoteHost();
-  virtual uint16 getRemotePort();
+  virtual uint16_t getRemotePort();
   virtual const void *getPostData(int &size);
   virtual bool hasMorePostData();
   virtual const void *getMorePostData(int &size);
@@ -60,7 +60,7 @@ class LibEventTransport : public Transport {
   int m_workerId;
   std::string m_url;
   std::string m_remote_host;
-  uint16 m_remote_port;
+  uint16_t m_remote_port;
   std::string m_http_version;
   Method m_method;
   const char *m_extended_method;
diff --git a/hphp/runtime/base/server/pagelet_server.cpp b/hphp/runtime/base/server/pagelet_server.cpp
index 3e453add7e45f..e2507370a31b9 100644
--- a/hphp/runtime/base/server/pagelet_server.cpp
+++ b/hphp/runtime/base/server/pagelet_server.cpp
@@ -84,7 +84,7 @@ class PageletTransport : public Transport, public Synchronizable {
   virtual const char *getRemoteHost() {
     return m_remoteHost.c_str();
   }
-  virtual uint16 getRemotePort() {
+  virtual uint16_t getRemotePort() {
     return 0;
   }
   virtual const void *getPostData(int &size) {
@@ -158,7 +158,7 @@ class PageletTransport : public Transport, public Synchronizable {
     return m_pipeline.empty();
   }
 
-  String getResults(Array &headers, int &code, int64 timeout_ms) {
+  String getResults(Array &headers, int &code, int64_t timeout_ms) {
     {
       Lock lock(this);
       while (!m_done && m_pipeline.empty()) {
@@ -327,7 +327,7 @@ Object PageletServer::TaskStart(CStrRef url, CArrRef headers,
   return ret;
 }
 
-int64 PageletServer::TaskStatus(CObjRef task) {
+int64_t PageletServer::TaskStatus(CObjRef task) {
   PageletTask *ptask = task.getTyped<PageletTask>();
   PageletTransport *job = ptask->getJob();
   if (!job->isPipelineEmpty()) {
@@ -340,7 +340,7 @@ int64 PageletServer::TaskStatus(CObjRef task) {
 }
 
 String PageletServer::TaskResult(CObjRef task, Array &headers, int &code,
-                                 int64 timeout_ms) {
+                                 int64_t timeout_ms) {
   PageletTask *ptask = task.getTyped<PageletTask>();
   return ptask->getJob()->getResults(headers, code, timeout_ms);
 }
diff --git a/hphp/runtime/base/server/pagelet_server.h b/hphp/runtime/base/server/pagelet_server.h
index 4643d30452499..1cbcc40b84ee8 100644
--- a/hphp/runtime/base/server/pagelet_server.h
+++ b/hphp/runtime/base/server/pagelet_server.h
@@ -40,7 +40,7 @@ class PageletServer {
    * Query if a task is finished. This is non-blocking and can be called as
    * many times as desired.
    */
-  static int64 TaskStatus(CObjRef task);
+  static int64_t TaskStatus(CObjRef task);
 
   /**
    * Get results of a task. This is blocking until task is finished or times
@@ -49,7 +49,7 @@ class PageletServer {
   static String TaskResult(CObjRef task,
                            Array &headers,
                            int &code,
-                           int64 timeout_ms);
+                           int64_t timeout_ms);
 
   /**
    * Add a piece of response to the pipeline.
diff --git a/hphp/runtime/base/server/replay_transport.cpp b/hphp/runtime/base/server/replay_transport.cpp
index 3688218ed3c95..f2a534da7a0bc 100644
--- a/hphp/runtime/base/server/replay_transport.cpp
+++ b/hphp/runtime/base/server/replay_transport.cpp
@@ -31,7 +31,7 @@ void ReplayTransport::recordInput(Transport* transport, const char *filename) {
   char buf[32];
   snprintf(buf, sizeof(buf), "%u", Process::GetProcessId());
   hdf["pid"] = string(buf);
-  snprintf(buf, sizeof(buf), "%" PRIx64, (int64)Process::GetThreadId());
+  snprintf(buf, sizeof(buf), "%" PRIx64, (int64_t)Process::GetThreadId());
   hdf["tid"] = string(buf);
   snprintf(buf, sizeof(buf), "%u", Process::GetThreadPid());
   hdf["tpid"] = string(buf);
@@ -93,7 +93,7 @@ const char *ReplayTransport::getUrl() {
 const char *ReplayTransport::getRemoteHost() {
   return m_hdf["remote_host"].get("");
 }
-uint16 ReplayTransport::getRemotePort() {
+uint16_t ReplayTransport::getRemotePort() {
   return m_hdf["remote_port"].getUInt16(0);
 }
 
diff --git a/hphp/runtime/base/server/replay_transport.h b/hphp/runtime/base/server/replay_transport.h
index 0e26f90c60a80..c1d4957038064 100644
--- a/hphp/runtime/base/server/replay_transport.h
+++ b/hphp/runtime/base/server/replay_transport.h
@@ -43,7 +43,7 @@ class ReplayTransport : public Transport {
    */
   virtual const char *getUrl();
   virtual const char *getRemoteHost();
-  virtual uint16 getRemotePort();
+  virtual uint16_t getRemotePort();
   virtual const void *getPostData(int &size);
   virtual Method getMethod();
   virtual std::string getHeader(const char *name);
diff --git a/hphp/runtime/base/server/server_stats.cpp b/hphp/runtime/base/server/server_stats.cpp
index b55526ad466cb..db200a9f66dae 100644
--- a/hphp/runtime/base/server/server_stats.cpp
+++ b/hphp/runtime/base/server/server_stats.cpp
@@ -326,7 +326,7 @@ class Writer {
   virtual void writeEntry(const char *name, const std::string &value) = 0;
 
   // Writes a string value with a given name.
-  virtual void writeEntry(const char *name, int64 value) = 0;
+  virtual void writeEntry(const char *name, int64_t value) = 0;
 
   // Ends the writing of an object.
   virtual void endObject(const char *name) = 0;
@@ -388,7 +388,7 @@ class XMLWriter : public Writer {
     m_out << "<value>" << Escape(value.c_str()) << "</value></entry>\n";
   }
 
-  virtual void writeEntry(const char *name, int64 value) {
+  virtual void writeEntry(const char *name, int64_t value) {
     writeIndent();
     m_out << "<entry><key>" << Escape(name) << "</key>";
     m_out << "<value>" << value << "</value></entry>\n";
@@ -524,7 +524,7 @@ class JSONWriter : public Writer {
     m_out << "\"" << JSON::Escape(value.c_str()) << "\"\n";
   }
 
-  virtual void writeEntry(const char *name, int64 value) {
+  virtual void writeEntry(const char *name, int64_t value) {
     beginEntity(name);
 
     // Now write the actual value
@@ -575,7 +575,7 @@ class HTMLWriter : public Writer {
     m_out << "<td>" << Escape(value.c_str()) << "</td></tr>\n";
   }
 
-  virtual void writeEntry(const char *name, int64 value) {
+  virtual void writeEntry(const char *name, int64_t value) {
     writeIndent();
     m_out << "<tr><td>" << Escape(name) << "</td>";
     m_out << "<td>" << value << "</td></tr>\n";
@@ -609,13 +609,13 @@ void ServerStats::LogPage(const string &url, int code) {
   }
 }
 
-void ServerStats::Log(const string &name, int64 value) {
+void ServerStats::Log(const string &name, int64_t value) {
   if (RuntimeOption::EnableStats && RuntimeOption::EnableWebStats) {
     ServerStats::s_logger->log(name, value);
   }
 }
 
-void ServerStats::LogBytes(int64 bytes) {
+void ServerStats::LogBytes(int64_t bytes) {
   if (RuntimeOption::EnableStats && RuntimeOption::EnableWebStats) {
     ServerStats::s_logger->logBytes(bytes);
   }
@@ -637,7 +637,7 @@ void ServerStats::SetThreadIOStatusAddress(const char *name) {
 }
 
 void ServerStats::SetThreadIOStatus(const char *name, const char *addr,
-                                    int64 usWallTime /* = -1 */) {
+                                    int64_t usWallTime /* = -1 */) {
   ServerStats::s_logger->setThreadIOStatus(name, addr, usWallTime);
 }
 
@@ -645,7 +645,7 @@ Array ServerStats::GetThreadIOStatuses() {
   return ServerStats::s_logger->getThreadIOStatuses();
 }
 
-int64 ServerStats::Get(const string &name) {
+int64_t ServerStats::Get(const string &name) {
   return ServerStats::s_logger->get(name);
 }
 
@@ -660,7 +660,7 @@ void ServerStats::Clear() {
   }
 }
 
-void ServerStats::CollectSlots(list<TimeSlot*> &slots, int64 from, int64 to) {
+void ServerStats::CollectSlots(list<TimeSlot*> &slots, int64_t from, int64_t to) {
   if (from < 0 || to <= 0) {
     time_t now = time(nullptr);
     if (from < 0) from = now + from;
@@ -676,7 +676,7 @@ void ServerStats::CollectSlots(list<TimeSlot*> &slots, int64 from, int64 to) {
   }
 }
 
-void ServerStats::GetKeys(string &out, int64 from, int64 to) {
+void ServerStats::GetKeys(string &out, int64_t from, int64_t to) {
   list<TimeSlot*> slots;
   CollectSlots(slots, from, to);
   set<string> allKeys;
@@ -688,7 +688,7 @@ void ServerStats::GetKeys(string &out, int64 from, int64 to) {
   }
 }
 
-void ServerStats::Report(string &out, Format format, int64 from, int64 to,
+void ServerStats::Report(string &out, Format format, int64_t from, int64_t to,
                          const std::string &agg, const std::string &keys,
                          const std::string &url, int code,
                          const std::string &prefix) {
@@ -847,7 +847,7 @@ void ServerStats::ReportStatus(std::string &output, Format format) {
   w->beginObject("status");
 
   w->beginObject("process");
-  w->writeEntry("id", (int64)Process::GetProcessId());
+  w->writeEntry("id", (int64_t)Process::GetProcessId());
   w->writeEntry("build", RuntimeOption::BuildId);
 
   w->writeEntry("compiler", kCompilerId);
@@ -900,7 +900,7 @@ void ServerStats::ReportStatus(std::string &output, Format format) {
     }
 
     w->beginObject("thread");
-    w->writeEntry("id", (int64)ts.m_threadId);
+    w->writeEntry("id", (int64_t)ts.m_threadId);
     w->writeEntry("req", ts.m_requestCount);
     w->writeEntry("bytes", ts.m_writeBytes);
     w->writeEntry("start", DateTime(ts.m_start.tv_sec).
@@ -1018,11 +1018,11 @@ ServerStats::~ServerStats() {
   }
 }
 
-void ServerStats::log(const string &name, int64 value) {
+void ServerStats::log(const string &name, int64_t value) {
   m_values[name] += value;
 }
 
-int64 ServerStats::get(const std::string &name) {
+int64_t ServerStats::get(const std::string &name) {
   CounterMap::const_iterator iter = m_values.find(name);
   if (iter != m_values.end()) {
     return iter->second;
@@ -1031,13 +1031,13 @@ int64 ServerStats::get(const std::string &name) {
 }
 
 void ServerStats::logPage(const string &url, int code) {
-  int64 now = time(nullptr) / RuntimeOption::StatsSlotDuration;
+  int64_t now = time(nullptr) / RuntimeOption::StatsSlotDuration;
   int slot = now % RuntimeOption::StatsMaxSlot;
 
   {
     Lock lock(m_lock, false);
     int count = 0;
-    for (int64 t = m_last + 1; t < now; t++) {
+    for (int64_t t = m_last + 1; t < now; t++) {
       m_slots[t % RuntimeOption::StatsMaxSlot].m_time = 0;
       if (++count > RuntimeOption::StatsMaxSlot) {
         break; // we have cleared all slots, good enough
@@ -1081,9 +1081,9 @@ void ServerStats::clear() {
   }
 }
 
-void ServerStats::collect(std::list<TimeSlot*> &slots, int64 from, int64 to) {
+void ServerStats::collect(std::list<TimeSlot*> &slots, int64_t from, int64_t to) {
   if (from > to) {
-    int64 tmp = from;
+    int64_t tmp = from;
     from = to;
     to = tmp;
   }
@@ -1092,7 +1092,7 @@ void ServerStats::collect(std::list<TimeSlot*> &slots, int64 from, int64 to) {
 
   Lock lock(m_lock, false);
   list<TimeSlot*> collected;
-  for (int64 t = from; t <= to; t++) {
+  for (int64_t t = from; t <= to; t++) {
     int slot = t % RuntimeOption::StatsMaxSlot;
     if (m_slots[slot].m_time == t) {
       collected.push_back(&m_slots[slot]);
@@ -1101,7 +1101,7 @@ void ServerStats::collect(std::list<TimeSlot*> &slots, int64 from, int64 to) {
   Merge(slots, collected);
 }
 
-void ServerStats::logBytes(int64 bytes) {
+void ServerStats::logBytes(int64_t bytes) {
   m_threadStatus.m_writeBytes += bytes;
 }
 
@@ -1140,7 +1140,7 @@ void ServerStats::setThreadIOStatusAddress(const char *name) {
 }
 
 void ServerStats::setThreadIOStatus(const char *name, const char *addr,
-                                    int64 usWallTime /* = -1 */) {
+                                    int64_t usWallTime /* = -1 */) {
   bool starting = ((name && *name) || (addr && *addr));
 
   if (starting) {
@@ -1165,7 +1165,7 @@ void ServerStats::setThreadIOStatus(const char *name, const char *addr,
     m_threadStatus.m_ioInProcess = false;
 
     if (RuntimeOption::EnableNetworkIOStatus || s_profile_network) {
-      int64 wt = usWallTime;
+      int64_t wt = usWallTime;
       if (wt < 0) {
         timespec now;
         gettime(CLOCK_MONOTONIC, &now);
@@ -1227,7 +1227,7 @@ Array ServerStats::getThreadIOStatuses() {
 ///////////////////////////////////////////////////////////////////////////////
 
 ServerStatsHelper::ServerStatsHelper(const char *section,
-                                     uint32 track /* = false */)
+                                     uint32_t track /* = false */)
   : m_section(section), m_instStart(0), m_track(track) {
   if (RuntimeOption::EnableStats && RuntimeOption::EnableWebStats) {
     gettime(CLOCK_MONOTONIC, &m_wallStart);
@@ -1249,12 +1249,12 @@ ServerStatsHelper::~ServerStatsHelper() {
 
     if (m_track & TRACK_MEMORY) {
       MemoryManager *mm = MemoryManager::TheMemoryManager();
-      int64 mem = mm->getStats(true).peakUsage;
+      int64_t mem = mm->getStats(true).peakUsage;
       ServerStats::Log(string("mem.") + m_section, mem);
     }
 
     if (m_track & TRACK_HWINST) {
-      int64 instEnd = HardwareCounter::GetInstructionCount();
+      int64_t instEnd = HardwareCounter::GetInstructionCount();
       logTime("page.inst.", m_instStart, instEnd);
     }
   }
@@ -1266,7 +1266,7 @@ void ServerStatsHelper::logTime(const std::string &prefix,
 }
 
 void ServerStatsHelper::logTime(const std::string &prefix,
-                                const int64 &start, const int64 &end) {
+                                const int64_t &start, const int64_t &end) {
   ServerStats::Log(prefix + m_section, end - start);
 }
 
@@ -1319,7 +1319,7 @@ void set_curl_statuses(CURL *cp, const char *url) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void server_stats_log_mutex(const std::string &stack, int64 elapsed_us) {
+void server_stats_log_mutex(const std::string &stack, int64_t elapsed_us) {
   char buf[128];
   snprintf(buf, sizeof(buf), "mutex.%s.", stack.c_str());
   ServerStats::Log(string(buf) + "hit", 1);
diff --git a/hphp/runtime/base/server/server_stats.h b/hphp/runtime/base/server/server_stats.h
index 284d9ce2d6877..2dbaeb7a3926d 100644
--- a/hphp/runtime/base/server/server_stats.h
+++ b/hphp/runtime/base/server/server_stats.h
@@ -44,19 +44,19 @@ class ServerStats {
   };
 
 public:
-  static void Log(const std::string &name, int64 value);
-  static int64 Get(const std::string &name);
+  static void Log(const std::string &name, int64_t value);
+  static int64_t Get(const std::string &name);
   static void LogPage(const std::string &url, int code);
   static void Reset();
   static void Clear();
-  static void GetKeys(std::string &out, int64 from, int64 to);
-  static void Report(std::string &out, Format format, int64 from, int64 to,
+  static void GetKeys(std::string &out, int64_t from, int64_t to);
+  static void Report(std::string &out, Format format, int64_t from, int64_t to,
                      const std::string &agg, const std::string &keys,
                      const std::string &url, int code,
                      const std::string &prefix);
 
   // thread status functions
-  static void LogBytes(int64 bytes);
+  static void LogBytes(int64_t bytes);
   static void StartRequest(const char *url, const char *clientIP,
                            const char *vhost);
   static void SetThreadMode(ThreadMode mode);
@@ -65,7 +65,7 @@ class ServerStats {
   // io status functions
   static void SetThreadIOStatusAddress(const char *name);
   static void SetThreadIOStatus(const char *name, const char *addr,
-                                int64 usWallTime = -1);
+                                int64_t usWallTime = -1);
   static Array GetThreadIOStatuses();
   static void StartNetworkProfile();
   static Array EndNetworkProfile();
@@ -90,7 +90,7 @@ class ServerStats {
   static std::vector<ServerStats*> s_loggers;
   static DECLARE_THREAD_LOCAL_NO_CHECK(ServerStats, s_logger);
 
-  typedef hphp_shared_string_map<int64> CounterMap;
+  typedef hphp_shared_string_map<int64_t> CounterMap;
 
   struct PageStats {
     std::string m_url; // which page
@@ -100,7 +100,7 @@ class ServerStats {
   };
   typedef hphp_shared_string_map<PageStats> PageStatsMap;
   struct TimeSlot {
-    int64 m_time;
+    int64_t m_time;
     PageStatsMap m_pages;
   };
 
@@ -114,7 +114,7 @@ class ServerStats {
   static void Aggregate(std::list<TimeSlot*> &slots, const std::string &agg,
                         std::map<std::string, int> &wantedKeys);
 
-  static void CollectSlots(std::list<TimeSlot*> &slots, int64 from, int64 to);
+  static void CollectSlots(std::list<TimeSlot*> &slots, int64_t from, int64_t to);
   static void FreeSlots(std::list<TimeSlot*> &slots);
 
   static void GetAllKeys(std::set<std::string> &allKeys,
@@ -125,36 +125,36 @@ class ServerStats {
 
   Mutex m_lock;
   std::vector<TimeSlot> m_slots;
-  int64 m_last; // previous timepoint
-  int64 m_min;  // earliest timepoint
-  int64 m_max;  // latest timepoint
+  int64_t m_last; // previous timepoint
+  int64_t m_min;  // earliest timepoint
+  int64_t m_max;  // latest timepoint
   CounterMap m_values;  // current page's name value pairs
 
-  void log(const std::string &name, int64 value);
-  int64 get(const std::string &name);
+  void log(const std::string &name, int64_t value);
+  int64_t get(const std::string &name);
   void logPage(const std::string &url, int code);
   void reset();
   void clear();
-  void collect(std::list<TimeSlot*> &slots, int64 from, int64 to);
+  void collect(std::list<TimeSlot*> &slots, int64_t from, int64_t to);
 
   /**
    * Live status, instead of historical statistics.
    */
-  void logBytes(int64 bytes);
+  void logBytes(int64_t bytes);
   void startRequest(const char *url, const char *clientIP, const char *vhost);
   void setThreadMode(ThreadMode mode);
 
   void setThreadIOStatusAddress(const char *name);
   void setThreadIOStatus(const char *name, const char *addr,
-                         int64 usWallTime = -1);
+                         int64_t usWallTime = -1);
   Array getThreadIOStatuses();
 
   class IOStatus {
   public:
     IOStatus() : count(0), wall_time(0) {}
 
-    int64 count;
-    int64 wall_time; // micro-seconds
+    int64_t count;
+    int64_t wall_time; // micro-seconds
   };
   // keys: "url==>name" and "name==>address"
   typedef hphp_string_map<IOStatus> IOStatusMap;
@@ -168,8 +168,8 @@ class ServerStats {
     MemoryManager* m_mm;
 
     // total traffic
-    int64 m_requestCount;
-    int64 m_writeBytes;
+    int64_t m_requestCount;
+    int64_t m_writeBytes;
 
     // current request
     timeval m_start;
@@ -206,20 +206,20 @@ class ServerStatsHelper {
     TRACK_MEMORY = 0x00000001,
     TRACK_HWINST = 0x00000002,
   };
-  ServerStatsHelper(const char *section, uint32 track = 0);
+  ServerStatsHelper(const char *section, uint32_t track = 0);
   ~ServerStatsHelper();
 
 private:
   const char *m_section;
   timespec m_wallStart;
   timespec m_cpuStart;
-  int64 m_instStart;
-  uint32 m_track;
+  int64_t m_instStart;
+  uint32_t m_track;
 
   void logTime(const std::string &prefix, const timespec &start,
                const timespec &end);
-  void logTime(const std::string &prefix, const int64 &start,
-               const int64 &end);
+  void logTime(const std::string &prefix, const int64_t &start,
+               const int64_t &end);
 };
 
 /**
@@ -242,7 +242,7 @@ void set_curl_statuses(CURL *cp, const char *url);
 /**
  * For profiling mutexes.
  */
-void server_stats_log_mutex(const std::string &stack, int64 elapsed_us);
+void server_stats_log_mutex(const std::string &stack, int64_t elapsed_us);
 
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/base/server/transport.cpp b/hphp/runtime/base/server/transport.cpp
index fbb62ac3acafe..48c2c68a54db1 100644
--- a/hphp/runtime/base/server/transport.cpp
+++ b/hphp/runtime/base/server/transport.cpp
@@ -512,7 +512,7 @@ String Transport::getMimeType() {
 ///////////////////////////////////////////////////////////////////////////////
 // cookies
 
-bool Transport::setCookie(CStrRef name, CStrRef value, int64 expire /* = 0 */,
+bool Transport::setCookie(CStrRef name, CStrRef value, int64_t expire /* = 0 */,
                           CStrRef path /* = "" */, CStrRef domain /* = "" */,
                           bool secure /* = false */,
                           bool httponly /* = false */,
@@ -796,7 +796,7 @@ void Transport::redirect(const char *location, int code /* = 302 */,
   sendStringLocked(location, code);
 }
 
-void Transport::onFlushProgress(int writtenSize, int64 delayUs) {
+void Transport::onFlushProgress(int writtenSize, int64_t delayUs) {
   m_responseSentSize += writtenSize;
   m_flushTimeUs += delayUs;
   m_chunksSentSizes.push_back(writtenSize);
diff --git a/hphp/runtime/base/server/transport.h b/hphp/runtime/base/server/transport.h
index 9672cebbf046e..624fd0cc80958 100644
--- a/hphp/runtime/base/server/transport.h
+++ b/hphp/runtime/base/server/transport.h
@@ -87,7 +87,7 @@ class Transport : public IDebuggable {
   const timespec &getQueueTime() const { return m_queueTime;}
   const timespec &getWallTime() const { return m_wallTime;}
   const timespec &getCpuTime() const { return m_cpuTime;}
-  const int64 &getInstructions() const { return m_instructions;}
+  const int64_t &getInstructions() const { return m_instructions;}
 
   ///////////////////////////////////////////////////////////////////////////
   // Functions sub-classes have to implement.
@@ -97,7 +97,7 @@ class Transport : public IDebuggable {
    */
   virtual const char *getUrl() = 0;
   virtual const char *getRemoteHost() = 0;
-  virtual uint16 getRemotePort() = 0;
+  virtual uint16_t getRemotePort() = 0;
 
   /**
    * POST request's data.
@@ -165,7 +165,7 @@ class Transport : public IDebuggable {
   /**
    * Set cookie response header.
    */
-  bool setCookie(CStrRef name, CStrRef value, int64 expire = 0,
+  bool setCookie(CStrRef name, CStrRef value, int64_t expire = 0,
                  CStrRef path = "", CStrRef domain = "", bool secure = false,
                  bool httponly = false, bool encode_url = true);
 
@@ -332,11 +332,11 @@ class Transport : public IDebuggable {
 
   int getResponseTotalSize() const { return m_responseTotalSize; }
   int getResponseSentSize() const { return m_responseSentSize; }
-  int64 getFlushTime() const { return m_flushTimeUs; }
+  int64_t getFlushTime() const { return m_flushTimeUs; }
   int getLastChunkSentSize();
   void getChunkSentSizes(Array &ret);
   void onFlushBegin(int totalSize) { m_responseTotalSize = totalSize; }
-  void onFlushProgress(int writtenSize, int64 delayUs);
+  void onFlushProgress(int writtenSize, int64_t delayUs);
   void onChunkedProgress(int writtenSize);
 
   void setThreadType(ThreadType type) { m_threadType = type;}
@@ -365,7 +365,7 @@ class Transport : public IDebuggable {
   timespec m_wallTime;
   timespec m_cpuTime;
 
-  int64 m_instructions;
+  int64_t m_instructions;
 
   // input
   char *m_url;
@@ -389,7 +389,7 @@ class Transport : public IDebuggable {
   int m_responseSize;
   int m_responseTotalSize; // including added headers
   int m_responseSentSize;
-  int64 m_flushTimeUs;
+  int64_t m_flushTimeUs;
 
   std::vector<int> m_chunksSentSizes;
 
diff --git a/hphp/runtime/base/server/virtual_host.cpp b/hphp/runtime/base/server/virtual_host.cpp
index e49a1ebe4ae5a..13f24892496ad 100644
--- a/hphp/runtime/base/server/virtual_host.cpp
+++ b/hphp/runtime/base/server/virtual_host.cpp
@@ -44,7 +44,7 @@ const VirtualHost *VirtualHost::GetCurrent() {
   return ret;
 }
 
-int64 VirtualHost::GetMaxPostSize() {
+int64_t VirtualHost::GetMaxPostSize() {
   const VirtualHost *vh = GetCurrent();
   assert(vh);
   if (vh->m_runtimeOption.maxPostSize != -1) {
@@ -53,7 +53,7 @@ int64 VirtualHost::GetMaxPostSize() {
   return RuntimeOption::MaxPostSize;
 }
 
-int64 VirtualHost::GetUploadMaxFileSize() {
+int64_t VirtualHost::GetUploadMaxFileSize() {
   const VirtualHost *vh = GetCurrent();
   assert(vh);
   if (vh->m_runtimeOption.uploadMaxFileSize != -1) {
@@ -108,10 +108,10 @@ void VirtualHost::SortAllowedDirectories(std::vector<std::string>& dirs) {
 void VirtualHost::initRuntimeOption(Hdf overwrite) {
   int requestTimeoutSeconds =
     overwrite["Server.RequestTimeoutSeconds"].getInt32(-1);
-  int64 maxPostSize =
+  int64_t maxPostSize =
     overwrite["Server.MaxPostSize"].getInt32(-1);
   if (maxPostSize != -1) maxPostSize *= (1LL << 20);
-  int64 uploadMaxFileSize =
+  int64_t uploadMaxFileSize =
     overwrite["Server.Upload.UploadMaxFileSize"].getInt32(-1);
   if (uploadMaxFileSize != -1) uploadMaxFileSize *= (1LL << 20);
   overwrite["Server.AllowedDirectories"].
diff --git a/hphp/runtime/base/server/virtual_host.h b/hphp/runtime/base/server/virtual_host.h
index f4eb02e7d19ed..e4e1e8cc9943b 100644
--- a/hphp/runtime/base/server/virtual_host.h
+++ b/hphp/runtime/base/server/virtual_host.h
@@ -31,8 +31,8 @@ class VirtualHost {
 
   static void SetCurrent(VirtualHost *vhost);
   static const VirtualHost *GetCurrent();
-  static int64 GetMaxPostSize();
-  static int64 GetUploadMaxFileSize();
+  static int64_t GetMaxPostSize();
+  static int64_t GetUploadMaxFileSize();
   static const std::vector<std::string> &GetAllowedDirectories();
   static void SortAllowedDirectories(std::vector<std::string>& dirs);
 public:
@@ -94,8 +94,8 @@ class VirtualHost {
   struct VhostRuntimeOption {
   public:
     int requestTimeoutSeconds;
-    int64 maxPostSize;
-    int64 uploadMaxFileSize;
+    int64_t maxPostSize;
+    int64_t uploadMaxFileSize;
     std::vector<std::string> allowedDirectories;
   };
 
diff --git a/hphp/runtime/base/server/xbox_server.cpp b/hphp/runtime/base/server/xbox_server.cpp
index dd934ce4a497b..b41fb821b9247 100644
--- a/hphp/runtime/base/server/xbox_server.cpp
+++ b/hphp/runtime/base/server/xbox_server.cpp
@@ -54,7 +54,7 @@ class XboxTransport : public Transport, public Synchronizable {
   virtual const char *getRemoteHost() {
     return "127.0.0.1";
   }
-  virtual uint16 getRemotePort() {
+  virtual uint16_t getRemotePort() {
     return 0;
   }
   virtual const void *getPostData(int &size) {
diff --git a/hphp/runtime/base/shared/concurrent_shared_store.cpp b/hphp/runtime/base/shared/concurrent_shared_store.cpp
index 50e9d41eafcd0..46d80742a1b99 100644
--- a/hphp/runtime/base/shared/concurrent_shared_store.cpp
+++ b/hphp/runtime/base/shared/concurrent_shared_store.cpp
@@ -70,9 +70,9 @@ static bool check_noTTL(const char *key) {
 
 // stats_on_update should be called before updating sval with new value
 static void stats_on_update(const StringData* key, const StoreValue* sval,
-                            const SharedVariant* svar, int64 ttl) {
+                            const SharedVariant* svar, int64_t ttl) {
   if (RuntimeOption::EnableAPCSizeStats && !check_skip(key->data())) {
-    int32 newSize = svar->getSpaceUsage();
+    int32_t newSize = svar->getSpaceUsage();
     SharedStoreStats::updateDirect(sval->size, newSize);
     sval->size = newSize;
   }
@@ -85,9 +85,9 @@ static void stats_on_update(const StringData* key, const StoreValue* sval,
 }
 // stats_on_add should be called after writing sval with the value
 static void stats_on_add(const StringData* key, const StoreValue* sval,
-                         int64 ttl, bool prime, bool file) {
+                         int64_t ttl, bool prime, bool file) {
   if (RuntimeOption::EnableAPCSizeStats && !check_skip(key->data())) {
-    int32 size = sval->var->getSpaceUsage();
+    int32_t size = sval->var->getSpaceUsage();
     SharedStoreStats::addDirect(key->size(), size, prime, file);
     sval->size = size;
   }
@@ -183,13 +183,13 @@ void ConcurrentTableSharedStore::purgeExpired() {
     ++i;
   }
   gettime(CLOCK_MONOTONIC, &tsEnd);
-  int64 elapsed = gettime_diff_us(tsBegin, tsEnd);
+  int64_t elapsed = gettime_diff_us(tsBegin, tsEnd);
   SharedStoreStats::addPurgingTime(elapsed);
   // Size could be inaccurate, but for stats reporting, it is good enough
   SharedStoreStats::setExpireQueueSize(m_expQueue.size());
 }
 
-void ConcurrentTableSharedStore::addToExpirationQueue(const char* key, int64 etime) {
+void ConcurrentTableSharedStore::addToExpirationQueue(const char* key, int64_t etime) {
   ExpMap::accessor acc;
   if (m_expMap.find(acc, key)) {
     acc->second++;
@@ -224,7 +224,7 @@ bool ConcurrentTableSharedStore::handlePromoteObj(CStrRef key,
     // sv may not be same as svar here because some other thread may have
     // updated it already, check before updating
     if (sv == svar && !sv->isUnserializedObj()) {
-      int64 ttl = sval->expiry ? sval->expiry - time(nullptr) : 0;
+      int64_t ttl = sval->expiry ? sval->expiry - time(nullptr) : 0;
       stats_on_update(key.get(), sval, converted, ttl);
       sval->var = converted;
       sv->decRef();
@@ -319,7 +319,7 @@ bool ConcurrentTableSharedStore::get(CStrRef key, Variant &value) {
   return true;
 }
 
-static int64 get_int64_value(StoreValue* sval) {
+static int64_t get_int64_value(StoreValue* sval) {
   Variant v;
   if (sval->inMem()) {
     v = sval->var->toLocal();
@@ -331,9 +331,9 @@ static int64 get_int64_value(StoreValue* sval) {
   return v.toInt64();
 }
 
-int64 ConcurrentTableSharedStore::inc(CStrRef key, int64 step, bool &found) {
+int64_t ConcurrentTableSharedStore::inc(CStrRef key, int64_t step, bool &found) {
   found = false;
-  int64 ret = 0;
+  int64_t ret = 0;
   ConditionalReadLock l(m_lock, !RuntimeOption::ApcConcurrentTableLockFree ||
                                 m_lockingFlag);
   StoreValue *sval;
@@ -354,7 +354,7 @@ int64 ConcurrentTableSharedStore::inc(CStrRef key, int64 step, bool &found) {
   return ret;
 }
 
-bool ConcurrentTableSharedStore::cas(CStrRef key, int64 old, int64 val) {
+bool ConcurrentTableSharedStore::cas(CStrRef key, int64_t old, int64_t val) {
   bool success = false;
   ConditionalReadLock l(m_lock, !RuntimeOption::ApcConcurrentTableLockFree ||
                                 m_lockingFlag);
@@ -408,7 +408,7 @@ bool ConcurrentTableSharedStore::exists(CStrRef key) {
   return true;
 }
 
-static int64 adjust_ttl(int64 ttl, bool overwritePrime) {
+static int64_t adjust_ttl(int64_t ttl, bool overwritePrime) {
   if (RuntimeOption::ApcTTLLimit > 0 && !overwritePrime) {
     if (ttl == 0 || ttl > RuntimeOption::ApcTTLLimit) {
       return RuntimeOption::ApcTTLLimit;
@@ -417,7 +417,7 @@ static int64 adjust_ttl(int64 ttl, bool overwritePrime) {
   return ttl;
 }
 
-bool ConcurrentTableSharedStore::store(CStrRef key, CVarRef value, int64 ttl,
+bool ConcurrentTableSharedStore::store(CStrRef key, CVarRef value, int64_t ttl,
                                        bool overwrite /* = true */) {
   StoreValue *sval;
   SharedVariant* svar = construct(value);
@@ -452,7 +452,7 @@ bool ConcurrentTableSharedStore::store(CStrRef key, CVarRef value, int64 ttl,
         return false;
       }
     }
-    int64 adjustedTtl = adjust_ttl(ttl, overwritePrime);
+    int64_t adjustedTtl = adjust_ttl(ttl, overwritePrime);
     if (check_noTTL(key.data())) {
       adjustedTtl = 0;
     }
diff --git a/hphp/runtime/base/shared/concurrent_shared_store.h b/hphp/runtime/base/shared/concurrent_shared_store.h
index da80597644caf..33e9d2f78ad94 100644
--- a/hphp/runtime/base/shared/concurrent_shared_store.h
+++ b/hphp/runtime/base/shared/concurrent_shared_store.h
@@ -45,10 +45,10 @@ class ConcurrentTableSharedStore : public SharedStore {
     return m_vars.size();
   }
   virtual bool get(CStrRef key, Variant &value);
-  virtual bool store(CStrRef key, CVarRef val, int64 ttl,
+  virtual bool store(CStrRef key, CVarRef val, int64_t ttl,
                      bool overwrite = true);
-  virtual int64 inc(CStrRef key, int64 step, bool &found);
-  virtual bool cas(CStrRef key, int64 old, int64 val);
+  virtual int64_t inc(CStrRef key, int64_t step, bool &found);
+  virtual bool cas(CStrRef key, int64_t old, int64_t val);
   virtual bool exists(CStrRef key);
 
   virtual void prime(const std::vector<SharedStore::KeyValuePair> &vars);
@@ -109,12 +109,12 @@ class ConcurrentTableSharedStore : public SharedStore {
     ExpMap;
   ExpMap m_expMap;
 
-  std::atomic<uint64> m_purgeCounter;
+  std::atomic<uint64_t> m_purgeCounter;
 
   // Should be called outside m_lock
   void purgeExpired();
 
-  void addToExpirationQueue(const char* key, int64 etime);
+  void addToExpirationQueue(const char* key, int64_t etime);
 
   bool handleUpdate(CStrRef key, SharedVariant* svar);
   bool handlePromoteObj(CStrRef key, SharedVariant* svar, CVarRef valye);
diff --git a/hphp/runtime/base/shared/immutable_map.cpp b/hphp/runtime/base/shared/immutable_map.cpp
index 827131ad2f5d2..0b5fdbcd9d0e3 100644
--- a/hphp/runtime/base/shared/immutable_map.cpp
+++ b/hphp/runtime/base/shared/immutable_map.cpp
@@ -97,7 +97,7 @@ int ImmutableMap::indexOf(const StringData* key) {
 }
 
 HOT_FUNC
-int ImmutableMap::indexOf(int64 key) {
+int ImmutableMap::indexOf(int64_t key) {
   int bucket = hash()[key & m.m_capacity_mask];
   Bucket* b = buckets();
   while (bucket != -1) {
diff --git a/hphp/runtime/base/shared/immutable_map.h b/hphp/runtime/base/shared/immutable_map.h
index 335d7e903a021..8fd37009ddc2b 100644
--- a/hphp/runtime/base/shared/immutable_map.h
+++ b/hphp/runtime/base/shared/immutable_map.h
@@ -35,7 +35,7 @@ class SharedVariant;
 class ImmutableMap {
 public:
   int indexOf(const StringData* key);
-  int indexOf(int64 key);
+  int indexOf(int64_t key);
 
   SharedVariant* getKeyIndex(int index) {
     assert(index < size());
diff --git a/hphp/runtime/base/shared/immutable_obj.cpp b/hphp/runtime/base/shared/immutable_obj.cpp
index 4927c17ab78b6..e23fae119c395 100644
--- a/hphp/runtime/base/shared/immutable_obj.cpp
+++ b/hphp/runtime/base/shared/immutable_obj.cpp
@@ -112,8 +112,8 @@ void ImmutableObj::getSizeStats(SharedVariantStats *stats) {
   }
 }
 
-int32 ImmutableObj::getSpaceUsage() {
-  int32 size = sizeof(ImmutableObj) + sizeof(Prop) * m_propCount;
+int32_t ImmutableObj::getSpaceUsage() {
+  int32_t size = sizeof(ImmutableObj) + sizeof(Prop) * m_propCount;
   if (!m_cls->isStatic()) {
     size += sizeof(StringData) + m_cls->size();
   }
diff --git a/hphp/runtime/base/shared/immutable_obj.h b/hphp/runtime/base/shared/immutable_obj.h
index d83a0f9d84f37..ddd4a8e1bdd31 100644
--- a/hphp/runtime/base/shared/immutable_obj.h
+++ b/hphp/runtime/base/shared/immutable_obj.h
@@ -33,7 +33,7 @@ class ImmutableObj {
   Object getObject();
   ~ImmutableObj();
   void getSizeStats(SharedVariantStats *stats);
-  int32 getSpaceUsage();
+  int32_t getSpaceUsage();
 
   struct Prop {
     StringData *name;
diff --git a/hphp/runtime/base/shared/shared_map.cpp b/hphp/runtime/base/shared/shared_map.cpp
index e2a4d3901ae27..19fa177762d28 100644
--- a/hphp/runtime/base/shared/shared_map.cpp
+++ b/hphp/runtime/base/shared/shared_map.cpp
@@ -61,11 +61,11 @@ bool SharedMap::exists(const StringData* k) const {
   return m_arr->getIndex(k) != -1;
 }
 
-bool SharedMap::exists(int64 k) const {
+bool SharedMap::exists(int64_t k) const {
   return m_arr->getIndex(k) != -1;
 }
 
-ssize_t SharedMap::getIndex(int64 k) const {
+ssize_t SharedMap::getIndex(int64_t k) const {
   return m_arr->getIndex(k);
 }
 
@@ -81,7 +81,7 @@ CVarRef SharedMap::get(const StringData* k, bool error /* = false */) const {
   return getValueRef(index);
 }
 
-CVarRef SharedMap::get(int64 k, bool error /* = false */) const {
+CVarRef SharedMap::get(int64_t k, bool error /* = false */) const {
   int index = m_arr->getIndex(k);
   if (index == -1) {
     return error ? getNotFound(k) : null_variant;
@@ -89,7 +89,7 @@ CVarRef SharedMap::get(int64 k, bool error /* = false */) const {
   return getValueRef(index);
 }
 
-ArrayData *SharedMap::lval(int64 k, Variant *&ret, bool copy,
+ArrayData *SharedMap::lval(int64_t k, Variant *&ret, bool copy,
                            bool checkExist /* = false */) {
   ArrayData *escalated = escalate();
   ArrayData *ee = escalated->lval(k, ret, false);
@@ -121,7 +121,7 @@ ArrayData *SharedMap::lvalNew(Variant *&ret, bool copy) {
   return escalated;
 }
 
-ArrayData *SharedMap::set(int64 k, CVarRef v, bool copy) {
+ArrayData *SharedMap::set(int64_t k, CVarRef v, bool copy) {
   ArrayData *escalated = escalate();
   ArrayData *ee = escalated->set(k, v, false);
   if (ee) {
@@ -141,7 +141,7 @@ ArrayData *SharedMap::set(StringData* k, CVarRef v, bool copy) {
   return escalated;
 }
 
-ArrayData *SharedMap::setRef(int64 k, CVarRef v, bool copy) {
+ArrayData *SharedMap::setRef(int64_t k, CVarRef v, bool copy) {
   ArrayData *escalated = escalate();
   ArrayData *ee = escalated->setRef(k, v, false);
   if (ee) {
@@ -161,7 +161,7 @@ ArrayData *SharedMap::setRef(StringData* k, CVarRef v, bool copy) {
   return escalated;
 }
 
-ArrayData *SharedMap::remove(int64 k, bool copy) {
+ArrayData *SharedMap::remove(int64_t k, bool copy) {
   ArrayData *escalated = escalate();
   ArrayData *ee = escalated->remove(k, false);
   if (ee) {
@@ -242,7 +242,7 @@ ArrayData *SharedMap::escalate() const {
   return ret;
 }
 
-TypedValue* SharedMap::nvGet(int64 k) const {
+TypedValue* SharedMap::nvGet(int64_t k) const {
   int index = m_arr->getIndex(k);
   if (index == -1) return nullptr;
   return (TypedValue*)&getValueRef(index);
@@ -267,7 +267,7 @@ TypedValue* SharedMap::nvGetValueRef(ssize_t pos) {
   return const_cast<TypedValue*>(SharedMap::getValueRef(pos).asTypedValue());
 }
 
-TypedValue* SharedMap::nvGetCell(int64 k) const {
+TypedValue* SharedMap::nvGetCell(int64_t k) const {
   int index = m_arr->getIndex(k);
   return index != -1 ? getValueRef(index).getTypedAccessor() :
          nvGetNotFound(k);
diff --git a/hphp/runtime/base/shared/shared_map.h b/hphp/runtime/base/shared/shared_map.h
index a8fdc7c4f5df9..5da6b94a79a6b 100644
--- a/hphp/runtime/base/shared/shared_map.h
+++ b/hphp/runtime/base/shared/shared_map.h
@@ -70,27 +70,27 @@ class SharedMap : public ArrayData, Sweepable {
   Variant getValue(ssize_t pos) const { return getValueRef(pos); }
   CVarRef getValueRef(ssize_t pos) const;
 
-  bool exists(int64 k) const;
+  bool exists(int64_t k) const;
   bool exists(const StringData* k) const;
 
-  CVarRef get(int64 k, bool error = false) const;
+  CVarRef get(int64_t k, bool error = false) const;
   CVarRef get(const StringData* k, bool error = false) const;
 
-  ssize_t getIndex(int64 k) const;
+  ssize_t getIndex(int64_t k) const;
   ssize_t getIndex(const StringData* k) const;
 
-  virtual ArrayData *lval(int64 k, Variant *&ret, bool copy,
+  virtual ArrayData *lval(int64_t k, Variant *&ret, bool copy,
                           bool checkExist = false);
   virtual ArrayData *lval(StringData* k, Variant *&ret, bool copy,
                           bool checkExist = false);
   ArrayData *lvalNew(Variant *&ret, bool copy);
 
-  ArrayData *set(int64 k, CVarRef v, bool copy);
+  ArrayData *set(int64_t k, CVarRef v, bool copy);
   ArrayData *set(StringData* k, CVarRef v, bool copy);
-  ArrayData *setRef(int64 k, CVarRef v, bool copy);
+  ArrayData *setRef(int64_t k, CVarRef v, bool copy);
   ArrayData *setRef(StringData* k, CVarRef v, bool copy);
 
-  ArrayData *remove(int64 k, bool copy);
+  ArrayData *remove(int64_t k, bool copy);
   ArrayData *remove(const StringData* k, bool copy);
 
   ArrayData *copy() const;
@@ -107,11 +107,11 @@ class SharedMap : public ArrayData, Sweepable {
   /**
    * Non-Variant virtual methods that override ArrayData
    */
-  TypedValue* nvGet(int64 k) const;
+  TypedValue* nvGet(int64_t k) const;
   TypedValue* nvGet(const StringData* k) const;
   void nvGetKey(TypedValue* out, ssize_t pos);
   TypedValue* nvGetValueRef(ssize_t pos);
-  TypedValue* nvGetCell(int64 ki) const;
+  TypedValue* nvGetCell(int64_t ki) const;
   TypedValue* nvGetCell(const StringData* k) const;
 
   /**
diff --git a/hphp/runtime/base/shared/shared_store_base.cpp b/hphp/runtime/base/shared/shared_store_base.cpp
index 85e4d71e76ded..1898c5d030dfe 100644
--- a/hphp/runtime/base/shared/shared_store_base.cpp
+++ b/hphp/runtime/base/shared/shared_store_base.cpp
@@ -66,7 +66,7 @@ bool SharedStore::erase(CStrRef key, bool expired /* = false */) {
   return success;
 }
 
-void StoreValue::set(SharedVariant *v, int64 ttl) {
+void StoreValue::set(SharedVariant *v, int64_t ttl) {
   var = v;
   expiry = ttl ? time(nullptr) + ttl : 0;
 }
@@ -119,7 +119,7 @@ void SharedStores::Create() {
 SharedStoreFileStorage s_apc_file_storage;
 
 void SharedStoreFileStorage::enable(const std::string& prefix,
-                                    int64 chunkSize, int64 maxSize) {
+                                    int64_t chunkSize, int64_t maxSize) {
   Lock lock(m_lock);
   m_prefix = prefix;
   m_chunkSize = chunkSize;
@@ -134,7 +134,7 @@ void SharedStoreFileStorage::enable(const std::string& prefix,
   m_state = StateOpen;
 }
 
-char *SharedStoreFileStorage::put(const char *data, int32 len) {
+char *SharedStoreFileStorage::put(const char *data, int32_t len) {
   Lock lock(m_lock);
   if (m_state != StateOpen ||
       len + PaddingSize > m_chunkSize - PaddingSize) {
@@ -149,7 +149,7 @@ char *SharedStoreFileStorage::put(const char *data, int32 len) {
   strhash_t h = hash_string_inline(data, len);
   *(strhash_t*)m_current = h;
   m_current += sizeof(h);
-  *(int32*)m_current = len;
+  *(int32_t*)m_current = len;
   m_current += sizeof(len);
   // should be no overlap
   memcpy(m_current, data, len);
@@ -199,24 +199,24 @@ bool SharedStoreFileStorage::hashCheck() {
         break;
       }
       current += sizeof(h);
-      int32 len = *(int32*)current;
+      int32_t len = *(int32_t*)current;
       current += sizeof(len);
       if (len < 0 ||
-          len + PaddingSize >= (int64)boundary - (int64)current) {
+          len + PaddingSize >= (int64_t)boundary - (int64_t)current) {
         Logger::Error("invalid len %d at chunk %d offset %lld", len, i,
-                      (int64)current - (int64)m_chunks[i]);
+                      (int64_t)current - (int64_t)m_chunks[i]);
         return false;
       }
       strhash_t h_data = hash_string_inline(current, len);
       if (h_data != h) {
         Logger::Error("invalid hash at chunk %d offset %lld", i,
-                      (int64)current - (int64)m_chunks[i]);
+                      (int64_t)current - (int64_t)m_chunks[i]);
         return false;
       }
       current += len;
       if (*current != '\0') {
         Logger::Error("missing \\0 at chunk %d offset %lld", i,
-                      (int64)current - (int64)m_chunks[i]);
+                      (int64_t)current - (int64_t)m_chunks[i]);
         return false;
       }
       current++;
@@ -234,7 +234,7 @@ void SharedStoreFileStorage::cleanup() {
 }
 
 bool SharedStoreFileStorage::addFile() {
-  if ((int64)m_chunks.size() * m_chunkSize >= m_maxSize) {
+  if ((int64_t)m_chunks.size() * m_chunkSize >= m_maxSize) {
     m_state = StateFull;
     return false;
   }
diff --git a/hphp/runtime/base/shared/shared_store_base.h b/hphp/runtime/base/shared/shared_store_base.h
index f89f84ae66383..025fea06a9aba 100644
--- a/hphp/runtime/base/shared/shared_store_base.h
+++ b/hphp/runtime/base/shared/shared_store_base.h
@@ -36,7 +36,7 @@ class StoreValue {
   StoreValue(const StoreValue& v) : var(v.var), sAddr(v.sAddr),
                                     expiry(v.expiry), size(v.size),
                                     sSize(v.sSize) {}
-  void set(SharedVariant *v, int64 ttl);
+  void set(SharedVariant *v, int64_t ttl);
   bool expired() const;
 
   // Mutable fields here are so that we can deserialize the object from disk
@@ -44,9 +44,9 @@ class StoreValue {
   // for how we use TBB
   mutable SharedVariant *var;
   char *sAddr; // For file storage
-  int64 expiry;
-  mutable int32 size;
-  int32 sSize; // For file storage, negative means serailized object
+  int64_t expiry;
+  mutable int32_t size;
+  int32_t sSize; // For file storage, negative means serailized object
   mutable SmallLock lock;
 
   bool inMem() const {
@@ -56,7 +56,7 @@ class StoreValue {
     return sAddr != nullptr;
   }
 
-  int32 getSerializedSize() const {
+  int32_t getSerializedSize() const {
     return abs(sSize);
   }
   bool isSerializedObj() const {
@@ -74,11 +74,11 @@ class SharedStore {
   virtual int size() = 0;
 
   virtual bool get(CStrRef key, Variant &value) = 0;
-  virtual bool store(CStrRef key, CVarRef val, int64 ttl,
+  virtual bool store(CStrRef key, CVarRef val, int64_t ttl,
                      bool overwrite = true) = 0;
   bool erase(CStrRef key, bool expired = false);
-  virtual int64 inc(CStrRef key, int64 step, bool &found) = 0;
-  virtual bool cas(CStrRef key, int64 old, int64 val) = 0;
+  virtual int64_t inc(CStrRef key, int64_t step, bool &found) = 0;
+  virtual bool cas(CStrRef key, int64_t old, int64_t val) = 0;
   virtual bool exists(CStrRef key) {
     // Default implementation does a copy
     Variant tmp;
@@ -92,7 +92,7 @@ class SharedStore {
     int len;
     SharedVariant *value;
     char *sAddr;
-    int32 sSize;
+    int32_t sSize;
 
     bool inMem() const {
       return value != nullptr;
@@ -159,8 +159,8 @@ class SharedStoreFileStorage {
 
   SharedStoreFileStorage()
   : m_state(StateInvalid), m_current(nullptr), m_chunkRemain(0) {}
-  void enable(const std::string& prefix, int64 chunkSize, int64 maxSize);
-  char *put(const char *data, int32 len);
+  void enable(const std::string& prefix, int64_t chunkSize, int64_t maxSize);
+  char *put(const char *data, int32_t len);
   void seal();
   void adviseOut();
   bool hashCheck();
@@ -173,17 +173,17 @@ class SharedStoreFileStorage {
 private:
   std::vector<void*> m_chunks;
   std::string m_prefix;
-  int64 m_chunkSize;
-  int64 m_maxSize;
+  int64_t m_chunkSize;
+  int64_t m_maxSize;
   StorageState m_state;
   char *m_current;
-  int32 m_chunkRemain;
+  int32_t m_chunkRemain;
   std::vector<std::string> m_fileNames;
 
   Mutex m_lock;
   static const strhash_t TombHash = 0xdeadbeef;
   static const int PaddingSize = sizeof(strhash_t) + // hash
-                                 sizeof(int32) + // len
+                                 sizeof(int32_t) + // len
                                  sizeof(char); // '\0'
 };
 
diff --git a/hphp/runtime/base/shared/shared_store_stats.cpp b/hphp/runtime/base/shared/shared_store_stats.cpp
index 8b5f43c7befbc..acfdd777c2344 100644
--- a/hphp/runtime/base/shared/shared_store_stats.cpp
+++ b/hphp/runtime/base/shared/shared_store_stats.cpp
@@ -29,7 +29,7 @@ namespace HPHP {
 //////////////////////////////////////////////////////////////////////////////
 // Helpers to write JSON entry
 
-static void writeEntryInt(ostream& out, const char *name, int64 value,
+static void writeEntryInt(ostream& out, const char *name, int64_t value,
                           bool last = false, int indent = 0,
                           bool newline = false) {
   for (int i = 0; i < indent ; i++) {
@@ -337,7 +337,7 @@ bool SharedStoreStats::snapshot(const char *filename, std::string& keySample) {
     out << "{";
     writeEntryStr(out, "KeyName", iter->first);
     writeEntryInt(out, "TotalSize", iter->second->totalSize);
-    writeEntryInt(out, "Prime", (int64)iter->second->isPrime);
+    writeEntryInt(out, "Prime", (int64_t)iter->second->isPrime);
     writeEntryInt(out, "TTL", iter->second->ttl);
     writeEntryInt(out, "KeySize", iter->second->keySize);
     writeEntryInt(out, "DataSize", iter->second->var.dataTotalSize);
@@ -384,11 +384,11 @@ void SharedStoreStats::add(SharedValueProfile *svp) {
 //////////////////////////////////////////////////////////////////////////////
 // Hooks
 
-void SharedStoreStats::addDirect(int32 keySize, int32 dataTotal, bool prime,
+void SharedStoreStats::addDirect(int32_t keySize, int32_t dataTotal, bool prime,
                                  bool file) {
   s_keyCount.fetch_add(1, std::memory_order_relaxed);
   s_keySize.fetch_add(keySize, std::memory_order_relaxed);
-  s_dataTotalSize.fetch_add((int64)dataTotal, std::memory_order_relaxed);
+  s_dataTotalSize.fetch_add((int64_t)dataTotal, std::memory_order_relaxed);
   s_addCount.fetch_add(1, std::memory_order_relaxed);
   if (prime) {
     s_primeCount.fetch_add(1, std::memory_order_relaxed);
@@ -398,10 +398,10 @@ void SharedStoreStats::addDirect(int32 keySize, int32 dataTotal, bool prime,
   }
 }
 
-void SharedStoreStats::removeDirect(int32 keySize, int32 dataTotal, bool exp) {
+void SharedStoreStats::removeDirect(int32_t keySize, int32_t dataTotal, bool exp) {
   s_keyCount.fetch_sub(1, std::memory_order_relaxed);
   s_keySize.fetch_sub(keySize, std::memory_order_relaxed);
-  s_dataTotalSize.fetch_sub((int64)dataTotal, std::memory_order_relaxed);
+  s_dataTotalSize.fetch_sub((int64_t)dataTotal, std::memory_order_relaxed);
   if (exp) {
     s_expireCount.fetch_add(1, std::memory_order_relaxed);
   } else {
@@ -409,13 +409,13 @@ void SharedStoreStats::removeDirect(int32 keySize, int32 dataTotal, bool exp) {
   }
 }
 
-void SharedStoreStats::updateDirect(int32 dataTotalOld, int32 dataTotalNew) {
-  s_dataTotalSize.fetch_sub((int64)dataTotalOld, std::memory_order_relaxed);
-  s_dataTotalSize.fetch_add((int64)dataTotalNew, std::memory_order_relaxed);
+void SharedStoreStats::updateDirect(int32_t dataTotalOld, int32_t dataTotalNew) {
+  s_dataTotalSize.fetch_sub((int64_t)dataTotalOld, std::memory_order_relaxed);
+  s_dataTotalSize.fetch_add((int64_t)dataTotalNew, std::memory_order_relaxed);
   s_updateCount.fetch_add(1, std::memory_order_relaxed);
 }
 
-void SharedStoreStats::addPurgingTime(int64 purgingTime) {
+void SharedStoreStats::addPurgingTime(int64_t purgingTime) {
   s_purgingTime.fetch_add(purgingTime, std::memory_order_relaxed);
 }
 
@@ -468,7 +468,7 @@ void SharedStoreStats::onGet(const StringData *key, const SharedVariant *var) {
 }
 
 void SharedStoreStats::onStore(const StringData *key, const SharedVariant *var,
-                               int64 ttl, bool prime) {
+                               int64_t ttl, bool prime) {
   char normalizedKey[MAX_KEY_LEN + 1];
 
   SharedValueProfile *svpInd;
diff --git a/hphp/runtime/base/shared/shared_store_stats.h b/hphp/runtime/base/shared/shared_store_stats.h
index 172eab4388c7d..18660866db7f4 100644
--- a/hphp/runtime/base/shared/shared_store_stats.h
+++ b/hphp/runtime/base/shared/shared_store_stats.h
@@ -48,21 +48,21 @@ class SharedValueProfile {
 public:
   char *key;
   SharedVariantStats var;
-  int32 totalSize;
-  int32 keySize;
+  int32_t totalSize;
+  int32_t keySize;
   bool isGroup;
   bool isPrime;
   bool isValid;
-  int32 keyCount; // valid only for group
-  int32 sizeNoTTL; // valid only for group
-  int32 ttl; // valid for both, for group key stats, it's average
+  int32_t keyCount; // valid only for group
+  int32_t sizeNoTTL; // valid only for group
+  int32_t ttl; // valid for both, for group key stats, it's average
   // Also treat no ttl as 48-hrs.
 
   // fetchCount and lastGetTime only valid for individual (so that we don't need
   // normalize the key for every get)
-  int32 fetchCount;
-  int32 storeCount;
-  int32 deleteCount;
+  int32_t fetchCount;
+  int32_t storeCount;
+  int32_t deleteCount;
   time_t lastFetchTime;
   time_t lastStoreTime;
   time_t lastDeleteTime;
@@ -91,7 +91,7 @@ class SharedValueProfile {
 class SharedStoreStats {
 public:
   static void onStore(const StringData *key, const SharedVariant *var,
-                      int64 ttl, bool prime);
+                      int64_t ttl, bool prime);
   static void onDelete(const StringData *key, const SharedVariant *var,
                        bool replace, bool noTTL);
   static void onGet(const StringData *key, const SharedVariant *var);
@@ -101,14 +101,14 @@ class SharedStoreStats {
   static std::string report_keys();
   static bool snapshot(const char *filename, std::string& keySample);
 
-  static void addDirect(int32 keySize, int32 dataTotal, bool prime, bool file);
-  static void removeDirect(int32 keySize, int32 dataTotal, bool exp);
-  static void updateDirect(int32 dataTotalOld, int32 dataTotalNew);
+  static void addDirect(int32_t keySize, int32_t dataTotal, bool prime, bool file);
+  static void removeDirect(int32_t keySize, int32_t dataTotal, bool exp);
+  static void updateDirect(int32_t dataTotalOld, int32_t dataTotalNew);
 
-  static void setExpireQueueSize(int32 size) {
+  static void setExpireQueueSize(int32_t size) {
     s_expireQueueSize = size;
   }
-  static void addPurgingTime(int64 purgingTime);
+  static void addPurgingTime(int64_t purgingTime);
 
 protected:
   static ReadWriteMutex s_rwlock;
diff --git a/hphp/runtime/base/shared/shared_string.h b/hphp/runtime/base/shared/shared_string.h
index 6ff2bba86c702..065e1ea8598d0 100644
--- a/hphp/runtime/base/shared/shared_string.h
+++ b/hphp/runtime/base/shared/shared_string.h
@@ -74,7 +74,7 @@ struct shared_string_eq {
 struct shared_string_hash {
   size_t operator()(const SharedString &s) const {
     // Because pointers and strings are 1-1, can just hash the ptr.
-    return hash_int64((int64)s.get());
+    return hash_int64((int64_t)s.get());
   }
 };
 
diff --git a/hphp/runtime/base/shared/shared_variant.cpp b/hphp/runtime/base/shared/shared_variant.cpp
index 9f2dcc141ba89..44321d18b5961 100644
--- a/hphp/runtime/base/shared/shared_variant.cpp
+++ b/hphp/runtime/base/shared/shared_variant.cpp
@@ -245,7 +245,7 @@ int SharedVariant::getIndex(const StringData* key) {
   return m_data.map->indexOf(key);
 }
 
-int SharedVariant::getIndex(int64 key) {
+int SharedVariant::getIndex(int64_t key) {
   assert(is(KindOfArray));
   if (getIsVector()) {
     if (key < 0 || (size_t) key >= m_data.vec->m_size) return -1;
@@ -342,8 +342,8 @@ SharedVariant* SharedVariant::convertObj(CVarRef var) {
   return tmp;
 }
 
-int32 SharedVariant::getSpaceUsage() const {
-  int32 size = sizeof(SharedVariant);
+int32_t SharedVariant::getSpaceUsage() const {
+  int32_t size = sizeof(SharedVariant);
   if (!IS_REFCOUNTED_TYPE(m_type)) return size;
   switch (m_type) {
   case KindOfObject:
diff --git a/hphp/runtime/base/shared/shared_variant.h b/hphp/runtime/base/shared/shared_variant.h
index 9081acb1c740a..30daab04fb700 100644
--- a/hphp/runtime/base/shared/shared_variant.h
+++ b/hphp/runtime/base/shared/shared_variant.h
@@ -78,7 +78,7 @@ class SharedVariant {
 
   Variant toLocal();
 
-  int64 intData() const {
+  int64_t intData() const {
     assert(is(KindOfInt64));
     return m_data.num;
   }
@@ -110,7 +110,7 @@ class SharedVariant {
     return m_data.map->capacity();
   }
 
-  int getIndex(int64 key);
+  int getIndex(int64_t key);
   int getIndex(const StringData* key);
 
   void loadElems(ArrayData *&elems, const SharedMap &sharedMap,
@@ -124,7 +124,7 @@ class SharedVariant {
   void dump(std::string &out);
 
   void getStats(SharedVariantStats *stats) const;
-  int32 getSpaceUsage() const;
+  int32_t getSpaceUsage() const;
 
   StringData *getStringData() const {
     assert(is(KindOfString) || is(KindOfStaticString));
@@ -171,7 +171,7 @@ class SharedVariant {
 #ifdef WORDS_BIGENDIAN
  #define SharedVarData \
   union {\
-    int64 num;\
+    int64_t num;\
     double dbl;\
     StringData *str;\
     ImmutableMap* map;\
@@ -180,13 +180,13 @@ class SharedVariant {
   } m_data;\
   int m_count;\
   bool m_shouldCache;\
-  uint8 m_flags;\
-  uint16 m_type
+  uint8_t m_flags;\
+  uint16_t m_type
 
 #else
  #define SharedVarData \
   union {\
-    int64 num;\
+    int64_t num;\
     double dbl;\
     StringData *str;\
     ImmutableMap* map;\
@@ -194,9 +194,9 @@ class SharedVariant {
     ImmutableObj* obj;\
   } m_data;\
   int m_count;\
-  uint16 m_type;\
+  uint16_t m_type;\
   bool m_shouldCache;\
-  uint8 m_flags
+  uint8_t m_flags
 
 #endif
 
@@ -212,10 +212,10 @@ class SharedVariant {
   };
 #undef SharedVarData
 
-  const static uint8 SerializedArray = (1<<0);
-  const static uint8 IsVector = (1<<1);
-  const static uint8 IsObj = (1<<2);
-  const static uint8 ObjAttempted = (1<<3);
+  const static uint8_t SerializedArray = (1<<0);
+  const static uint8_t IsVector = (1<<1);
+  const static uint8_t IsObj = (1<<2);
+  const static uint8_t ObjAttempted = (1<<3);
 
   static void compileTimeAssertions() {
     static_assert(offsetof(SharedVar, m_data) == offsetof(TypedValue, m_data),
@@ -245,9 +245,9 @@ class SharedVariant {
 
 class SharedVariantStats {
  public:
-  int32 dataSize;
-  int32 dataTotalSize;
-  int32 variantCount;
+  int32_t dataSize;
+  int32_t dataTotalSize;
+  int32_t variantCount;
 
   void initStats() {
     variantCount = 0;
diff --git a/hphp/runtime/base/string_data.cpp b/hphp/runtime/base/string_data.cpp
index cdf9ae85831f3..28124f2f8d99e 100644
--- a/hphp/runtime/base/string_data.cpp
+++ b/hphp/runtime/base/string_data.cpp
@@ -700,7 +700,7 @@ void StringData::preCompute() const {
   StringSlice s = slice();
   m_hash = hash_string(s.ptr, s.len);
   assert(m_hash >= 0);
-  int64 lval; double dval;
+  int64_t lval; double dval;
   if (isNumericWithVal(lval, dval, 1) == KindOfNull) {
     m_hash |= STRHASH_MSB;
   }
@@ -714,7 +714,7 @@ void StringData::setStatic() const {
 ///////////////////////////////////////////////////////////////////////////////
 // type conversions
 
-DataType StringData::isNumericWithVal(int64 &lval, double &dval,
+DataType StringData::isNumericWithVal(int64_t &lval, double &dval,
                                       int allow_errors) const {
   if (m_hash < 0) return KindOfNull;
   DataType ret = KindOfNull;
@@ -731,7 +731,7 @@ DataType StringData::isNumericWithVal(int64 &lval, double &dval,
 
 bool StringData::isNumeric() const {
   if (isStatic()) return (m_hash >= 0);
-  int64 lval; double dval;
+  int64_t lval; double dval;
   DataType ret = isNumericWithVal(lval, dval, 0);
   switch (ret) {
   case KindOfNull:   return false;
@@ -746,7 +746,7 @@ bool StringData::isNumeric() const {
 
 bool StringData::isInteger() const {
   if (m_hash < 0) return false;
-  int64 lval; double dval;
+  int64_t lval; double dval;
   DataType ret = isNumericWithVal(lval, dval, 0);
   switch (ret) {
   case KindOfNull:   return false;
@@ -765,8 +765,8 @@ bool StringData::isValidVariableName() const {
   return is_valid_var_name(s.ptr, s.len);
 }
 
-int64 StringData::hashForIntSwitch(int64 firstNonZero, int64 noMatch) const {
-  int64 lval; double dval;
+int64_t StringData::hashForIntSwitch(int64_t firstNonZero, int64_t noMatch) const {
+  int64_t lval; double dval;
   DataType ret = isNumericWithVal(lval, dval, 1);
   switch (ret) {
   case KindOfNull:
@@ -783,15 +783,15 @@ int64 StringData::hashForIntSwitch(int64 firstNonZero, int64 noMatch) const {
   return 0;
 }
 
-int64 StringData::hashForStringSwitch(
-    int64 firstTrueCaseHash,
-    int64 firstNullCaseHash,
-    int64 firstFalseCaseHash,
-    int64 firstZeroCaseHash,
-    int64 firstHash,
-    int64 noMatchHash,
+int64_t StringData::hashForStringSwitch(
+    int64_t firstTrueCaseHash,
+    int64_t firstNullCaseHash,
+    int64_t firstFalseCaseHash,
+    int64_t firstZeroCaseHash,
+    int64_t firstHash,
+    int64_t noMatchHash,
     bool &needsOrder) const {
-  int64 lval; double dval;
+  int64_t lval; double dval;
   DataType ret = isNumericWithVal(lval, dval, 1);
   needsOrder = false;
   switch (ret) {
@@ -800,7 +800,7 @@ int64 StringData::hashForStringSwitch(
   case KindOfInt64:
     return lval;
   case KindOfDouble:
-    return (int64) dval;
+    return (int64_t) dval;
   default:
     break;
   }
@@ -812,7 +812,7 @@ bool StringData::toBoolean() const {
   return !empty() && !isZero();
 }
 
-int64 StringData::toInt64(int base /* = 10 */) const {
+int64_t StringData::toInt64(int base /* = 10 */) const {
   // Taint absorbtion unnecessary; taint is recreated later for numerics
   return strtoll(rawdata(), nullptr, base);
 }
@@ -824,7 +824,7 @@ double StringData::toDouble() const {
   return 0;
 }
 
-DataType StringData::toNumeric(int64 &lval, double &dval) const {
+DataType StringData::toNumeric(int64_t &lval, double &dval) const {
   if (m_hash < 0) return KindOfString;
   DataType ret = isNumericWithVal(lval, dval, 0);
   if (ret == KindOfInt64 || ret == KindOfDouble) return ret;
@@ -838,7 +838,7 @@ HOT_FUNC
 int StringData::numericCompare(const StringData *v2) const {
   assert(v2);
 
-  int64 lval1, lval2;
+  int64_t lval1, lval2;
   double dval1, dval2;
   DataType ret1, ret2;
   if ((ret1 = isNumericWithVal(lval1, dval1, 0)) == KindOfNull ||
diff --git a/hphp/runtime/base/string_data.h b/hphp/runtime/base/string_data.h
index cb9eeb1cdc46f..5f3f5c62960af 100644
--- a/hphp/runtime/base/string_data.h
+++ b/hphp/runtime/base/string_data.h
@@ -276,10 +276,10 @@ class StringData {
     Format f = format();
     return f == IsLiteral || f == IsShared || isStatic();
   }
-  DataType isNumericWithVal(int64 &lval, double &dval, int allow_errors) const;
+  DataType isNumericWithVal(int64_t &lval, double &dval, int allow_errors) const;
   bool isNumeric() const;
   bool isInteger() const;
-  bool isStrictlyInteger(int64 &res) const {
+  bool isStrictlyInteger(int64_t &res) const {
     if (isStatic() && m_hash < 0) return false;
     StringSlice s = slice();
     return is_strictly_integer(s.ptr, s.len, res);
@@ -287,14 +287,14 @@ class StringData {
   bool isZero() const { return size() == 1 && rawdata()[0] == '0'; }
   bool isValidVariableName() const;
 
-  int64 hashForIntSwitch(int64 firstNonZero, int64 noMatch) const;
-  int64 hashForStringSwitch(
-      int64 firstTrueCaseHash,
-      int64 firstNullCaseHash,
-      int64 firstFalseCaseHash,
-      int64 firstZeroCaseHash,
-      int64 firstHash,
-      int64 noMatchHash,
+  int64_t hashForIntSwitch(int64_t firstNonZero, int64_t noMatch) const;
+  int64_t hashForStringSwitch(
+      int64_t firstTrueCaseHash,
+      int64_t firstNullCaseHash,
+      int64_t firstFalseCaseHash,
+      int64_t firstZeroCaseHash,
+      int64_t firstHash,
+      int64_t noMatchHash,
       bool &needsOrder) const;
 
 #ifdef TAINTED
@@ -314,8 +314,8 @@ class StringData {
   void set(char    key, CStrRef v) { setChar(key, v); }
   void set(short   key, CStrRef v) { setChar(key, v); }
   void set(int     key, CStrRef v) { setChar(key, v); }
-  void set(int64   key, CStrRef v) { setChar(key, v); }
-  void set(double  key, CStrRef v) { setChar((int64)key, v); }
+  void set(int64_t   key, CStrRef v) { setChar(key, v); }
+  void set(double  key, CStrRef v) { setChar((int64_t)key, v); }
   void set(CStrRef key, CStrRef v);
   void set(CVarRef key, CStrRef v);
 
@@ -326,9 +326,9 @@ class StringData {
   char   toByte   (int base = 10) const { return toInt64(base);}
   short  toInt16  (int base = 10) const { return toInt64(base);}
   int    toInt32  (int base = 10) const { return toInt64(base);}
-  int64  toInt64  (int base = 10) const;
+  int64_t  toInt64  (int base = 10) const;
   double toDouble () const;
-  DataType toNumeric(int64 &lval, double &dval) const;
+  DataType toNumeric(int64_t &lval, double &dval) const;
 
   strhash_t getPrecomputedHash() const {
     assert(!isShared());
diff --git a/hphp/runtime/base/string_util.cpp b/hphp/runtime/base/string_util.cpp
index 3fe01acbb057f..2c9b1ec199d9a 100644
--- a/hphp/runtime/base/string_util.cpp
+++ b/hphp/runtime/base/string_util.cpp
@@ -571,7 +571,7 @@ String StringUtil::ROT13(CStrRef input) {
   return String(string_rot13(input, input.size()), input.size(), AttachString);
 }
 
-int64 StringUtil::CRC32(CStrRef input) {
+int64_t StringUtil::CRC32(CStrRef input) {
   return string_crc32(input, input.size());
 }
 
diff --git a/hphp/runtime/base/string_util.h b/hphp/runtime/base/string_util.h
index de6882df16cc0..69f2f78997357 100644
--- a/hphp/runtime/base/string_util.h
+++ b/hphp/runtime/base/string_util.h
@@ -125,7 +125,7 @@ class StringUtil {
    */
   static String Translate(CStrRef input, CStrRef from, CStrRef to);
   static String ROT13(CStrRef input);
-  static int64 CRC32(CStrRef input);
+  static int64_t CRC32(CStrRef input);
   static String Crypt(CStrRef input, const char *salt = "");
   static String MD5(CStrRef input, bool raw = false);
   static String SHA1(CStrRef input, bool raw = false);
diff --git a/hphp/runtime/base/time/dateinterval.h b/hphp/runtime/base/time/dateinterval.h
index 48123ca3967a7..c87d59fae6aad 100644
--- a/hphp/runtime/base/time/dateinterval.h
+++ b/hphp/runtime/base/time/dateinterval.h
@@ -73,26 +73,26 @@ class DateInterval : public SweepableResourceData {
   DateInterval(CStrRef date_interval, bool date_string = false);
   DateInterval(timelib_rel_time *di);
 
-  int64 getYears()      const    { return m_di->y;                      }
-  int64 getMonths()     const    { return m_di->m;                      }
-  int64 getDays()       const    { return m_di->d;                      }
-  int64 getHours()      const    { return m_di->h;                      }
-  int64 getMinutes()    const    { return m_di->i;                      }
-  int64 getSeconds()    const    { return m_di->s;                      }
+  int64_t getYears()      const    { return m_di->y;                      }
+  int64_t getMonths()     const    { return m_di->m;                      }
+  int64_t getDays()       const    { return m_di->d;                      }
+  int64_t getHours()      const    { return m_di->h;                      }
+  int64_t getMinutes()    const    { return m_di->i;                      }
+  int64_t getSeconds()    const    { return m_di->s;                      }
   bool  isInverted()    const    { return TIMELIB_REL_INVERT(m_di);     }
   bool  haveTotalDays() const    { return TIMELIB_REL_DAYS(m_di) != -99999; }
-  int64 getTotalDays()  const    { return TIMELIB_REL_DAYS(m_di);       }
-
-  void setYears(int64 value)     { if (isValid()) m_di->y      = value; }
-  void setMonths(int64 value)    { if (isValid()) m_di->m      = value; }
-  void setDays(int64 value)      { if (isValid()) m_di->d      = value; }
-  void setHours(int64 value)     { if (isValid()) m_di->h      = value; }
-  void setMinutes(int64 value)   { if (isValid()) m_di->i      = value; }
-  void setSeconds(int64 value)   { if (isValid()) m_di->s      = value; }
+  int64_t getTotalDays()  const    { return TIMELIB_REL_DAYS(m_di);       }
+
+  void setYears(int64_t value)     { if (isValid()) m_di->y      = value; }
+  void setMonths(int64_t value)    { if (isValid()) m_di->m      = value; }
+  void setDays(int64_t value)      { if (isValid()) m_di->d      = value; }
+  void setHours(int64_t value)     { if (isValid()) m_di->h      = value; }
+  void setMinutes(int64_t value)   { if (isValid()) m_di->i      = value; }
+  void setSeconds(int64_t value)   { if (isValid()) m_di->s      = value; }
   void setInverted(bool value)   {
     if (isValid()) TIMELIB_REL_INVERT_SET(m_di, value);
   }
-  void setTotalDays(int64 value) {
+  void setTotalDays(int64_t value) {
     if (isValid()) TIMELIB_REL_DAYS_SET(m_di, value);
   }
 
diff --git a/hphp/runtime/base/time/datetime.cpp b/hphp/runtime/base/time/datetime.cpp
index 37a2d5c97ad07..7864f0e5f1eca 100644
--- a/hphp/runtime/base/time/datetime.cpp
+++ b/hphp/runtime/base/time/datetime.cpp
@@ -220,11 +220,11 @@ DateTime::DateTime() : m_timestamp(-1), m_timestampSet(false) {
   setTimezone(TimeZone::Current());
 }
 
-DateTime::DateTime(int64 timestamp, bool utc /* = false */) {
+DateTime::DateTime(int64_t timestamp, bool utc /* = false */) {
   fromTimeStamp(timestamp, utc);
 }
 
-void DateTime::fromTimeStamp(int64 timestamp, bool utc /* = false */) {
+void DateTime::fromTimeStamp(int64_t timestamp, bool utc /* = false */) {
   m_timestamp = timestamp;
   m_timestampSet = true;
 
@@ -443,7 +443,7 @@ void DateTime::toTm(struct tm &ta) const {
   }
 }
 
-int64 DateTime::toTimeStamp(bool &err) const {
+int64_t DateTime::toTimeStamp(bool &err) const {
   err = false;
   if (!m_timestampSet) {
     int error;
@@ -457,7 +457,7 @@ int64 DateTime::toTimeStamp(bool &err) const {
   return m_timestamp;
 }
 
-int64 DateTime::toInteger(char format) const {
+int64_t DateTime::toInteger(char format) const {
   bool error;
   switch (format) {
   case 'd':
diff --git a/hphp/runtime/base/time/datetime.h b/hphp/runtime/base/time/datetime.h
index 0da3101d8f853..747f444dfdd2a 100644
--- a/hphp/runtime/base/time/datetime.h
+++ b/hphp/runtime/base/time/datetime.h
@@ -223,7 +223,7 @@ class DateTime : public SweepableResourceData {
 public:
   // constructor
   DateTime();
-  DateTime(int64 timestamp, bool utc = false); // from a timestamp
+  DateTime(int64_t timestamp, bool utc = false); // from a timestamp
 
   static StaticString s_class_name;
   // overriding ResourceData
@@ -267,12 +267,12 @@ class DateTime : public SweepableResourceData {
 
   // conversions
   void toTm(struct tm &ta) const;
-  int64 toTimeStamp(bool &err) const;
-  int64 toInteger(char format) const;
+  int64_t toTimeStamp(bool &err) const;
+  int64_t toInteger(char format) const;
   String toString(CStrRef format, bool stdc = false) const;
   String toString(DateFormat format) const;
   Array toArray(ArrayFormat format) const;
-  void fromTimeStamp(int64 timestamp, bool utc = false);
+  void fromTimeStamp(int64_t timestamp, bool utc = false);
   bool fromString(CStrRef input, SmartObject<TimeZone> tz, const char* format=nullptr);
 
   // comparison
@@ -344,7 +344,7 @@ class DateTime : public SweepableResourceData {
 
   TimePtr m_time;
   SmartObject<TimeZone> m_tz;
-  mutable int64 m_timestamp;
+  mutable int64_t m_timestamp;
   mutable bool m_timestampSet;
 
   // helpers
diff --git a/hphp/runtime/base/time/timestamp.cpp b/hphp/runtime/base/time/timestamp.cpp
index e3202391f36ed..b2514b08becb0 100644
--- a/hphp/runtime/base/time/timestamp.cpp
+++ b/hphp/runtime/base/time/timestamp.cpp
@@ -23,7 +23,7 @@ namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 // creation
 
-int64 TimeStamp::Current() {
+int64_t TimeStamp::Current() {
   return time(0);
 }
 
@@ -58,7 +58,7 @@ String TimeStamp::CurrentMicroTime() {
   return String(ret, CopyString);
 }
 
-int64 TimeStamp::Get(bool &error, int hou, int min, int sec, int mon, int day,
+int64_t TimeStamp::Get(bool &error, int hou, int min, int sec, int mon, int day,
                    int yea, bool gmt) {
   DateTime dt(Current());
   if (gmt) {
diff --git a/hphp/runtime/base/time/timestamp.h b/hphp/runtime/base/time/timestamp.h
index 834d1f1158234..bb3da8a006462 100644
--- a/hphp/runtime/base/time/timestamp.h
+++ b/hphp/runtime/base/time/timestamp.h
@@ -30,12 +30,12 @@ namespace HPHP {
  */
 class TimeStamp {
 public:
-  static int64 Current();
+  static int64_t Current();
   static double CurrentSecond();
   static Array CurrentTime();
   static String CurrentMicroTime();
 
-  static int64 Get(bool &error, int hour = INT_MAX, int minute = INT_MAX,
+  static int64_t Get(bool &error, int hour = INT_MAX, int minute = INT_MAX,
                  int second = INT_MAX, int month = INT_MAX, int day = INT_MAX,
                  int year = INT_MAX, bool gmt = false);
 };
diff --git a/hphp/runtime/base/tv_helpers.cpp b/hphp/runtime/base/tv_helpers.cpp
index 839c1d85a72fb..48cbf8b21b106 100644
--- a/hphp/runtime/base/tv_helpers.cpp
+++ b/hphp/runtime/base/tv_helpers.cpp
@@ -47,7 +47,7 @@ void tvCastToInt64InPlace(TypedValue* tv, int base /* = 10 */) {
   if (tv->m_type == KindOfRef) {
     tvUnbox(tv);
   }
-  int64 i;
+  int64_t i;
   switch (tv->m_type) {
   case KindOfUninit:
   case KindOfNull:
diff --git a/hphp/runtime/base/type_array.cpp b/hphp/runtime/base/type_array.cpp
index d6d3fddec1386..4da8c444d93d4 100644
--- a/hphp/runtime/base/type_array.cpp
+++ b/hphp/runtime/base/type_array.cpp
@@ -428,21 +428,21 @@ CVarRef Array::rvalAtRef(bool key, ACCESSPARAMS_IMPL) const {
 }
 
 Variant Array::rvalAt(int key, ACCESSPARAMS_IMPL) const {
-  if (m_px) return m_px->get((int64)key, flags & AccessFlags::Error);
+  if (m_px) return m_px->get((int64_t)key, flags & AccessFlags::Error);
   return null_variant;
 }
 
 CVarRef Array::rvalAtRef(int key, ACCESSPARAMS_IMPL) const {
-  if (m_px) return m_px->get((int64)key, flags & AccessFlags::Error);
+  if (m_px) return m_px->get((int64_t)key, flags & AccessFlags::Error);
   return null_variant;
 }
 
-Variant Array::rvalAt(int64 key, ACCESSPARAMS_IMPL) const {
+Variant Array::rvalAt(int64_t key, ACCESSPARAMS_IMPL) const {
   if (m_px) return m_px->get(key, flags & AccessFlags::Error);
   return null_variant;
 }
 
-CVarRef Array::rvalAtRef(int64 key, ACCESSPARAMS_IMPL) const {
+CVarRef Array::rvalAtRef(int64_t key, ACCESSPARAMS_IMPL) const {
   if (m_px) return m_px->get(key, flags & AccessFlags::Error);
   return null_variant;
 }
@@ -461,7 +461,7 @@ CVarRef Array::rvalAtRef(litstr key, ACCESSPARAMS_IMPL) const {
   if (m_px) {
     bool error = flags & AccessFlags::Error;
     if (flags & AccessFlags::Key) return m_px->get(key, error);
-    int64 n;
+    int64_t n;
     int len = strlen(key);
     if (!is_strictly_integer(key, len, n)) {
       return m_px->get(key, error);
@@ -481,7 +481,7 @@ CVarRef Array::rvalAtRef(CStrRef key, ACCESSPARAMS_IMPL) const {
     bool error = flags & AccessFlags::Error;
     if (flags & AccessFlags::Key) return m_px->get(key, error);
     if (key.isNull()) return m_px->get(empty_string, error);
-    int64 n;
+    int64_t n;
     if (!key->isStrictlyInteger(n)) {
       return m_px->get(key, error);
     } else {
@@ -505,10 +505,10 @@ CVarRef Array::rvalAtRef(CVarRef key, ACCESSPARAMS_IMPL) const {
   case KindOfInt64:
     return m_px->get(key.m_data.num, flags & AccessFlags::Error);
   case KindOfDouble:
-    return m_px->get((int64)key.m_data.dbl, flags & AccessFlags::Error);
+    return m_px->get((int64_t)key.m_data.dbl, flags & AccessFlags::Error);
   case KindOfStaticString:
   case KindOfString: {
-    int64 n;
+    int64_t n;
     if (!(flags & AccessFlags::Key) &&
         key.m_data.pstr->isStrictlyInteger(n)) {
       return m_px->get(n, flags & AccessFlags::Error);
@@ -557,7 +557,7 @@ Variant *Array::lvalPtr(CStrRef key, bool forWrite, bool create) {
   return ret;
 }
 
-Variant *Array::lvalPtr(int64 key, bool forWrite, bool create) {
+Variant *Array::lvalPtr(int64_t key, bool forWrite, bool create) {
   if (create) {
     if (!m_px) {
       ArrayBase::operator=(ArrayData::Create());
@@ -656,7 +656,7 @@ CVarRef Array::addImpl(const T &key, CVarRef v) {
   return v;
 }
 
-CVarRef Array::set(int64   key, CVarRef v) {
+CVarRef Array::set(int64_t   key, CVarRef v) {
   return setImpl(key, v);
 }
 
@@ -682,7 +682,7 @@ CVarRef Array::set(CVarRef key, CVarRef v, bool isKey /* = false */) {
   return Variant::lvalBlackHole();
 }
 
-CVarRef Array::setRef(int64   key, CVarRef v) {
+CVarRef Array::setRef(int64_t   key, CVarRef v) {
   return setRefImpl(key, v);
 }
 CVarRef Array::setRef(litstr  key, CVarRef v, bool isKey /* = false */) {
@@ -706,7 +706,7 @@ CVarRef Array::setRef(CVarRef key, CVarRef v, bool isKey /* = false */) {
   return Variant::lvalBlackHole();
 }
 
-CVarRef Array::add(int64   key, CVarRef v) {
+CVarRef Array::add(int64_t   key, CVarRef v) {
   return addImpl(key, v);
 }
 CVarRef Array::add(litstr  key, CVarRef v, bool isKey /* = false */) {
@@ -974,7 +974,7 @@ void Array::serialize(VariableSerializer *serializer,
 }
 
 void Array::unserialize(VariableUnserializer *uns) {
-  int64 size = uns->readInt();
+  int64_t size = uns->readInt();
   char sep = uns->readChar();
   if (sep != ':') {
     throw Exception("Expected ':' but got '%c'", sep);
@@ -991,7 +991,7 @@ void Array::unserialize(VariableUnserializer *uns) {
     // the middle, which breaks references.
     operator=(ArrayInit(size).create());
     bool isAPC = (uns->getType() == VariableUnserializer::APCSerialize);
-    for (int64 i = 0; i < size; i++) {
+    for (int64_t i = 0; i < size; i++) {
       Variant key(uns->unserializeKey());
       if (!key.isString() && !key.isInteger()) {
         throw Exception("Invalid key");
diff --git a/hphp/runtime/base/type_array.h b/hphp/runtime/base/type_array.h
index a6cfe749c8f0c..61c40344420f0 100644
--- a/hphp/runtime/base/type_array.h
+++ b/hphp/runtime/base/type_array.h
@@ -34,8 +34,8 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-inline int64 ToKey(double d) {
-  return d > std::numeric_limits<uint64>::max() ? 0u : (uint64)d;
+inline int64_t ToKey(double d) {
+  return d > std::numeric_limits<uint64_t>::max() ? 0u : (uint64_t)d;
 }
 
 // forward declaration
@@ -118,17 +118,17 @@ class Array : protected ArrayBase {
   Array keys(CVarRef search_value = null_variant, bool strict = false) const;
   Array values() const;
 
-  int64 hashForIntSwitch(int64 firstNonZero, int64 noMatch) const {
+  int64_t hashForIntSwitch(int64_t firstNonZero, int64_t noMatch) const {
     return m_px ? noMatch : 0;
   }
 
-  int64 hashForStringSwitch(
-      int64 firstTrueCaseHash,
-      int64 firstNullCaseHash,
-      int64 firstFalseCaseHash,
-      int64 firstZeroCaseHash,
-      int64 firstHash,
-      int64 noMatchHash,
+  int64_t hashForStringSwitch(
+      int64_t firstTrueCaseHash,
+      int64_t firstNullCaseHash,
+      int64_t firstFalseCaseHash,
+      int64_t firstZeroCaseHash,
+      int64_t firstHash,
+      int64_t noMatchHash,
       bool &needsOrder) const {
     needsOrder = false;
     return m_px ? noMatchHash : firstNullCaseHash;
@@ -248,7 +248,7 @@ class Array : protected ArrayBase {
   char   toByte   () const { return (m_px && !m_px->empty()) ? 1 : 0;}
   short  toInt16  () const { return (m_px && !m_px->empty()) ? 1 : 0;}
   int    toInt32  () const { return (m_px && !m_px->empty()) ? 1 : 0;}
-  int64  toInt64  () const { return (m_px && !m_px->empty()) ? 1 : 0;}
+  int64_t  toInt64  () const { return (m_px && !m_px->empty()) ? 1 : 0;}
   double toDouble () const { return (m_px && !m_px->empty()) ? 1.0 : 0.0;}
   String toString () const { return m_px ? "Array" : "";}
   Object toObject () const;
@@ -272,7 +272,7 @@ class Array : protected ArrayBase {
    */
   Variant rvalAt(bool    key, ACCESSPARAMS_DECL) const;
   Variant rvalAt(int     key, ACCESSPARAMS_DECL) const;
-  Variant rvalAt(int64   key, ACCESSPARAMS_DECL) const;
+  Variant rvalAt(int64_t   key, ACCESSPARAMS_DECL) const;
   Variant rvalAt(double  key, ACCESSPARAMS_DECL) const;
   Variant rvalAt(litstr  key, ACCESSPARAMS_DECL) const;
   Variant rvalAt(CStrRef key, ACCESSPARAMS_DECL) const;
@@ -283,7 +283,7 @@ class Array : protected ArrayBase {
    */
   CVarRef rvalAtRef(bool    key, ACCESSPARAMS_DECL) const;
   CVarRef rvalAtRef(int     key, ACCESSPARAMS_DECL) const;
-  CVarRef rvalAtRef(int64   key, ACCESSPARAMS_DECL) const;
+  CVarRef rvalAtRef(int64_t   key, ACCESSPARAMS_DECL) const;
   CVarRef rvalAtRef(double  key, ACCESSPARAMS_DECL) const;
   CVarRef rvalAtRef(litstr  key, ACCESSPARAMS_DECL) const;
   CVarRef rvalAtRef(CVarRef key, ACCESSPARAMS_DECL) const;
@@ -291,13 +291,13 @@ class Array : protected ArrayBase {
 
   const Variant operator[](bool    key) const;
   const Variant operator[](int     key) const;
-  const Variant operator[](int64   key) const;
+  const Variant operator[](int64_t   key) const;
   const Variant operator[](double  key) const;
   const Variant operator[](litstr  key) const;
   const Variant operator[](CStrRef key) const;
   const Variant operator[](CVarRef key) const;
 
-  Variant &lval(int64 key) {
+  Variant &lval(int64_t key) {
     if (!m_px) {
       ArrayBase::operator=(ArrayData::Create());
     }
@@ -324,7 +324,7 @@ class Array : protected ArrayBase {
   }
 
   Variant *lvalPtr(CStrRef key, bool forWrite, bool create);
-  Variant *lvalPtr(int64   key, bool forWrite, bool create);
+  Variant *lvalPtr(int64_t   key, bool forWrite, bool create);
 
   Variant &lvalAt();
 
@@ -334,7 +334,7 @@ class Array : protected ArrayBase {
   Variant &lvalAt(int     key, ACCESSPARAMS_DECL) {
     return lvalAtImpl(key, flags);
   }
-  Variant &lvalAt(int64   key, ACCESSPARAMS_DECL) {
+  Variant &lvalAt(int64_t   key, ACCESSPARAMS_DECL) {
     return lvalAtImpl(key, flags);
   }
   Variant &lvalAt(double  key, ACCESSPARAMS_DECL) {
@@ -354,9 +354,9 @@ class Array : protected ArrayBase {
     return set(int64_t(key ? 1 : 0), v);
   }
   CVarRef set(int     key, CVarRef v) {
-    return set((int64)key, v);
+    return set((int64_t)key, v);
   }
-  CVarRef set(int64   key, CVarRef v);
+  CVarRef set(int64_t   key, CVarRef v);
   CVarRef set(double  key, CVarRef v) {
     return set(ToKey(key), v);
   }
@@ -369,7 +369,7 @@ class Array : protected ArrayBase {
   CVarRef set(char    key, RefResult v) { return setRef(key,variant(v)); }
   CVarRef set(short   key, RefResult v) { return setRef(key,variant(v)); }
   CVarRef set(int     key, RefResult v) { return setRef(key,variant(v)); }
-  CVarRef set(int64   key, RefResult v) { return setRef(key,variant(v)); }
+  CVarRef set(int64_t   key, RefResult v) { return setRef(key,variant(v)); }
   CVarRef set(double  key, RefResult v) { return setRef(key,variant(v)); }
 
   CVarRef set(litstr  key, RefResult v, bool isKey = false) {
@@ -383,12 +383,12 @@ class Array : protected ArrayBase {
   }
 
   CVarRef setRef(bool    key, CVarRef v) {
-    return setRef((int64)key, v);
+    return setRef((int64_t)key, v);
   }
   CVarRef setRef(int     key, CVarRef v) {
-    return setRef((int64)key, v);
+    return setRef((int64_t)key, v);
   }
-  CVarRef setRef(int64   key, CVarRef v);
+  CVarRef setRef(int64_t   key, CVarRef v);
   CVarRef setRef(double  key, CVarRef v) {
     return setRef(ToKey(key), v);
   }
@@ -402,12 +402,12 @@ class Array : protected ArrayBase {
   CVarRef addImpl(const T &key, CVarRef v);
 
   CVarRef add(bool    key, CVarRef v) {
-    return add((int64)key, v);
+    return add((int64_t)key, v);
   }
   CVarRef add(int     key, CVarRef v) {
-    return add((int64)key, v);
+    return add((int64_t)key, v);
   }
-  CVarRef add(int64   key, CVarRef v);
+  CVarRef add(int64_t   key, CVarRef v);
   CVarRef add(double  key, CVarRef v) {
     return add(ToKey(key), v);
   }
@@ -435,9 +435,9 @@ class Array : protected ArrayBase {
     return addLvalImpl(key ? 1LL : 0LL);
   }
   Variant &addLval(int     key) {
-    return addLvalImpl((int64)key);
+    return addLvalImpl((int64_t)key);
   }
-  Variant &addLval(int64   key) {
+  Variant &addLval(int64_t   key) {
     return addLvalImpl(key);
   }
   Variant &addLval(double  key) {
@@ -460,15 +460,15 @@ class Array : protected ArrayBase {
     return existsImpl(key ? 1LL : 0LL);
   }
   bool exists(char    key) const {
-    return existsImpl((int64)key);
+    return existsImpl((int64_t)key);
   }
   bool exists(short   key) const {
-    return existsImpl((int64)key);
+    return existsImpl((int64_t)key);
   }
   bool exists(int     key) const {
-    return existsImpl((int64)key);
+    return existsImpl((int64_t)key);
   }
-  bool exists(int64   key) const {
+  bool exists(int64_t   key) const {
     return existsImpl(key);
   }
   bool exists(double  key) const {
@@ -492,15 +492,15 @@ class Array : protected ArrayBase {
     removeImpl(key ? 1LL : 0LL);
   }
   void remove(char    key) {
-    removeImpl((int64)key);
+    removeImpl((int64_t)key);
   }
   void remove(short   key) {
-    removeImpl((int64)key);
+    removeImpl((int64_t)key);
   }
   void remove(int     key) {
-    removeImpl((int64)key);
+    removeImpl((int64_t)key);
   }
-  void remove(int64   key) {
+  void remove(int64_t   key) {
     removeImpl(key);
   }
   void remove(double  key) {
diff --git a/hphp/runtime/base/type_conversions.h b/hphp/runtime/base/type_conversions.h
index 7cbd5e8aaa9e8..aff467f795c40 100644
--- a/hphp/runtime/base/type_conversions.h
+++ b/hphp/runtime/base/type_conversions.h
@@ -28,7 +28,7 @@ inline bool toBoolean(bool    v) { return v;}
 inline bool toBoolean(char    v) { return v;}
 inline bool toBoolean(short   v) { return v;}
 inline bool toBoolean(int     v) { return v;}
-inline bool toBoolean(int64   v) { return v;}
+inline bool toBoolean(int64_t   v) { return v;}
 inline bool toBoolean(double  v) { return v;}
 inline bool toBoolean(litstr  v) { return v && *v;}
 inline bool toBoolean(const StringData *v) {
@@ -49,7 +49,7 @@ inline char toByte(bool    v) { return v ? 1 : 0;}
 inline char toByte(char    v) { return v;}
 inline char toByte(short   v) { return v;}
 inline char toByte(int     v) { return v;}
-inline char toByte(int64   v) { return v;}
+inline char toByte(int64_t   v) { return v;}
 inline char toByte(double  v) { return (char)v;}
 inline char toByte(litstr  v) { return StringData(v).toByte();}
 inline char toByte(const StringData *v) { return v ? v->toByte() : 0;}
@@ -64,7 +64,7 @@ inline short toInt16(bool    v) { return v ? 1 : 0;}
 inline short toInt16(char    v) { return v;}
 inline short toInt16(short   v) { return v;}
 inline short toInt16(int     v) { return v;}
-inline short toInt16(int64   v) { return v;}
+inline short toInt16(int64_t   v) { return v;}
 inline short toInt16(double  v) { return (short)v;}
 inline short toInt16(litstr  v) { return StringData(v).toInt16();}
 inline short toInt16(const StringData *v) { return v ? v->toInt16() : 0;}
@@ -79,7 +79,7 @@ inline int toInt32(bool    v) { return v ? 1 : 0;}
 inline int toInt32(char    v) { return v;}
 inline int toInt32(short   v) { return v;}
 inline int toInt32(int     v) { return v;}
-inline int toInt32(int64   v) { return v;}
+inline int toInt32(int64_t   v) { return v;}
 inline int toInt32(double  v) { return (int)v;}
 inline int toInt32(litstr  v) { return StringData(v).toInt32();}
 inline int toInt32(const StringData *v) { return v ? v->toInt32() : 0;}
@@ -90,29 +90,29 @@ inline int toInt32(const ObjectData *v) { return v ? v->o_toInt64() : 0;}
 inline int toInt32(CObjRef v) { return toInt32(v.get());}
 inline int toInt32(CVarRef v) { return v.toInt32();}
 
-inline int64 toInt64(bool    v) { return v ? 1 : 0;}
-inline int64 toInt64(char    v) { return v;}
-inline int64 toInt64(short   v) { return v;}
-inline int64 toInt64(int     v) { return v;}
-inline int64 toInt64(int64   v) { return v;}
-inline int64 toInt64(double  v) {
-  return (v >= 0 ? v > std::numeric_limits<uint64>::max() ? 0u :
-          (uint64)v : (int64)v);
+inline int64_t toInt64(bool    v) { return v ? 1 : 0;}
+inline int64_t toInt64(char    v) { return v;}
+inline int64_t toInt64(short   v) { return v;}
+inline int64_t toInt64(int     v) { return v;}
+inline int64_t toInt64(int64_t   v) { return v;}
+inline int64_t toInt64(double  v) {
+  return (v >= 0 ? v > std::numeric_limits<uint64_t>::max() ? 0u :
+          (uint64_t)v : (int64_t)v);
 }
-inline int64 toInt64(litstr  v) { return StringData(v).toInt64();}
-inline int64 toInt64(const StringData *v) { return v ? v->toInt64() : 0;}
-inline int64 toInt64(CStrRef v) { return toInt64(v.get());}
-inline int64 toInt64(const ArrayData *v) { return (v && !v->empty()) ? 1 : 0;}
-inline int64 toInt64(CArrRef v) { return toInt64(v.get());}
-inline int64 toInt64(const ObjectData *v) { return v ? v->o_toInt64() : 0;}
-inline int64 toInt64(CObjRef v) { return toInt64(v.get());}
-inline int64 toInt64(CVarRef v) { return v.toInt64();}
+inline int64_t toInt64(litstr  v) { return StringData(v).toInt64();}
+inline int64_t toInt64(const StringData *v) { return v ? v->toInt64() : 0;}
+inline int64_t toInt64(CStrRef v) { return toInt64(v.get());}
+inline int64_t toInt64(const ArrayData *v) { return (v && !v->empty()) ? 1 : 0;}
+inline int64_t toInt64(CArrRef v) { return toInt64(v.get());}
+inline int64_t toInt64(const ObjectData *v) { return v ? v->o_toInt64() : 0;}
+inline int64_t toInt64(CObjRef v) { return toInt64(v.get());}
+inline int64_t toInt64(CVarRef v) { return v.toInt64();}
 
 inline double toDouble(bool    v) { return v ? 1 : 0;}
 inline double toDouble(char    v) { return v;}
 inline double toDouble(short   v) { return v;}
 inline double toDouble(int     v) { return v;}
-inline double toDouble(int64   v) { return v;}
+inline double toDouble(int64_t   v) { return v;}
 inline double toDouble(double  v) { return v;}
 inline double toDouble(litstr  v) { return StringData(v).toDouble();}
 inline double toDouble(const StringData *v) { return v? v->toDouble() : 0;}
@@ -126,10 +126,10 @@ inline double toDouble(CObjRef v) { return toDouble(v.get());}
 inline double toDouble(CVarRef v) { return v.toDouble();}
 
 inline String toString(bool    v) { return v ? "1" : "";}
-inline String toString(char    v) { return (int64)v;}
-inline String toString(short   v) { return (int64)v;}
-inline String toString(int     v) { return (int64)v;}
-inline String toString(int64   v) { return v;}
+inline String toString(char    v) { return (int64_t)v;}
+inline String toString(short   v) { return (int64_t)v;}
+inline String toString(int     v) { return (int64_t)v;}
+inline String toString(int64_t   v) { return v;}
 inline String toString(double  v) { return v;}
 inline String toString(litstr  v) { return v;}
 inline String toString(StringData *v) { return v ? String(v) : String("");}
@@ -146,7 +146,7 @@ inline Array toArray(bool    v) { return Array::Create(v);}
 inline Array toArray(char    v) { return Array::Create(v);}
 inline Array toArray(short   v) { return Array::Create(v);}
 inline Array toArray(int     v) { return Array::Create(v);}
-inline Array toArray(int64   v) { return Array::Create(v);}
+inline Array toArray(int64_t   v) { return Array::Create(v);}
 inline Array toArray(double  v) { return Array::Create(v);}
 inline Array toArray(litstr  v) { return Array::Create(v);}
 inline Array toArray(StringData *v) {
@@ -165,7 +165,7 @@ inline Object toObject(bool    v) { return Variant(v).toObject();}
 inline Object toObject(char    v) { return Variant(v).toObject();}
 inline Object toObject(short   v) { return Variant(v).toObject();}
 inline Object toObject(int     v) { return Variant(v).toObject();}
-inline Object toObject(int64   v) { return Variant(v).toObject();}
+inline Object toObject(int64_t   v) { return Variant(v).toObject();}
 inline Object toObject(double  v) { return Variant(v).toObject();}
 inline Object toObject(litstr  v) { return Variant(v).toObject();}
 inline Object toObject(const StringData *v) { return Variant(StrNR(v)).toObject();}
diff --git a/hphp/runtime/base/type_object.cpp b/hphp/runtime/base/type_object.cpp
index 11c4ae8e9023e..eedc612123e0d 100644
--- a/hphp/runtime/base/type_object.cpp
+++ b/hphp/runtime/base/type_object.cpp
@@ -62,7 +62,7 @@ Variant Object::toKey() const {
     : String();
 }
 
-int64 Object::toInt64ForCompare() const {
+int64_t Object::toInt64ForCompare() const {
   check_collection_compare(m_px);
   return toInt64();
 }
diff --git a/hphp/runtime/base/type_object.h b/hphp/runtime/base/type_object.h
index a694c8269792f..0354d0e47b390 100644
--- a/hphp/runtime/base/type_object.h
+++ b/hphp/runtime/base/type_object.h
@@ -96,16 +96,16 @@ class Object : protected ObjectBase {
   bool instanceof(CStrRef s) const {
     return m_px && m_px->o_instanceof(s);
   }
-  int64 hashForIntSwitch(int64 firstNonZero, int64 noMatch) const {
+  int64_t hashForIntSwitch(int64_t firstNonZero, int64_t noMatch) const {
     return m_px ? m_px->o_toInt64() : 0;
   }
-  int64 hashForStringSwitch(
-      int64 firstTrueCaseHash,
-      int64 firstNullCaseHash,
-      int64 firstFalseCaseHash,
-      int64 firstZeroCaseHash,
-      int64 firstHash,
-      int64 noMatchHash,
+  int64_t hashForStringSwitch(
+      int64_t firstTrueCaseHash,
+      int64_t firstNullCaseHash,
+      int64_t firstFalseCaseHash,
+      int64_t firstZeroCaseHash,
+      int64_t firstHash,
+      int64_t noMatchHash,
       bool &needsOrder) const {
     if (!m_px) {
       needsOrder = false;
@@ -179,13 +179,13 @@ class Object : protected ObjectBase {
   char   toByte   () const { return m_px ? m_px->o_toInt64() : 0;}
   short  toInt16  () const { return m_px ? m_px->o_toInt64() : 0;}
   int    toInt32  () const { return m_px ? m_px->o_toInt64() : 0;}
-  int64  toInt64  () const { return m_px ? m_px->o_toInt64() : 0;}
+  int64_t  toInt64  () const { return m_px ? m_px->o_toInt64() : 0;}
   double toDouble () const { return m_px ? m_px->o_toDouble() : 0;}
   String toString () const { return m_px ? m_px->t___tostring() : String();}
   Array  toArray  () const;
   Variant toKey   () const;
 
-  int64 toInt64ForCompare() const;
+  int64_t toInt64ForCompare() const;
   double toDoubleForCompare() const;
 
   /**
diff --git a/hphp/runtime/base/type_string.cpp b/hphp/runtime/base/type_string.cpp
index e28d2e1b42434..e5f2841d59e88 100644
--- a/hphp/runtime/base/type_string.cpp
+++ b/hphp/runtime/base/type_string.cpp
@@ -41,7 +41,7 @@ StringData const **String::converted_integers;
 
 String::IntegerStringDataMap String::integer_string_data_map;
 
-static const StringData *convert_integer_helper(int64 n) {
+static const StringData *convert_integer_helper(int64_t n) {
   char tmpbuf[21];
   char *p;
   int is_negative;
@@ -52,14 +52,14 @@ static const StringData *convert_integer_helper(int64 n) {
   return StringData::GetStaticString(p);
 }
 
-void String::PreConvertInteger(int64 n) {
+void String::PreConvertInteger(int64_t n) {
   IntegerStringDataMap::const_iterator it =
     integer_string_data_map.find(n);
   if (it != integer_string_data_map.end()) return;
   integer_string_data_map[n] = convert_integer_helper(n);
 }
 
-const StringData *String::ConvertInteger(int64 n) {
+const StringData *String::ConvertInteger(int64_t n) {
   StringData const **psd = converted_integers + n;
   const StringData *sd = convert_integer_helper(n);
   *psd = sd;
@@ -114,7 +114,7 @@ String::String(int n) {
   m_px->setRefCount(1);
 }
 
-StringData* buildStringData(int64 n) {
+StringData* buildStringData(int64_t n) {
   char tmpbuf[21];
   char* p;
   int is_negative;
@@ -128,7 +128,7 @@ StringData* buildStringData(int64 n) {
 }
 
 HOT_FUNC
-String::String(int64 n) {
+String::String(int64_t n) {
   const StringData *sd = GetIntegerStringData(n);
   if (sd) {
     assert(sd->isStatic());
@@ -522,7 +522,7 @@ String &String::operator^=(CStrRef v) {
 HOT_FUNC
 VarNR String::toKey() const {
   if (!m_px) return VarNR(empty_string);
-  int64 n = 0;
+  int64_t n = 0;
   if (m_px->isStrictlyInteger(n)) {
     return VarNR(n);
   } else {
@@ -702,7 +702,7 @@ void String::serialize(VariableSerializer *serializer) const {
 void String::unserialize(VariableUnserializer *uns,
                          char delimiter0 /* = '"' */,
                          char delimiter1 /* = '"' */) {
-  int64 size = uns->readInt();
+  int64_t size = uns->readInt();
   if (size >= RuntimeOption::MaxSerializedStringSize) {
     throw Exception("Size of serialized string (%d) exceeds max", int(size));
   }
diff --git a/hphp/runtime/base/type_string.h b/hphp/runtime/base/type_string.h
index 02bfbf2c76066..3129ed5282ade 100644
--- a/hphp/runtime/base/type_string.h
+++ b/hphp/runtime/base/type_string.h
@@ -38,7 +38,7 @@ class VarNR;
 
 // helpers
 StringData* buildStringData(int     n);
-StringData* buildStringData(int64   n);
+StringData* buildStringData(int64_t   n);
 StringData* buildStringData(double  n);
 StringData* buildStringData(litstr  s);
 
@@ -54,7 +54,7 @@ typedef SmartPtr<StringData> StringBase;
  */
 class String : protected StringBase {
 public:
-  typedef hphp_hash_map<int64, const StringData *, int64_hash>
+  typedef hphp_hash_map<int64_t, const StringData *, int64_hash>
     IntegerStringDataMap;
   static const int MinPrecomputedInteger = SCHAR_MIN;
   static const int MaxPrecomputedInteger = 4095 + SCHAR_MIN;
@@ -62,21 +62,21 @@ class String : protected StringBase {
   static StringData const **converted_integers;
   static IntegerStringDataMap integer_string_data_map;
 
-  static bool HasConverted(int64 n) {
+  static bool HasConverted(int64_t n) {
     return MinPrecomputedInteger <= n && n <= MaxPrecomputedInteger;
   }
   static bool HasConverted(int n) {
-    return HasConverted((int64)n);
+    return HasConverted((int64_t)n);
   }
-  static void PreConvertInteger(int64 n) ATTRIBUTE_COLD;
+  static void PreConvertInteger(int64_t n) ATTRIBUTE_COLD;
 
   // create a string from a character
   static String FromChar(char ch) {
     return StringData::GetStaticString(ch);
   }
 
-  static const StringData *ConvertInteger(int64 n) ATTRIBUTE_COLD;
-  static const StringData *GetIntegerStringData(int64 n) {
+  static const StringData *ConvertInteger(int64_t n) ATTRIBUTE_COLD;
+  static const StringData *GetIntegerStringData(int64_t n) {
     if (HasConverted(n)) {
       const StringData *sd = *(converted_integers + n);
       if (UNLIKELY(sd == nullptr)) {
@@ -90,15 +90,15 @@ class String : protected StringBase {
     return nullptr;
   }
   static const StringData *GetIntegerStringData(int n) {
-    return GetIntegerStringData((int64)n);
+    return GetIntegerStringData((int64_t)n);
   }
-  static const char *GetIntegerString(int64 n) {
+  static const char *GetIntegerString(int64_t n) {
     const StringData *sd = GetIntegerStringData(n);
     if (sd) return sd->data();
     return nullptr;
   }
   static const char *GetIntegerString(int n) {
-    return GetIntegerString((int64)n);
+    return GetIntegerString((int64_t)n);
   }
 
 public:
@@ -126,7 +126,7 @@ class String : protected StringBase {
    */
   String(StringData *data) : StringBase(data) { }
   String(int     n);
-  String(int64   n);
+  String(int64_t   n);
   String(double  n);
   String(litstr  s) {
     if (s) {
@@ -274,17 +274,17 @@ class String : protected StringBase {
     return m_px ? m_px->isLiteral() : true;
   }
 
-  int64 hashForIntSwitch(int64 firstNonZero, int64 noMatch) const {
+  int64_t hashForIntSwitch(int64_t firstNonZero, int64_t noMatch) const {
     return m_px ? m_px->hashForIntSwitch(firstNonZero, noMatch) : 0;
   }
 
-  int64 hashForStringSwitch(
-      int64 firstTrueCaseHash,
-      int64 firstNullCaseHash,
-      int64 firstFalseCaseHash,
-      int64 firstZeroCaseHash,
-      int64 firstHash,
-      int64 noMatchHash,
+  int64_t hashForStringSwitch(
+      int64_t firstTrueCaseHash,
+      int64_t firstNullCaseHash,
+      int64_t firstFalseCaseHash,
+      int64_t firstZeroCaseHash,
+      int64_t firstHash,
+      int64_t noMatchHash,
       bool &needsOrder) const {
     if (!m_px) {
       needsOrder = false;
@@ -397,7 +397,7 @@ class String : protected StringBase {
   char   toByte   () const { return m_px ? m_px->toByte   () : 0;}
   short  toInt16  () const { return m_px ? m_px->toInt16  () : 0;}
   int    toInt32  () const { return m_px ? m_px->toInt32  () : 0;}
-  int64  toInt64  () const { return m_px ? m_px->toInt64  () : 0;}
+  int64_t  toInt64  () const { return m_px ? m_px->toInt64  () : 0;}
   double toDouble () const { return m_px ? m_px->toDouble () : 0;}
   VarNR  toKey   () const;
 
@@ -432,8 +432,8 @@ class String : protected StringBase {
   String rvalAt(char    key) const { return rvalAtImpl(key);}
   String rvalAt(short   key) const { return rvalAtImpl(key);}
   String rvalAt(int     key) const { return rvalAtImpl(key);}
-  String rvalAt(int64   key) const { return rvalAtImpl(key);}
-  String rvalAt(double  key) const { return rvalAtImpl((int64)key);}
+  String rvalAt(int64_t   key) const { return rvalAtImpl(key);}
+  String rvalAt(double  key) const { return rvalAtImpl((int64_t)key);}
   String rvalAt(litstr  key) const { return rvalAtImpl(String(key).toInt32());}
   String rvalAt(const StringData *key) const {
     not_reached();
@@ -448,8 +448,8 @@ class String : protected StringBase {
   StringOffset lvalAt(char    key) { return lvalAtImpl(key);}
   StringOffset lvalAt(short   key) { return lvalAtImpl(key);}
   StringOffset lvalAt(int     key) { return lvalAtImpl(key);}
-  StringOffset lvalAt(int64   key) { return lvalAtImpl(key);}
-  StringOffset lvalAt(double  key) { return lvalAtImpl((int64)key);}
+  StringOffset lvalAt(int64_t   key) { return lvalAtImpl(key);}
+  StringOffset lvalAt(double  key) { return lvalAtImpl((int64_t)key);}
   StringOffset lvalAt(litstr  key) { return lvalAtImpl(String(key).toInt32());}
   StringOffset lvalAt(const StringData *key) {
     not_reached();
diff --git a/hphp/runtime/base/type_variant.cpp b/hphp/runtime/base/type_variant.cpp
index db5dd0b8c4378..d61357b4c8e8b 100644
--- a/hphp/runtime/base/type_variant.cpp
+++ b/hphp/runtime/base/type_variant.cpp
@@ -67,8 +67,8 @@ static StaticString s_PHP_Incomplete_Class_Name("__PHP_Incomplete_Class_Name");
 ///////////////////////////////////////////////////////////////////////////////
 // local helpers
 
-static int64 ToKey(bool i) { return (int64)i; }
-static int64 ToKey(int64 i) { return i; }
+static int64_t ToKey(bool i) { return (int64_t)i; }
+static int64_t ToKey(int64_t i) { return i; }
 static VarNR ToKey(CStrRef s) { return s.toKey(); }
 static VarNR ToKey(CVarRef v) { return v.toKey(); }
 
@@ -287,7 +287,7 @@ Variant &Variant::setWithRef(CVarRef v, const ArrayData *arr /* = NULL */) {
 IMPLEMENT_VOID_SET(setNull, m_type = KindOfNull)
 HOT_FUNC IMPLEMENT_SET(bool, m_type = KindOfBoolean; m_data.num = v)
 IMPLEMENT_SET(int, m_type = KindOfInt64; m_data.num = v)
-HOT_FUNC IMPLEMENT_SET(int64, m_type = KindOfInt64; m_data.num = v)
+HOT_FUNC IMPLEMENT_SET(int64_t, m_type = KindOfInt64; m_data.num = v)
 IMPLEMENT_SET(double, m_type = KindOfDouble; m_data.dbl = v)
 IMPLEMENT_SET(litstr,
               m_type = KindOfString;
@@ -352,7 +352,7 @@ void Variant::split() {
   }
 }
 
-int64 Variant::hashForIntSwitch(int64 firstNonZero, int64 noMatch) const {
+int64_t Variant::hashForIntSwitch(int64_t firstNonZero, int64_t noMatch) const {
   switch (m_type) {
   case KindOfInt64:
     return m_data.num;
@@ -381,21 +381,21 @@ int64 Variant::hashForIntSwitch(int64 firstNonZero, int64 noMatch) const {
   return 0;
 }
 
-int64 Variant::DoubleHashForIntSwitch(double dbl, int64 noMatch) {
+int64_t Variant::DoubleHashForIntSwitch(double dbl, int64_t noMatch) {
   // only matches an int if it is integral, ie
   // "50.00" -> 50
   // "50.12" -> no match
-  int64 t = (int64) dbl;
+  int64_t t = (int64_t) dbl;
   return t == dbl ? t : noMatch;
 }
 
-int64 Variant::hashForStringSwitch(
-    int64 firstTrueCaseHash,
-    int64 firstNullCaseHash,
-    int64 firstFalseCaseHash,
-    int64 firstZeroCaseHash,
-    int64 firstHash,
-    int64 noMatchHash,
+int64_t Variant::hashForStringSwitch(
+    int64_t firstTrueCaseHash,
+    int64_t firstNullCaseHash,
+    int64_t firstFalseCaseHash,
+    int64_t firstZeroCaseHash,
+    int64_t firstHash,
+    int64_t noMatchHash,
     bool &needsOrder) const {
   switch (m_type) {
   case KindOfInt64:
@@ -464,13 +464,13 @@ bool Variant::isInteger() const {
 
 HOT_FUNC
 bool Variant::isNumeric(bool checkString /* = false */) const {
-  int64 ival;
+  int64_t ival;
   double dval;
   DataType t = toNumeric(ival, dval, checkString);
   return t == KindOfInt64 || t == KindOfDouble;
 }
 
-DataType Variant::toNumeric(int64 &ival, double &dval,
+DataType Variant::toNumeric(int64_t &ival, double &dval,
     bool checkString /* = false */) const {
   switch (m_type) {
   case KindOfInt64:
@@ -689,7 +689,7 @@ Variant Variant::array_iter_each() {
   return null_variant;
 }
 
-inline DataType Variant::convertToNumeric(int64 *lval, double *dval) const {
+inline DataType Variant::convertToNumeric(int64_t *lval, double *dval) const {
   StringData *s = getStringData();
   assert(s);
   return s->isNumericWithVal(*lval, *dval, 1);
@@ -708,7 +708,7 @@ Variant Variant::operator+() const {
     return toInt64();
   }
   if (isString()) {
-    int64 lval; double dval;
+    int64_t lval; double dval;
     DataType ret = convertToNumeric(&lval, &dval);
     if (ret == KindOfDouble) {
       return dval;
@@ -743,13 +743,13 @@ Variant operator+(const Variant & lhs, const Variant & rhs) {
     return lhs.toDouble() + rhs.toDouble();
   }
   if (lhs.isString()) {
-    int64 lval; double dval;
+    int64_t lval; double dval;
     if (lhs.convertToNumeric(&lval, &dval) == KindOfDouble) {
       return dval + rhs.toDouble();
     }
   }
   if (rhs.isString()) {
-    int64 lval; double dval;
+    int64_t lval; double dval;
     if (rhs.convertToNumeric(&lval, &dval) == KindOfDouble) {
       return lhs.toDouble() + dval;
     }
@@ -796,7 +796,7 @@ Variant &Variant::operator+=(CVarRef var) {
     return *this;
   }
   if (isString()) {
-    int64 lval; double dval;
+    int64_t lval; double dval;
     DataType ret = convertToNumeric(&lval, &dval);
     if (ret == KindOfDouble) {
       set(dval + var.toDouble());
@@ -804,7 +804,7 @@ Variant &Variant::operator+=(CVarRef var) {
     }
   }
   if (var.isString()) {
-    int64 lval; double dval;
+    int64_t lval; double dval;
     DataType ret = var.convertToNumeric(&lval, &dval);
     if (ret == KindOfDouble) {
       set(toDouble() + dval);
@@ -815,7 +815,7 @@ Variant &Variant::operator+=(CVarRef var) {
   return *this;
 }
 
-Variant &Variant::operator+=(int64 n) {
+Variant &Variant::operator+=(int64_t n) {
   if (m_type == KindOfInt64) {
     m_data.num += n;
     return *this;
@@ -832,7 +832,7 @@ Variant &Variant::operator+=(int64 n) {
     throw BadArrayMergeException();
   }
   if (isString()) {
-    int64 lval; double dval;
+    int64_t lval; double dval;
     DataType ret = convertToNumeric(&lval, &dval);
     if (ret == KindOfDouble) {
       set(dval + n);
@@ -866,7 +866,7 @@ Variant Variant::operator-() const {
     return -toInt64();
   } else {
     if (isString()) {
-      int64 lval; double dval;
+      int64_t lval; double dval;
       DataType ret = convertToNumeric(&lval, &dval);
       if (ret == KindOfDouble) {
         return -dval;
@@ -893,14 +893,14 @@ Variant Variant::operator-(CVarRef var) const {
     return toInt64() - var.toInt64();
   }
   if (isString()) {
-    int64 lval; double dval;
+    int64_t lval; double dval;
     DataType ret = convertToNumeric(&lval, &dval);
     if (ret == KindOfDouble) {
       return dval - var.toDouble();
     }
   }
   if (var.isString()) {
-    int64 lval; double dval;
+    int64_t lval; double dval;
     DataType ret = var.convertToNumeric(&lval, &dval);
     if (ret == KindOfDouble) {
       return toDouble() - dval;
@@ -919,7 +919,7 @@ Variant &Variant::operator-=(CVarRef var) {
     set(toInt64() - var.toInt64());
   } else {
     if (isString()) {
-      int64 lval; double dval;
+      int64_t lval; double dval;
       DataType ret = convertToNumeric(&lval, &dval);
       if (ret == KindOfDouble) {
         set(dval - var.toDouble());
@@ -927,7 +927,7 @@ Variant &Variant::operator-=(CVarRef var) {
       }
     }
     if (var.isString()) {
-      int64 lval; double dval;
+      int64_t lval; double dval;
       DataType ret = var.convertToNumeric(&lval, &dval);
       if (ret == KindOfDouble) {
         set(toDouble() - dval);
@@ -939,7 +939,7 @@ Variant &Variant::operator-=(CVarRef var) {
   return *this;
 }
 
-Variant &Variant::operator-=(int64 n) {
+Variant &Variant::operator-=(int64_t n) {
   if (is(KindOfArray)) {
     throw BadArrayOperandException();
   }
@@ -949,7 +949,7 @@ Variant &Variant::operator-=(int64 n) {
     set(toInt64() - n);
   } else {
     if (isString()) {
-      int64 lval; double dval;
+      int64_t lval; double dval;
       DataType ret = convertToNumeric(&lval, &dval);
       if (ret == KindOfDouble) {
         set(dval - n);
@@ -985,14 +985,14 @@ Variant Variant::operator*(CVarRef var) const {
     return toInt64() * var.toInt64();
   }
   if (isString()) {
-    int64 lval; double dval;
+    int64_t lval; double dval;
     DataType ret = convertToNumeric(&lval, &dval);
     if (ret == KindOfDouble) {
       return dval * var.toDouble();
     }
   }
   if (var.isString()) {
-    int64 lval; double dval;
+    int64_t lval; double dval;
     DataType ret = var.convertToNumeric(&lval, &dval);
     if (ret == KindOfDouble) {
       return toDouble() * dval;
@@ -1011,7 +1011,7 @@ Variant &Variant::operator*=(CVarRef var) {
     set(toInt64() * var.toInt64());
   } else {
     if (isString()) {
-      int64 lval; double dval;
+      int64_t lval; double dval;
       DataType ret = convertToNumeric(&lval, &dval);
       if (ret == KindOfDouble) {
         set(dval * var.toDouble());
@@ -1019,7 +1019,7 @@ Variant &Variant::operator*=(CVarRef var) {
       }
     }
     if (var.isString()) {
-      int64 lval; double dval;
+      int64_t lval; double dval;
       DataType ret = var.convertToNumeric(&lval, &dval);
       if (ret == KindOfDouble) {
         set(toDouble() * dval);
@@ -1031,7 +1031,7 @@ Variant &Variant::operator*=(CVarRef var) {
   return *this;
 }
 
-Variant &Variant::operator*=(int64 n) {
+Variant &Variant::operator*=(int64_t n) {
   if (is(KindOfArray)) {
     throw BadArrayOperandException();
   }
@@ -1041,7 +1041,7 @@ Variant &Variant::operator*=(int64 n) {
     set(toInt64() * n);
   } else {
     if (isString()) {
-      int64 lval; double dval;
+      int64_t lval; double dval;
       DataType ret = convertToNumeric(&lval, &dval);
       if (ret == KindOfDouble) {
         set(dval * n);
@@ -1070,8 +1070,8 @@ Variant Variant::operator/(CVarRef var) const {
   if (is(KindOfArray) || var.is(KindOfArray)) {
     throw BadArrayOperandException();
   }
-  int64 lval; double dval; bool int1 = true;
-  int64 lval2; double dval2; bool int2 = true;
+  int64_t lval; double dval; bool int1 = true;
+  int64_t lval2; double dval2; bool int2 = true;
 
   if (isDouble()) {
     dval = toDouble();
@@ -1128,8 +1128,8 @@ Variant &Variant::operator/=(CVarRef var) {
   if (is(KindOfArray) || var.is(KindOfArray)) {
     throw BadArrayOperandException();
   }
-  int64 lval; double dval; bool int1 = true;
-  int64 lval2; double dval2; bool int2 = true;
+  int64_t lval; double dval; bool int1 = true;
+  int64_t lval2; double dval2; bool int2 = true;
 
   if (isDouble()) {
     dval = toDouble();
@@ -1184,7 +1184,7 @@ Variant &Variant::operator/=(CVarRef var) {
   return *this;
 }
 
-Variant &Variant::operator/=(int64 n) {
+Variant &Variant::operator/=(int64_t n) {
   if (is(KindOfArray)) {
     throw BadArrayOperandException();
   }
@@ -1200,7 +1200,7 @@ Variant &Variant::operator/=(int64 n) {
     set(toDouble() / n);
   } else {
     if (isString()) {
-      int64 lval; double dval;
+      int64_t lval; double dval;
       DataType ret = convertToNumeric(&lval, &dval);
       if (ret == KindOfInt64 && lval % n == 0) {
         set(lval / n);
@@ -1228,9 +1228,9 @@ Variant &Variant::operator/=(double n) {
 ///////////////////////////////////////////////////////////////////////////////
 // modulus
 
-int64 Variant::operator%(CVarRef var) const {
-  int64 lval = toInt64();
-  int64 lval2 = var.toInt64();
+int64_t Variant::operator%(CVarRef var) const {
+  int64_t lval = toInt64();
+  int64_t lval2 = var.toInt64();
   if (lval2 == 0) {
     raise_warning("Division by zero");
     return false;
@@ -1239,8 +1239,8 @@ int64 Variant::operator%(CVarRef var) const {
 }
 
 Variant &Variant::operator%=(CVarRef var) {
-  int64 lval = toInt64();
-  int64 lval2 = var.toInt64();
+  int64_t lval = toInt64();
+  int64_t lval2 = var.toInt64();
   if (lval2 == 0) {
     raise_warning("Division by zero");
     set(false);
@@ -1250,7 +1250,7 @@ Variant &Variant::operator%=(CVarRef var) {
   return *this;
 }
 
-Variant &Variant::operator%=(int64 n) {
+Variant &Variant::operator%=(int64_t n) {
   if (n == 0) {
     raise_warning("Division by zero");
     set(false);
@@ -1261,12 +1261,12 @@ Variant &Variant::operator%=(int64 n) {
 }
 
 Variant &Variant::operator%=(double n) {
-  if ((int64)n == 0) {
+  if ((int64_t)n == 0) {
     raise_warning("Division by zero");
     set(false);
     return *this;
   }
-  set(toInt64() % (int64)n);
+  set(toInt64() % (int64_t)n);
   return *this;
 }
 
@@ -1337,12 +1337,12 @@ Variant &Variant::operator^=(CVarRef v) {
   return *this;
 }
 
-Variant &Variant::operator<<=(int64 n) {
+Variant &Variant::operator<<=(int64_t n) {
   set(toInt64() << n);
   return *this;
 }
 
-Variant &Variant::operator>>=(int64 n) {
+Variant &Variant::operator>>=(int64_t n) {
   set(toInt64() >> n);
   return *this;
 }
@@ -1362,7 +1362,7 @@ Variant &Variant::operator++() {
       if (getStringData()->empty()) {
         set("1");
       } else {
-        int64 lval; double dval;
+        int64_t lval; double dval;
         DataType ret = convertToNumeric(&lval, &dval);
         switch (ret) {
         case KindOfInt64:  set(lval + 1); break;
@@ -1400,7 +1400,7 @@ Variant &Variant::operator--() {
       if (getStringData()->empty()) {
         set(int64_t(-1LL));
       } else {
-        int64 lval; double dval;
+        int64_t lval; double dval;
         DataType ret = convertToNumeric(&lval, &dval);
         switch (ret) {
         case KindOfInt64:  set(lval - 1);   break;
@@ -1478,7 +1478,7 @@ bool Variant::toBooleanHelper() const {
   return m_data.num;
 }
 
-int64 Variant::toInt64Helper(int base /* = 10 */) const {
+int64_t Variant::toInt64Helper(int base /* = 10 */) const {
   assert(m_type > KindOfInt64);
   switch (m_type) {
   case KindOfDouble:  {
@@ -1575,7 +1575,7 @@ Object Variant::toObjectHelper() const {
 HOT_FUNC
 VarNR Variant::toKey() const {
   if (m_type == KindOfString || m_type == KindOfStaticString) {
-    int64 n;
+    int64_t n;
     if (m_data.pstr->isStrictlyInteger(n)) {
       return VarNR(n);
     } else {
@@ -1625,10 +1625,10 @@ bool Variant::same(bool v2) const {
 }
 
 bool Variant::same(int v2) const {
-  return same((int64)v2);
+  return same((int64_t)v2);
 }
 
-bool Variant::same(int64 v2) const {
+bool Variant::same(int64_t v2) const {
   TypedValueAccessor acc = getTypedAccessor();
   switch (GetAccessorType(acc)) {
   case KindOfInt64:
@@ -1827,7 +1827,7 @@ bool Variant::same(CVarRef v2) const {
 bool Variant::equal(bool    v2) const { UNWRAP(equal);}
 bool Variant::equal(int     v2) const { UNWRAP(equal);}
 HOT_FUNC
-bool Variant::equal(int64   v2) const { UNWRAP(equal);}
+bool Variant::equal(int64_t   v2) const { UNWRAP(equal);}
 bool Variant::equal(double  v2) const { UNWRAP(equal);}
 bool Variant::equal(litstr  v2) const { UNWRAP_STR(equal);}
 bool Variant::equal(const StringData *v2) const { UNWRAP_STR(equal);}
@@ -1840,7 +1840,7 @@ bool Variant::equal(CVarRef v2) const { UNWRAP_VAR(equal,equal);}
 
 bool Variant::equalAsStr(bool    v2) const { UNWRAP_STRING(equalAsStr);}
 bool Variant::equalAsStr(int     v2) const { UNWRAP_STRING(equalAsStr);}
-bool Variant::equalAsStr(int64   v2) const { UNWRAP_STRING(equalAsStr);}
+bool Variant::equalAsStr(int64_t   v2) const { UNWRAP_STRING(equalAsStr);}
 bool Variant::equalAsStr(double  v2) const { UNWRAP_STRING(equalAsStr);}
 bool Variant::equalAsStr(litstr  v2) const { UNWRAP_STRING(equalAsStr);}
 bool Variant::equalAsStr(const StringData *v2) const {
@@ -1853,7 +1853,7 @@ bool Variant::equalAsStr(CVarRef  v2) const { UNWRAP_STRING(equalAsStr);}
 
 bool Variant::less(bool    v2) const { UNWRAP(more);}
 bool Variant::less(int     v2) const { UNWRAP(more);}
-bool Variant::less(int64   v2) const { UNWRAP(more);}
+bool Variant::less(int64_t   v2) const { UNWRAP(more);}
 bool Variant::less(double  v2) const { UNWRAP(more);}
 bool Variant::less(litstr  v2) const { UNWRAP_STR(more);}
 bool Variant::less(const StringData *v2) const { UNWRAP_STR(more);}
@@ -1866,7 +1866,7 @@ bool Variant::less(CVarRef v2) const { UNWRAP_VAR(less,more);}
 bool Variant::more(bool    v2) const { UNWRAP(less);}
 bool Variant::more(int     v2) const { UNWRAP(less);}
 HOT_FUNC
-bool Variant::more(int64   v2) const { UNWRAP(less);}
+bool Variant::more(int64_t   v2) const { UNWRAP(less);}
 bool Variant::more(double  v2) const { UNWRAP(less);}
 bool Variant::more(litstr  v2) const { UNWRAP_STR(less);}
 bool Variant::more(const StringData *v2) const { UNWRAP_STR(less);}
@@ -1970,7 +1970,7 @@ Variant Variant::rvalAt(double offset, ACCESSPARAMS_IMPL) const {
   IMPLEMENT_RVAL_INTEGRAL
 }
 
-Variant Variant::rvalAtHelper(int64 offset, ACCESSPARAMS_IMPL) const {
+Variant Variant::rvalAtHelper(int64_t offset, ACCESSPARAMS_IMPL) const {
   switch (m_type) {
   case KindOfStaticString:
   case KindOfString:
@@ -2004,7 +2004,7 @@ Variant Variant::rvalAt(litstr offset, ACCESSPARAMS_IMPL) const {
     if (flags & AccessFlags::Key) {
       return m_data.parr->get(offset, error);
     }
-    int64 n;
+    int64_t n;
     int len = strlen(offset);
     if (!is_strictly_integer(offset, len, n)) {
       return m_data.parr->get(offset, error);
@@ -2047,7 +2047,7 @@ Variant Variant::rvalAt(CStrRef offset, ACCESSPARAMS_IMPL) const {
       return m_data.parr->get(offset, error);
     }
     if (offset.isNull()) return m_data.parr->get(empty_string, error);
-    int64 n;
+    int64_t n;
     if (!offset->isStrictlyInteger(n)) {
       return m_data.parr->get(offset, error);
     } else {
@@ -2092,11 +2092,11 @@ Variant Variant::rvalAt(CVarRef offset, ACCESSPARAMS_IMPL) const {
     case KindOfInt64:
       return m_data.parr->get(offset.m_data.num, flags & AccessFlags::Error);
     case KindOfDouble:
-      return m_data.parr->get((int64)offset.m_data.dbl,
+      return m_data.parr->get((int64_t)offset.m_data.dbl,
                               flags & AccessFlags::Error);
     case KindOfStaticString:
     case KindOfString: {
-      int64 n;
+      int64_t n;
       if (offset.m_data.pstr->isStrictlyInteger(n)) {
         return m_data.parr->get(n, flags & AccessFlags::Error);
       } else {
@@ -2180,7 +2180,7 @@ CVarRef Variant::rvalRefHelper(T offset, CVarRef tmp, ACCESSPARAMS_IMPL) const {
 }
 
 template CVarRef
-Variant::rvalRefHelper(int64 offset, CVarRef tmp, ACCESSPARAMS_IMPL) const;
+Variant::rvalRefHelper(int64_t offset, CVarRef tmp, ACCESSPARAMS_IMPL) const;
 
 CVarRef Variant::rvalRef(bool offset, CVarRef tmp, ACCESSPARAMS_IMPL) const {
   if (m_type == KindOfArray) {
@@ -2200,7 +2200,7 @@ CVarRef Variant::rvalRef(litstr offset, CVarRef tmp, ACCESSPARAMS_IMPL) const {
   if (m_type == KindOfArray) {
     bool error = flags & AccessFlags::Error;
     if (flags & AccessFlags::Key) return m_data.parr->get(offset, error);
-    int64 n;
+    int64_t n;
     int len = strlen(offset);
     if (!is_strictly_integer(offset, len, n)) {
       return m_data.parr->get(offset, error);
@@ -2216,7 +2216,7 @@ CVarRef Variant::rvalRef(CStrRef offset, CVarRef tmp, ACCESSPARAMS_IMPL) const {
     bool error = flags & AccessFlags::Error;
     if (flags & AccessFlags::Key) return m_data.parr->get(offset, error);
     if (offset.isNull()) return m_data.parr->get(empty_string, error);
-    int64 n;
+    int64_t n;
     if (!offset->isStrictlyInteger(n)) {
       return m_data.parr->get(offset, error);
     } else {
@@ -2237,11 +2237,11 @@ CVarRef Variant::rvalRef(CVarRef offset, CVarRef tmp, ACCESSPARAMS_IMPL) const {
     case KindOfInt64:
       return m_data.parr->get(offset.m_data.num, flags & AccessFlags::Error);
     case KindOfDouble:
-      return m_data.parr->get((int64)offset.m_data.dbl,
+      return m_data.parr->get((int64_t)offset.m_data.dbl,
                               flags & AccessFlags::Error);
     case KindOfStaticString:
     case KindOfString: {
-      int64 n;
+      int64_t n;
       if (offset.m_data.pstr->isStrictlyInteger(n)) {
         return m_data.parr->get(n, flags & AccessFlags::Error);
       } else {
@@ -2280,7 +2280,7 @@ CVarRef Variant::rvalAtRefHelper(T offset, ACCESSPARAMS_IMPL) const {
 }
 
 template
-CVarRef Variant::rvalAtRefHelper<int64>(int64 offset, ACCESSPARAMS_IMPL) const;
+CVarRef Variant::rvalAtRefHelper<int64_t>(int64_t offset, ACCESSPARAMS_IMPL) const;
 template
 CVarRef Variant::rvalAtRefHelper<CStrRef>(CStrRef offset,
                                           ACCESSPARAMS_IMPL) const;
@@ -2295,18 +2295,18 @@ template <typename T>
 class LvalHelper {};
 
 template<>
-class LvalHelper<int64> {
+class LvalHelper<int64_t> {
 public:
-  typedef int64 KeyType;
+  typedef int64_t KeyType;
   static bool CheckKey(KeyType k) { return true; };
   static const bool CheckParams = false;
 };
 
 template<>
-class LvalHelper<bool> : public LvalHelper<int64> {};
+class LvalHelper<bool> : public LvalHelper<int64_t> {};
 
 template<>
-class LvalHelper<double> : public LvalHelper<int64> {};
+class LvalHelper<double> : public LvalHelper<int64_t> {};
 
 template<>
 class LvalHelper<CStrRef> {
@@ -2384,9 +2384,9 @@ Variant &Variant::lvalAt(bool    key, ACCESSPARAMS_IMPL) {
   return lvalAtImpl(key, flags);
 }
 Variant &Variant::lvalAt(int     key, ACCESSPARAMS_IMPL) {
-  return lvalAt((int64)key, flags);
+  return lvalAt((int64_t)key, flags);
 }
-Variant &Variant::lvalAt(int64   key, ACCESSPARAMS_IMPL) {
+Variant &Variant::lvalAt(int64_t   key, ACCESSPARAMS_IMPL) {
   return lvalAtImpl(key, flags);
 }
 Variant &Variant::lvalAt(double  key, ACCESSPARAMS_IMPL) {
@@ -2407,9 +2407,9 @@ Variant &Variant::lvalRef(bool    key, Variant& tmp, ACCESSPARAMS_IMPL) {
   return LvalAtImpl0(this, key, &tmp, false, flags);
 }
 Variant &Variant::lvalRef(int     key, Variant& tmp, ACCESSPARAMS_IMPL) {
-  return lvalRef((int64)key, tmp, flags);
+  return lvalRef((int64_t)key, tmp, flags);
 }
-Variant &Variant::lvalRef(int64   key, Variant& tmp, ACCESSPARAMS_IMPL) {
+Variant &Variant::lvalRef(int64_t   key, Variant& tmp, ACCESSPARAMS_IMPL) {
   return LvalAtImpl0(this, key, &tmp, false, flags);
 }
 Variant &Variant::lvalRef(double  key, Variant& tmp, ACCESSPARAMS_IMPL) {
@@ -2631,7 +2631,7 @@ Variant Variant::o_setPublicRef(CStrRef propName, CVarRef val) {
   return m_data.pobj->o_setPublicRef(propName, val);
 }
 
-Variant Variant::o_invoke(CStrRef s, CArrRef params, int64 hash /* = -1 */) {
+Variant Variant::o_invoke(CStrRef s, CArrRef params, int64_t hash /* = -1 */) {
   if (m_type == KindOfObject) {
     return m_data.pobj->o_invoke(s, params, hash);
   } else if (m_type == KindOfRef) {
@@ -2642,7 +2642,7 @@ Variant Variant::o_invoke(CStrRef s, CArrRef params, int64 hash /* = -1 */) {
 }
 
 Variant Variant::o_root_invoke(CStrRef s, CArrRef params,
-                               int64 hash /* = -1 */) {
+                               int64_t hash /* = -1 */) {
   if (m_type == KindOfObject) {
     return m_data.pobj->o_invoke(s, params, hash);
   } else if (m_type == KindOfRef) {
@@ -2662,7 +2662,7 @@ Variant Variant::o_invoke_ex(CStrRef clsname, CStrRef s, CArrRef params) {
   }
 }
 
-Variant Variant::o_invoke_few_args(CStrRef s, int64 hash, int count,
+Variant Variant::o_invoke_few_args(CStrRef s, int64_t hash, int count,
                                    INVOKE_FEW_ARGS_IMPL_ARGS) {
   if (m_type == KindOfObject) {
     return m_data.pobj->o_invoke_few_args(s, hash, count,
@@ -2846,7 +2846,7 @@ CVarRef Variant::set(bool key, CVarRef v) {
   return SetImpl(this, key, v, false);
 }
 
-CVarRef Variant::set(int64 key, CVarRef v) {
+CVarRef Variant::set(int64_t key, CVarRef v) {
   return SetImpl(this, key, v, false);
 }
 
@@ -2975,7 +2975,7 @@ CVarRef Variant::setRef(bool key, CVarRef v) {
   return SetRefImpl(this, key, v, false);
 }
 
-CVarRef Variant::setRef(int64 key, CVarRef v) {
+CVarRef Variant::setRef(int64_t key, CVarRef v) {
   return SetRefImpl(this, key, v, false);
 }
 
@@ -3041,7 +3041,7 @@ CVarRef Variant::setOpEqual(int op, bool key, CVarRef v) {
   IMPLEMENT_SETAT_OPEQUAL;
 }
 
-CVarRef Variant::setOpEqual(int op, int64 key, CVarRef v) {
+CVarRef Variant::setOpEqual(int op, int64_t key, CVarRef v) {
   IMPLEMENT_SETAT_OPEQUAL;
 }
 
@@ -3291,7 +3291,7 @@ void Variant::removeImpl(double key) {
   }
 }
 
-void Variant::removeImpl(int64 key) {
+void Variant::removeImpl(int64_t key) {
   switch (getType()) {
   case KindOfUninit:
   case KindOfNull:
@@ -3517,7 +3517,7 @@ static void setValue(void *addr, DataType type,
   value.unserialize(uns);
   switch (type) {
     case KindOfBoolean: *(bool*)addr = value;   break;
-    case KindOfInt64:   *(int64*)addr = value;  break;
+    case KindOfInt64:   *(int64_t*)addr = value;  break;
     case KindOfDouble:  *(double*)addr = value; break;
     case KindOfString:
       *(String*)addr = value.isString() ? value.getStringData() : nullptr;
@@ -3597,7 +3597,7 @@ void Variant::unserialize(VariableUnserializer *uns) {
   switch (type) {
   case 'r':
     {
-      int64 id = uns->readInt();
+      int64_t id = uns->readInt();
       Variant *v = uns->get(id);
       if (v == nullptr) {
         throw Exception("Id %ld out of range", id);
@@ -3607,7 +3607,7 @@ void Variant::unserialize(VariableUnserializer *uns) {
     break;
   case 'R':
     {
-      int64 id = uns->readInt();
+      int64_t id = uns->readInt();
       Variant *v = uns->get(id);
       if (v == nullptr) {
         throw Exception("Id %ld out of range", id);
@@ -3615,8 +3615,8 @@ void Variant::unserialize(VariableUnserializer *uns) {
       assignRef(*v);
     }
     break;
-  case 'b': { int64 v = uns->readInt(); operator=((bool)v); } break;
-  case 'i': { int64 v = uns->readInt(); operator=(v);       } break;
+  case 'b': { int64_t v = uns->readInt(); operator=((bool)v); } break;
+  case 'i': { int64_t v = uns->readInt(); operator=(v);       } break;
   case 'd':
     {
       double v;
@@ -3694,7 +3694,7 @@ void Variant::unserialize(VariableUnserializer *uns) {
         obj->o_set(s_PHP_Incomplete_Class_Name, clsName);
       }
       operator=(obj);
-      int64 size = uns->readInt();
+      int64_t size = uns->readInt();
       char sep = uns->readChar();
       if (sep != ':') {
         throw Exception("Expected ':' but got '%c'", sep);
@@ -3722,7 +3722,7 @@ void Variant::unserialize(VariableUnserializer *uns) {
             of dynamic properties when we see the first dynamic prop).
             see getVariantPtr
           */
-          for (int64 i = size; i--; ) {
+          for (int64_t i = size; i--; ) {
             String key = uns->unserializeKey().toString();
             int ksize = key.size();
             const char *kdata = key.data();
diff --git a/hphp/runtime/base/type_variant.h b/hphp/runtime/base/type_variant.h
index 3c0aabaf2f953..9c0dbb56e76df 100644
--- a/hphp/runtime/base/type_variant.h
+++ b/hphp/runtime/base/type_variant.h
@@ -147,7 +147,7 @@ class Variant : VariantBase {
   // implemented as long or long long.
   Variant(long   v) : _count(0), m_type(KindOfInt64  ) { m_data.num = v;}
   Variant(long long v) : _count(0), m_type(KindOfInt64  ) { m_data.num = v;}
-  Variant(uint64  v) : _count(0), m_type(KindOfInt64  ) { m_data.num = v;}
+  Variant(uint64_t  v) : _count(0), m_type(KindOfInt64  ) { m_data.num = v;}
 
   Variant(double  v) : _count(0), m_type(KindOfDouble ) { m_data.dbl = v;}
 
@@ -304,12 +304,12 @@ class Variant : VariantBase {
 ///////////////////////////////////////////////////////////////////////////////
 // int64
 
-  inline ALWAYS_INLINE int64 asInt64Val() const {
+  inline ALWAYS_INLINE int64_t asInt64Val() const {
     assert(m_type == KindOfInt64);
     return m_data.num;
   }
 
-  inline ALWAYS_INLINE int64 toInt64Val() const {
+  inline ALWAYS_INLINE int64_t toInt64Val() const {
     assert(is(KindOfInt64));
     return
         LIKELY(m_type == KindOfInt64) ?
@@ -479,7 +479,7 @@ class Variant : VariantBase {
   }
   bool isInteger() const;
   bool isNumeric(bool checkString = false) const;
-  DataType toNumeric(int64 &ival, double &dval, bool checkString = false)
+  DataType toNumeric(int64_t &ival, double &dval, bool checkString = false)
     const;
   bool isScalar() const;
   bool isObject() const {
@@ -516,17 +516,17 @@ class Variant : VariantBase {
    * first non zero case in the statements. noMatch refers to a case
    * statement which does NOT exist in the statements.
    */
-  int64 hashForIntSwitch(int64 firstNonZero, int64 noMatch) const;
+  int64_t hashForIntSwitch(int64_t firstNonZero, int64_t noMatch) const;
 
-  static int64 DoubleHashForIntSwitch(double dbl, int64 noMatch);
+  static int64_t DoubleHashForIntSwitch(double dbl, int64_t noMatch);
 
-  int64 hashForStringSwitch(
-      int64 firstTrueCaseHash,
-      int64 firstNullCaseHash,
-      int64 firstFalseCaseHash,
-      int64 firstZeroCaseHash,
-      int64 firstHash,
-      int64 noMatchHash,
+  int64_t hashForStringSwitch(
+      int64_t firstTrueCaseHash,
+      int64_t firstNullCaseHash,
+      int64_t firstFalseCaseHash,
+      int64_t firstZeroCaseHash,
+      int64_t firstHash,
+      int64_t noMatchHash,
       bool &needsOrder) const;
 
   /**
@@ -546,7 +546,7 @@ class Variant : VariantBase {
     bool val = m_type == KindOfRef ? m_data.pref->var()->m_data.num : m_data.num;
     return val;
   }
-  int64 getInt64() const {
+  int64_t getInt64() const {
     assert(getType() == KindOfInt64);
     return m_type == KindOfRef ? m_data.pref->var()->m_data.num : m_data.num;
   }
@@ -594,34 +594,34 @@ class Variant : VariantBase {
   Variant unary_plus() const { return Variant(*this).operator+();}
   friend Variant  operator +  (const Variant & lhs, const Variant & rhs);
   Variant &operator += (CVarRef v);
-  Variant &operator += (int     n) { return operator+=((int64)n);}
-  Variant &operator += (int64   n);
+  Variant &operator += (int     n) { return operator+=((int64_t)n);}
+  Variant &operator += (int64_t   n);
   Variant &operator += (double  n);
 
   Variant negate() const { return Variant(*this).operator-();}
   Variant  operator -  () const;
   Variant  operator -  (CVarRef v) const;
   Variant &operator -= (CVarRef v);
-  Variant &operator -= (int     n) { return operator-=((int64)n);}
-  Variant &operator -= (int64   n);
+  Variant &operator -= (int     n) { return operator-=((int64_t)n);}
+  Variant &operator -= (int64_t   n);
   Variant &operator -= (double  n);
 
   Variant  operator *  (CVarRef v) const;
   Variant &operator *= (CVarRef v);
-  Variant &operator *= (int     n) { return operator*=((int64)n);}
-  Variant &operator *= (int64   n);
+  Variant &operator *= (int     n) { return operator*=((int64_t)n);}
+  Variant &operator *= (int64_t   n);
   Variant &operator *= (double  n);
 
   Variant  operator /  (CVarRef v) const;
   Variant &operator /= (CVarRef v);
-  Variant &operator /= (int     n) { return operator/=((int64)n);}
-  Variant &operator /= (int64   n);
+  Variant &operator /= (int     n) { return operator/=((int64_t)n);}
+  Variant &operator /= (int64_t   n);
   Variant &operator /= (double  n);
 
-  int64    operator %  (CVarRef v) const;
+  int64_t    operator %  (CVarRef v) const;
   Variant &operator %= (CVarRef v);
-  Variant &operator %= (int     n) { return operator%=((int64)n);}
-  Variant &operator %= (int64   n);
+  Variant &operator %= (int     n) { return operator%=((int64_t)n);}
+  Variant &operator %= (int64_t   n);
   Variant &operator %= (double  n);
 
   Variant  operator ~  () const;
@@ -631,8 +631,8 @@ class Variant : VariantBase {
   Variant &operator &= (CVarRef v);
   Variant  operator ^  (CVarRef v) const;
   Variant &operator ^= (CVarRef v);
-  Variant &operator <<=(int64 n);
-  Variant &operator >>=(int64 n);
+  Variant &operator <<=(int64_t n);
+  Variant &operator >>=(int64_t n);
 
   Variant &operator ++ ();
   Variant  operator ++ (int);
@@ -673,7 +673,7 @@ class Variant : VariantBase {
   operator char   () const { return toByte();}
   operator short  () const { return toInt16();}
   operator int    () const { return toInt32();}
-  operator int64  () const { return toInt64();}
+  operator int64_t  () const { return toInt64();}
   operator double () const { return toDouble();}
   operator String () const;
   operator Array  () const;
@@ -691,12 +691,12 @@ class Variant : VariantBase {
   char   toByte   () const { return (char)toInt64();}
   short  toInt16  (int base = 10) const { return (short)toInt64(base);}
   int    toInt32  (int base = 10) const { return (int)toInt64(base);}
-  int64  toInt64  () const {
+  int64_t  toInt64  () const {
     if (IS_NULL_TYPE(m_type)) return 0;
     if (m_type <= KindOfInt64) return m_data.num;
     return toInt64Helper(10);
   }
-  int64  toInt64  (int base) const {
+  int64_t  toInt64  (int base) const {
     if (IS_NULL_TYPE(m_type)) return 0;
     if (m_type <= KindOfInt64) return m_data.num;
     return toInt64Helper(base);
@@ -750,7 +750,7 @@ class Variant : VariantBase {
    */
   bool same(bool    v2) const;
   bool same(int     v2) const;
-  bool same(int64   v2) const;
+  bool same(int64_t   v2) const;
   bool same(double  v2) const;
   bool same(litstr  v2) const;
   bool same(const StringData *v2) const;
@@ -761,7 +761,7 @@ class Variant : VariantBase {
 
   bool equal(bool    v2) const;
   bool equal(int     v2) const;
-  bool equal(int64   v2) const;
+  bool equal(int64_t   v2) const;
   bool equal(double  v2) const;
   bool equal(litstr  v2) const;
   bool equal(const StringData *v2) const;
@@ -772,7 +772,7 @@ class Variant : VariantBase {
 
   bool equalAsStr(bool    v2) const;
   bool equalAsStr(int     v2) const;
-  bool equalAsStr(int64   v2) const;
+  bool equalAsStr(int64_t   v2) const;
   bool equalAsStr(double  v2) const;
   bool equalAsStr(litstr v2) const;
   bool equalAsStr(const StringData *v2) const;
@@ -783,7 +783,7 @@ class Variant : VariantBase {
 
   bool less(bool    v2) const;
   bool less(int     v2) const;
-  bool less(int64   v2) const;
+  bool less(int64_t   v2) const;
   bool less(double  v2) const;
   bool less(litstr  v2) const;
   bool less(const StringData *v2) const;
@@ -794,7 +794,7 @@ class Variant : VariantBase {
 
   bool more(bool    v2) const;
   bool more(int     v2) const;
-  bool more(int64   v2) const;
+  bool more(int64_t   v2) const;
   bool more(double  v2) const;
   bool more(litstr  v2) const;
   bool more(const StringData *v2) const;
@@ -831,12 +831,12 @@ class Variant : VariantBase {
   /**
    * Offset functions
    */
-  Variant rvalAtHelper(int64 offset, ACCESSPARAMS_DECL) const;
+  Variant rvalAtHelper(int64_t offset, ACCESSPARAMS_DECL) const;
   Variant rvalAt(bool offset, ACCESSPARAMS_DECL) const;
   Variant rvalAt(int offset, ACCESSPARAMS_DECL) const {
-    return rvalAt((int64)offset, flags);
+    return rvalAt((int64_t)offset, flags);
   }
-  Variant rvalAt(int64 offset, ACCESSPARAMS_DECL) const {
+  Variant rvalAt(int64_t offset, ACCESSPARAMS_DECL) const {
     if (m_type == KindOfArray) {
       return m_data.parr->get(offset, flags & AccessFlags::Error);
     }
@@ -850,10 +850,10 @@ class Variant : VariantBase {
   template <typename T>
   CVarRef rvalRefHelper(T offset, CVarRef tmp, ACCESSPARAMS_DECL) const;
   CVarRef rvalRef(int offset, CVarRef tmp, ACCESSPARAMS_DECL) const {
-    return rvalRef((int64)offset, tmp, flags);
+    return rvalRef((int64_t)offset, tmp, flags);
   }
 
-  CVarRef rvalRef(int64 offset, CVarRef tmp, ACCESSPARAMS_DECL) const {
+  CVarRef rvalRef(int64_t offset, CVarRef tmp, ACCESSPARAMS_DECL) const {
     if (m_type == KindOfArray) {
       return m_data.parr->get(offset, flags & AccessFlags::Error);
     }
@@ -869,13 +869,13 @@ class Variant : VariantBase {
   template <typename T>
   CVarRef rvalAtRefHelper(T offset, ACCESSPARAMS_DECL) const;
   CVarRef rvalAtRef(bool offset, ACCESSPARAMS_DECL) const {
-    return rvalAtRefHelper((int64)offset, flags);
+    return rvalAtRefHelper((int64_t)offset, flags);
   }
   CVarRef rvalAtRef(int offset, ACCESSPARAMS_DECL) const {
-    return rvalAtRefHelper((int64)offset, flags);
+    return rvalAtRefHelper((int64_t)offset, flags);
   }
   CVarRef rvalAtRef(double offset, ACCESSPARAMS_DECL) const;
-  CVarRef rvalAtRef(int64 offset, ACCESSPARAMS_DECL) const {
+  CVarRef rvalAtRef(int64_t offset, ACCESSPARAMS_DECL) const {
     return rvalAtRefHelper(offset, flags);
   }
   CVarRef rvalAtRef(CStrRef offset, ACCESSPARAMS_DECL) const {
@@ -886,7 +886,7 @@ class Variant : VariantBase {
   }
   const Variant operator[](bool    key) const { return rvalAt(key);}
   const Variant operator[](int     key) const { return rvalAt(key);}
-  const Variant operator[](int64   key) const { return rvalAt(key);}
+  const Variant operator[](int64_t   key) const { return rvalAt(key);}
   const Variant operator[](double  key) const { return rvalAt(key);}
   const Variant operator[](litstr  key) const { return rvalAt(key);}
   const Variant operator[](CStrRef key) const { return rvalAt(key);}
@@ -920,7 +920,7 @@ class Variant : VariantBase {
 
   Variant &lvalAt(bool    key, ACCESSPARAMS_DECL);
   Variant &lvalAt(int     key, ACCESSPARAMS_DECL);
-  Variant &lvalAt(int64   key, ACCESSPARAMS_DECL);
+  Variant &lvalAt(int64_t   key, ACCESSPARAMS_DECL);
   Variant &lvalAt(double  key, ACCESSPARAMS_DECL);
   Variant &lvalAt(litstr  key, ACCESSPARAMS_DECL);
   Variant &lvalAt(CStrRef key, ACCESSPARAMS_DECL);
@@ -928,7 +928,7 @@ class Variant : VariantBase {
 
   Variant &lvalRef(bool    key, Variant& tmp, ACCESSPARAMS_DECL);
   Variant &lvalRef(int     key, Variant& tmp, ACCESSPARAMS_DECL);
-  Variant &lvalRef(int64   key, Variant& tmp, ACCESSPARAMS_DECL);
+  Variant &lvalRef(int64_t   key, Variant& tmp, ACCESSPARAMS_DECL);
   Variant &lvalRef(double  key, Variant& tmp, ACCESSPARAMS_DECL);
   Variant &lvalRef(litstr  key, Variant& tmp, ACCESSPARAMS_DECL);
   Variant &lvalRef(CStrRef key, Variant& tmp, ACCESSPARAMS_DECL);
@@ -957,12 +957,12 @@ class Variant : VariantBase {
   bool o_isset(CStrRef propName, CStrRef context = null_string) const;
   void o_unset(CStrRef propName, CStrRef context = null_string);
 
-  Variant o_invoke(CStrRef s, CArrRef params, int64 hash = -1);
-  Variant o_root_invoke(CStrRef s, CArrRef params, int64 hash = -1);
+  Variant o_invoke(CStrRef s, CArrRef params, int64_t hash = -1);
+  Variant o_root_invoke(CStrRef s, CArrRef params, int64_t hash = -1);
   Variant o_invoke_ex(CStrRef clsname, CStrRef s, CArrRef params);
-  Variant o_invoke_few_args(CStrRef s, int64 hash, int count,
+  Variant o_invoke_few_args(CStrRef s, int64_t hash, int count,
                             INVOKE_FEW_ARGS_DECL_ARGS);
-  Variant o_root_invoke_few_args(CStrRef s, int64 hash, int count,
+  Variant o_root_invoke_few_args(CStrRef s, int64_t hash, int count,
                             INVOKE_FEW_ARGS_DECL_ARGS);
 
   template <typename T>
@@ -974,8 +974,8 @@ class Variant : VariantBase {
     Variant *self, T key, CVarRef v, bool isKey);
 
   CVarRef set(bool    key, CVarRef v);
-  CVarRef set(int     key, CVarRef v) { return set((int64)key, v); }
-  CVarRef set(int64   key, CVarRef v);
+  CVarRef set(int     key, CVarRef v) { return set((int64_t)key, v); }
+  CVarRef set(int64_t   key, CVarRef v);
   CVarRef set(double  key, CVarRef v);
   CVarRef set(litstr  key, CVarRef v, bool isString = false) {
     return set(String(key), v, isString);
@@ -986,8 +986,8 @@ class Variant : VariantBase {
   CVarRef append(CVarRef v);
 
   CVarRef setRef(bool    key, CVarRef v);
-  CVarRef setRef(int     key, CVarRef v) { return setRef((int64)key, v); }
-  CVarRef setRef(int64   key, CVarRef v);
+  CVarRef setRef(int     key, CVarRef v) { return setRef((int64_t)key, v); }
+  CVarRef setRef(int64_t   key, CVarRef v);
   CVarRef setRef(double  key, CVarRef v);
   CVarRef setRef(litstr  key, CVarRef v, bool isString = false) {
     return setRef(String(key), v, isString);
@@ -997,7 +997,7 @@ class Variant : VariantBase {
 
   CVarRef set(bool    key, RefResult v) { return setRef(key, variant(v)); }
   CVarRef set(int     key, RefResult v) { return setRef(key, variant(v)); }
-  CVarRef set(int64   key, RefResult v) { return setRef(key, variant(v)); }
+  CVarRef set(int64_t   key, RefResult v) { return setRef(key, variant(v)); }
   CVarRef set(double  key, RefResult v) { return setRef(key, variant(v)); }
   CVarRef set(litstr  key, RefResult v, bool isString = false) {
     return setRef(key, variant(v), isString);
@@ -1012,9 +1012,9 @@ class Variant : VariantBase {
 
   CVarRef setOpEqual(int op, bool key, CVarRef v);
   CVarRef setOpEqual(int op, int key, CVarRef v) {
-    return setOpEqual(op, (int64)key, v);
+    return setOpEqual(op, (int64_t)key, v);
   }
-  CVarRef setOpEqual(int op, int64 key, CVarRef v);
+  CVarRef setOpEqual(int op, int64_t key, CVarRef v);
   CVarRef setOpEqual(int op, double key, CVarRef v);
   CVarRef setOpEqual(int op, litstr  key, CVarRef v, bool isString = false) {
     return setOpEqual(op, String(key), v, isString);
@@ -1027,8 +1027,8 @@ class Variant : VariantBase {
   T o_assign_op(CStrRef propName, CVarRef val, CStrRef context = null_string);
 
   void remove(bool    key) { removeImpl(key);}
-  void remove(int     key) { removeImpl((int64)key);}
-  void remove(int64   key) { removeImpl(key);}
+  void remove(int     key) { removeImpl((int64_t)key);}
+  void remove(int64_t   key) { removeImpl(key);}
   void remove(double  key) { removeImpl(key);}
   void remove(litstr  key, bool isString = false) {
     remove(String(key), isString);
@@ -1105,7 +1105,7 @@ class Variant : VariantBase {
   /**
    * Low level access that should be restricted to internal use.
    */
-  int64 *getInt64Data() const {
+  int64_t *getInt64Data() const {
     assert(getType() == KindOfInt64);
     return m_type == KindOfRef ? &m_data.pref->var()->m_data.num : &m_data.num;
   }
@@ -1159,7 +1159,7 @@ class Variant : VariantBase {
 
   ObjectData *getArrayAccess() const;
   void callOffsetUnset(CVarRef key);
-  int64 getNumData() const { return m_data.num; }
+  int64_t getNumData() const { return m_data.num; }
   bool isStatic() const { return _count == RefCountStaticValue; }
   void setEvalScalar() const;
 
@@ -1194,7 +1194,7 @@ class Variant : VariantBase {
     assert(acc && acc->m_type == KindOfBoolean);
     return acc->m_data.num;
   }
-  static int64 GetInt64(TypedValueAccessor acc) {
+  static int64_t GetInt64(TypedValueAccessor acc) {
     assert(acc);
     assert(acc->m_type == KindOfInt64);
     return acc->m_data.num;
@@ -1243,7 +1243,7 @@ class Variant : VariantBase {
    */
  protected:
   mutable union Data {
-    int64        num;
+    int64_t        num;
     double       dbl;
     StringData  *pstr;
     ArrayData   *parr;
@@ -1257,7 +1257,7 @@ class Variant : VariantBase {
       mutable int32_t _count;
       mutable DataType m_type;
     };
-    uint64 m_countAndTypeUnion;
+    uint64_t m_countAndTypeUnion;
   };
 
  private:
@@ -1271,14 +1271,14 @@ class Variant : VariantBase {
   }
 
   void removeImpl(double key);
-  void removeImpl(int64 key);
+  void removeImpl(int64_t key);
   void removeImpl(bool key);
   void removeImpl(CVarRef key, bool isString = false);
   void removeImpl(CStrRef key, bool isString = false);
 
   CVarRef set(bool    v);
   CVarRef set(int     v);
-  CVarRef set(int64   v);
+  CVarRef set(int64_t   v);
   CVarRef set(double  v);
   CVarRef set(litstr  v);
   CVarRef set(const std::string & v) {
@@ -1446,7 +1446,7 @@ class Variant : VariantBase {
   }
 
   bool   toBooleanHelper() const;
-  int64  toInt64Helper(int base = 10) const;
+  int64_t  toInt64Helper(int base = 10) const;
   double toDoubleHelper() const;
   String toStringHelper() const;
   Array  toArrayHelper() const;
@@ -1462,7 +1462,7 @@ class Variant : VariantBase {
     static_assert(offsetof(Variant,_count) == FAST_REFCOUNT_OFFSET,
                   "Offset of _count in Variant must be FAST_REFCOUNT_OFFSET");
   }
-  DataType convertToNumeric(int64 *lval, double *dval) const;
+  DataType convertToNumeric(int64_t *lval, double *dval) const;
 };
 
 class VariantVectorBase {
@@ -1519,7 +1519,7 @@ class VRefParamValue {
 
   operator bool   () const { return m_var.toBoolean();}
   operator int    () const { return m_var.toInt32();}
-  operator int64  () const { return m_var.toInt64();}
+  operator int64_t  () const { return m_var.toInt64();}
   operator double () const { return m_var.toDouble();}
   operator String () const { return m_var.toString();}
   operator Array  () const { return m_var.toArray();}
@@ -1532,7 +1532,7 @@ class VRefParamValue {
   bool isNull() const { return m_var.isNull(); }
 
   bool toBoolean() const { return m_var.toBoolean(); }
-  int64 toInt64() const { return m_var.toInt64(); }
+  int64_t toInt64() const { return m_var.toInt64(); }
   double toDouble() const { return m_var.toDouble(); }
   String toString() const { return m_var.toString(); }
   StringData *getStringData() const { return m_var.getStringData(); }
@@ -1599,7 +1599,7 @@ class VarNR : private TypedValue {
   // implemented as long or long long.
   explicit VarNR(long    v) { init(KindOfInt64  ); m_data.num = v;}
   explicit VarNR(long long v) { init(KindOfInt64  ); m_data.num = v;}
-  explicit VarNR(uint64  v) { init(KindOfInt64  ); m_data.num = v;}
+  explicit VarNR(uint64_t  v) { init(KindOfInt64  ); m_data.num = v;}
   explicit VarNR(double  v) { init(KindOfDouble ); m_data.dbl = v;}
 
   explicit VarNR(const StaticString &v) {
@@ -1678,7 +1678,7 @@ inline const Variant Array::operator[](int     key) const {
   return rvalAt(key);
 }
 
-inline const Variant Array::operator[](int64   key) const {
+inline const Variant Array::operator[](int64_t   key) const {
   return rvalAt(key);
 }
 
diff --git a/hphp/runtime/base/util/string_buffer.cpp b/hphp/runtime/base/util/string_buffer.cpp
index 09324be2dcb04..762b0949ade51 100644
--- a/hphp/runtime/base/util/string_buffer.cpp
+++ b/hphp/runtime/base/util/string_buffer.cpp
@@ -186,7 +186,7 @@ void StringBuffer::append(int n) {
   append(p, len);
 }
 
-void StringBuffer::append(int64 n) {
+void StringBuffer::append(int64_t n) {
   char buf[21];
   int is_negative;
   int len;
@@ -398,7 +398,7 @@ void StringBuffer::read(File* in, int page_size /* = 1024 */) {
       growBy(page_size);
       buffer_size = m_cap - m_len;
     }
-    int64 len = in->readImpl(m_buffer + m_len, buffer_size);
+    int64_t len = in->readImpl(m_buffer + m_len, buffer_size);
     assert(len >= 0);
     if (len == 0) break;
     m_len += len;
diff --git a/hphp/runtime/base/util/string_buffer.h b/hphp/runtime/base/util/string_buffer.h
index 6bed544db3ae9..8ee42f64e2851 100644
--- a/hphp/runtime/base/util/string_buffer.h
+++ b/hphp/runtime/base/util/string_buffer.h
@@ -95,7 +95,7 @@ class StringBuffer {
    * Append strings.
    */
   void append(int n);
-  void append(int64 n);
+  void append(int64_t n);
   void append(char c) {
     if (m_buffer && m_len < m_cap) {
       m_buffer[m_len++] = c;
diff --git a/hphp/runtime/base/util/thrift_buffer.cpp b/hphp/runtime/base/util/thrift_buffer.cpp
index f61bc81830751..381695e0c7444 100644
--- a/hphp/runtime/base/util/thrift_buffer.cpp
+++ b/hphp/runtime/base/util/thrift_buffer.cpp
@@ -31,7 +31,7 @@ ThriftBuffer::ThriftBuffer(int size,
   m_buf = (char *)malloc(m_size + 1);
   if (!m_buf) throwOutOfMemory();
   m_pEnd = m_buf + m_size;
-  m_pSafe = m_pEnd - sizeof(int64) - 1;
+  m_pSafe = m_pEnd - sizeof(int64_t) - 1;
   m_p = m_buf;
 }
 
@@ -46,14 +46,14 @@ void ThriftBuffer::reset(bool read) {
   } else {
     m_pEnd = m_buf + m_size;
   }
-  m_pSafe = m_pEnd - sizeof(int64) - 1;
+  m_pSafe = m_pEnd - sizeof(int64_t) - 1;
   m_p = m_buf;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void ThriftBuffer::write(CStrRef data) {
-  int32 len = data.size();
+  int32_t len = data.size();
   write(len);
 
   if (m_p + len > m_pEnd) {
@@ -108,7 +108,7 @@ void ThriftBuffer::read(char *data, int len) {
       } else {
         m_pEnd = m_buf;
       }
-      m_pSafe = m_pEnd - sizeof(int64) - 1;
+      m_pSafe = m_pEnd - sizeof(int64_t) - 1;
       m_p = m_buf;
       if (m_p > m_pSafe) m_safe = false;
       return; // done
@@ -120,14 +120,14 @@ void ThriftBuffer::read(char *data, int len) {
   }
 }
 
-void ThriftBuffer::skip(int8 type) {
+void ThriftBuffer::skip(int8_t type) {
   switch (type) {
     case T_STOP:
     case T_VOID:
       return;
     case T_STRUCT:
       while (true) {
-        int8 ttype; read(ttype); // get field type
+        int8_t ttype; read(ttype); // get field type
         if (ttype == T_STOP) break;
         read(nullptr, 2); // skip field number, I16
         skip(ttype); // skip field payload
@@ -152,23 +152,23 @@ void ThriftBuffer::skip(int8 type) {
     case T_UTF8:
     case T_UTF16:
     case T_STRING: {
-      int32 len; read(len);
+      int32_t len; read(len);
       read(nullptr, len);
       } return;
     case T_MAP: {
-      int8 keytype; read(keytype);
-      int8 valtype; read(valtype);
-      int32 size; read(size);
-      for (int32 i = 0; i < size; ++i) {
+      int8_t keytype; read(keytype);
+      int8_t valtype; read(valtype);
+      int32_t size; read(size);
+      for (int32_t i = 0; i < size; ++i) {
         skip(keytype);
         skip(valtype);
       }
     } return;
     case T_LIST:
     case T_SET: {
-      int8 valtype; read(valtype);
-      int32 size; read(size);
-      for (int32 i = 0; i < size; ++i) {
+      int8_t valtype; read(valtype);
+      int32_t size; read(size);
+      for (int32_t i = 0; i < size; ++i) {
         skip(valtype);
       }
     } return;
@@ -214,7 +214,7 @@ void ThriftBuffer::write(const std::string &data) {
 }
 
 void ThriftBuffer::read(std::vector<std::string> &data) {
-  int32 size;
+  int32_t size;
   read(size);
   data.resize(size);
   for (int i = 0; i < size; i++) {
@@ -223,7 +223,7 @@ void ThriftBuffer::read(std::vector<std::string> &data) {
 }
 
 void ThriftBuffer::write(const std::vector<std::string> &data) {
-  int32 size = data.size();
+  int32_t size = data.size();
   write(size);
   for (int i = 0; i < size; i++) {
     write(data[i]);
diff --git a/hphp/runtime/base/util/thrift_buffer.h b/hphp/runtime/base/util/thrift_buffer.h
index 8573730f0ea22..b9ee4e66538cc 100644
--- a/hphp/runtime/base/util/thrift_buffer.h
+++ b/hphp/runtime/base/util/thrift_buffer.h
@@ -101,7 +101,7 @@ class ThriftBuffer {
   void reset(bool read); // get ready for reads or writes
 
   // input has been called with htons() call
-  void nwrite(int16 data) {
+  void nwrite(int16_t data) {
     memcpy(m_p, &data, sizeof(data));
     if ((m_p += sizeof(data)) > m_pSafe) flush();
   }
@@ -111,27 +111,27 @@ class ThriftBuffer {
     *m_p = (data ? 1 : 0);
     if (++m_p > m_pSafe) flush();
   }
-  void write(int8 data) {
+  void write(int8_t data) {
     *m_p = data;
     if (++m_p > m_pSafe) flush();
   }
-  void write(int16 data) {
+  void write(int16_t data) {
     data = htons(data);
     memcpy(m_p, &data, sizeof(data));
     if ((m_p += sizeof(data)) > m_pSafe) flush();
   }
-  void write(int32 data) {
+  void write(int32_t data) {
     data = htonl(data);
     memcpy(m_p, &data, sizeof(data));
     if ((m_p += sizeof(data)) > m_pSafe) flush();
   }
-  void write(int64 data) {
+  void write(int64_t data) {
     data = htonll(data);
     memcpy(m_p, &data, sizeof(data));
     if ((m_p += sizeof(data)) > m_pSafe) flush();
   }
   void write(double data) {
-    union { int64 c; double d;} a;
+    union { int64_t c; double d;} a;
     a.d = data;
     write(a.c);
   }
@@ -146,7 +146,7 @@ class ThriftBuffer {
       read((char*)&data, (int)sizeof(data));
     }
   }
-  void read(int8 &data) {
+  void read(int8_t &data) {
     if (m_safe) {
       data = *m_p;
       if (++m_p > m_pSafe) m_safe = false;
@@ -154,7 +154,7 @@ class ThriftBuffer {
       read((char*)&data, (int)sizeof(data));
     }
   }
-  void read(int16 &data) {
+  void read(int16_t &data) {
     if (m_safe) {
       memcpy(&data, m_p, sizeof(data));
       if ((m_p += sizeof(data)) > m_pSafe) m_safe = false;
@@ -163,7 +163,7 @@ class ThriftBuffer {
     }
     data = ntohs(data);
   }
-  void read(int32 &data) {
+  void read(int32_t &data) {
     if (m_safe) {
       memcpy(&data, m_p, sizeof(data));
       if ((m_p += sizeof(data)) > m_pSafe) m_safe = false;
@@ -172,7 +172,7 @@ class ThriftBuffer {
     }
     data = ntohl(data);
   }
-  void read(int64 &data) {
+  void read(int64_t &data) {
     if (m_safe) {
       memcpy(&data, m_p, sizeof(data));
       if ((m_p += sizeof(data)) > m_pSafe) m_safe = false;
@@ -182,12 +182,12 @@ class ThriftBuffer {
     data = ntohll(data);
   }
   void read(double &data) {
-    union { int64 c; double d;} a; a.d = data;
+    union { int64_t c; double d;} a; a.d = data;
     read(a.c);
     data = a.d;
   }
   void read(String &data) {
-    int32 size;
+    int32_t size;
     read(size);
     if (size > 0 && size + 1 > 0) {
       data = String(size, ReserveString);
@@ -208,7 +208,7 @@ class ThriftBuffer {
 
   template<typename T>
   void read(std::vector<T> &data) {
-    int32 size;
+    int32_t size;
     read(size);
     data.resize(size);
     for (int i = 0; i < size; i++) {
@@ -217,7 +217,7 @@ class ThriftBuffer {
   }
   template<typename T>
   void write(const std::vector<T> &data) {
-    int32 size = data.size();
+    int32_t size = data.size();
     write(size);
     for (int i = 0; i < size; i++) {
       write(data[i]);
@@ -247,7 +247,7 @@ class ThriftBuffer {
   void write(CObjRef data);
   void write(CVarRef data);
 
-  void skip(int8 type);
+  void skip(int8_t type);
 
 protected:
   virtual String readImpl() = 0;
diff --git a/hphp/runtime/base/variable_serializer.cpp b/hphp/runtime/base/variable_serializer.cpp
index 8e6c3a7043434..8ec0e9d956365 100644
--- a/hphp/runtime/base/variable_serializer.cpp
+++ b/hphp/runtime/base/variable_serializer.cpp
@@ -152,7 +152,7 @@ void VariableSerializer::write(bool v) {
   }
 }
 
-void VariableSerializer::write(int64 v) {
+void VariableSerializer::write(int64_t v) {
   switch (m_type) {
   case PrintR:
   case VarExport:
@@ -309,7 +309,7 @@ void VariableSerializer::write(const char *v, int len /* = -1 */,
     break;
   case JSON: {
     if (m_option & k_JSON_NUMERIC_CHECK) {
-      int64 lval; double dval;
+      int64_t lval; double dval;
       switch (is_numeric_string(v, len, &lval, &dval, 0)) {
         case KindOfInt64:
           write(lval);
diff --git a/hphp/runtime/base/variable_serializer.h b/hphp/runtime/base/variable_serializer.h
index adc7920afb0a0..f4035d5161170 100644
--- a/hphp/runtime/base/variable_serializer.h
+++ b/hphp/runtime/base/variable_serializer.h
@@ -72,10 +72,10 @@ class VariableSerializer {
    * Type specialized output functions.
    */
   void write(bool    v);
-  void write(char    v) { write((int64)v);}
-  void write(short   v) { write((int64)v);}
-  void write(int     v) { write((int64)v);}
-  void write(int64   v);
+  void write(char    v) { write((int64_t)v);}
+  void write(short   v) { write((int64_t)v);}
+  void write(int     v) { write((int64_t)v);}
+  void write(int64_t   v);
   void write(double  v);
   void write(const char *v, int len = -1, bool isArrayKey = false);
   void write(CStrRef v);
diff --git a/hphp/runtime/base/variable_unserializer.cpp b/hphp/runtime/base/variable_unserializer.cpp
index 0ede82fd8d9f0..d6253b48f3ba1 100644
--- a/hphp/runtime/base/variable_unserializer.cpp
+++ b/hphp/runtime/base/variable_unserializer.cpp
@@ -36,10 +36,10 @@ Variant VariableUnserializer::unserializeKey() {
   return v;
 }
 
-int64 VariableUnserializer::readInt() {
+int64_t VariableUnserializer::readInt() {
   check();
   char *newBuf;
-  int64 r = strtoll(m_buf, &newBuf, 10);
+  int64_t r = strtoll(m_buf, &newBuf, 10);
   m_buf = newBuf;
   return r;
 }
diff --git a/hphp/runtime/base/variable_unserializer.h b/hphp/runtime/base/variable_unserializer.h
index 2fd0ee7df6b76..fe61a783e9df7 100644
--- a/hphp/runtime/base/variable_unserializer.h
+++ b/hphp/runtime/base/variable_unserializer.h
@@ -56,7 +56,7 @@ class VariableUnserializer {
     if (id <= 0  || id > (int)m_refs.size()) return nullptr;
     return m_refs[id-1];
   }
-  int64 readInt();
+  int64_t readInt();
   double readDouble();
   char readChar() {
     check();
diff --git a/hphp/runtime/base/zend/zend_collator.cpp b/hphp/runtime/base/zend/zend_collator.cpp
index 88457c14b25db..4304575394561 100644
--- a/hphp/runtime/base/zend/zend_collator.cpp
+++ b/hphp/runtime/base/zend/zend_collator.cpp
@@ -207,9 +207,9 @@ static long collator_u_strtol(const UChar *nptr, UChar **endptr,
 }
 
 
-static DataType collator_is_numeric(UChar *str, int length, int64 *lval,
+static DataType collator_is_numeric(UChar *str, int length, int64_t *lval,
                                     double *dval, int allow_errors ) {
-  int64 local_lval;
+  int64_t local_lval;
   double local_dval;
   UChar *end_ptr_long, *end_ptr_double;
   int conv_base=10;
@@ -324,7 +324,7 @@ static Variant collator_convert_string_to_double(CVarRef str) {
 }
 
 static Variant collator_convert_string_to_number_if_possible(CVarRef str) {
-  int64 lval     = 0;
+  int64_t lval     = 0;
   double dval    = 0;
 
   if (!str.isString()) return false;
diff --git a/hphp/runtime/base/zend/zend_functions.cpp b/hphp/runtime/base/zend/zend_functions.cpp
index 0a7d1e3252aed..77d7c81ceebc0 100644
--- a/hphp/runtime/base/zend/zend_functions.cpp
+++ b/hphp/runtime/base/zend/zend_functions.cpp
@@ -31,10 +31,10 @@ static const char long_min_digits[] = "9223372036854775808";
 
 HOT_FUNC
 char *
-conv_10(register int64 num, register int *is_negative, char *buf_end,
+conv_10(register int64_t num, register int *is_negative, char *buf_end,
         register int *len) {
   register char *p = buf_end;
-  register uint64 magnitude;
+  register uint64_t magnitude;
 
   *is_negative = (num < 0);
 
@@ -48,17 +48,17 @@ conv_10(register int64 num, register int *is_negative, char *buf_end,
    *      d. add 1
    */
   if (*is_negative) {
-    int64 t = num + 1;
-    magnitude = ((uint64) - t) + 1;
+    int64_t t = num + 1;
+    magnitude = ((uint64_t) - t) + 1;
   } else {
-    magnitude = (uint64) num;
+    magnitude = (uint64_t) num;
   }
 
   /*
    * We use a do-while loop so that we write at least 1 digit
    */
   do {
-    uint64 new_magnitude = magnitude / 10;
+    uint64_t new_magnitude = magnitude / 10;
 
     *--p = (char)(magnitude - new_magnitude * 10 + '0');
     magnitude = new_magnitude;
@@ -73,7 +73,7 @@ conv_10(register int64 num, register int *is_negative, char *buf_end,
   return (p);
 }
 
-DataType is_numeric_string(const char *str, int length, int64 *lval,
+DataType is_numeric_string(const char *str, int length, int64_t *lval,
                            double *dval, int allow_errors /* = 1 */) {
   DataType type;
   const char *ptr;
diff --git a/hphp/runtime/base/zend/zend_functions.h b/hphp/runtime/base/zend/zend_functions.h
index 008f1fe73040b..05a371f10b979 100644
--- a/hphp/runtime/base/zend/zend_functions.h
+++ b/hphp/runtime/base/zend/zend_functions.h
@@ -29,7 +29,7 @@ namespace HPHP {
 /**
  * Testing whether a string is numeric or not.
  */
-DataType is_numeric_string(const char *str, int length, int64 *lval,
+DataType is_numeric_string(const char *str, int length, int64_t *lval,
                            double *dval, int allow_errors = 0);
 
 /**
@@ -43,7 +43,7 @@ bool is_valid_var_name(const char *var_name, int len);
  * Adapted from ap_php_conv_10 for fast signed integer to string conversion.
  */
 char *
-conv_10(register int64 num, register int *is_negative, char *buf_end,
+conv_10(register int64_t num, register int *is_negative, char *buf_end,
         register int *len);
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/base/zend/zend_ini.tab.cpp b/hphp/runtime/base/zend/zend_ini.tab.cpp
index a60765a05e079..b8cf72e49d52d 100644
--- a/hphp/runtime/base/zend/zend_ini.tab.cpp
+++ b/hphp/runtime/base/zend/zend_ini.tab.cpp
@@ -166,7 +166,7 @@ static void zend_ini_do_op(char type, String &result,
   case '!': i_result = !i_op1;        break;
   }
 
-  result = String((int64)i_result);
+  result = String((int64_t)i_result);
 }
 
 static void zend_ini_get_constant(String &result, CStrRef name) {
diff --git a/hphp/runtime/base/zend/zend_math.h b/hphp/runtime/base/zend/zend_math.h
index 9b64e23cdcea3..e8509dc307fcb 100644
--- a/hphp/runtime/base/zend/zend_math.h
+++ b/hphp/runtime/base/zend/zend_math.h
@@ -159,7 +159,7 @@ static inline double php_math_round(double value, int places,
  * -RL
  */
 #define RAND_RANGE(__n, __min, __max, __tmax) \
-  (__n) = (__min) + (int64) ((double) ((double)(__max) - (__min) + 1.0) * \
+  (__n) = (__min) + (int64_t) ((double) ((double)(__max) - (__min) + 1.0) * \
                             ((__n) / ((__tmax) + 1.0)))
 
 #define GENERATE_SEED() \
@@ -168,10 +168,10 @@ static inline double php_math_round(double value, int places,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void math_mt_srand(uint32 seed);
-int64 math_mt_rand(int64 min = 0, int64 max = RAND_MAX);
+void math_mt_srand(uint32_t seed);
+int64_t math_mt_rand(int64_t min = 0, int64_t max = RAND_MAX);
 double math_combined_lcg();
-int64 math_generate_seed();
+int64_t math_generate_seed();
 void zend_get_rand_data() ATTRIBUTE_COLD;
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/base/zend/zend_pack.cpp b/hphp/runtime/base/zend/zend_pack.cpp
index a126a47e57860..bf789a6d344a4 100644
--- a/hphp/runtime/base/zend/zend_pack.cpp
+++ b/hphp/runtime/base/zend/zend_pack.cpp
@@ -66,7 +66,7 @@ ZendPack::ZendPack() {
     little_endian_int32_map[2] = 2;
     little_endian_int32_map[3] = 3;
   } else {
-    int size = sizeof(int32);
+    int size = sizeof(int32_t);
 
     /* Where to get hi to lo bytes from */
     byte_map[0] = size - 1;
@@ -98,7 +98,7 @@ ZendPack::ZendPack() {
 }
 
 void ZendPack::pack(CVarRef val, int size, int *map, char *output) {
-  int32 n = val.toInt32();
+  int32_t n = val.toInt32();
   char *v = (char*)&n;
   for (int i = 0; i < size; i++) {
     *output++ = v[map[i]];
@@ -439,8 +439,8 @@ Variant ZendPack::pack(CStrRef fmt, CArrRef argv) {
   return s.setSize(outputpos);
 }
 
-int32 ZendPack::unpack(const char *data, int size, int issigned, int *map) {
-  int32 result;
+int32_t ZendPack::unpack(const char *data, int size, int issigned, int *map) {
+  int32_t result;
   char *cresult = (char *) &result;
   int i;
 
@@ -684,13 +684,13 @@ Variant ZendPack::unpack(CStrRef fmt, CStrRef data) {
 
         case 'i':
         case 'I': {
-          int32 v = 0;
+          int32_t v = 0;
           int issigned = 0;
 
           if (type == 'i') {
             issigned = input[inputpos + (machine_little_endian ?
                                          (sizeof(int) - 1) : 0)] & 0x80;
-          } else if (sizeof(int32) > 4 &&
+          } else if (sizeof(int32_t) > 4 &&
                      (input[inputpos + machine_endian_int32_map[3]]
                       & 0x80) == 0x80) {
             v = ~INT_MAX;
@@ -707,7 +707,7 @@ Variant ZendPack::unpack(CStrRef fmt, CStrRef data) {
         case 'V': {
           int issigned = 0;
           int *map = machine_endian_int32_map;
-          int32 v = 0;
+          int32_t v = 0;
 
           if (type == 'l' || type == 'L') {
             issigned = input[inputpos + (machine_little_endian ? 3 : 0)]
@@ -720,7 +720,7 @@ Variant ZendPack::unpack(CStrRef fmt, CStrRef data) {
             map = little_endian_int32_map;
           }
 
-          if (sizeof(int32) > 4 && issigned) {
+          if (sizeof(int32_t) > 4 && issigned) {
             v = ~INT_MAX;
           }
 
@@ -728,7 +728,7 @@ Variant ZendPack::unpack(CStrRef fmt, CStrRef data) {
           if (type == 'l') {
             ret.set(String(n, CopyString), v);
           } else {
-            uint64 u64 = uint32_t(v);
+            uint64_t u64 = uint32_t(v);
             ret.set(String(n, CopyString), u64);
           }
           break;
diff --git a/hphp/runtime/base/zend/zend_pack.h b/hphp/runtime/base/zend/zend_pack.h
index c9de99564892a..b0a6d026a87d7 100644
--- a/hphp/runtime/base/zend/zend_pack.h
+++ b/hphp/runtime/base/zend/zend_pack.h
@@ -77,7 +77,7 @@ class ZendPack {
   int little_endian_int32_map[4];
 
   void pack(CVarRef val, int size, int *map, char *output);
-  int32 unpack(const char *data, int size, int issigned, int *map);
+  int32_t unpack(const char *data, int size, int issigned, int *map);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/base/zend/zend_printf.cpp b/hphp/runtime/base/zend/zend_printf.cpp
index cec5f6ddc5529..e7c07ab390aa6 100644
--- a/hphp/runtime/base/zend/zend_printf.cpp
+++ b/hphp/runtime/base/zend/zend_printf.cpp
@@ -104,8 +104,8 @@ typedef enum {
     }                                                   \
 } while (0)
 
-typedef int64 wide_int;
-typedef uint64 u_wide_int;
+typedef int64_t wide_int;
+typedef uint64_t u_wide_int;
 
 #define FALSE           0
 #define TRUE            1
@@ -377,7 +377,7 @@ static char *php_gcvt(double value, int ndigit, char dec_point,
  * which is a pointer to the END of the buffer + 1 (i.e. if the buffer
  * is declared as buf[ 100 ], buf_end should be &buf[ 100 ])
  */
-char * ap_php_conv_p2(register uint64 num, register int nbits,
+char * ap_php_conv_p2(register uint64_t num, register int nbits,
                       char format, char *buf_end, register int *len)
 {
   register int mask = (1 << nbits) - 1;
@@ -408,14 +408,14 @@ char * ap_php_conv_p2(register uint64 num, register int nbits,
  * which is a pointer to the END of the buffer + 1 (i.e. if the buffer
  * is declared as buf[ 100 ], buf_end should be &buf[ 100 ])
  */
-char * ap_php_conv_10(register int64 num, register bool is_unsigned,
+char * ap_php_conv_10(register int64_t num, register bool is_unsigned,
                       register int * is_negative, char *buf_end,
                       register int *len) {
   register char *p = buf_end;
-  register uint64 magnitude;
+  register uint64_t magnitude;
 
   if (is_unsigned) {
-    magnitude = (uint64) num;
+    magnitude = (uint64_t) num;
     *is_negative = 0;
   } else {
     *is_negative = (num < 0);
@@ -430,10 +430,10 @@ char * ap_php_conv_10(register int64 num, register bool is_unsigned,
      *      d. add 1
      */
     if (*is_negative) {
-      int64 t = num + 1;
-      magnitude = ((uint64) - t) + 1;
+      int64_t t = num + 1;
+      magnitude = ((uint64_t) - t) + 1;
     } else {
-      magnitude = (uint64) num;
+      magnitude = (uint64_t) num;
     }
   }
 
@@ -441,7 +441,7 @@ char * ap_php_conv_10(register int64 num, register bool is_unsigned,
    * We use a do-while loop so that we write at least 1 digit
    */
   do {
-    register uint64 new_magnitude = magnitude / 10;
+    register uint64_t new_magnitude = magnitude / 10;
 
     *--p = (char)(magnitude - new_magnitude * 10 + '0');
     magnitude = new_magnitude;
@@ -530,7 +530,7 @@ char * php_conv_fp(register char format, register double num,
     *s++ = format; // either e or E
     decimal_point--;
     if (decimal_point != 0) {
-      p = ap_php_conv_10((int64) decimal_point, false,
+      p = ap_php_conv_10((int64_t) decimal_point, false,
                          &exponent_is_negative, &temp[EXPONENT_LENGTH],
                          &t_len);
       *s++ = exponent_is_negative ? '-' : '+';
diff --git a/hphp/runtime/base/zend/zend_rand.cpp b/hphp/runtime/base/zend/zend_rand.cpp
index 8d48789e970c0..4ec5eb3d0d621 100644
--- a/hphp/runtime/base/zend/zend_rand.cpp
+++ b/hphp/runtime/base/zend/zend_rand.cpp
@@ -93,7 +93,7 @@ namespace HPHP {
 #define mixBits(u, v) (hiBit(u)|loBits(v)) // move hi bit of u to hi bit of v
 
 #define twist(m,u,v) \
-  (m ^ (mixBits(u,v)>>1) ^ ((uint32)(-(int32)(loBit(u))) & 0x9908b0dfU))
+  (m ^ (mixBits(u,v)>>1) ^ ((uint32_t)(-(int32_t)(loBit(u))) & 0x9908b0dfU))
 
 class RandData {
 public:
@@ -105,12 +105,12 @@ class RandData {
 
   bool seeded;
   int left;
-  uint32 state[N];
-  uint32 *next;
+  uint32_t state[N];
+  uint32_t *next;
 
   bool lcg_seeded;
-  int32 lcg_s1;
-  int32 lcg_s2;
+  int32_t lcg_s1;
+  int32_t lcg_s2;
 };
 static IMPLEMENT_THREAD_LOCAL_NO_CHECK(RandData, s_rand_data);
 
@@ -118,14 +118,14 @@ void zend_get_rand_data() {
   s_rand_data.getCheck();
 }
 
-static inline void php_mt_initialize(uint32 seed, uint32 *state) {
+static inline void php_mt_initialize(uint32_t seed, uint32_t *state) {
   /* Initialize generator state with seed
      See Knuth TAOCP Vol 2, 3rd Ed, p.106 for multiplier.
      In previous versions, most significant bits (MSBs) of the seed affect
      only MSBs of the state array.  Modified 9 Jan 2002 by Makoto Matsumoto. */
 
-  register uint32 *s = state;
-  register uint32 *r = state;
+  register uint32_t *s = state;
+  register uint32_t *r = state;
   register int i = 1;
 
   *s++ = seed & 0xffffffffU;
@@ -140,8 +140,8 @@ static inline void php_mt_reload() {
      Made clearer and faster by Matthew Bellew (matthew.bellew@home.com) */
 
   RandData *data = s_rand_data.getNoCheck();
-  register uint32 *state = data->state;
-  register uint32 *p = state;
+  register uint32_t *state = data->state;
+  register uint32_t *p = state;
   register int i;
 
   for (i = N - M; i--; ++p)
@@ -153,7 +153,7 @@ static inline void php_mt_reload() {
   data->next = state;
 }
 
-void math_mt_srand(uint32 seed) {
+void math_mt_srand(uint32_t seed) {
   RandData *data = s_rand_data.getNoCheck();
 
   /* Seed the generator with a simple uint32 */
@@ -164,11 +164,11 @@ void math_mt_srand(uint32 seed) {
   data->seeded = true;
 }
 
-static inline uint32 php_mt_rand() {
+static inline uint32_t php_mt_rand() {
   // Pull a 32-bit integer from the generator state
   // Every other access function simply transforms the numbers extracted here
 
-  register uint32 s1;
+  register uint32_t s1;
 
   RandData *data = s_rand_data.getNoCheck();
   if (data->left == 0) {
@@ -184,7 +184,7 @@ static inline uint32 php_mt_rand() {
 }
 
 // Returns a random number from Mersenne Twister
-int64 math_mt_rand(int64 min /* = 0 */, int64 max /* = RAND_MAX */) {
+int64_t math_mt_rand(int64_t min /* = 0 */, int64_t max /* = RAND_MAX */) {
   if (!s_rand_data->seeded) {
     math_mt_srand(math_generate_seed());
   }
@@ -197,7 +197,7 @@ int64 math_mt_rand(int64 min /* = 0 */, int64 max /* = RAND_MAX */) {
    * Update:
    * I talked with Cokus via email and it won't ruin the algorithm
    */
-  int64 number = (php_mt_rand() >> 1);
+  int64_t number = (php_mt_rand() >> 1);
   if (min != 0 || max != RAND_MAX) {
     RAND_RANGE(number, min, max, MT_RAND_MAX);
   }
@@ -234,8 +234,8 @@ static void lcg_seed() {
 }
 
 double math_combined_lcg() {
-  int32 q;
-  int32 z;
+  int32_t q;
+  int32_t z;
 
   RandData *data = s_rand_data.getNoCheck();
   if (!data->lcg_seeded) {
@@ -253,8 +253,8 @@ double math_combined_lcg() {
   return z * 4.656613e-10;
 }
 
-int64 math_generate_seed() {
-  int64 value;
+int64_t math_generate_seed() {
+  int64_t value;
   if (RAND_bytes((unsigned char *)&value, sizeof(value)) < 1) {
     return GENERATE_SEED();
   } else {
diff --git a/hphp/runtime/base/zend/zend_string.cpp b/hphp/runtime/base/zend/zend_string.cpp
index bc570c7b0dd9f..65634b4c8fca3 100644
--- a/hphp/runtime/base/zend/zend_string.cpp
+++ b/hphp/runtime/base/zend/zend_string.cpp
@@ -1558,10 +1558,10 @@ char *string_hex2bin(const char *input, int &len) {
 }
 
 Variant string_base_to_numeric(const char *s, int len, int base) {
-  int64 num = 0;
+  int64_t num = 0;
   double fnum = 0;
   int mode = 0;
-  int64 cutoff;
+  int64_t cutoff;
   int cutlim;
 
   assert(string_validate_base(base));
diff --git a/hphp/runtime/eval/debugger/break_point.cpp b/hphp/runtime/eval/debugger/break_point.cpp
index cb5fe839a6494..58218bf189fd3 100644
--- a/hphp/runtime/eval/debugger/break_point.cpp
+++ b/hphp/runtime/eval/debugger/break_point.cpp
@@ -565,7 +565,7 @@ bool BreakPointInfo::parseLines(const std::string &token) {
       return true;
     }
     if (m_line2 < m_line1) {
-      int32 tmp = m_line1;
+      int32_t tmp = m_line1;
       m_line1 = m_line2;
       m_line2 = tmp;
     }
@@ -846,7 +846,7 @@ bool BreakPointInfo::checkClause() {
 
 void BreakPointInfo::SendImpl(const BreakPointInfoPtrVec &bps,
                               DebuggerThriftBuffer &thrift) {
-  int16 size = bps.size();
+  int16_t size = bps.size();
   thrift.write(size);
   for (int i = 0; i < size; i++) {
     bps[i]->sendImpl(thrift);
@@ -855,7 +855,7 @@ void BreakPointInfo::SendImpl(const BreakPointInfoPtrVec &bps,
 
 void BreakPointInfo::RecvImpl(BreakPointInfoPtrVec &bps,
                               DebuggerThriftBuffer &thrift) {
-  int16 size;
+  int16_t size;
   thrift.read(size);
   bps.resize(size);
   for (int i = 0; i < size; i++) {
diff --git a/hphp/runtime/eval/debugger/break_point.h b/hphp/runtime/eval/debugger/break_point.h
index 6db54a3de8d09..71a86dd1c502c 100644
--- a/hphp/runtime/eval/debugger/break_point.h
+++ b/hphp/runtime/eval/debugger/break_point.h
@@ -48,10 +48,10 @@ class InterruptSite {
   virtual const char *getNamespace() const { return nullptr; }
   int getFileLen() const;
 
-  int32 getLine0() const { return m_line0;}
-  int32 getChar0() const { return m_char0;}
-  int32 getLine1() const { return m_line1;}
-  int32 getChar1() const { return m_char1;}
+  int32_t getLine0() const { return m_line0;}
+  int32_t getChar0() const { return m_char0;}
+  int32_t getLine1() const { return m_line1;}
+  int32_t getChar1() const { return m_char1;}
   CVarRef getException() { return m_exception;}
 
   std::string &url() const { return m_url;}
@@ -69,10 +69,10 @@ class InterruptSite {
   mutable String m_file;
   mutable std::string m_url;
 
-  int32 m_line0;
-  int32 m_char0;
-  int32 m_line1;
-  int32 m_char1;
+  int32_t m_line0;
+  int32_t m_char0;
+  int32_t m_line1;
+  int32_t m_char1;
 
   // jump instruction
   bool m_jumping;
@@ -159,18 +159,18 @@ class BreakPointInfo {
   void setBreakable(int stackDepth);
   void changeBreakPointDepth(int stackDepth);
 
-  int16 m_index; // client side index number
+  int16_t m_index; // client side index number
 
-  int8 m_state;
+  int8_t m_state;
   bool m_valid;
-  int8 m_interrupt;
+  int8_t m_interrupt;
 
   // file::line1-line2
   std::string m_file;
-  int32 m_line1;
-  int32 m_line2;
-  int32 m_char1;
-  int32 m_char2;
+  int32_t m_line1;
+  int32_t m_line2;
+  int32_t m_char1;
+  int32_t m_char2;
 
   // class::func()
   DFunctionInfoPtrVec m_funcs;
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_example.h b/hphp/runtime/eval/debugger/cmd/cmd_example.h
index 8dd09c2f5c255..3d02b87cbc29c 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_example.h
+++ b/hphp/runtime/eval/debugger/cmd/cmd_example.h
@@ -36,7 +36,7 @@ class CmdExample : public CmdExtended {
 
 private:
   std::string m_input;
-  int32 m_output;
+  int32_t m_output;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_flow_control.h b/hphp/runtime/eval/debugger/cmd/cmd_flow_control.h
index 46aea9c21e88b..c6457c24adc31 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_flow_control.h
+++ b/hphp/runtime/eval/debugger/cmd/cmd_flow_control.h
@@ -50,7 +50,7 @@ class CmdFlowControl : public DebuggerCommand {
   int getVMDepth() const { return m_vmDepth; }
 
 private:
-  int16 m_count;
+  int16_t m_count;
   FrameInjection *m_frame;  // which frame to break next time
   FrameInjection *m_nframe; // definitely not to break with this frame
   std::string m_loc; // last break's source location
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_info.cpp b/hphp/runtime/eval/debugger/cmd/cmd_info.cpp
index 7ffa46e54a3f5..d8e2d0f716b52 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_info.cpp
+++ b/hphp/runtime/eval/debugger/cmd/cmd_info.cpp
@@ -30,7 +30,7 @@ void CmdInfo::sendImpl(DebuggerThriftBuffer &thrift) {
   thrift.write(m_info);
   if (m_acLiveLists) {
     thrift.write(true);
-    thrift.write((int8)DebuggerClient::AutoCompleteCount);
+    thrift.write((int8_t)DebuggerClient::AutoCompleteCount);
     for (int i = 0; i < DebuggerClient::AutoCompleteCount; i++) {
       thrift.write((*m_acLiveLists)[i]);
     }
@@ -48,7 +48,7 @@ void CmdInfo::recvImpl(DebuggerThriftBuffer &thrift) {
   thrift.read(hasLists);
   if (hasLists) {
     m_acLiveLists = DebuggerClient::CreateNewLiveLists();
-    int8 count;
+    int8_t count;
     thrift.read(count);
     for (int i = 0; i < count; i++) {
       if (i < DebuggerClient::AutoCompleteCount) {
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_info.h b/hphp/runtime/eval/debugger/cmd/cmd_info.h
index 8d8858d8cff48..9019971f2cd75 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_info.h
+++ b/hphp/runtime/eval/debugger/cmd/cmd_info.h
@@ -55,7 +55,7 @@ class CmdInfo : public DebuggerCommand {
     KindOfLiveLists, // for auto-complete
   };
 
-  int8   m_type;
+  int8_t   m_type;
   String m_symbol;
   Array  m_info;
   DebuggerClient::LiveListsPtr m_acLiveLists;
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_instrument.cpp b/hphp/runtime/eval/debugger/cmd/cmd_instrument.cpp
index 098f55a0211cd..137e791e9b697 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_instrument.cpp
+++ b/hphp/runtime/eval/debugger/cmd/cmd_instrument.cpp
@@ -211,7 +211,7 @@ void CmdInstrument::validateAndWriteToTable(DebuggerProxyVM *proxy) {
         tablePC = new VM::InjectionTableInt64();
       }
       ipi->m_valid = true;
-      (*tablePC)[(int64)pc] = inj;
+      (*tablePC)[(int64_t)pc] = inj;
     }
     if (ipi->m_locType == InstPointInfo::LocFuncEntry) {
       StackStringData sd(ipi->m_func.c_str(), ipi->m_func.size(), AttachLiteral);
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_instrument.h b/hphp/runtime/eval/debugger/cmd/cmd_instrument.h
index 3345716816f6e..4660200689e6e 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_instrument.h
+++ b/hphp/runtime/eval/debugger/cmd/cmd_instrument.h
@@ -49,7 +49,7 @@ class CmdInstrument : public DebuggerCommand {
     ActionRead,
     ActionWrite,
   };
-  int8 m_type;
+  int8_t m_type;
   bool m_enabled;
 
   InstPointInfoPtrVec *m_instPoints;
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_interrupt.h b/hphp/runtime/eval/debugger/cmd/cmd_interrupt.h
index ce0ccf82fc660..f600b47476596 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_interrupt.h
+++ b/hphp/runtime/eval/debugger/cmd/cmd_interrupt.h
@@ -35,11 +35,11 @@ class CmdInterrupt : public DebuggerCommand {
       : DebuggerCommand(KindOfInterrupt),
         m_interrupt(interrupt), m_program(program ? program : ""),
         m_site(site), m_pendingJump(false) {
-    m_threadId = (int64)Process::GetThreadId();
+    m_threadId = (int64_t)Process::GetThreadId();
     if (error) m_errorMsg = error;
   }
 
-  int64 getThreadId() const { return m_threadId;}
+  int64_t getThreadId() const { return m_threadId;}
   InterruptType getInterruptType() const { return (InterruptType)m_interrupt;}
   std::string desc() const;
   std::string error() const { return m_errorMsg;}
@@ -60,10 +60,10 @@ class CmdInterrupt : public DebuggerCommand {
   void setPendingJump() { m_pendingJump = true;}
 
 private:
-  int16 m_interrupt;
+  int16_t m_interrupt;
   std::string m_program;   // informational only
   std::string m_errorMsg;  // informational only
-  int64 m_threadId;
+  int64_t m_threadId;
   InterruptSite *m_site;   // server side
   BreakPointInfoPtr m_bpi; // client side
   BreakPointInfoPtrVec m_matched;
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_jump.h b/hphp/runtime/eval/debugger/cmd/cmd_jump.h
index 11211cd377426..700503d159772 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_jump.h
+++ b/hphp/runtime/eval/debugger/cmd/cmd_jump.h
@@ -43,7 +43,7 @@ class CmdJump : public DebuggerCommand {
 private:
   std::string m_label;
   std::string m_file;
-  int32 m_line;
+  int32_t m_line;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_list.cpp b/hphp/runtime/eval/debugger/cmd/cmd_list.cpp
index a1f8f01bfb112..50ca4529c3e44 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_list.cpp
+++ b/hphp/runtime/eval/debugger/cmd/cmd_list.cpp
@@ -104,7 +104,7 @@ bool CmdList::listFileRange(DebuggerClient *client, int line,
   if (m_line1 <= 0) m_line1 = 1;
   if (m_line2 <= 0) m_line2 = 1;
   if (m_line1 > m_line2) {
-    int32 tmp = m_line1;
+    int32_t tmp = m_line1;
     m_line1 = m_line2;
     m_line2 = tmp;
   }
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_list.h b/hphp/runtime/eval/debugger/cmd/cmd_list.h
index ca10b99f7cd6f..069f4f7ed0618 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_list.h
+++ b/hphp/runtime/eval/debugger/cmd/cmd_list.h
@@ -41,8 +41,8 @@ class CmdList : public DebuggerCommand {
 
 private:
   std::string m_file;
-  int32 m_line1;
-  int32 m_line2;
+  int32_t m_line1;
+  int32_t m_line2;
   Variant m_code;
 
   bool listCurrent(DebuggerClient *client, int &line,
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_print.cpp b/hphp/runtime/eval/debugger/cmd/cmd_print.cpp
index 2bd7e9f2795ea..89fcb28469c08 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_print.cpp
+++ b/hphp/runtime/eval/debugger/cmd/cmd_print.cpp
@@ -40,7 +40,7 @@ std::string CmdPrint::FormatResult(const char *format, CVarRef ret) {
   if (strcmp(format, "dec") == 0 ||
       strcmp(format, "unsigned") == 0 ||
       ret.isInteger()) {
-    int64 nret = ret.toInt64();
+    int64_t nret = ret.toInt64();
     char buf[64];
     if (strcmp(format, "hex") == 0 || strcmp(format, "x") == 0) {
       snprintf(buf, sizeof(buf), "%" PRIx64, nret);
@@ -107,7 +107,7 @@ std::string CmdPrint::FormatResult(const char *format, CVarRef ret) {
   }
   if (strcmp(format, "time") == 0) {
     DateTime dt;
-    int64 ts = -1;
+    int64_t ts = -1;
     if (dt.fromString(ret.toString(), SmartObject<TimeZone>())) {
       bool err;
       ts = dt.toTimeStamp(err);
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_signal.h b/hphp/runtime/eval/debugger/cmd/cmd_signal.h
index 84ec7938ad53b..41611b6b392f9 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_signal.h
+++ b/hphp/runtime/eval/debugger/cmd/cmd_signal.h
@@ -43,7 +43,7 @@ class CmdSignal : public DebuggerCommand {
   virtual void recvImpl(DebuggerThriftBuffer &thrift);
 
 private:
-  int32 m_signum;
+  int32_t m_signum;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/eval/debugger/cmd/cmd_thread.cpp b/hphp/runtime/eval/debugger/cmd/cmd_thread.cpp
index 49a626a8e8901..cf37c476d4058 100644
--- a/hphp/runtime/eval/debugger/cmd/cmd_thread.cpp
+++ b/hphp/runtime/eval/debugger/cmd/cmd_thread.cpp
@@ -172,7 +172,7 @@ void CmdThread::debuggerInfo(InfoVec &info) {
   Add(info, "Binary",     Process::GetAppName());
   Add(info, "Version",    Process::GetAppVersion());
   Add(info, "Process ID", FormatNumber("%lld", Process::GetProcessId()));
-  Add(info, "Thread ID",  FormatNumber("0x%llx", (int64)Process::GetThreadId()));
+  Add(info, "Thread ID",  FormatNumber("0x%llx", (int64_t)Process::GetThreadId()));
 }
 
 bool CmdThread::onServer(DebuggerProxy *proxy) {
diff --git a/hphp/runtime/eval/debugger/debugger.cpp b/hphp/runtime/eval/debugger/debugger.cpp
index fdd92ecfa6a50..4e5f476cc6e02 100644
--- a/hphp/runtime/eval/debugger/debugger.cpp
+++ b/hphp/runtime/eval/debugger/debugger.cpp
@@ -93,7 +93,7 @@ void Debugger::GetRegisteredSandboxes(DSandboxInfoPtrVec &sandboxes) {
   s_debugger.getSandboxes(sandboxes);
 }
 
-bool Debugger::IsThreadDebugging(int64 id) {
+bool Debugger::IsThreadDebugging(int64_t id) {
   return s_debugger.isThreadDebugging(id);
 }
 
@@ -247,7 +247,7 @@ String Debugger::ColorStderr(CStrRef s) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool Debugger::isThreadDebugging(int64 tid) {
+bool Debugger::isThreadDebugging(int64_t tid) {
   ThreadInfoMap::const_accessor acc;
   if (m_threadInfos.find(acc, tid)) {
     ThreadInfo* ti = acc->second;
@@ -258,7 +258,7 @@ bool Debugger::isThreadDebugging(int64 tid) {
 
 void Debugger::registerThread() {
   ThreadInfo* ti = ThreadInfo::s_threadInfo.getNoCheck();
-  int64 tid = (int64)Process::GetThreadId();
+  int64_t tid = (int64_t)Process::GetThreadId();
   ThreadInfoMap::accessor acc;
   m_threadInfos.insert(acc, tid);
   acc->second = ti;
diff --git a/hphp/runtime/eval/debugger/debugger.h b/hphp/runtime/eval/debugger/debugger.h
index 47b4737fe985e..e085773c92efb 100644
--- a/hphp/runtime/eval/debugger/debugger.h
+++ b/hphp/runtime/eval/debugger/debugger.h
@@ -53,7 +53,7 @@ class Debugger {
   static DebuggerProxyPtr GetProxy();
 
   static void GetRegisteredSandboxes(DSandboxInfoPtrVec &sandboxes);
-  static bool IsThreadDebugging(int64 tid);
+  static bool IsThreadDebugging(int64_t tid);
 
   static void RetireDummySandboxThread(DummySandbox* toRetire);
   static void CleanupDummySandboxThreads();
@@ -115,13 +115,13 @@ class Debugger {
                                    StringDataHashCompare> SandboxThreadInfoMap;
   SandboxThreadInfoMap m_sandboxThreadInfoMap;
 
-  typedef tbb::concurrent_hash_map<int64, ThreadInfo*> ThreadInfoMap;
+  typedef tbb::concurrent_hash_map<int64_t, ThreadInfo*> ThreadInfoMap;
   ThreadInfoMap m_threadInfos; // tid => ThreadInfo*
 
   typedef tbb::concurrent_queue<DummySandbox*> DummySandboxQ;
   DummySandboxQ m_cleanupDummySandboxQ;
 
-  bool isThreadDebugging(int64 id);
+  bool isThreadDebugging(int64_t id);
   void registerThread();
   void updateSandbox(const DSandboxInfo &sandbox);
   DSandboxInfoPtr getSandbox(const StringData* sid);
diff --git a/hphp/runtime/eval/debugger/debugger_base.cpp b/hphp/runtime/eval/debugger/debugger_base.cpp
index 88123d9cdd26f..e40e226450d99 100644
--- a/hphp/runtime/eval/debugger/debugger_base.cpp
+++ b/hphp/runtime/eval/debugger/debugger_base.cpp
@@ -38,9 +38,9 @@ const std::string DSandboxInfo::desc() const {
   return ret;
 }
 
-DSandboxInfo DSandboxInfo::CreateDummyInfo(uint64 unique) {
+DSandboxInfo DSandboxInfo::CreateDummyInfo(uint64_t unique) {
   char buf[64];
-  snprintf(buf, 64, "dummy\t0x%llu", unique);
+  snprintf(buf, 64, "dummy\t0x%" PRIu64, unique);
   return DSandboxInfo(std::string(buf));
 }
 
diff --git a/hphp/runtime/eval/debugger/debugger_base.h b/hphp/runtime/eval/debugger/debugger_base.h
index a789ba2679663..e9b82a4768a72 100644
--- a/hphp/runtime/eval/debugger/debugger_base.h
+++ b/hphp/runtime/eval/debugger/debugger_base.h
@@ -135,7 +135,7 @@ class DSandboxInfo {
 
   const std::string &id() const;
   const std::string desc() const;
-  static DSandboxInfo CreateDummyInfo(uint64 unique);
+  static DSandboxInfo CreateDummyInfo(uint64_t unique);
 
   bool valid() const { return !m_user.empty(); }
   void set(const std::string &id);
@@ -153,7 +153,7 @@ class DSandboxInfo {
 DECLARE_BOOST_TYPES(DThreadInfo);
 class DThreadInfo {
 public:
-  int64 m_id;
+  int64_t m_id;
   std::string m_desc;
   std::string m_type;
   std::string m_url;
diff --git a/hphp/runtime/eval/debugger/debugger_client.cpp b/hphp/runtime/eval/debugger/debugger_client.cpp
index 70f0dddaa66e4..e558bafc61989 100644
--- a/hphp/runtime/eval/debugger/debugger_client.cpp
+++ b/hphp/runtime/eval/debugger/debugger_client.cpp
@@ -851,15 +851,15 @@ char *DebuggerClient::getCompletion(const char *text, int state) {
 
   for (; m_acIndex < (int)m_acLists.size(); m_acIndex++) {
     const char **list = m_acLists[m_acIndex];
-    if ((int64)list == AutoCompleteFileNames) {
+    if ((int64_t)list == AutoCompleteFileNames) {
       char *p = rl_filename_completion_function(text, ++m_acPos);
       if (p) return p;
-    } else if ((int64)list >= 0 && (int64)list < AutoCompleteCount) {
+    } else if ((int64_t)list >= 0 && (int64_t)list < AutoCompleteCount) {
       if (m_acLiveListsDirty) {
         updateLiveLists();
         assert(!m_acLiveListsDirty);
       }
-      char *p = getCompletion((*m_acLiveLists)[(int64)list], text);
+      char *p = getCompletion((*m_acLiveLists)[(int64_t)list], text);
       if (p) return p;
     } else {
       for (const char *p = list[++m_acPos]; p; p = list[++m_acPos]) {
@@ -1853,7 +1853,7 @@ void DebuggerClient::updateThreads(DThreadInfoPtrVec threads) {
   m_threads = threads;
   for (unsigned int i = 0; i < m_threads.size(); i++) {
     DThreadInfoPtr thread = m_threads[i];
-    std::map<int64, int>::const_iterator iter =
+    std::map<int64_t, int>::const_iterator iter =
       m_threadIdMap.find(thread->m_id);
     if (iter != m_threadIdMap.end()) {
       m_threads[i]->m_index = iter->second;
@@ -1923,7 +1923,7 @@ void DebuggerClient::setMatchedBreakPoints(BreakPointInfoPtrVec breakpoints) {
   m_matched = breakpoints;
 }
 
-void DebuggerClient::setCurrentLocation(int64 threadId,
+void DebuggerClient::setCurrentLocation(int64_t threadId,
                                         BreakPointInfoPtr breakpoint) {
   m_threadId = threadId;
   m_breakpoint = breakpoint;
@@ -2149,7 +2149,7 @@ void DebuggerClient::usageLog(const std::string& cmd, const std::string& line) {
   char buf[MAX_LINE];
   int len = snprintf(buf, MAX_LINE, "%s %" PRId64 " %" PRId64 " %s #### %s",
                      m_usageLogHeader.c_str(),
-                     (int64)tp.tv_sec, (int64)tp.tv_nsec,
+                     (int64_t)tp.tv_sec, (int64_t)tp.tv_nsec,
                      cmd.c_str(), line.c_str());
   len = len >= MAX_LINE ? MAX_LINE - 1: len;
   buf[len] = '\n';
diff --git a/hphp/runtime/eval/debugger/debugger_client.h b/hphp/runtime/eval/debugger/debugger_client.h
index 2e0fd0bf29d4e..582148cbba180 100644
--- a/hphp/runtime/eval/debugger/debugger_client.h
+++ b/hphp/runtime/eval/debugger/debugger_client.h
@@ -219,7 +219,7 @@ class DebuggerClient {
    */
   void updateThreads(DThreadInfoPtrVec threads);
   DThreadInfoPtr getThread(int index) const;
-  int64 getCurrentThreadId() const { return m_threadId;}
+  int64_t getCurrentThreadId() const { return m_threadId;}
 
   /**
    * Current source location and breakpoints.
@@ -229,7 +229,7 @@ class DebuggerClient {
   InstPointInfoPtrVec *getInstPoints() { return &m_instPoints;}
   void setInstPoints(InstPointInfoPtrVec &ips) { m_instPoints = ips;}
   void setMatchedBreakPoints(BreakPointInfoPtrVec breakpoints);
-  void setCurrentLocation(int64 threadId, BreakPointInfoPtr breakpoint);
+  void setCurrentLocation(int64_t threadId, BreakPointInfoPtr breakpoint);
   BreakPointInfoPtrVec *getMatchedBreakPoints() { return &m_matched;}
   void getListLocation(std::string &file, int &line, int &lineFocus0,
                        int &charFocus0, int &lineFocus1, int &charFocus1);
@@ -400,8 +400,8 @@ class DebuggerClient {
 
   DSandboxInfoPtrVec m_sandboxes;
   DThreadInfoPtrVec m_threads;
-  int64 m_threadId;
-  std::map<int64, int> m_threadIdMap; // maps threadId to index
+  int64_t m_threadId;
+  std::map<int64_t, int> m_threadIdMap; // maps threadId to index
 
   BreakPointInfoPtrVec m_breakpoints;
   BreakPointInfoPtr m_breakpoint;
diff --git a/hphp/runtime/eval/debugger/debugger_command.cpp b/hphp/runtime/eval/debugger/debugger_command.cpp
index 2d693dd5ff5c9..68af3e5e5fa21 100644
--- a/hphp/runtime/eval/debugger/debugger_command.cpp
+++ b/hphp/runtime/eval/debugger/debugger_command.cpp
@@ -50,7 +50,7 @@ bool DebuggerCommand::recv(DebuggerThriftBuffer &thrift) {
 }
 
 void DebuggerCommand::sendImpl(DebuggerThriftBuffer &thrift) {
-  thrift.write((int32)m_type);
+  thrift.write((int32_t)m_type);
   thrift.write(m_class);
   thrift.write(m_body);
   thrift.write(m_version);
@@ -76,7 +76,7 @@ bool DebuggerCommand::Receive(DebuggerThriftBuffer &thrift,
     return errno != EINTR; // treat signals as timeouts
   }
 
-  int32 type;
+  int32_t type;
   string clsname;
   try {
     thrift.reset(true);
diff --git a/hphp/runtime/eval/debugger/debugger_proxy.cpp b/hphp/runtime/eval/debugger/debugger_proxy.cpp
index 360155ae7f6c3..0bc62c63c8b56 100644
--- a/hphp/runtime/eval/debugger/debugger_proxy.cpp
+++ b/hphp/runtime/eval/debugger/debugger_proxy.cpp
@@ -35,7 +35,7 @@ DebuggerProxy::DebuggerProxy(SmartPtr<Socket> socket, bool local)
       m_signalThread(this, &DebuggerProxy::pollSignal),
       m_signum(CmdSignal::SignalNone) {
   m_thrift.create(socket);
-  m_dummyInfo = DSandboxInfo::CreateDummyInfo((int64)this);
+  m_dummyInfo = DSandboxInfo::CreateDummyInfo((int64_t)this);
 }
 
 DebuggerProxy::~DebuggerProxy() {
@@ -73,7 +73,7 @@ void DebuggerProxy::getThreads(DThreadInfoPtrVec &threads) {
       threads.push_back(createThreadInfo(tint->desc()));
     }
   }
-  for (std::map<int64, DThreadInfoPtr>::const_iterator iter =
+  for (std::map<int64_t, DThreadInfoPtr>::const_iterator iter =
          m_threads.begin(); iter != m_threads.end(); ++iter) {
     DThreadInfoPtr thread(new DThreadInfo());
     *thread = *iter->second;
@@ -106,7 +106,7 @@ bool DebuggerProxy::switchThread(DThreadInfoPtr thread) {
 }
 
 void DebuggerProxy::switchThreadMode(ThreadMode mode,
-                                     int64 threadId /* = 0 */) {
+                                     int64_t threadId /* = 0 */) {
   Lock lock(this);
   m_threadMode = mode;
   if (threadId) {
@@ -117,7 +117,7 @@ void DebuggerProxy::switchThreadMode(ThreadMode mode,
     m_thread = 0;
     notify();
   } else {
-    m_thread = (int64)Process::GetThreadId();
+    m_thread = (int64_t)Process::GetThreadId();
   }
   if (mode == Normal) {
     m_jump.reset();
@@ -360,7 +360,7 @@ Variant DebuggerProxy::ExecutePHP(const std::string &php, String &output,
 
 DThreadInfoPtr DebuggerProxy::createThreadInfo(const std::string &desc) {
   DThreadInfoPtr info(new DThreadInfo());
-  info->m_id = (int64)Process::GetThreadId();
+  info->m_id = (int64_t)Process::GetThreadId();
   info->m_desc = desc;
   Transport *transport = g_context->getTransport();
   if (transport) {
@@ -373,7 +373,7 @@ DThreadInfoPtr DebuggerProxy::createThreadInfo(const std::string &desc) {
 }
 
 bool DebuggerProxy::blockUntilOwn(CmdInterrupt &cmd, bool check) {
-  int64 self = cmd.getThreadId();
+  int64_t self = cmd.getThreadId();
 
   Lock lock(this);
   if (m_thread && m_thread != self) {
diff --git a/hphp/runtime/eval/debugger/debugger_proxy.h b/hphp/runtime/eval/debugger/debugger_proxy.h
index 5ce6fa81617e2..c3fdac69243ec 100644
--- a/hphp/runtime/eval/debugger/debugger_proxy.h
+++ b/hphp/runtime/eval/debugger/debugger_proxy.h
@@ -62,7 +62,7 @@ class DebuggerProxy : public Synchronizable,
   bool switchSandbox(const std::string &newId, bool force);
   void updateSandbox(DSandboxInfoPtr sandbox);
   bool switchThread(DThreadInfoPtr thread);
-  void switchThreadMode(ThreadMode mode, int64 threadId = 0);
+  void switchThreadMode(ThreadMode mode, int64_t threadId = 0);
 
   void startDummySandbox();
   void notifyDummySandbox();
@@ -100,9 +100,9 @@ class DebuggerProxy : public Synchronizable,
   DSandboxInfo m_dummyInfo;
 
   ThreadMode m_threadMode;
-  int64 m_thread;
+  int64_t m_thread;
   DThreadInfoPtr m_newThread;
-  std::map<int64, DThreadInfoPtr> m_threads;
+  std::map<int64_t, DThreadInfoPtr> m_threads;
 
   typedef tbb::concurrent_hash_map<const StringData*, void*,
                                    StringDataHashCompare> StringDataMap;
diff --git a/hphp/runtime/eval/debugger/inst_point.cpp b/hphp/runtime/eval/debugger/inst_point.cpp
index 807a913accddc..e5014e3e2c2a9 100644
--- a/hphp/runtime/eval/debugger/inst_point.cpp
+++ b/hphp/runtime/eval/debugger/inst_point.cpp
@@ -81,7 +81,7 @@ void InstPointInfo::recvImpl(DebuggerThriftBuffer &thrift) {
 
 void InstPointInfo::SendImpl(const InstPointInfoPtrVec& ips,
                              DebuggerThriftBuffer &thrift) {
-  int16 size = ips.size();
+  int16_t size = ips.size();
   thrift.write(size);
   for (int i = 0; i < size; i++) {
     ips[i]->sendImpl(thrift);
@@ -90,7 +90,7 @@ void InstPointInfo::SendImpl(const InstPointInfoPtrVec& ips,
 
 void InstPointInfo::RecvImpl(InstPointInfoPtrVec& ips,
                              DebuggerThriftBuffer &thrift) {
-  int16 size;
+  int16_t size;
   thrift.read(size);
   ips.resize(size);
   for (int i = 0; i < size; i++) {
diff --git a/hphp/runtime/eval/debugger/inst_point.h b/hphp/runtime/eval/debugger/inst_point.h
index 73452f87c5c91..17ef70faeea96 100644
--- a/hphp/runtime/eval/debugger/inst_point.h
+++ b/hphp/runtime/eval/debugger/inst_point.h
@@ -53,7 +53,7 @@ class InstPointInfo {
   int m_locType;
   bool m_valid;
   std::string m_file;
-  int32 m_line;
+  int32_t m_line;
   std::string m_func;
   // TODO: add more info
 
diff --git a/hphp/runtime/eval/runtime/file_repository.h b/hphp/runtime/eval/runtime/file_repository.h
index 7af5bbe2c9d8e..39c6502d4d07b 100644
--- a/hphp/runtime/eval/runtime/file_repository.h
+++ b/hphp/runtime/eval/runtime/file_repository.h
@@ -82,10 +82,10 @@ class PhpFile {
 };
 
 class PhpFileWrapper {
-  static int64 timespecCompare(const struct timespec& l,
+  static int64_t timespecCompare(const struct timespec& l,
                                const struct timespec& r) {
     if (l.tv_sec != r.tv_sec) return l.tv_sec - r.tv_sec;
-    int64 ret = l.tv_nsec - r.tv_nsec;
+    int64_t ret = l.tv_nsec - r.tv_nsec;
     return ret;
   }
 public:
diff --git a/hphp/runtime/ext/asio/wait_handle.cpp b/hphp/runtime/ext/asio/wait_handle.cpp
index cdaa5ed91dded..a5178783108de 100644
--- a/hphp/runtime/ext/asio/wait_handle.cpp
+++ b/hphp/runtime/ext/asio/wait_handle.cpp
@@ -63,7 +63,7 @@ bool c_WaitHandle::t_isfailed() {
   return isFailed();
 }
 
-int64 c_WaitHandle::t_getid() {
+int64_t c_WaitHandle::t_getid() {
   return ((long) this) / sizeof(void*);
 }
 
diff --git a/hphp/runtime/ext/ext_apc.cpp b/hphp/runtime/ext/ext_apc.cpp
index 6be0d83978e78..e775640bb92a3 100644
--- a/hphp/runtime/ext/ext_apc.cpp
+++ b/hphp/runtime/ext/ext_apc.cpp
@@ -60,8 +60,8 @@ static class apcExtension : public Extension {
   }
 } s_apc_extension;
 
-bool f_apc_store(CStrRef key, CVarRef var, int64 ttl /* = 0 */,
-                 int64 cache_id /* = 0 */) {
+bool f_apc_store(CStrRef key, CVarRef var, int64_t ttl /* = 0 */,
+                 int64_t cache_id /* = 0 */) {
   if (!RuntimeOption::EnableApc) return false;
 
   if (cache_id < 0 || cache_id >= MAX_SHARED_STORE) {
@@ -75,8 +75,8 @@ bool f_apc_store(CStrRef key, CVarRef var, int64 ttl /* = 0 */,
   return s_apc_store[cache_id].store(key, var, ttl);
 }
 
-bool f_apc_add(CStrRef key, CVarRef var, int64 ttl /* = 0 */,
-               int64 cache_id /* = 0 */) {
+bool f_apc_add(CStrRef key, CVarRef var, int64_t ttl /* = 0 */,
+               int64_t cache_id /* = 0 */) {
   if (!RuntimeOption::EnableApc) return false;
 
   if (cache_id < 0 || cache_id >= MAX_SHARED_STORE) {
@@ -91,7 +91,7 @@ bool f_apc_add(CStrRef key, CVarRef var, int64 ttl /* = 0 */,
 }
 
 Variant f_apc_fetch(CVarRef key, VRefParam success /* = null */,
-                    int64 cache_id /* = 0 */) {
+                    int64_t cache_id /* = 0 */) {
   if (!RuntimeOption::EnableApc) return false;
 
   if (cache_id < 0 || cache_id >= MAX_SHARED_STORE) {
@@ -133,7 +133,7 @@ Variant f_apc_fetch(CVarRef key, VRefParam success /* = null */,
   return v;
 }
 
-Variant f_apc_delete(CVarRef key, int64 cache_id /* = 0 */) {
+Variant f_apc_delete(CVarRef key, int64_t cache_id /* = 0 */) {
   if (!RuntimeOption::EnableApc) return false;
 
   if (cache_id < 0 || cache_id >= MAX_SHARED_STORE) {
@@ -159,7 +159,7 @@ Variant f_apc_delete(CVarRef key, int64 cache_id /* = 0 */) {
   return s_apc_store[cache_id].erase(key.toString());
 }
 
-bool f_apc_clear_cache(int64 cache_id /* = 0 */) {
+bool f_apc_clear_cache(int64_t cache_id /* = 0 */) {
   if (!RuntimeOption::EnableApc) return false;
 
   if (cache_id < 0 || cache_id >= MAX_SHARED_STORE) {
@@ -169,8 +169,8 @@ bool f_apc_clear_cache(int64 cache_id /* = 0 */) {
   return s_apc_store[cache_id].clear();
 }
 
-Variant f_apc_inc(CStrRef key, int64 step /* = 1 */,
-                  VRefParam success /* = null */, int64 cache_id /* = 0 */) {
+Variant f_apc_inc(CStrRef key, int64_t step /* = 1 */,
+                  VRefParam success /* = null */, int64_t cache_id /* = 0 */) {
   if (!RuntimeOption::EnableApc) return false;
 
   if (cache_id < 0 || cache_id >= MAX_SHARED_STORE) {
@@ -178,13 +178,13 @@ Variant f_apc_inc(CStrRef key, int64 step /* = 1 */,
     return false;
   }
   bool found = false;
-  int64 newValue = s_apc_store[cache_id].inc(key, step, found);
+  int64_t newValue = s_apc_store[cache_id].inc(key, step, found);
   success = found;
   return newValue;
 }
 
-Variant f_apc_dec(CStrRef key, int64 step /* = 1 */,
-                  VRefParam success /* = null */, int64 cache_id /* = 0 */) {
+Variant f_apc_dec(CStrRef key, int64_t step /* = 1 */,
+                  VRefParam success /* = null */, int64_t cache_id /* = 0 */) {
   if (!RuntimeOption::EnableApc) return false;
 
   if (cache_id < 0 || cache_id >= MAX_SHARED_STORE) {
@@ -192,13 +192,13 @@ Variant f_apc_dec(CStrRef key, int64 step /* = 1 */,
     return false;
   }
   bool found = false;
-  int64 newValue = s_apc_store[cache_id].inc(key, -step, found);
+  int64_t newValue = s_apc_store[cache_id].inc(key, -step, found);
   success = found;
   return newValue;
 }
 
-bool f_apc_cas(CStrRef key, int64 old_cas, int64 new_cas,
-               int64 cache_id /* = 0 */) {
+bool f_apc_cas(CStrRef key, int64_t old_cas, int64_t new_cas,
+               int64_t cache_id /* = 0 */) {
   if (!RuntimeOption::EnableApc) return false;
 
   if (cache_id < 0 || cache_id >= MAX_SHARED_STORE) {
@@ -208,7 +208,7 @@ bool f_apc_cas(CStrRef key, int64 old_cas, int64 new_cas,
   return s_apc_store[cache_id].cas(key, old_cas, new_cas);
 }
 
-Variant f_apc_exists(CVarRef key, int64 cache_id /* = 0 */) {
+Variant f_apc_exists(CVarRef key, int64_t cache_id /* = 0 */) {
   if (!RuntimeOption::EnableApc) return false;
 
   if (cache_id < 0 || cache_id >= MAX_SHARED_STORE) {
@@ -236,7 +236,7 @@ Variant f_apc_exists(CVarRef key, int64 cache_id /* = 0 */) {
   return s_apc_store[cache_id].exists(key.toString());
 }
 
-Variant f_apc_cache_info(int64 cache_id /* = 0 */, bool limited /* = false */) {
+Variant f_apc_cache_info(int64_t cache_id /* = 0 */, bool limited /* = false */) {
   return CREATE_MAP1("start_time", start_time());
 }
 
@@ -405,8 +405,8 @@ void const_load_impl(struct cache_info *info,
       const char **k = int_keys;
       long long* v = int_values;
       for (int i = 0; i < count; i++, k += 2) {
-        String key(*k, (int)(int64)*(k+1), CopyString);
-        int64 value = *v++;
+        String key(*k, (int)(int64_t)*(k+1), CopyString);
+        int64_t value = *v++;
         const_load_set(key, value);
       }
     }
@@ -417,7 +417,7 @@ void const_load_impl(struct cache_info *info,
       const char **k = char_keys;
       char *v = char_values;
       for (int i = 0; i < count; i++, k += 2) {
-        String key(*k, (int)(int64)*(k+1), CopyString);
+        String key(*k, (int)(int64_t)*(k+1), CopyString);
         Variant value;
         switch (*v++) {
         case 0: value = false; break;
@@ -435,8 +435,8 @@ void const_load_impl(struct cache_info *info,
     if (count) {
       const char **p = strings;
       for (int i = 0; i < count; i++, p += 4) {
-        String key(*p, (int)(int64)*(p+1), CopyString);
-        String value(*(p+2), (int)(int64)*(p+3), CopyString);
+        String key(*p, (int)(int64_t)*(p+1), CopyString);
+        String value(*(p+2), (int)(int64_t)*(p+3), CopyString);
         const_load_set(key, value);
       }
     }
@@ -448,8 +448,8 @@ void const_load_impl(struct cache_info *info,
     if (count) {
       const char **p = objects;
       for (int i = 0; i < count; i++, p += 4) {
-        String key(*p, (int)(int64)*(p+1), CopyString);
-        String value(*(p+2), (int)(int64)*(p+3), AttachLiteral);
+        String key(*p, (int)(int64_t)*(p+1), CopyString);
+        String value(*(p+2), (int)(int64_t)*(p+3), AttachLiteral);
         const_load_set(key, f_unserialize(value));
       }
     }
@@ -460,8 +460,8 @@ void const_load_impl(struct cache_info *info,
       vector<SharedStore::KeyValuePair> vars(count);
       const char **p = thrifts;
       for (int i = 0; i < count; i++, p += 4) {
-        String key(*p, (int)(int64)*(p+1), CopyString);
-        String value(*(p+2), (int)(int64)*(p+3), AttachLiteral);
+        String key(*p, (int)(int64_t)*(p+1), CopyString);
+        String value(*(p+2), (int)(int64_t)*(p+3), AttachLiteral);
         Variant success;
         Variant v = f_fb_thrift_unserialize(value, ref(success));
         if (same(success, false)) {
@@ -476,8 +476,8 @@ void const_load_impl(struct cache_info *info,
     if (count) {
       const char **p = others;
       for (int i = 0; i < count; i++, p += 4) {
-        String key(*p, (int)(int64)*(p+1), CopyString);
-        String value(*(p+2), (int)(int64)*(p+3), AttachLiteral);
+        String key(*p, (int)(int64_t)*(p+1), CopyString);
+        String value(*(p+2), (int)(int64_t)*(p+3), AttachLiteral);
         Variant v = f_unserialize(value);
         if (same(v, false)) {
           throw Exception("bad apc archive, f_unserialize failed");
@@ -507,7 +507,7 @@ void apc_load_impl(struct cache_info *info,
       for (int i = 0; i < count; i++, k += 2) {
         SharedStore::KeyValuePair &item = vars[i];
         item.key = *k;
-        item.len = (int)(int64)*(k+1);
+        item.len = (int)(int64_t)*(k+1);
         s.constructPrime(*v++, item);
       }
       s.prime(vars);
@@ -522,7 +522,7 @@ void apc_load_impl(struct cache_info *info,
       for (int i = 0; i < count; i++, k += 2) {
         SharedStore::KeyValuePair &item = vars[i];
         item.key = *k;
-        item.len = (int)(int64)*(k+1);
+        item.len = (int)(int64_t)*(k+1);
         switch (*v++) {
         case 0: s.constructPrime(false, item); break;
         case 1: s.constructPrime(true , item); break;
@@ -542,9 +542,9 @@ void apc_load_impl(struct cache_info *info,
       for (int i = 0; i < count; i++, p += 4) {
         SharedStore::KeyValuePair &item = vars[i];
         item.key = *p;
-        item.len = (int)(int64)*(p+1);
+        item.len = (int)(int64_t)*(p+1);
         // Strings would be copied into APC anyway.
-        String value(*(p+2), (int)(int64)*(p+3), AttachLiteral);
+        String value(*(p+2), (int)(int64_t)*(p+3), AttachLiteral);
         value.checkStatic();
         s.constructPrime(value, item, false);
       }
@@ -559,8 +559,8 @@ void apc_load_impl(struct cache_info *info,
       for (int i = 0; i < count; i++, p += 4) {
         SharedStore::KeyValuePair &item = vars[i];
         item.key = *p;
-        item.len = (int)(int64)*(p+1);
-        String value(*(p+2), (int)(int64)*(p+3), AttachLiteral);
+        item.len = (int)(int64_t)*(p+1);
+        String value(*(p+2), (int)(int64_t)*(p+3), AttachLiteral);
         s.constructPrime(value, item, true);
       }
       s.prime(vars);
@@ -574,8 +574,8 @@ void apc_load_impl(struct cache_info *info,
       for (int i = 0; i < count; i++, p += 4) {
         SharedStore::KeyValuePair &item = vars[i];
         item.key = *p;
-        item.len = (int)(int64)*(p+1);
-        String value(*(p+2), (int)(int64)*(p+3), AttachLiteral);
+        item.len = (int)(int64_t)*(p+1);
+        String value(*(p+2), (int)(int64_t)*(p+3), AttachLiteral);
         Variant success;
         Variant v = f_fb_thrift_unserialize(value, ref(success));
         if (same(success, false)) {
@@ -594,9 +594,9 @@ void apc_load_impl(struct cache_info *info,
       for (int i = 0; i < count; i++, p += 4) {
         SharedStore::KeyValuePair &item = vars[i];
         item.key = *p;
-        item.len = (int)(int64)*(p+1);
+        item.len = (int)(int64_t)*(p+1);
 
-        String value(*(p+2), (int)(int64)*(p+3), AttachLiteral);
+        String value(*(p+2), (int)(int64_t)*(p+3), AttachLiteral);
         Variant v = f_unserialize(value);
         if (same(v, false)) {
           // we can't possibly get here if it was a boolean "false" that's
@@ -634,7 +634,7 @@ void const_load_impl_compressed
       long long* v = int_values;
       for (int i = 0; i < count; i++) {
         String key(k, int_lens[i + 2], CopyString);
-        int64 value = *v++;
+        int64_t value = *v++;
         const_load_set(key, value);
         k += int_lens[i + 2] + 1;
       }
@@ -1170,13 +1170,13 @@ void reserialize(VariableUnserializer *uns, StringBuffer &buf) {
   case 'a':
     {
       buf.append("a:");
-      int64 size = uns->readInt();
+      int64_t size = uns->readInt();
       char sep2 = uns->readChar();
       buf.append(size);
       buf.append(sep2);
       sep2 = uns->readChar();
       buf.append(sep2);
-      for (int64 i = 0; i < size; i++) {
+      for (int64_t i = 0; i < size; i++) {
         reserialize(uns, buf); // key
         reserialize(uns, buf); // value
       }
@@ -1199,14 +1199,14 @@ void reserialize(VariableUnserializer *uns, StringBuffer &buf) {
       buf.append("\":");
 
       uns->readChar();
-      int64 size = uns->readInt();
+      int64_t size = uns->readInt();
       char sep2 = uns->readChar();
 
       buf.append(size);
       buf.append(sep2);
       sep2 = uns->readChar(); // '{'
       buf.append(sep2);
-      for (int64 i = 0; i < size; i++) {
+      for (int64_t i = 0; i < size; i++) {
         reserialize(uns, buf); // property name
         reserialize(uns, buf); // property value
       }
diff --git a/hphp/runtime/ext/ext_apc.h b/hphp/runtime/ext/ext_apc.h
index b068a10056068..ad16d558d73c7 100644
--- a/hphp/runtime/ext/ext_apc.h
+++ b/hphp/runtime/ext/ext_apc.h
@@ -25,29 +25,29 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-bool f_apc_add(CStrRef key, CVarRef var, int64 ttl = 0, int64 cache_id = 0);
-bool f_apc_store(CStrRef key, CVarRef var, int64 ttl = 0, int64 cache_id = 0);
-Variant f_apc_fetch(CVarRef key, VRefParam success = null, int64 cache_id = 0);
-Variant f_apc_delete(CVarRef key, int64 cache_id = 0);
-bool f_apc_clear_cache(int64 cache_id = 0);
-Variant f_apc_inc(CStrRef key, int64 step = 1, VRefParam success = null, int64 cache_id = 0);
-Variant f_apc_dec(CStrRef key, int64 step = 1, VRefParam success = null, int64 cache_id = 0);
-bool f_apc_cas(CStrRef key, int64 old_cas, int64 new_cas, int64 cache_id = 0);
-Variant f_apc_exists(CVarRef key, int64 cache_id = 0);
+bool f_apc_add(CStrRef key, CVarRef var, int64_t ttl = 0, int64_t cache_id = 0);
+bool f_apc_store(CStrRef key, CVarRef var, int64_t ttl = 0, int64_t cache_id = 0);
+Variant f_apc_fetch(CVarRef key, VRefParam success = null, int64_t cache_id = 0);
+Variant f_apc_delete(CVarRef key, int64_t cache_id = 0);
+bool f_apc_clear_cache(int64_t cache_id = 0);
+Variant f_apc_inc(CStrRef key, int64_t step = 1, VRefParam success = null, int64_t cache_id = 0);
+Variant f_apc_dec(CStrRef key, int64_t step = 1, VRefParam success = null, int64_t cache_id = 0);
+bool f_apc_cas(CStrRef key, int64_t old_cas, int64_t new_cas, int64_t cache_id = 0);
+Variant f_apc_exists(CVarRef key, int64_t cache_id = 0);
 
 ///////////////////////////////////////////////////////////////////////////////
 
-Variant f_apc_cache_info(int64 cache_id = 0, bool limited = false);
+Variant f_apc_cache_info(int64_t cache_id = 0, bool limited = false);
 inline Array f_apc_sma_info(bool limited = false) {
   return Array::Create();
 }
 inline bool f_apc_define_constants(CStrRef key, CStrRef constants,
                                    bool case_sensitive = true,
-                                   int64 cache_id = 0) {
+                                   int64_t cache_id = 0) {
   throw NotSupportedException(__func__, "dynamic coding");
 }
 inline bool f_apc_load_constants(CStrRef key, bool case_sensitive = true,
-                                 int64 cache_id = 0) {
+                                 int64_t cache_id = 0) {
   throw NotSupportedException(__func__, "dynamic coding");
 }
 inline bool f_apc_compile_file(CStrRef filename, bool atomic = true,
@@ -57,22 +57,22 @@ inline bool f_apc_compile_file(CStrRef filename, bool atomic = true,
 inline Array f_apc_filehits() {
   throw NotSupportedException(__func__, "feature not supported");
 }
-inline Variant f_apc_delete_file(CVarRef keys, int64 cache_id = 0) {
+inline Variant f_apc_delete_file(CVarRef keys, int64_t cache_id = 0) {
   throw NotSupportedException(__func__, "feature not supported");
 }
-inline Variant f_apc_bin_dump(int64 cache_id = 0, CVarRef filter = null_variant) {
+inline Variant f_apc_bin_dump(int64_t cache_id = 0, CVarRef filter = null_variant) {
   throw NotSupportedException(__func__, "feature not supported");
 }
-inline bool f_apc_bin_load(CStrRef data, int64 flags = 0, int64 cache_id = 0) {
+inline bool f_apc_bin_load(CStrRef data, int64_t flags = 0, int64_t cache_id = 0) {
   throw NotSupportedException(__func__, "feature not supported");
 }
-inline Variant f_apc_bin_dumpfile(int64 cache_id, CVarRef filter,
-                                  CStrRef filename, int64 flags = 0,
+inline Variant f_apc_bin_dumpfile(int64_t cache_id, CVarRef filter,
+                                  CStrRef filename, int64_t flags = 0,
                                   CObjRef context = null) {
   throw NotSupportedException(__func__, "feature not supported");
 }
 inline bool f_apc_bin_loadfile(CStrRef filename, CObjRef context = null,
-                               int64 flags = 0, int64 cache_id = 0) {
+                               int64_t flags = 0, int64_t cache_id = 0) {
   throw NotSupportedException(__func__, "feature not supported");
 }
 
@@ -99,14 +99,14 @@ void apc_load_impl_compressed(
 class apc_rfc1867_data {
 public:
   std::string tracking_key;
-  int64 content_length;
+  int64_t content_length;
   std::string filename;
   std::string name;
   char *temp_filename;
   int cancel_upload;
   double start_time;
-  int64 bytes_processed;
-  int64 prev_bytes_processed;
+  int64_t bytes_processed;
+  int64_t prev_bytes_processed;
   int update_freq;
   double rate;
 };
@@ -130,7 +130,7 @@ void const_load_impl_compressed(
   int *thrift_lens, const char *thrifts,
   int *other_lens, const char *others);
 
-static_assert(sizeof(int64) == sizeof(long long),
+static_assert(sizeof(int64_t) == sizeof(long long),
               "Must be able to cast an int64* to a long long*");
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/ext/ext_array.cpp b/hphp/runtime/ext/ext_array.cpp
index 058db73d55404..02aa9c960b82d 100644
--- a/hphp/runtime/ext/ext_array.cpp
+++ b/hphp/runtime/ext/ext_array.cpp
@@ -36,32 +36,32 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-const int64 k_UCOL_DEFAULT = UCOL_DEFAULT;
+const int64_t k_UCOL_DEFAULT = UCOL_DEFAULT;
 
-const int64 k_UCOL_PRIMARY = UCOL_PRIMARY;
-const int64 k_UCOL_SECONDARY = UCOL_SECONDARY;
-const int64 k_UCOL_TERTIARY = UCOL_TERTIARY;
-const int64 k_UCOL_DEFAULT_STRENGTH = UCOL_DEFAULT_STRENGTH;
-const int64 k_UCOL_QUATERNARY = UCOL_QUATERNARY;
-const int64 k_UCOL_IDENTICAL = UCOL_IDENTICAL;
+const int64_t k_UCOL_PRIMARY = UCOL_PRIMARY;
+const int64_t k_UCOL_SECONDARY = UCOL_SECONDARY;
+const int64_t k_UCOL_TERTIARY = UCOL_TERTIARY;
+const int64_t k_UCOL_DEFAULT_STRENGTH = UCOL_DEFAULT_STRENGTH;
+const int64_t k_UCOL_QUATERNARY = UCOL_QUATERNARY;
+const int64_t k_UCOL_IDENTICAL = UCOL_IDENTICAL;
 
-const int64 k_UCOL_OFF = UCOL_OFF;
-const int64 k_UCOL_ON = UCOL_ON;
+const int64_t k_UCOL_OFF = UCOL_OFF;
+const int64_t k_UCOL_ON = UCOL_ON;
 
-const int64 k_UCOL_SHIFTED = UCOL_SHIFTED;
-const int64 k_UCOL_NON_IGNORABLE = UCOL_NON_IGNORABLE;
+const int64_t k_UCOL_SHIFTED = UCOL_SHIFTED;
+const int64_t k_UCOL_NON_IGNORABLE = UCOL_NON_IGNORABLE;
 
-const int64 k_UCOL_LOWER_FIRST = UCOL_LOWER_FIRST;
-const int64 k_UCOL_UPPER_FIRST = UCOL_UPPER_FIRST;
+const int64_t k_UCOL_LOWER_FIRST = UCOL_LOWER_FIRST;
+const int64_t k_UCOL_UPPER_FIRST = UCOL_UPPER_FIRST;
 
-const int64 k_UCOL_FRENCH_COLLATION = UCOL_FRENCH_COLLATION;
-const int64 k_UCOL_ALTERNATE_HANDLING = UCOL_ALTERNATE_HANDLING;
-const int64 k_UCOL_CASE_FIRST = UCOL_CASE_FIRST;
-const int64 k_UCOL_CASE_LEVEL = UCOL_CASE_LEVEL;
-const int64 k_UCOL_NORMALIZATION_MODE = UCOL_NORMALIZATION_MODE;
-const int64 k_UCOL_STRENGTH = UCOL_STRENGTH;
-const int64 k_UCOL_HIRAGANA_QUATERNARY_MODE = UCOL_HIRAGANA_QUATERNARY_MODE;
-const int64 k_UCOL_NUMERIC_COLLATION = UCOL_NUMERIC_COLLATION;
+const int64_t k_UCOL_FRENCH_COLLATION = UCOL_FRENCH_COLLATION;
+const int64_t k_UCOL_ALTERNATE_HANDLING = UCOL_ALTERNATE_HANDLING;
+const int64_t k_UCOL_CASE_FIRST = UCOL_CASE_FIRST;
+const int64_t k_UCOL_CASE_LEVEL = UCOL_CASE_LEVEL;
+const int64_t k_UCOL_NORMALIZATION_MODE = UCOL_NORMALIZATION_MODE;
+const int64_t k_UCOL_STRENGTH = UCOL_STRENGTH;
+const int64_t k_UCOL_HIRAGANA_QUATERNARY_MODE = UCOL_HIRAGANA_QUATERNARY_MODE;
+const int64_t k_UCOL_NUMERIC_COLLATION = UCOL_NUMERIC_COLLATION;
 
 using HPHP::VM::Transl::CallerFrame;
 
@@ -147,7 +147,7 @@ bool f_array_key_exists(CVarRef key, CVarRef search) {
   switch (Variant::GetAccessorType(kacc)) {
   case KindOfString:
   case KindOfStaticString: {
-    int64 n = 0;
+    int64_t n = 0;
     StringData *sd = Variant::GetStringData(kacc);
     if (sd->isStrictlyInteger(n)) {
       return ad->exists(n);
@@ -368,7 +368,7 @@ Variant f_array_product(CVarRef array) {
   if (arr_array.empty()) {
     return 0; // to be consistent with PHP
   }
-  int64 i;
+  int64_t i;
   double d;
   if (ArrayUtil::Product(arr_array, &i, &d) == KindOfInt64) {
     return i;
@@ -427,7 +427,7 @@ Variant f_array_slice(CVarRef array, int offset,
                       CVarRef length /* = null_variant */,
                       bool preserve_keys /* = false */) {
   getCheckedArray(array);
-  int64 len = length.isNull() ? 0x7FFFFFFF : length.toInt64();
+  int64_t len = length.isNull() ? 0x7FFFFFFF : length.toInt64();
   return ArrayUtil::Slice(arr_array, offset, len, preserve_keys);
 }
 Variant f_array_splice(VRefParam input, int offset,
@@ -435,13 +435,13 @@ Variant f_array_splice(VRefParam input, int offset,
                        CVarRef replacement /* = null_variant */) {
   getCheckedArray(input);
   Array ret(Array::Create());
-  int64 len = length.isNull() ? 0x7FFFFFFF : length.toInt64();
+  int64_t len = length.isNull() ? 0x7FFFFFFF : length.toInt64();
   input = ArrayUtil::Splice(arr_input, offset, len, replacement, &ret);
   return ret;
 }
 Variant f_array_sum(CVarRef array) {
   getCheckedArray(array);
-  int64 i;
+  int64_t i;
   double d;
   if (ArrayUtil::Sum(arr_array, &i, &d) == KindOfInt64) {
     return i;
@@ -450,7 +450,7 @@ Variant f_array_sum(CVarRef array) {
   }
 }
 
-int64 f_array_unshift(int _argc, VRefParam array, CVarRef var, CArrRef _argv /* = null_array */) {
+int64_t f_array_unshift(int _argc, VRefParam array, CVarRef var, CArrRef _argv /* = null_array */) {
   if (array.toArray()->isVectorData()) {
     if (!_argv.empty()) {
       for (ssize_t pos = _argv->iter_end(); pos != ArrayData::invalid_index;
@@ -617,7 +617,7 @@ bool f_shuffle(VRefParam array) {
   return true;
 }
 
-int64 f_count(CVarRef var, bool recursive /* = false */) {
+int64_t f_count(CVarRef var, bool recursive /* = false */) {
   switch (var.getType()) {
   case KindOfUninit:
   case KindOfNull:
@@ -713,7 +713,7 @@ Variant f_range(CVarRef low, CVarRef high, CVarRef step /* = 1 */) {
     dstep = step.toDouble();
     is_step_double = true;
   } else if (step.isString()) {
-    int64 sn;
+    int64_t sn;
     double sd;
     DataType stype = step.toString()->isNumericWithVal(sn, sd, 0);
     if (stype == KindOfDouble) {
@@ -733,7 +733,7 @@ Variant f_range(CVarRef low, CVarRef high, CVarRef step /* = 1 */) {
     String slow = low.toString();
     String shigh = high.toString();
     if (slow.size() >= 1 && shigh.size() >=1) {
-      int64 n1, n2;
+      int64_t n1, n2;
       double d1, d2;
       DataType type1 = slow->isNumericWithVal(n1, d1, 0);
       DataType type2 = shigh->isNumericWithVal(n2, d2, 0);
@@ -743,7 +743,7 @@ Variant f_range(CVarRef low, CVarRef high, CVarRef step /* = 1 */) {
         return ArrayUtil::Range(d1, d2, dstep);
       }
 
-      int64 lstep = (int64) dstep;
+      int64_t lstep = (int64_t) dstep;
       if (type1 == KindOfInt64 || type2 == KindOfInt64) {
         if (type1 != KindOfInt64) n1 = slow.toInt64();
         if (type2 != KindOfInt64) n2 = shigh.toInt64();
@@ -759,7 +759,7 @@ Variant f_range(CVarRef low, CVarRef high, CVarRef step /* = 1 */) {
     return ArrayUtil::Range(low.toDouble(), high.toDouble(), dstep);
   }
 
-  int64 lstep = (int64) dstep;
+  int64_t lstep = (int64_t) dstep;
   return ArrayUtil::Range(low.toDouble(), high.toDouble(), lstep);
 }
 ///////////////////////////////////////////////////////////////////////////////
@@ -990,7 +990,7 @@ class Collator : public RequestEventHandler {
     return m_ucoll;
   }
 
-  bool setAttribute(int64 attr, int64 val) {
+  bool setAttribute(int64_t attr, int64_t val) {
     if (!m_ucoll) {
       Logger::Verbose("m_ucoll is NULL");
       return false;
@@ -1005,7 +1005,7 @@ class Collator : public RequestEventHandler {
     return true;
   }
 
-  bool setStrength(int64 strength) {
+  bool setStrength(int64_t strength) {
     if (!m_ucoll) {
       Logger::Verbose("m_ucoll is NULL");
       return false;
@@ -1323,11 +1323,11 @@ bool f_i18n_loc_set_default(CStrRef locale) {
   return s_collator->setLocale(locale);
 }
 
-bool f_i18n_loc_set_attribute(int64 attr, int64 val) {
+bool f_i18n_loc_set_attribute(int64_t attr, int64_t val) {
   return s_collator->setAttribute(attr, val);
 }
 
-bool f_i18n_loc_set_strength(int64 strength) {
+bool f_i18n_loc_set_strength(int64_t strength) {
   return s_collator->setStrength(strength);
 }
 
diff --git a/hphp/runtime/ext/ext_array.h b/hphp/runtime/ext/ext_array.h
index 5973f846e12ea..434b60da6971b 100644
--- a/hphp/runtime/ext/ext_array.h
+++ b/hphp/runtime/ext/ext_array.h
@@ -26,27 +26,27 @@ namespace HPHP {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-extern const int64 k_UCOL_DEFAULT;
-extern const int64 k_UCOL_PRIMARY;
-extern const int64 k_UCOL_SECONDARY;
-extern const int64 k_UCOL_TERTIARY;
-extern const int64 k_UCOL_DEFAULT_STRENGTH;
-extern const int64 k_UCOL_QUATERNARY;
-extern const int64 k_UCOL_IDENTICAL;
-extern const int64 k_UCOL_OFF;
-extern const int64 k_UCOL_ON;
-extern const int64 k_UCOL_SHIFTED;
-extern const int64 k_UCOL_NON_IGNORABLE;
-extern const int64 k_UCOL_LOWER_FIRST;
-extern const int64 k_UCOL_UPPER_FIRST;
-extern const int64 k_UCOL_FRENCH_COLLATION;
-extern const int64 k_UCOL_ALTERNATE_HANDLING;
-extern const int64 k_UCOL_CASE_FIRST;
-extern const int64 k_UCOL_CASE_LEVEL;
-extern const int64 k_UCOL_NORMALIZATION_MODE;
-extern const int64 k_UCOL_STRENGTH;
-extern const int64 k_UCOL_HIRAGANA_QUATERNARY_MODE;
-extern const int64 k_UCOL_NUMERIC_COLLATION;
+extern const int64_t k_UCOL_DEFAULT;
+extern const int64_t k_UCOL_PRIMARY;
+extern const int64_t k_UCOL_SECONDARY;
+extern const int64_t k_UCOL_TERTIARY;
+extern const int64_t k_UCOL_DEFAULT_STRENGTH;
+extern const int64_t k_UCOL_QUATERNARY;
+extern const int64_t k_UCOL_IDENTICAL;
+extern const int64_t k_UCOL_OFF;
+extern const int64_t k_UCOL_ON;
+extern const int64_t k_UCOL_SHIFTED;
+extern const int64_t k_UCOL_NON_IGNORABLE;
+extern const int64_t k_UCOL_LOWER_FIRST;
+extern const int64_t k_UCOL_UPPER_FIRST;
+extern const int64_t k_UCOL_FRENCH_COLLATION;
+extern const int64_t k_UCOL_ALTERNATE_HANDLING;
+extern const int64_t k_UCOL_CASE_FIRST;
+extern const int64_t k_UCOL_CASE_LEVEL;
+extern const int64_t k_UCOL_NORMALIZATION_MODE;
+extern const int64_t k_UCOL_STRENGTH;
+extern const int64_t k_UCOL_HIRAGANA_QUATERNARY_MODE;
+extern const int64_t k_UCOL_NUMERIC_COLLATION;
 
 Variant f_array_change_key_case(CVarRef input, bool upper = false);
 Variant f_array_chunk(CVarRef input, int size,
@@ -102,7 +102,7 @@ Variant f_array_splice(VRefParam input, int offset,
 Variant f_array_sum(CVarRef array);
 Variant f_array_unique(CVarRef array, int sort_flags = 2);
 
-int64 f_array_unshift(int _argc, VRefParam array, CVarRef var, CArrRef _argv = null_array);
+int64_t f_array_unshift(int _argc, VRefParam array, CVarRef var, CArrRef _argv = null_array);
 
 Variant f_array_values(CVarRef input);
 bool f_array_walk_recursive(VRefParam input, CVarRef funcname,
@@ -121,9 +121,9 @@ Array compact(LVariableTable *variables, int _argc, CVarRef varname,
               CArrRef _argv = null_array);
 
 bool f_shuffle(VRefParam array);
-int64 f_count(CVarRef var, bool recursive = false);
+int64_t f_count(CVarRef var, bool recursive = false);
 
-inline int64 f_sizeof(CVarRef var, bool recursive = false) {
+inline int64_t f_sizeof(CVarRef var, bool recursive = false) {
   return f_count(var, recursive);
 }
 inline Variant f_each(VRefParam array) {
@@ -210,8 +210,8 @@ bool f_array_multisort(int _argc, VRefParam ar1, CArrRef _argv = null_array);
 
 String f_i18n_loc_get_default();
 bool f_i18n_loc_set_default(CStrRef locale);
-bool f_i18n_loc_set_attribute(int64 attr, int64 val);
-bool f_i18n_loc_set_strength(int64 strength);
+bool f_i18n_loc_set_attribute(int64_t attr, int64_t val);
+bool f_i18n_loc_set_strength(int64_t strength);
 Variant f_i18n_loc_get_error_code();
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/ext/ext_asio.h b/hphp/runtime/ext/ext_asio.h
index 88256242a53e4..4cac8b2d592bc 100644
--- a/hphp/runtime/ext/ext_asio.h
+++ b/hphp/runtime/ext/ext_asio.h
@@ -67,7 +67,7 @@ class c_WaitHandle : public ExtObjectData {
   public: bool t_isfinished();
   public: bool t_issucceeded();
   public: bool t_isfailed();
-  public: int64 t_getid();
+  public: int64_t t_getid();
   public: String t_getname();
   public: Object t_getexceptioniffailed();
 
diff --git a/hphp/runtime/ext/ext_bcmath.cpp b/hphp/runtime/ext/ext_bcmath.cpp
index d6729e0d1ef8d..18b531398fa05 100644
--- a/hphp/runtime/ext/ext_bcmath.cpp
+++ b/hphp/runtime/ext/ext_bcmath.cpp
@@ -48,12 +48,12 @@ static void php_str2num(bc_num *num, const char *str) {
   }
 }
 
-bool f_bcscale(int64 scale) {
+bool f_bcscale(int64_t scale) {
   BCG(bc_precision) = scale < 0 ? 0 : scale;
   return true;
 }
 
-String f_bcadd(CStrRef left, CStrRef right, int64 scale /* = -1 */) {
+String f_bcadd(CStrRef left, CStrRef right, int64_t scale /* = -1 */) {
   if (scale < 0) scale = BCG(bc_precision);
   bc_num first, second, result;
   bc_init_num(&first);
@@ -72,7 +72,7 @@ String f_bcadd(CStrRef left, CStrRef right, int64 scale /* = -1 */) {
   return ret;
 }
 
-String f_bcsub(CStrRef left, CStrRef right, int64 scale /* = -1 */) {
+String f_bcsub(CStrRef left, CStrRef right, int64_t scale /* = -1 */) {
   if (scale < 0) scale = BCG(bc_precision);
   bc_num first, second, result;
   bc_init_num(&first);
@@ -91,20 +91,20 @@ String f_bcsub(CStrRef left, CStrRef right, int64 scale /* = -1 */) {
   return ret;
 }
 
-int64 f_bccomp(CStrRef left, CStrRef right, int64 scale /* = -1 */) {
+int64_t f_bccomp(CStrRef left, CStrRef right, int64_t scale /* = -1 */) {
   if (scale < 0) scale = BCG(bc_precision);
   bc_num first, second;
   bc_init_num(&first);
   bc_init_num(&second);
   bc_str2num(&first, (char*)left.data(), scale);
   bc_str2num(&second, (char*)right.data(), scale);
-  int64 ret = bc_compare(first, second);
+  int64_t ret = bc_compare(first, second);
   bc_free_num(&first);
   bc_free_num(&second);
   return ret;
 }
 
-String f_bcmul(CStrRef left, CStrRef right, int64 scale /* = -1 */) {
+String f_bcmul(CStrRef left, CStrRef right, int64_t scale /* = -1 */) {
   if (scale < 0) scale = BCG(bc_precision);
   bc_num first, second, result;
   bc_init_num(&first);
@@ -123,7 +123,7 @@ String f_bcmul(CStrRef left, CStrRef right, int64 scale /* = -1 */) {
   return ret;
 }
 
-String f_bcdiv(CStrRef left, CStrRef right, int64 scale /* = -1 */) {
+String f_bcdiv(CStrRef left, CStrRef right, int64_t scale /* = -1 */) {
   if (scale < 0) scale = BCG(bc_precision);
   bc_num first, second, result;
   bc_init_num(&first);
@@ -160,7 +160,7 @@ String f_bcmod(CStrRef left, CStrRef right) {
   return ret;
 }
 
-String f_bcpow(CStrRef left, CStrRef right, int64 scale /* = -1 */) {
+String f_bcpow(CStrRef left, CStrRef right, int64_t scale /* = -1 */) {
   if (scale < 0) scale = BCG(bc_precision);
   bc_num first, second, result;
   bc_init_num(&first);
@@ -180,7 +180,7 @@ String f_bcpow(CStrRef left, CStrRef right, int64 scale /* = -1 */) {
 }
 
 Variant f_bcpowmod(CStrRef left, CStrRef right, CStrRef modulus,
-                  int64 scale /* = -1 */) {
+                  int64_t scale /* = -1 */) {
   if (scale < 0) scale = BCG(bc_precision);
   bc_num first, second, mod, result;
   bc_init_num(&first);
@@ -204,7 +204,7 @@ Variant f_bcpowmod(CStrRef left, CStrRef right, CStrRef modulus,
   return ret;
 }
 
-Variant f_bcsqrt(CStrRef operand, int64 scale /* = -1 */) {
+Variant f_bcsqrt(CStrRef operand, int64_t scale /* = -1 */) {
   if (scale < 0) scale = BCG(bc_precision);
   bc_num result;
   bc_init_num(&result);
diff --git a/hphp/runtime/ext/ext_bcmath.h b/hphp/runtime/ext/ext_bcmath.h
index d1a988f930f18..1494296097a7c 100644
--- a/hphp/runtime/ext/ext_bcmath.h
+++ b/hphp/runtime/ext/ext_bcmath.h
@@ -25,17 +25,17 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-bool f_bcscale(int64 scale);
-String f_bcadd(CStrRef left, CStrRef right, int64 scale = -1);
-String f_bcsub(CStrRef left, CStrRef right, int64 scale = -1);
-int64 f_bccomp(CStrRef left, CStrRef right, int64 scale = -1);
-String f_bcmul(CStrRef left, CStrRef right, int64 scale = -1);
-String f_bcdiv(CStrRef left, CStrRef right, int64 scale = -1);
+bool f_bcscale(int64_t scale);
+String f_bcadd(CStrRef left, CStrRef right, int64_t scale = -1);
+String f_bcsub(CStrRef left, CStrRef right, int64_t scale = -1);
+int64_t f_bccomp(CStrRef left, CStrRef right, int64_t scale = -1);
+String f_bcmul(CStrRef left, CStrRef right, int64_t scale = -1);
+String f_bcdiv(CStrRef left, CStrRef right, int64_t scale = -1);
 String f_bcmod(CStrRef left, CStrRef right);
-String f_bcpow(CStrRef left, CStrRef right, int64 scale = -1);
+String f_bcpow(CStrRef left, CStrRef right, int64_t scale = -1);
 Variant f_bcpowmod(CStrRef left, CStrRef right, CStrRef modulus,
-                  int64 scale = -1);
-Variant f_bcsqrt(CStrRef operand, int64 scale = -1);
+                  int64_t scale = -1);
+Variant f_bcsqrt(CStrRef operand, int64_t scale = -1);
 
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/ext/ext_bzip2.cpp b/hphp/runtime/ext/ext_bzip2.cpp
index 78759dfce9c37..ee5ff935ce0b1 100644
--- a/hphp/runtime/ext/ext_bzip2.cpp
+++ b/hphp/runtime/ext/ext_bzip2.cpp
@@ -53,7 +53,7 @@ Variant f_bzerror(CObjRef bz) {
   return f->error();
 }
 
-int64 f_bzerrno(CObjRef bz) {
+int64_t f_bzerrno(CObjRef bz) {
   BZ2File *f = bz.getTyped<BZ2File>();
   return f->errnu();
 }
@@ -89,7 +89,7 @@ Variant f_bzdecompress(CStrRef source, int small /* = 0 */) {
   char *dest;
   int source_len = source.length();
   int error;
-  uint64 size = 0;
+  uint64_t size = 0;
   bz_stream bzs;
 
   bzs.bzalloc = NULL;
diff --git a/hphp/runtime/ext/ext_bzip2.h b/hphp/runtime/ext/ext_bzip2.h
index 82e25ba905d04..0b1e5fb67f8fa 100644
--- a/hphp/runtime/ext/ext_bzip2.h
+++ b/hphp/runtime/ext/ext_bzip2.h
@@ -42,7 +42,7 @@ Variant f_bzopen(CStrRef filename, CStrRef mode);
 Variant f_bzflush(CObjRef bz);
 String f_bzerrstr(CObjRef bz);
 Variant f_bzerror(CObjRef bz);
-int64 f_bzerrno(CObjRef bz);
+int64_t f_bzerrno(CObjRef bz);
 Variant f_bzcompress(CStrRef source, int blocksize = 4, int workfactor = 0);
 Variant f_bzdecompress(CStrRef source, int small = 0);
 
diff --git a/hphp/runtime/ext/ext_collection.cpp b/hphp/runtime/ext/ext_collection.cpp
index 0735a9100389c..407d7ff0c9e4f 100644
--- a/hphp/runtime/ext/ext_collection.cpp
+++ b/hphp/runtime/ext/ext_collection.cpp
@@ -25,7 +25,7 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-static void throwIntOOB(int64 key, bool isVector = false) {
+static void throwIntOOB(int64_t key, bool isVector = false) {
   static const size_t reserveSize = 50;
   String msg(reserveSize, ReserveString);
   char* buf = msg.mutableSlice().ptr;
@@ -102,7 +102,7 @@ void c_Vector::grow() {
   m_data = (TypedValue*)smart_realloc(m_data, m_capacity * sizeof(TypedValue));
 }
 
-void c_Vector::resize(int64 sz, TypedValue* val) {
+void c_Vector::resize(int64_t sz, TypedValue* val) {
   assert(val && val->m_type != KindOfRef);
   ++m_versionNumber;
   assert(sz >= 0);
@@ -124,7 +124,7 @@ void c_Vector::resize(int64 sz, TypedValue* val) {
   }
 }
 
-void c_Vector::reserve(int64 sz) {
+void c_Vector::reserve(int64_t sz) {
   ++m_versionNumber;
   if (sz <= 0) return;
   if (m_capacity < sz) {
@@ -199,7 +199,7 @@ void c_Vector::t_resize(CVarRef sz, CVarRef value) {
       "Parameter sz must be a non-negative integer"));
     throw e;
   }
-  int64 intSz = sz.toInt64();
+  int64_t intSz = sz.toInt64();
   if (intSz < 0) {
     Object e(SystemLib::AllocInvalidArgumentExceptionObject(
       "Parameter sz must be a non-negative integer"));
@@ -229,7 +229,7 @@ bool c_Vector::t_isempty() {
   return (m_size == 0);
 }
 
-int64 c_Vector::t_count() {
+int64_t c_Vector::t_count() {
   return m_size;
 }
 
@@ -329,8 +329,8 @@ void c_Vector::t_splice(CVarRef offset, CVarRef len /* = null */,
       "Vector::splice does not support replacement parameter"));
     throw e;
   }
-  int64 sz = m_size;
-  int64 startPos = offset.toInt64();
+  int64_t sz = m_size;
+  int64_t startPos = offset.toInt64();
   if (UNLIKELY(uint64_t(startPos) >= uint64_t(sz))) {
     if (startPos >= 0) {
       return;
@@ -340,9 +340,9 @@ void c_Vector::t_splice(CVarRef offset, CVarRef len /* = null */,
       startPos = 0;
     }
   }
-  int64 endPos;
+  int64_t endPos;
   if (len.isInteger()) {
-    int64 intLen = len.toInt64();
+    int64_t intLen = len.toInt64();
     if (LIKELY(intLen > 0)) {
       endPos = startPos + intLen;
       if (endPos > sz) {
@@ -362,7 +362,7 @@ void c_Vector::t_splice(CVarRef offset, CVarRef len /* = null */,
   }
   // Null out each element before decreffing it. We need to do this in case
   // a __destruct method reenters and accesses this Vector object.
-  for (int64 i = startPos; i < endPos; ++i) {
+  for (int64_t i = startPos; i < endPos; ++i) {
     uint64_t datum = m_data[i].m_data.num;
     DataType t = m_data[i].m_type;
     tvWriteNull(&m_data[i]);
@@ -376,7 +376,7 @@ void c_Vector::t_splice(CVarRef offset, CVarRef len /* = null */,
   m_size -= (endPos - startPos);
 }
 
-int64 c_Vector::t_linearsearch(CVarRef search_value) {
+int64_t c_Vector::t_linearsearch(CVarRef search_value) {
   uint sz = m_size;
   for (uint i = 0; i < sz; ++i) {
     if (search_value.same(tvAsCVarRef(&m_data[i]))) {
@@ -492,8 +492,8 @@ Variant c_Vector::ti_slice(const char* cls, CVarRef vec, CVarRef offset,
   c_Vector* target;
   Object ret = target = NEWOBJ(c_Vector)();
   auto v = static_cast<c_Vector*>(obj);
-  int64 sz = v->m_size;
-  int64 startPos = offset.toInt64();
+  int64_t sz = v->m_size;
+  int64_t startPos = offset.toInt64();
   if (UNLIKELY(uint64_t(startPos) >= uint64_t(sz))) {
     if (startPos >= 0) {
       return ret;
@@ -503,9 +503,9 @@ Variant c_Vector::ti_slice(const char* cls, CVarRef vec, CVarRef offset,
       startPos = 0;
     }
   }
-  int64 endPos;
+  int64_t endPos;
   if (len.isInteger()) {
-    int64 intLen = len.toInt64();
+    int64_t intLen = len.toInt64();
     if (LIKELY(intLen > 0)) {
       endPos = startPos + intLen;
       if (endPos > sz) {
@@ -535,7 +535,7 @@ Variant c_Vector::ti_slice(const char* cls, CVarRef vec, CVarRef offset,
   return ret;
 }
 
-void c_Vector::throwOOB(int64 key) {
+void c_Vector::throwOOB(int64_t key) {
   throwIntOOB(key, true);
 }
 
@@ -543,7 +543,7 @@ struct VectorValAccessor {
   typedef const TypedValue& ElmT;
   bool isInt(ElmT elm) const { return elm.m_type == KindOfInt64; }
   bool isStr(ElmT elm) const { return IS_STRING_TYPE(elm.m_type); }
-  int64 getInt(ElmT elm) const { return elm.m_data.num; }
+  int64_t getInt(ElmT elm) const { return elm.m_data.num; }
   StringData* getStr(ElmT elm) const { return elm.m_data.pstr; }
   Variant getValue(ElmT elm) const { return tvAsCVarRef(&elm); }
 };
@@ -806,7 +806,7 @@ Array c_Map::toArrayImpl() const {
     Bucket& p = m_data[i];
     if (p.validValue()) {
       if (p.hasIntKey()) {
-        ai.set((int64)p.ikey, tvAsCVarRef(&p.data));
+        ai.set((int64_t)p.ikey, tvAsCVarRef(&p.data));
       } else {
         ai.set(*(const String*)(&p.skey), tvAsCVarRef(&p.data));
       }
@@ -860,7 +860,7 @@ bool c_Map::t_isempty() {
   return (m_size == 0);
 }
 
-int64 c_Map::t_count() {
+int64_t c_Map::t_count() {
   return m_size;
 }
 
@@ -951,7 +951,7 @@ Array c_Map::t_tokeysarray() {
     Bucket& p = m_data[i];
     if (p.validValue()) {
       if (p.hasIntKey()) {
-        ai.set((int64)p.ikey);
+        ai.set((int64_t)p.ikey);
       } else {
         ai.set(*(const String*)(&p.skey));
       }
@@ -963,7 +963,7 @@ Array c_Map::t_tokeysarray() {
 Object c_Map::t_values() {
   c_Vector* target;
   Object ret = target = NEWOBJ(c_Vector)();
-  int64 sz = m_size;
+  int64_t sz = m_size;
   if (!sz) {
     return ret;
   }
@@ -971,7 +971,7 @@ Object c_Map::t_values() {
   target->m_capacity = target->m_size = m_size;
   target->m_data = data = (TypedValue*)smart_malloc(sz * sizeof(TypedValue));
 
-  int64 j = 0;
+  int64_t j = 0;
   for (uint i = 0; i <= m_nLastSlot; ++i) {
     Bucket& p = m_data[i];
     if (p.validValue()) {
@@ -1033,7 +1033,7 @@ Object c_Map::t_updatefromiterable(CVarRef it) {
       c_Map::Bucket& p = mp->m_data[i];
       if (p.validValue()) {
         if (p.hasIntKey()) {
-          update((int64)p.ikey, &p.data);
+          update((int64_t)p.ikey, &p.data);
         } else {
           update(p.skey, &p.data);
         }
@@ -1073,7 +1073,7 @@ Object c_Map::t_differencebykey(CVarRef it) {
       c_Map::Bucket& p = mp->m_data[i];
       if (p.validValue()) {
         if (p.hasIntKey()) {
-          target->remove((int64)p.ikey);
+          target->remove((int64_t)p.ikey);
         } else {
           target->remove(p.skey);
         }
@@ -1158,7 +1158,7 @@ Object c_Map::ti_fromiterable(const char* cls, CVarRef it) {
   return ret;
 }
 
-void c_Map::throwOOB(int64 key) {
+void c_Map::throwOOB(int64_t key) {
   throwIntOOB(key);
 }
 
@@ -1180,8 +1180,8 @@ bool inline hitStringKey(const c_Map::Bucket* p, const char* k,
                        memcmp(data, k, len) == 0);
 }
 
-bool inline hitIntKey(const c_Map::Bucket* p, int64 ki) ALWAYS_INLINE;
-bool inline hitIntKey(const c_Map::Bucket* p, int64 ki) {
+bool inline hitIntKey(const c_Map::Bucket* p, int64_t ki) ALWAYS_INLINE;
+bool inline hitIntKey(const c_Map::Bucket* p, int64_t ki) {
   assert(p->validValue());
   return p->ikey == ki && p->hasIntKey();
 }
@@ -1237,7 +1237,7 @@ bool inline hitIntKey(const c_Map::Bucket* p, int64 ki) {
     } \
   }
 
-c_Map::Bucket* c_Map::find(int64 h) const {
+c_Map::Bucket* c_Map::find(int64_t h) const {
   FIND_BODY(h, hitIntKey(p, h));
 }
 
@@ -1245,7 +1245,7 @@ c_Map::Bucket* c_Map::find(const char* k, int len, strhash_t prehash) const {
   FIND_BODY(prehash, hitStringKey(p, k, len, STRING_HASH(prehash)));
 }
 
-c_Map::Bucket* c_Map::findForInsert(int64 h) const {
+c_Map::Bucket* c_Map::findForInsert(int64_t h) const {
   FIND_FOR_INSERT_BODY(h, hitIntKey(p, h));
 }
 
@@ -1277,7 +1277,7 @@ c_Map::Bucket* c_Map::findForNewInsert(size_t h0) const {
 #undef FIND_BODY
 #undef FIND_FOR_INSERT_BODY
 
-bool c_Map::update(int64 h, TypedValue* data) {
+bool c_Map::update(int64_t h, TypedValue* data) {
   assert(data->m_type != KindOfRef);
   Bucket* p = findForInsert(h);
   assert(p);
@@ -1352,7 +1352,7 @@ void c_Map::resize() {
   reserve(m_size);
 }
 
-void c_Map::reserve(int64 sz) {
+void c_Map::reserve(int64_t sz) {
   ++m_versionNumber;
   if (sz < 2) {
     if (sz <= 0) return;
@@ -1428,7 +1428,7 @@ Variant c_Map::iter_key(ssize_t pos) const {
   if (p->hasStrKey()) {
     return p->skey;
   }
-  return (int64)p->ikey;
+  return (int64_t)p->ikey;
 }
 
 Variant c_Map::iter_value(ssize_t pos) const {
@@ -1684,7 +1684,7 @@ Array c_StableMap::toArrayImpl() const {
   Bucket* p = m_pListHead;
   while (p) {
     if (p->hasIntKey()) {
-      ai.set((int64)p->ikey, tvAsCVarRef(&p->data));
+      ai.set((int64_t)p->ikey, tvAsCVarRef(&p->data));
     } else {
       ai.set(*(const String*)(&p->skey), tvAsCVarRef(&p->data));
     }
@@ -1756,7 +1756,7 @@ bool c_StableMap::t_isempty() {
   return (m_size == 0);
 }
 
-int64 c_StableMap::t_count() {
+int64_t c_StableMap::t_count() {
   return m_size;
 }
 
@@ -1846,7 +1846,7 @@ Array c_StableMap::t_tokeysarray() {
   Bucket* p = m_pListHead;
   while (p) {
     if (p->hasIntKey()) {
-      ai.set((int64)p->ikey);
+      ai.set((int64_t)p->ikey);
     } else {
       ai.set(*(const String*)(&p->skey));
     }
@@ -1858,7 +1858,7 @@ Array c_StableMap::t_tokeysarray() {
 Object c_StableMap::t_values() {
   c_Vector* target;
   Object ret = target = NEWOBJ(c_Vector)();
-  int64 sz = m_size;
+  int64_t sz = m_size;
   if (!sz) {
     return ret;
   }
@@ -1866,7 +1866,7 @@ Object c_StableMap::t_values() {
   target->m_capacity = target->m_size = m_size;
   target->m_data = data = (TypedValue*)smart_malloc(sz * sizeof(TypedValue));
   Bucket* p = m_pListHead;
-  for (int64 i = 0; i < sz; ++i) {
+  for (int64_t i = 0; i < sz; ++i) {
     assert(p);
     tvDup(&p->data, &data[i]);
     p = p->pListNext;
@@ -1920,7 +1920,7 @@ Object c_StableMap::t_updatefromiterable(CVarRef it) {
     c_StableMap::Bucket* p = smp->m_pListHead;
     while (p) {
       if (p->hasIntKey()) {
-        update((int64)p->ikey, &p->data);
+        update((int64_t)p->ikey, &p->data);
       } else {
         update(p->skey, &p->data);
       }
@@ -1959,7 +1959,7 @@ Object c_StableMap::t_differencebykey(CVarRef it) {
     c_StableMap::Bucket* p = smp->m_pListHead;
     while (p) {
       if (p->hasIntKey()) {
-        target->remove((int64)p->ikey);
+        target->remove((int64_t)p->ikey);
       } else {
         target->remove(p->skey);
       }
@@ -2044,7 +2044,7 @@ Object c_StableMap::ti_fromiterable(const char* cls, CVarRef it) {
   return ret;
 }
 
-void c_StableMap::throwOOB(int64 key) {
+void c_StableMap::throwOOB(int64_t key) {
   throwIntOOB(key);
 }
 
@@ -2053,9 +2053,9 @@ void c_StableMap::throwOOB(StringData* key) {
 }
 
 bool inline sm_hit_string_key(const c_StableMap::Bucket* p,
-                              const char* k, int len, int32 hash) ALWAYS_INLINE;
+                              const char* k, int len, int32_t hash) ALWAYS_INLINE;
 bool inline sm_hit_string_key(const c_StableMap::Bucket* p,
-                              const char* k, int len, int32 hash) {
+                              const char* k, int len, int32_t hash) {
   if (p->hasIntKey()) return false;
   const char* data = p->skey->data();
   return data == k || (p->hash() == hash &&
@@ -2063,7 +2063,7 @@ bool inline sm_hit_string_key(const c_StableMap::Bucket* p,
                        memcmp(data, k, len) == 0);
 }
 
-c_StableMap::Bucket* c_StableMap::find(int64 h) const {
+c_StableMap::Bucket* c_StableMap::find(int64_t h) const {
   for (Bucket* p = m_arBuckets[h & m_nTableMask]; p; p = p->pNext) {
     if (p->hasIntKey() && p->ikey == h) {
       return p;
@@ -2081,7 +2081,7 @@ c_StableMap::Bucket* c_StableMap::find(const char* k, int len,
   return NULL;
 }
 
-c_StableMap::Bucket** c_StableMap::findForErase(int64 h) const {
+c_StableMap::Bucket** c_StableMap::findForErase(int64_t h) const {
   Bucket** ret = &(m_arBuckets[h & m_nTableMask]);
   Bucket* p = *ret;
   while (p) {
@@ -2107,7 +2107,7 @@ c_StableMap::Bucket** c_StableMap::findForErase(const char* k, int len,
   return NULL;
 }
 
-bool c_StableMap::update(int64 h, TypedValue* data) {
+bool c_StableMap::update(int64_t h, TypedValue* data) {
   Bucket* p = find(h);
   if (p) {
     tvRefcountedIncRef(data);
@@ -2181,7 +2181,7 @@ void c_StableMap::resize() {
   reserve(m_size);
 }
 
-void c_StableMap::reserve(int64 sz) {
+void c_StableMap::reserve(int64_t sz) {
   ++m_versionNumber;
   if (sz < 4) {
     if (sz <= 0) return;
@@ -2235,7 +2235,7 @@ Variant c_StableMap::iter_key(ssize_t pos) const {
   if (p->hasStrKey()) {
     return p->skey;
   }
-  return (int64)p->ikey;
+  return (int64_t)p->ikey;
 }
 
 Variant c_StableMap::iter_value(ssize_t pos) const {
@@ -2248,7 +2248,7 @@ struct StableMapKeyAccessor {
   typedef const c_StableMap::Bucket* ElmT;
   bool isInt(ElmT elm) const { return elm->hasIntKey(); }
   bool isStr(ElmT elm) const { return elm->hasStrKey(); }
-  int64 getInt(ElmT elm) const { return elm->ikey; }
+  int64_t getInt(ElmT elm) const { return elm->ikey; }
   StringData* getStr(ElmT elm) const { return elm->skey; }
   Variant getValue(ElmT elm) const {
     if (isInt(elm)) {
@@ -2263,7 +2263,7 @@ struct StableMapValAccessor {
   typedef const c_StableMap::Bucket* ElmT;
   bool isInt(ElmT elm) const { return elm->data.m_type == KindOfInt64; }
   bool isStr(ElmT elm) const { return IS_STRING_TYPE(elm->data.m_type); }
-  int64 getInt(ElmT elm) const { return elm->data.m_data.num; }
+  int64_t getInt(ElmT elm) const { return elm->data.m_data.num; }
   StringData* getStr(ElmT elm) const { return elm->data.m_data.pstr; }
   Variant getValue(ElmT elm) const { return tvAsCVarRef(&elm->data); }
 };
@@ -2626,7 +2626,7 @@ COLLECTION_MAGIC_METHODS(StableMap)
 
 void collectionSerialize(ObjectData* obj, VariableSerializer* serializer) {
   assert(obj->isCollection());
-  int64 sz = collectionSize(obj);
+  int64_t sz = collectionSize(obj);
   if (obj->getCollectionType() == Collection::VectorType) {
     serializer->setObjectInfo(obj->o_getClassName(), obj->o_getId(), 'V');
     serializer->writeArrayHeader(sz, true);
@@ -2660,19 +2660,19 @@ void collectionSerialize(ObjectData* obj, VariableSerializer* serializer) {
 
 void collectionUnserialize(ObjectData* obj,
                            VariableUnserializer* uns,
-                           int64 sz,
+                           int64_t sz,
                            char type) {
   assert(obj->isCollection());
   collectionReserve(obj, sz);
   if (type == 'V') {
-    for (int64 i = 0; i < sz; ++i) {
+    for (int64_t i = 0; i < sz; ++i) {
       Variant v;
       v.unserialize(uns);
       collectionOffsetAppend(obj, v);
     }
   } else {
     assert(type == 'K');
-    for (int64 i = 0; i < sz; ++i) {
+    for (int64_t i = 0; i < sz; ++i) {
       Variant k;
       k.unserialize(uns);
       Variant v;
diff --git a/hphp/runtime/ext/ext_collection.h b/hphp/runtime/ext/ext_collection.h
index c531ab89e0f3c..497d1d49bc405 100644
--- a/hphp/runtime/ext/ext_collection.h
+++ b/hphp/runtime/ext/ext_collection.h
@@ -55,7 +55,7 @@ class c_Vector : public ExtObjectDataFlags<ObjectData::VectorAttrInit|
   public: void t_resize(CVarRef sz, CVarRef value);
   public: Object t_clear();
   public: bool t_isempty();
-  public: int64 t_count();
+  public: int64_t t_count();
   public: Variant t_at(CVarRef key);
   public: Variant t_get(CVarRef key);
   public: Object t_put(CVarRef key, CVarRef value);
@@ -65,7 +65,7 @@ class c_Vector : public ExtObjectDataFlags<ObjectData::VectorAttrInit|
   public: void t_reverse();
   public: void t_splice(CVarRef offset, CVarRef len = null,
                         CVarRef replacement = null);
-  public: int64 t_linearsearch(CVarRef search_value);
+  public: int64_t t_linearsearch(CVarRef search_value);
   public: void t_shuffle();
   public: Object t_getiterator();
   public: String t___tostring();
@@ -88,22 +88,22 @@ class c_Vector : public ExtObjectDataFlags<ObjectData::VectorAttrInit|
     return ti_slice("vector", vec, offset, len);
   }
 
-  public: static void throwOOB(int64 key) ATTRIBUTE_COLD;
+  public: static void throwOOB(int64_t key) ATTRIBUTE_COLD;
 
-  public: TypedValue* at(int64 key) {
+  public: TypedValue* at(int64_t key) {
     if (UNLIKELY((uint64_t)key >= (uint64_t)m_size)) {
       throwOOB(key);
       return NULL;
     }
     return &m_data[key];
   }
-  public: TypedValue* get(int64 key) {
+  public: TypedValue* get(int64_t key) {
     if ((uint64_t)key >= (uint64_t)m_size) {
       return NULL;
     }
     return &m_data[key];
   }
-  public: void put(int64 key, TypedValue* val) {
+  public: void put(int64_t key, TypedValue* val) {
     assert(val->m_type != KindOfRef);
     if (UNLIKELY((uint64_t)key >= (uint64_t)m_size)) {
       throwOOB(key);
@@ -128,11 +128,11 @@ class c_Vector : public ExtObjectDataFlags<ObjectData::VectorAttrInit|
     tv->_count = 0;
     ++m_size;
   }
-  public: void resize(int64 sz, TypedValue* val);
-  public: bool contains(int64 key) {
+  public: void resize(int64_t sz, TypedValue* val);
+  public: bool contains(int64_t key) {
     return ((uint64_t)key < (uint64_t)m_size);
   }
-  public: void reserve(int64 sz);
+  public: void reserve(int64_t sz);
   public: int getVersionNumber() {
     return m_versionNumber;
   }
@@ -214,7 +214,7 @@ class c_Map : public ExtObjectDataFlags<ObjectData::MapAttrInit|
   friend class c_StableMap;
   friend class ArrayIter;
 
-  public: static const int32 KindOfTombstone = -1;
+  public: static const int32_t KindOfTombstone = -1;
 
   public: c_Map(VM::Class* cls = c_Map::s_cls);
   public: ~c_Map();
@@ -223,7 +223,7 @@ class c_Map : public ExtObjectDataFlags<ObjectData::MapAttrInit|
   public: Variant t___destruct();
   public: Object t_clear();
   public: bool t_isempty();
-  public: int64 t_count();
+  public: int64_t t_count();
   public: Variant t_at(CVarRef key);
   public: Variant t_get(CVarRef key);
   public: Object t_put(CVarRef key, CVarRef value);
@@ -253,16 +253,16 @@ class c_Map : public ExtObjectDataFlags<ObjectData::MapAttrInit|
     return ti_fromiterable("map", vec);
   }
 
-  public: static void throwOOB(int64 key) ATTRIBUTE_COLD;
+  public: static void throwOOB(int64_t key) ATTRIBUTE_COLD;
   public: static void throwOOB(StringData* key) ATTRIBUTE_COLD;
 
-  public: TypedValue* at(int64 key) {
+  public: TypedValue* at(int64_t key) {
     Bucket* p = find(key);
     if (LIKELY(p != NULL)) return &p->data;
     throwOOB(key);
     return NULL;
   }
-  public: TypedValue* get(int64 key) {
+  public: TypedValue* get(int64_t key) {
     Bucket* p = find(key);
     if (p) return &p->data;
     return NULL;
@@ -278,7 +278,7 @@ class c_Map : public ExtObjectDataFlags<ObjectData::MapAttrInit|
     if (p) return &p->data;
     return NULL;
   }
-  public: void put(int64 key, TypedValue* val) {
+  public: void put(int64_t key, TypedValue* val) {
     assert(val->m_type != KindOfRef);
     update(key, val);
   }
@@ -286,7 +286,7 @@ class c_Map : public ExtObjectDataFlags<ObjectData::MapAttrInit|
     assert(val->m_type != KindOfRef);
     update(key, val);
   }
-  public: void remove(int64 key) {
+  public: void remove(int64_t key) {
     ++m_versionNumber;
     erase(find(key));
   }
@@ -294,13 +294,13 @@ class c_Map : public ExtObjectDataFlags<ObjectData::MapAttrInit|
     ++m_versionNumber;
     erase(find(key->data(), key->size(), key->hash()));
   }
-  public: bool contains(int64 key) {
+  public: bool contains(int64_t key) {
     return find(key);
   }
   public: bool contains(StringData* key) {
     return find(key->data(), key->size(), key->hash());
   }
-  public: void reserve(int64 sz);
+  public: void reserve(int64_t sz);
   public: int getVersionNumber() {
     return m_versionNumber;
   }
@@ -339,7 +339,7 @@ class c_Map : public ExtObjectDataFlags<ObjectData::MapAttrInit|
      */
     TypedValue   data;
     union {
-      int64      ikey;
+      int64_t      ikey;
       StringData *skey;
     };
     inline bool hasStrKey() const { return data._count != 0; }
@@ -349,11 +349,11 @@ class c_Map : public ExtObjectDataFlags<ObjectData::MapAttrInit|
       skey->incRefCount();
       data._count = int32_t(h) | 0x80000000;
     }
-    inline void setIntKey(int64 k) {
+    inline void setIntKey(int64_t k) {
       ikey = k;
       data._count = 0;
     }
-    inline int64 hashKey() const {
+    inline int64_t hashKey() const {
       return data._count == 0 ? ikey : data._count;
     }
     inline int32_t hash() const {
@@ -423,7 +423,7 @@ class c_Map : public ExtObjectDataFlags<ObjectData::MapAttrInit|
   // instructions instead of imul when indexing into m_data
   Bucket* fetchBucket(Bucket* data, intptr_t slot) const {
     assert(sizeof(Bucket) == 24);
-    assert(sizeof(int64) == 8);
+    assert(sizeof(int64_t) == 8);
     assert(slot >= 0 && slot <= m_nLastSlot);
     intptr_t index = slot + (slot<<1);
     int64_t* ptr = (int64_t*)data;
@@ -434,13 +434,13 @@ class c_Map : public ExtObjectDataFlags<ObjectData::MapAttrInit|
     return fetchBucket(m_data, slot);
   }
 
-  Bucket* find(int64 h) const;
+  Bucket* find(int64_t h) const;
   Bucket* find(const char* k, int len, strhash_t prehash) const;
-  Bucket* findForInsert(int64 h) const;
+  Bucket* findForInsert(int64_t h) const;
   Bucket* findForInsert(const char* k, int len, strhash_t prehash) const;
   Bucket* findForNewInsert(size_t h0) const;
 
-  bool update(int64 h, TypedValue* data);
+  bool update(int64_t h, TypedValue* data);
   bool update(StringData* key, TypedValue* data);
   void erase(Bucket* prev);
 
@@ -509,7 +509,7 @@ class c_StableMap : public ExtObjectDataFlags<ObjectData::StableMapAttrInit|
   public: Variant t___destruct();
   public: Object t_clear();
   public: bool t_isempty();
-  public: int64 t_count();
+  public: int64_t t_count();
   public: Variant t_at(CVarRef key);
   public: Variant t_get(CVarRef key);
   public: Object t_put(CVarRef key, CVarRef value);
@@ -539,10 +539,10 @@ class c_StableMap : public ExtObjectDataFlags<ObjectData::StableMapAttrInit|
     return ti_fromiterable("map", vec);
   }
 
-  public: static void throwOOB(int64 key) ATTRIBUTE_COLD;
+  public: static void throwOOB(int64_t key) ATTRIBUTE_COLD;
   public: static void throwOOB(StringData* key) ATTRIBUTE_COLD;
 
-  public: TypedValue* at(int64 key) {
+  public: TypedValue* at(int64_t key) {
     Bucket* p = find(key);
     if (LIKELY(p != NULL)) return &p->data;
     throwOOB(key);
@@ -554,7 +554,7 @@ class c_StableMap : public ExtObjectDataFlags<ObjectData::StableMapAttrInit|
     throwOOB(key);
     return NULL;
   }
-  public: TypedValue* get(int64 key) {
+  public: TypedValue* get(int64_t key) {
     Bucket* p = find(key);
     if (p != NULL) return &p->data;
     return NULL;
@@ -564,13 +564,13 @@ class c_StableMap : public ExtObjectDataFlags<ObjectData::StableMapAttrInit|
     if (p != NULL) return &p->data;
     return NULL;
   }
-  public: void put(int64 key, TypedValue* val) {
+  public: void put(int64_t key, TypedValue* val) {
     update(key, val);
   }
   public: void put(StringData* key, TypedValue* val) {
     update(key, val);
   }
-  public: void remove(int64 key) {
+  public: void remove(int64_t key) {
     ++m_versionNumber;
     erase(findForErase(key));
   }
@@ -578,13 +578,13 @@ class c_StableMap : public ExtObjectDataFlags<ObjectData::StableMapAttrInit|
     ++m_versionNumber;
     erase(findForErase(key->data(), key->size(), key->hash()));
   }
-  public: bool contains(int64 key) {
+  public: bool contains(int64_t key) {
     return find(key);
   }
   public: bool contains(StringData* key) {
     return find(key->data(), key->size(), key->hash());
   }
-  public: void reserve(int64 sz);
+  public: void reserve(int64_t sz);
   public: int getVersionNumber() {
     return m_versionNumber;
   }
@@ -629,7 +629,7 @@ class c_StableMap : public ExtObjectDataFlags<ObjectData::StableMapAttrInit|
      * read or write the _count field! */
     TypedValue data;
     union {
-      int64 ikey;
+      int64_t ikey;
       StringData* skey;
     };
     Bucket* pListNext;
@@ -643,11 +643,11 @@ class c_StableMap : public ExtObjectDataFlags<ObjectData::StableMapAttrInit|
       skey->incRefCount();
       data._count = encodeHash(h);
     }
-    inline void setIntKey(int64 k) {
+    inline void setIntKey(int64_t k) {
       ikey = k;
       data._count = 0;
     }
-    inline int64 hashKey() const {
+    inline int64_t hashKey() const {
       return data._count == 0 ? ikey : data._count;
     }
     inline int32_t hash() const {
@@ -681,12 +681,12 @@ class c_StableMap : public ExtObjectDataFlags<ObjectData::StableMapAttrInit|
   Bucket*          m_pListTail;
   Bucket**         m_arBuckets;
 
-  Bucket* find(int64 h) const;
+  Bucket* find(int64_t h) const;
   Bucket* find(const char* k, int len, strhash_t prehash) const;
-  Bucket** findForErase(int64 h) const;
+  Bucket** findForErase(int64_t h) const;
   Bucket** findForErase(const char* k, int len, strhash_t prehash) const;
 
-  bool update(int64 h, TypedValue* data);
+  bool update(int64_t h, TypedValue* data);
   bool update(StringData* key, TypedValue* data);
   void erase(Bucket** prev);
 
@@ -826,7 +826,7 @@ inline void collectionAppend(ObjectData* obj, TypedValue* val) {
 
 // Helpers for hphpc
 
-inline Variant& collectionOffsetGet(ObjectData* obj, int64 offset) {
+inline Variant& collectionOffsetGet(ObjectData* obj, int64_t offset) {
   int ct = obj->getCollectionType();
   if (ct == Collection::VectorType) {
     c_Vector* vec = static_cast<c_Vector*>(obj);
@@ -893,7 +893,7 @@ inline Variant& collectionOffsetGet(ObjectData* obj, litstr offset) {
   return collectionOffsetGet(obj, Variant(offset));
 }
 
-inline void collectionOffsetSet(ObjectData* obj, int64 offset, CVarRef val) {
+inline void collectionOffsetSet(ObjectData* obj, int64_t offset, CVarRef val) {
   TypedValue* tv = (TypedValue*)(&val);
   if (UNLIKELY(tv->m_type == KindOfRef)) {
     tv = tv->m_data.pref->tv();
@@ -1050,7 +1050,7 @@ inline void collectionOffsetAppend(ObjectData* obj, CVarRef val) {
   collectionAppend(obj, tv);
 }
 
-inline int64 collectionSize(ObjectData* obj) {
+inline int64_t collectionSize(ObjectData* obj) {
   int ct = obj->getCollectionType();
   if (ct == Collection::VectorType) {
     return static_cast<c_Vector*>(obj)->t_count();
@@ -1064,7 +1064,7 @@ inline int64 collectionSize(ObjectData* obj) {
   }
 }
 
-inline void collectionReserve(ObjectData* obj, int64 sz) {
+inline void collectionReserve(ObjectData* obj, int64_t sz) {
   int ct = obj->getCollectionType();
   if (ct == Collection::VectorType) {
     static_cast<c_Vector*>(obj)->reserve(sz);
@@ -1080,7 +1080,7 @@ inline void collectionReserve(ObjectData* obj, int64 sz) {
 void collectionSerialize(ObjectData* obj, VariableSerializer* serializer);
 void collectionUnserialize(ObjectData* obj,
                            VariableUnserializer* uns,
-                           int64 sz,
+                           int64_t sz,
                            char type);
 
 inline bool collectionEquals(ObjectData* obj1, ObjectData* obj2) {
@@ -1122,7 +1122,7 @@ class CollectionInit {
     collectionOffsetAppend(m_data, variant(v));
     return *this;
   }
-  CollectionInit &set(int64 name, CVarRef v) {
+  CollectionInit &set(int64_t name, CVarRef v) {
     collectionOffsetSet(m_data, name, v);
     return *this;
   }
diff --git a/hphp/runtime/ext/ext_continuation.cpp b/hphp/runtime/ext/ext_continuation.cpp
index bf39e9bdb7a28..4eea5391aa88f 100644
--- a/hphp/runtime/ext/ext_continuation.cpp
+++ b/hphp/runtime/ext/ext_continuation.cpp
@@ -40,7 +40,7 @@ p_Continuation f_hphp_create_continuation(CStrRef clsname,
 }
 
 void f_hphp_pack_continuation(CObjRef continuation,
-                              int64 label, CVarRef value) {
+                              int64_t label, CVarRef value) {
   throw_fatal("Invalid call hphp_pack_continuation");
 }
 
@@ -78,7 +78,7 @@ c_Continuation::~c_Continuation() {
 }
 
 void c_Continuation::t___construct(
-    int64 func, int64 extra, bool isMethod,
+    int64_t func, int64_t extra, bool isMethod,
     CStrRef origFuncName, CVarRef obj, CArrRef args) {
   m_vmFunc       = (VM::Func*) extra;
   assert(m_vmFunc);
@@ -94,7 +94,7 @@ void c_Continuation::t___construct(
   m_args = args;
 }
 
-void c_Continuation::t_update(int64 label, CVarRef value) {
+void c_Continuation::t_update(int64_t label, CVarRef value) {
   m_label = label;
   m_value.assignVal(value);
 }
@@ -104,11 +104,11 @@ void c_Continuation::t_done() {
   m_value.setNull();
 }
 
-int64 c_Continuation::t_getlabel() {
+int64_t c_Continuation::t_getlabel() {
   return m_label;
 }
 
-int64 c_Continuation::t_num_args() {
+int64_t c_Continuation::t_num_args() {
   return m_args.size();
 }
 
@@ -116,7 +116,7 @@ Array c_Continuation::t_get_args() {
   return m_args;
 }
 
-Variant c_Continuation::t_get_arg(int64 id) {
+Variant c_Continuation::t_get_arg(int64_t id) {
   if (id < 0LL || id >= m_args.size()) return false;
   return m_args.rvalAt(id, AccessFlags::Error);
 }
@@ -126,7 +126,7 @@ Variant c_Continuation::t_current() {
   return m_value;
 }
 
-int64 c_Continuation::t_key() {
+int64_t c_Continuation::t_key() {
   startedCheck();
   return m_index;
 }
@@ -253,7 +253,7 @@ Variant c_DummyContinuation::t_current() {
   return null;
 }
 
-int64 c_DummyContinuation::t_key() {
+int64_t c_DummyContinuation::t_key() {
   throw_fatal("Tring to use a DummyContinuation");
   return 0;
 }
diff --git a/hphp/runtime/ext/ext_continuation.h b/hphp/runtime/ext/ext_continuation.h
index 5024a52e393d4..4a804f58b561d 100644
--- a/hphp/runtime/ext/ext_continuation.h
+++ b/hphp/runtime/ext/ext_continuation.h
@@ -28,7 +28,7 @@ namespace HPHP {
 FORWARD_DECLARE_CLASS_BUILTIN(Continuation);
 FORWARD_DECLARE_CLASS_BUILTIN(ContinuationWaitHandle);
 p_Continuation f_hphp_create_continuation(CStrRef clsname, CStrRef funcname, CStrRef origFuncName, CArrRef args = null_array);
-void f_hphp_pack_continuation(CObjRef continuation, int64 label, CVarRef value);
+void f_hphp_pack_continuation(CObjRef continuation, int64_t label, CVarRef value);
 void f_hphp_unpack_continuation(CObjRef continuation);
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -47,15 +47,15 @@ class c_Continuation : public ExtObjectData {
   // need to implement
   public: c_Continuation(VM::Class* cls = c_Continuation::s_cls);
   public: ~c_Continuation();
-  public: void t___construct(int64 func, int64 extra, bool isMethod, CStrRef origFuncName, CVarRef obj = null, CArrRef args = null_array);
-  public: void t_update(int64 label, CVarRef value);
+  public: void t___construct(int64_t func, int64_t extra, bool isMethod, CStrRef origFuncName, CVarRef obj = null, CArrRef args = null_array);
+  public: void t_update(int64_t label, CVarRef value);
   public: void t_done();
-  public: int64 t_getlabel();
-  public: int64 t_num_args();
+  public: int64_t t_getlabel();
+  public: int64_t t_num_args();
   public: Array t_get_args();
-  public: Variant t_get_arg(int64 id);
+  public: Variant t_get_arg(int64_t id);
   public: Variant t_current();
-  public: int64 t_key();
+  public: int64_t t_key();
   public: void t_next();
   public: void t_rewind();
   public: bool t_valid();
@@ -111,7 +111,7 @@ protected: virtual bool php_sleep(Variant &ret);
 public:
   Object m_obj;
   Array m_args;
-  int64 m_index;
+  int64_t m_index;
   Variant m_value;
   Variant m_received;
   String m_origFuncName;
@@ -122,7 +122,7 @@ protected: virtual bool php_sleep(Variant &ret);
 
   int m_localsOffset;
   VM::Func *m_vmFunc;
-  int64 m_label;
+  int64_t m_label;
   VM::ActRec* m_arPtr;
 
   p_ContinuationWaitHandle m_waitHandle;
@@ -157,7 +157,7 @@ class c_DummyContinuation : public ExtObjectData {
   public: ~c_DummyContinuation();
   public: void t___construct();
   public: Variant t_current();
-  public: int64 t_key();
+  public: int64_t t_key();
   public: void t_next();
   public: void t_rewind();
   public: bool t_valid();
diff --git a/hphp/runtime/ext/ext_ctype.cpp b/hphp/runtime/ext/ext_ctype.cpp
index 924df564c98f5..5595d7f2267c5 100644
--- a/hphp/runtime/ext/ext_ctype.cpp
+++ b/hphp/runtime/ext/ext_ctype.cpp
@@ -23,7 +23,7 @@ IMPLEMENT_DEFAULT_EXTENSION(ctype);
 
 static bool ctype(CVarRef v, int (*iswhat)(int)) {
   if (v.isInteger()) {
-    int64 n = v.toInt64();
+    int64_t n = v.toInt64();
     if (n <= 255 && n >= 0) {
       return iswhat(n);
     }
diff --git a/hphp/runtime/ext/ext_curl.cpp b/hphp/runtime/ext/ext_curl.cpp
index 1812e4a0f7ba1..32842af405c81 100644
--- a/hphp/runtime/ext/ext_curl.cpp
+++ b/hphp/runtime/ext/ext_curl.cpp
@@ -565,7 +565,7 @@ class CurlResource : public SweepableResourceData {
       break;
     }
 
-    m_opts.set(int64(option), value);
+    m_opts.set(int64_t(option), value);
 
     return m_error_no == CURLE_OK;
   }
@@ -573,10 +573,10 @@ class CurlResource : public SweepableResourceData {
   Variant getOption(long option) {
 
     if (option != 0) {
-      if (!m_opts.exists(int64(option))) {
+      if (!m_opts.exists(int64_t(option))) {
         return false;
       }
-      return m_opts[int64(option)];
+      return m_opts[int64_t(option)];
     }
 
     return m_opts;
@@ -1411,17 +1411,17 @@ Variant f_evhttp_recv(CObjRef handle) {
 }
 
 #if LIBCURL_VERSION_NUM >= 0x071500
-const int64 k_CURLINFO_LOCAL_PORT = CURLINFO_LOCAL_PORT;
+const int64_t k_CURLINFO_LOCAL_PORT = CURLINFO_LOCAL_PORT;
 #else
-const int64 k_CURLINFO_LOCAL_PORT = CURLINFO_NONE;
+const int64_t k_CURLINFO_LOCAL_PORT = CURLINFO_NONE;
 #endif
 
 #if LIBCURL_VERSION_NUM >= 0x071002
-const int64 k_CURLOPT_TIMEOUT_MS = CURLOPT_TIMEOUT_MS;
-const int64 k_CURLOPT_CONNECTTIMEOUT_MS = CURLOPT_CONNECTTIMEOUT_MS;
+const int64_t k_CURLOPT_TIMEOUT_MS = CURLOPT_TIMEOUT_MS;
+const int64_t k_CURLOPT_CONNECTTIMEOUT_MS = CURLOPT_CONNECTTIMEOUT_MS;
 #else
-const int64 k_CURLOPT_TIMEOUT_MS = CURLOPT_LASTENTRY;
-const int64 k_CURLOPT_CONNECTTIMEOUT_MS = CURLOPT_LASTENTRY;
+const int64_t k_CURLOPT_TIMEOUT_MS = CURLOPT_LASTENTRY;
+const int64_t k_CURLOPT_CONNECTTIMEOUT_MS = CURLOPT_LASTENTRY;
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/ext/ext_curl.h b/hphp/runtime/ext/ext_curl.h
index d6ead3f049d48..4a87368bd25ea 100644
--- a/hphp/runtime/ext/ext_curl.h
+++ b/hphp/runtime/ext/ext_curl.h
@@ -55,9 +55,9 @@ Variant f_evhttp_async_get(CStrRef url, CArrRef headers = null_array, int timeou
 Variant f_evhttp_async_post(CStrRef url, CStrRef data, CArrRef headers = null_array, int timeout = 5);
 Variant f_evhttp_recv(CObjRef handle);
 
-extern const int64 k_CURLINFO_LOCAL_PORT;
-extern const int64 k_CURLOPT_TIMEOUT_MS;
-extern const int64 k_CURLOPT_CONNECTTIMEOUT_MS;
+extern const int64_t k_CURLINFO_LOCAL_PORT;
+extern const int64_t k_CURLOPT_TIMEOUT_MS;
+extern const int64_t k_CURLOPT_CONNECTTIMEOUT_MS;
 
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/ext/ext_datetime.cpp b/hphp/runtime/ext/ext_datetime.cpp
index 784642bbe2100..30ba0dea14cee 100644
--- a/hphp/runtime/ext/ext_datetime.cpp
+++ b/hphp/runtime/ext/ext_datetime.cpp
@@ -36,20 +36,20 @@ const StaticString q_DateTime$$RFC3339(LITSTR_INIT("Y-m-d\\TH:i:sP"));
 const StaticString q_DateTime$$RSS(LITSTR_INIT("D, d M Y H:i:s O"));
 const StaticString q_DateTime$$W3C(LITSTR_INIT("Y-m-d\\TH:i:sP"));
 
-const int64 q_DateTimeZone$$AFRICA = 1;
-const int64 q_DateTimeZone$$AMERICA = 2;
-const int64 q_DateTimeZone$$ANTARCTICA = 4;
-const int64 q_DateTimeZone$$ARCTIC = 8;
-const int64 q_DateTimeZone$$ASIA = 16;
-const int64 q_DateTimeZone$$ATLANTIC = 32;
-const int64 q_DateTimeZone$$AUSTRALIA = 64;
-const int64 q_DateTimeZone$$EUROPE = 128;
-const int64 q_DateTimeZone$$INDIAN = 256;
-const int64 q_DateTimeZone$$PACIFIC = 512;
-const int64 q_DateTimeZone$$UTC = 1024;
-const int64 q_DateTimeZone$$ALL = 2047;
-const int64 q_DateTimeZone$$ALL_WITH_BC = 4095;
-const int64 q_DateTimeZone$$PER_COUNTRY = 4096;
+const int64_t q_DateTimeZone$$AFRICA = 1;
+const int64_t q_DateTimeZone$$AMERICA = 2;
+const int64_t q_DateTimeZone$$ANTARCTICA = 4;
+const int64_t q_DateTimeZone$$ARCTIC = 8;
+const int64_t q_DateTimeZone$$ASIA = 16;
+const int64_t q_DateTimeZone$$ATLANTIC = 32;
+const int64_t q_DateTimeZone$$AUSTRALIA = 64;
+const int64_t q_DateTimeZone$$EUROPE = 128;
+const int64_t q_DateTimeZone$$INDIAN = 256;
+const int64_t q_DateTimeZone$$PACIFIC = 512;
+const int64_t q_DateTimeZone$$UTC = 1024;
+const int64_t q_DateTimeZone$$ALL = 2047;
+const int64_t q_DateTimeZone$$ALL_WITH_BC = 4095;
+const int64_t q_DateTimeZone$$PER_COUNTRY = 4096;
 
 ///////////////////////////////////////////////////////////////////////////////
 // methods
@@ -102,11 +102,11 @@ Array c_DateTime::ti_getlasterrors(const char* cls ) {
   return ret;
 }
 
-int64 c_DateTime::t_getoffset() {
+int64_t c_DateTime::t_getoffset() {
   return m_dt->offset();
 }
 
-int64 c_DateTime::t_gettimestamp() {
+int64_t c_DateTime::t_gettimestamp() {
   bool err = false;
   return m_dt->toTimeStamp(err);
 }
@@ -124,22 +124,22 @@ Object c_DateTime::t_modify(CStrRef modify) {
   return this;
 }
 
-Object c_DateTime::t_setdate(int64 year, int64 month, int64 day) {
+Object c_DateTime::t_setdate(int64_t year, int64_t month, int64_t day) {
   m_dt->setDate(year, month, day);
   return this;
 }
 
-Object c_DateTime::t_setisodate(int64 year, int64 week, int64 day /*= 1*/) {
+Object c_DateTime::t_setisodate(int64_t year, int64_t week, int64_t day /*= 1*/) {
   m_dt->setISODate(year, week, day);
   return this;
 }
 
-Object c_DateTime::t_settime(int64 hour, int64 minute, int64 second /*= 0*/) {
+Object c_DateTime::t_settime(int64_t hour, int64_t minute, int64_t second /*= 0*/) {
   m_dt->setTime(hour, minute, second);
   return this;
 }
 
-Object c_DateTime::t_settimestamp(int64 unixtimestamp) {
+Object c_DateTime::t_settimestamp(int64_t unixtimestamp) {
   m_dt->fromTimeStamp(unixtimestamp, false);
   return this;
 }
@@ -186,9 +186,9 @@ String c_DateTimeZone::t_getname() {
   return m_tz->name();
 }
 
-int64 c_DateTimeZone::t_getoffset(CObjRef datetime) {
+int64_t c_DateTimeZone::t_getoffset(CObjRef datetime) {
   bool error;
-  int64 ts = c_DateTime::unwrap(datetime)->toTimeStamp(error);
+  int64_t ts = c_DateTime::unwrap(datetime)->toTimeStamp(error);
   return m_tz->offset(ts);
 }
 
diff --git a/hphp/runtime/ext/ext_datetime.h b/hphp/runtime/ext/ext_datetime.h
index fc6279539c08a..1f03fa30e0385 100644
--- a/hphp/runtime/ext/ext_datetime.h
+++ b/hphp/runtime/ext/ext_datetime.h
@@ -61,14 +61,14 @@ class c_DateTime : public ExtObjectData {
   public: static Array t_getlasterrors() {
     return ti_getlasterrors("datetime");
   }
-  public: int64 t_getoffset();
-  public: int64 t_gettimestamp();
+  public: int64_t t_getoffset();
+  public: int64_t t_gettimestamp();
   public: Variant t_gettimezone();
   public: Object t_modify(CStrRef modify);
-  public: Object t_setdate(int64 year, int64 month, int64 day);
-  public: Object t_setisodate(int64 year, int64 week, int64 day = 1);
-  public: Object t_settime(int64 hour, int64 minute, int64 second = 0);
-  public: Object t_settimestamp(int64 unixtimestamp);
+  public: Object t_setdate(int64_t year, int64_t month, int64_t day);
+  public: Object t_setisodate(int64_t year, int64_t week, int64_t day = 1);
+  public: Object t_settime(int64_t hour, int64_t minute, int64_t second = 0);
+  public: Object t_settimestamp(int64_t unixtimestamp);
   public: Object t_settimezone(CObjRef timezone);
   public: Object t_sub(CObjRef interval);
 
@@ -97,20 +97,20 @@ class c_DateTime : public ExtObjectData {
 ///////////////////////////////////////////////////////////////////////////////
 // class DateTimeZone
 
-extern const int64 q_DateTimeZone$$AFRICA;
-extern const int64 q_DateTimeZone$$AMERICA;
-extern const int64 q_DateTimeZone$$ANTARCTICA;
-extern const int64 q_DateTimeZone$$ARCTIC;
-extern const int64 q_DateTimeZone$$ASIA;
-extern const int64 q_DateTimeZone$$ATLANTIC;
-extern const int64 q_DateTimeZone$$AUSTRALIA;
-extern const int64 q_DateTimeZone$$EUROPE;
-extern const int64 q_DateTimeZone$$INDIAN;
-extern const int64 q_DateTimeZone$$PACIFIC;
-extern const int64 q_DateTimeZone$$UTC;
-extern const int64 q_DateTimeZone$$ALL;
-extern const int64 q_DateTimeZone$$ALL_WITH_BC;
-extern const int64 q_DateTimeZone$$PER_COUNTRY;
+extern const int64_t q_DateTimeZone$$AFRICA;
+extern const int64_t q_DateTimeZone$$AMERICA;
+extern const int64_t q_DateTimeZone$$ANTARCTICA;
+extern const int64_t q_DateTimeZone$$ARCTIC;
+extern const int64_t q_DateTimeZone$$ASIA;
+extern const int64_t q_DateTimeZone$$ATLANTIC;
+extern const int64_t q_DateTimeZone$$AUSTRALIA;
+extern const int64_t q_DateTimeZone$$EUROPE;
+extern const int64_t q_DateTimeZone$$INDIAN;
+extern const int64_t q_DateTimeZone$$PACIFIC;
+extern const int64_t q_DateTimeZone$$UTC;
+extern const int64_t q_DateTimeZone$$ALL;
+extern const int64_t q_DateTimeZone$$ALL_WITH_BC;
+extern const int64_t q_DateTimeZone$$PER_COUNTRY;
 
 FORWARD_DECLARE_CLASS_BUILTIN(DateTimeZone);
 class c_DateTimeZone : public ExtObjectData {
@@ -123,7 +123,7 @@ class c_DateTimeZone : public ExtObjectData {
   public: void t___construct(CStrRef timezone);
   public: Array t_getlocation();
   public: String t_getname();
-  public: int64 t_getoffset(CObjRef datetime);
+  public: int64_t t_getoffset(CObjRef datetime);
   public: Array t_gettransitions();
   public: static Array ti_listabbreviations(const char* cls );
   public: static Array t_listabbreviations() {
@@ -216,7 +216,7 @@ inline Variant f_microtime(bool get_as_float = false) {
   return TimeStamp::CurrentMicroTime();
 }
 
-inline int64 f_time() {
+inline int64_t f_time() {
   return time(0);
 }
 
@@ -224,7 +224,7 @@ inline Variant f_mktime(int hour = INT_MAX, int minute = INT_MAX,
                         int second = INT_MAX, int month = INT_MAX,
                         int day = INT_MAX, int year = INT_MAX) {
   bool error;
-  int64 ts = TimeStamp::Get(error, hour, minute, second, month, day, year,
+  int64_t ts = TimeStamp::Get(error, hour, minute, second, month, day, year,
                             false);
   if (error) return false;
   return ts;
@@ -235,23 +235,23 @@ inline Variant f_gmmktime(int hour = INT_MAX, int minute = INT_MAX,
                           int month = INT_MAX, int day = INT_MAX,
                           int year = INT_MAX) {
   bool error;
-  int64 ts = TimeStamp::Get(error, hour, minute, second, month, day, year,
+  int64_t ts = TimeStamp::Get(error, hour, minute, second, month, day, year,
                             true);
   if (error) return false;
   return ts;
 }
 
-inline Variant f_idate(CStrRef format, int64 timestamp = TimeStamp::Current()) {
+inline Variant f_idate(CStrRef format, int64_t timestamp = TimeStamp::Current()) {
   if (format.size() != 1) {
     throw_invalid_argument("format: %s", format.data());
     return false;
   }
-  int64 ret = DateTime(timestamp, false).toInteger(*format.data());
+  int64_t ret = DateTime(timestamp, false).toInteger(*format.data());
   if (ret == -1) return false;
   return ret;
 }
 
-inline Variant f_date(CStrRef format, int64 timestamp = TimeStamp::Current()) {
+inline Variant f_date(CStrRef format, int64_t timestamp = TimeStamp::Current()) {
   if (format.empty()) return "";
   String ret = DateTime(timestamp, false).toString(format, false);
   if (ret.isNull()) return false;
@@ -259,31 +259,31 @@ inline Variant f_date(CStrRef format, int64 timestamp = TimeStamp::Current()) {
 }
 
 inline Variant f_gmdate(CStrRef format,
-                       int64 timestamp = TimeStamp::Current()) {
+                       int64_t timestamp = TimeStamp::Current()) {
   String ret = DateTime(timestamp, true).toString(format, false);
   if (ret.isNull()) return false;
   return ret;
 }
 
 inline Variant f_strftime(CStrRef format,
-                         int64 timestamp = TimeStamp::Current()) {
+                         int64_t timestamp = TimeStamp::Current()) {
   String ret = DateTime(timestamp, false).toString(format, true);
   if (ret.isNull()) return false;
   return ret;
 }
 
 inline String f_gmstrftime(CStrRef format,
-                           int64 timestamp = TimeStamp::Current()) {
+                           int64_t timestamp = TimeStamp::Current()) {
   String ret = DateTime(timestamp, true).toString(format, true);
   if (ret.isNull()) return false;
   return ret;
 }
 
-inline Array f_getdate(int64 timestamp = TimeStamp::Current()) {
+inline Array f_getdate(int64_t timestamp = TimeStamp::Current()) {
   return DateTime(timestamp, false).toArray(DateTime::TimeMap);
 }
 
-inline Array f_localtime(int64 timestamp = TimeStamp::Current(),
+inline Array f_localtime(int64_t timestamp = TimeStamp::Current(),
                          bool is_associative = false) {
   DateTime::ArrayFormat format =
     is_associative ? DateTime::TmMap : DateTime::TmVector;
@@ -299,7 +299,7 @@ inline Variant f_strptime(CStrRef date, CStrRef format) {
 }
 
 inline Variant f_strtotime(CStrRef input,
-                           int64 timestamp = TimeStamp::Current()) {
+                           int64_t timestamp = TimeStamp::Current()) {
   if (input.empty()) {
     return false;
   }
@@ -355,7 +355,7 @@ inline String f_timezone_name_get(CObjRef object) {
   return object.getTyped<c_DateTimeZone>()->t_getname();
 }
 
-inline int64 f_timezone_offset_get(CObjRef object, CObjRef dt) {
+inline int64_t f_timezone_offset_get(CObjRef object, CObjRef dt) {
   return object.getTyped<c_DateTimeZone>()->t_getoffset(dt);
 }
 
@@ -429,7 +429,7 @@ inline void f_date_modify(CObjRef object, CStrRef modify) {
   object.getTyped<c_DateTime>()->t_modify(modify);
 }
 
-inline int64 f_date_offset_get(CObjRef object) {
+inline int64_t f_date_offset_get(CObjRef object) {
   return object.getTyped<c_DateTime>()->t_getoffset();
 }
 
@@ -442,11 +442,11 @@ inline void f_date_time_set(CObjRef object, int hour, int minute,
   object.getTyped<c_DateTime>()->t_settime(hour, minute, second);
 }
 
-inline int64 f_date_timestamp_get(CObjRef datetime) {
+inline int64_t f_date_timestamp_get(CObjRef datetime) {
   return datetime.getTyped<c_DateTime>()->t_gettimestamp();
 }
 
-inline Object f_date_timestamp_set(CObjRef datetime, int64 timestamp) {
+inline Object f_date_timestamp_set(CObjRef datetime, int64_t timestamp) {
   return datetime.getTyped<c_DateTime>()->
            t_settimestamp(timestamp);
 }
@@ -467,11 +467,11 @@ inline Object f_date_sub(CObjRef datetime, CObjRef interval) {
 ///////////////////////////////////////////////////////////////////////////////
 // sun
 
-inline Array f_date_sun_info(int64 ts, double latitude, double longitude) {
+inline Array f_date_sun_info(int64_t ts, double latitude, double longitude) {
   return DateTime(ts, false).getSunInfo(latitude, longitude);
 }
 
-inline Variant f_date_sunrise(int64 timestamp, int format = 0,
+inline Variant f_date_sunrise(int64_t timestamp, int format = 0,
                               double latitude = 0.0, double longitude = 0.0,
                               double zenith = 0.0,
                               double gmt_offset = 99999.0) {
@@ -480,7 +480,7 @@ inline Variant f_date_sunrise(int64 timestamp, int format = 0,
      zenith, gmt_offset, false);
 }
 
-inline Variant f_date_sunset(int64 timestamp, int format = 0,
+inline Variant f_date_sunset(int64_t timestamp, int format = 0,
                              double latitude = 0.0, double longitude = 0.0,
                              double zenith = 0.0,
                              double gmt_offset = 99999.0) {
diff --git a/hphp/runtime/ext/ext_debugger.cpp b/hphp/runtime/ext/ext_debugger.cpp
index ce596c472a310..8e256553454ba 100644
--- a/hphp/runtime/ext/ext_debugger.cpp
+++ b/hphp/runtime/ext/ext_debugger.cpp
@@ -31,25 +31,25 @@ namespace HPHP {
 using namespace Eval;
 using HPHP::VM::Transl::CallerFrame;
 
-const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_FILENAMES =
+const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_FILENAMES =
   DebuggerClient::AutoCompleteFileNames;
-const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_VARIABLES =
+const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_VARIABLES =
   DebuggerClient::AutoCompleteVariables;
-const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_CONSTANTS =
+const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_CONSTANTS =
   DebuggerClient::AutoCompleteConstants;
-const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASSES   =
+const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASSES   =
   DebuggerClient::AutoCompleteClasses;
-const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_FUNCTIONS =
+const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_FUNCTIONS =
   DebuggerClient::AutoCompleteFunctions;
-const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASS_METHODS =
+const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASS_METHODS =
   DebuggerClient::AutoCompleteClassMethods;
-const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASS_PROPERTIES =
+const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASS_PROPERTIES =
   DebuggerClient::AutoCompleteClassProperties;
-const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASS_CONSTANTS =
+const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASS_CONSTANTS =
   DebuggerClient::AutoCompleteClassConstants;
-const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_KEYWORDS =
+const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_KEYWORDS =
   DebuggerClient::AutoCompleteKeyword;
-const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_CODE =
+const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_CODE =
   DebuggerClient::AutoCompleteCode;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -284,7 +284,7 @@ bool c_DebuggerClientCmdUser::t_arg(int index, CStrRef str) {
   return m_client->arg(index + 1, str.data());
 }
 
-int64 c_DebuggerClientCmdUser::t_argcount() {
+int64_t c_DebuggerClientCmdUser::t_argcount() {
   return m_client->argCount() - 1;
 }
 
@@ -322,7 +322,7 @@ Variant c_DebuggerClientCmdUser::t_getcurrentlocation() {
   Array ret(Array::Create());
   if (bpi) {
     ret.set("file",      String(bpi->m_file));
-    ret.set("line",      (int64)bpi->m_line1);
+    ret.set("line",      (int64_t)bpi->m_line1);
     ret.set("namespace", String(bpi->getNamespace()));
     ret.set("class",     String(bpi->getClass()));
     ret.set("function",  String(bpi->getFunction()));
@@ -335,7 +335,7 @@ Variant c_DebuggerClientCmdUser::t_getstacktrace() {
   return m_client->getStackTrace();
 }
 
-int64 c_DebuggerClientCmdUser::t_getframe() {
+int64_t c_DebuggerClientCmdUser::t_getframe() {
   return m_client->getFrame();
 }
 
@@ -358,14 +358,14 @@ void c_DebuggerClientCmdUser::t_addcompletion(CVarRef list) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const int64 q_DebuggerClient$$STATE_INVALID = -1;
-const int64 q_DebuggerClient$$STATE_UNINIT
+const int64_t q_DebuggerClient$$STATE_INVALID = -1;
+const int64_t q_DebuggerClient$$STATE_UNINIT
   = DebuggerClient::StateUninit;
-const int64 q_DebuggerClient$$STATE_INITIALIZING
+const int64_t q_DebuggerClient$$STATE_INITIALIZING
   = DebuggerClient::StateInitializing;
-const int64 q_DebuggerClient$$STATE_READY_FOR_COMMAND
+const int64_t q_DebuggerClient$$STATE_READY_FOR_COMMAND
   = DebuggerClient::StateReadyForCommand;
-const int64 q_DebuggerClient$$STATE_BUSY
+const int64_t q_DebuggerClient$$STATE_BUSY
   = DebuggerClient::StateBusy;
 
 c_DebuggerClient::c_DebuggerClient(VM::Class* cb) : ExtObjectData(cb) {
@@ -379,7 +379,7 @@ c_DebuggerClient::~c_DebuggerClient() {
 void c_DebuggerClient::t___construct() {
 }
 
-int64 c_DebuggerClient::t_getstate() {
+int64_t c_DebuggerClient::t_getstate() {
   if (!m_client) {
     return q_DebuggerClient$$STATE_INVALID;
   }
diff --git a/hphp/runtime/ext/ext_debugger.h b/hphp/runtime/ext/ext_debugger.h
index 6a4be6cfc538a..386885f0f8f23 100644
--- a/hphp/runtime/ext/ext_debugger.h
+++ b/hphp/runtime/ext/ext_debugger.h
@@ -51,16 +51,16 @@ class c_DebuggerProxyCmdUser : public ExtObjectData {
  public:
   Eval::DebuggerProxy *m_proxy;
 };
-extern const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_FILENAMES;
-extern const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_VARIABLES;
-extern const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_CONSTANTS;
-extern const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASSES;
-extern const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_FUNCTIONS;
-extern const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASS_METHODS;
-extern const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASS_PROPERTIES;
-extern const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASS_CONSTANTS;
-extern const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_KEYWORDS;
-extern const int64 q_DebuggerClientCmdUser$$AUTO_COMPLETE_CODE;
+extern const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_FILENAMES;
+extern const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_VARIABLES;
+extern const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_CONSTANTS;
+extern const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASSES;
+extern const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_FUNCTIONS;
+extern const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASS_METHODS;
+extern const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASS_PROPERTIES;
+extern const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_CLASS_CONSTANTS;
+extern const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_KEYWORDS;
+extern const int64_t q_DebuggerClientCmdUser$$AUTO_COMPLETE_CODE;
 
 ///////////////////////////////////////////////////////////////////////////////
 // class DebuggerClientCmdUser
@@ -91,7 +91,7 @@ class c_DebuggerClientCmdUser : public ExtObjectData {
   public: String t_getcode();
   public: String t_getcommand();
   public: bool t_arg(int index, CStrRef str);
-  public: int64 t_argcount();
+  public: int64_t t_argcount();
   public: String t_argvalue(int index);
   public: String t_linerest(int index);
   public: Array t_args();
@@ -99,7 +99,7 @@ class c_DebuggerClientCmdUser : public ExtObjectData {
   public: Variant t_xend(CObjRef cmd);
   public: Variant t_getcurrentlocation();
   public: Variant t_getstacktrace();
-  public: int64 t_getframe();
+  public: int64_t t_getframe();
   public: void t_printframe(int index);
   public: void t_addcompletion(CVarRef list);
 
@@ -110,11 +110,11 @@ class c_DebuggerClientCmdUser : public ExtObjectData {
 ///////////////////////////////////////////////////////////////////////////////
 // class DebuggerClient
 
-extern const int64 q_DebuggerClient$$STATE_INVALID;
-extern const int64 q_DebuggerClient$$STATE_UNINIT;
-extern const int64 q_DebuggerClient$$STATE_INITIALIZING;
-extern const int64 q_DebuggerClient$$STATE_READY_FOR_COMMAND;
-extern const int64 q_DebuggerClient$$STATE_BUSY;
+extern const int64_t q_DebuggerClient$$STATE_INVALID;
+extern const int64_t q_DebuggerClient$$STATE_UNINIT;
+extern const int64_t q_DebuggerClient$$STATE_INITIALIZING;
+extern const int64_t q_DebuggerClient$$STATE_READY_FOR_COMMAND;
+extern const int64_t q_DebuggerClient$$STATE_BUSY;
 
 FORWARD_DECLARE_CLASS_BUILTIN(DebuggerClient);
 class c_DebuggerClient : public ExtObjectData, public Sweepable {
@@ -125,7 +125,7 @@ class c_DebuggerClient : public ExtObjectData, public Sweepable {
   public: c_DebuggerClient(VM::Class* cls = c_DebuggerClient::s_cls);
   public: ~c_DebuggerClient();
   public: void t___construct();
-  public: int64 t_getstate();
+  public: int64_t t_getstate();
   public: Variant t_init(CVarRef options);
   public: Variant t_processcmd(CVarRef cmdName, CVarRef args);
 
diff --git a/hphp/runtime/ext/ext_domdocument.cpp b/hphp/runtime/ext/ext_domdocument.cpp
index a899330addc7d..75a29163d3edc 100644
--- a/hphp/runtime/ext/ext_domdocument.cpp
+++ b/hphp/runtime/ext/ext_domdocument.cpp
@@ -2022,7 +2022,7 @@ Variant c_DOMNode::t_clonenode(bool deep /* = false */) {
   return create_node_object(node, doc(), true);
 }
 
-int64 c_DOMNode::t_getlineno() {
+int64_t c_DOMNode::t_getlineno() {
   xmlNodePtr nodep = m_node;
   return xmlGetLineNo(nodep);
 }
@@ -2499,7 +2499,7 @@ static void dom_characterdata_data_write(CObjRef obj, CVarRef value) {
 
 static Variant dom_characterdata_length_read(CObjRef obj) {
   CHECK_NODE(nodep);
-  int64 length = 0;
+  int64_t length = 0;
   xmlChar *content = xmlNodeGetContent(nodep);
   if (content) {
     length = xmlUTF8Strlen(content);
@@ -2558,7 +2558,7 @@ bool c_DOMCharacterData::t_appenddata(CStrRef arg) {
   return true;
 }
 
-bool c_DOMCharacterData::t_deletedata(int64 offset, int64 count) {
+bool c_DOMCharacterData::t_deletedata(int64_t offset, int64_t count) {
   xmlNodePtr node = m_node;
   xmlChar *cur, *substring, *second;
   cur = xmlNodeGetContent(node);
@@ -2588,7 +2588,7 @@ bool c_DOMCharacterData::t_deletedata(int64 offset, int64 count) {
   return true;
 }
 
-bool c_DOMCharacterData::t_insertdata(int64 offset, CStrRef data) {
+bool c_DOMCharacterData::t_insertdata(int64_t offset, CStrRef data) {
   xmlNodePtr node = m_node;
   xmlChar *cur, *first, *second;
   cur = xmlNodeGetContent(node);
@@ -2612,7 +2612,7 @@ bool c_DOMCharacterData::t_insertdata(int64 offset, CStrRef data) {
   return true;
 }
 
-bool c_DOMCharacterData::t_replacedata(int64 offset, int64 count,
+bool c_DOMCharacterData::t_replacedata(int64_t offset, int64_t count,
                                        CStrRef data) {
   xmlNodePtr node = m_node;
   xmlChar *cur, *substring, *second = NULL;
@@ -2648,7 +2648,7 @@ bool c_DOMCharacterData::t_replacedata(int64 offset, int64 count,
   return true;
 }
 
-String c_DOMCharacterData::t_substringdata(int64 offset, int64 count) {
+String c_DOMCharacterData::t_substringdata(int64_t offset, int64_t count) {
   xmlNodePtr node = m_node;
   xmlChar *cur, *substring;
   cur = xmlNodeGetContent(node);
@@ -2756,7 +2756,7 @@ bool c_DOMText::t_iswhitespaceinelementcontent() {
   return xmlIsBlankNode(m_node);
 }
 
-Variant c_DOMText::t_splittext(int64 offset) {
+Variant c_DOMText::t_splittext(int64_t offset) {
   xmlNodePtr node = m_node;
   xmlChar *cur, *first, *second;
   xmlNodePtr nnode;
@@ -2876,7 +2876,7 @@ static Variant dom_document_standalone_read(CObjRef obj) {
 
 static void dom_document_standalone_write(CObjRef obj, CVarRef value) {
   CHECK_WRITE_DOC(docp);
-  int64 standalone = value.toInt64();
+  int64_t standalone = value.toInt64();
   if (standalone > 0) {
     docp->standalone = 1;
   } else if (standalone < 0) {
@@ -3339,7 +3339,7 @@ Variant c_DOMDocument::t_importnode(CObjRef importednode,
   return create_node_object(retnodep, doc(), owner);
 }
 
-Variant c_DOMDocument::t_load(CStrRef filename, int64 options /* = 0 */) {
+Variant c_DOMDocument::t_load(CStrRef filename, int64_t options /* = 0 */) {
   SYNC_VM_REGS_SCOPED();
   String translated = File::TranslatePath(filename);
   if (translated.empty()) {
@@ -3364,7 +3364,7 @@ Variant c_DOMDocument::t_loadhtmlfile(CStrRef filename) {
   return dom_load_html(this, translated, DOM_LOAD_FILE);
 }
 
-Variant c_DOMDocument::t_loadxml(CStrRef source, int64 options /* = 0 */) {
+Variant c_DOMDocument::t_loadxml(CStrRef source, int64_t options /* = 0 */) {
   SYNC_VM_REGS_SCOPED();
   return dom_parse_document(this, source, options, DOM_LOAD_STRING);
 }
@@ -3406,7 +3406,7 @@ bool c_DOMDocument::t_relaxngvalidatesource(CStrRef source) {
   return _dom_document_relaxNG_validate(this, source, DOM_LOAD_STRING);
 }
 
-Variant c_DOMDocument::t_save(CStrRef file, int64 options /* = 0 */) {
+Variant c_DOMDocument::t_save(CStrRef file, int64_t options /* = 0 */) {
   xmlDocPtr docp = (xmlDocPtr)m_node;
   int bytes, format = 0, saveempty = 0;
 
@@ -3465,7 +3465,7 @@ Variant c_DOMDocument::t_savehtmlfile(CStrRef file) {
 }
 
 Variant c_DOMDocument::t_savexml(CObjRef node /* = null_object */,
-                                 int64 options /* = 0 */) {
+                                 int64_t options /* = 0 */) {
   xmlDocPtr docp = (xmlDocPtr)m_node;
   xmlBufferPtr buf;
   xmlChar *mem;
@@ -3547,7 +3547,7 @@ bool c_DOMDocument::t_validate() {
   return ret;
 }
 
-Variant c_DOMDocument::t_xinclude(int64 options /* = 0 */) {
+Variant c_DOMDocument::t_xinclude(int64_t options /* = 0 */) {
   xmlDocPtr docp = (xmlDocPtr)m_node;
   int err = xmlXIncludeProcessFlags(docp, options);
   /* XML_XINCLUDE_START and XML_XINCLUDE_END nodes need to be removed as these
@@ -4695,7 +4695,7 @@ Variant c_DOMNamedNodeMap::t_getnameditemns(CStrRef namespaceuri,
   return null;
 }
 
-Variant c_DOMNamedNodeMap::t_item(int64 index) {
+Variant c_DOMNamedNodeMap::t_item(int64_t index) {
   if (index >= 0) {
     xmlNodePtr itemnode = NULL;
     bool owner = false;
@@ -4827,7 +4827,7 @@ bool c_DOMNodeList::t___isset(Variant name) {
   return domnodelist_properties_map.isset(this, name);
 }
 
-Variant c_DOMNodeList::t_item(int64 index) {
+Variant c_DOMNodeList::t_item(int64_t index) {
   xmlNodePtr itemnode = NULL;
   xmlNodePtr nodep, curnode;
   int count = 0;
@@ -5507,13 +5507,13 @@ Variant f_dom_document_normalize_document(CVarRef obj) {
 }
 
 Variant f_dom_document_save(CVarRef obj, CStrRef file,
-                            int64 options /* = 0 */) {
+                            int64_t options /* = 0 */) {
   DOM_GET_OBJ(Document);
   return pobj->t_save(file, options);
 }
 
 Variant f_dom_document_savexml(CVarRef obj, CObjRef node /* = null_object */,
-                               int64 options /* = 0 */) {
+                               int64_t options /* = 0 */) {
   DOM_GET_OBJ(Document);
   return pobj->t_savexml(node, options);
 }
@@ -5523,7 +5523,7 @@ Variant f_dom_document_validate(CVarRef obj) {
   return pobj->t_validate();
 }
 
-Variant f_dom_document_xinclude(CVarRef obj, int64 options /* = 0 */) {
+Variant f_dom_document_xinclude(CVarRef obj, int64_t options /* = 0 */) {
   DOM_GET_OBJ(Document);
   return pobj->t_xinclude(options);
 }
@@ -5627,7 +5627,7 @@ Variant f_dom_node_lookup_namespace_uri(CVarRef obj, CStrRef namespaceuri) {
   return pobj->t_lookupnamespaceuri(namespaceuri);
 }
 
-Variant f_dom_nodelist_item(CVarRef obj, int64 index) {
+Variant f_dom_nodelist_item(CVarRef obj, int64_t index) {
   DOM_GET_OBJ(NodeList);
   return pobj->t_item(index);
 }
@@ -5637,7 +5637,7 @@ Variant f_dom_namednodemap_get_named_item(CVarRef obj, CStrRef name) {
   return pobj->t_getnameditem(name);
 }
 
-Variant f_dom_namednodemap_item(CVarRef obj, int64 index) {
+Variant f_dom_namednodemap_item(CVarRef obj, int64_t index) {
   DOM_GET_OBJ(NamedNodeMap);
   return pobj->t_item(index);
 }
@@ -5648,8 +5648,8 @@ Variant f_dom_namednodemap_get_named_item_ns(CVarRef obj, CStrRef namespaceuri,
   return pobj->t_getnameditemns(namespaceuri, localname);
 }
 
-Variant f_dom_characterdata_substring_data(CVarRef obj, int64 offset,
-                                           int64 count) {
+Variant f_dom_characterdata_substring_data(CVarRef obj, int64_t offset,
+                                           int64_t count) {
   DOM_GET_OBJ(CharacterData);
   return pobj->t_substringdata(offset, count);
 }
@@ -5659,20 +5659,20 @@ Variant f_dom_characterdata_append_data(CVarRef obj, CStrRef arg) {
   return pobj->t_appenddata(arg);
 }
 
-Variant f_dom_characterdata_insert_data(CVarRef obj, int64 offset,
+Variant f_dom_characterdata_insert_data(CVarRef obj, int64_t offset,
                                         CStrRef data) {
   DOM_GET_OBJ(CharacterData);
   return pobj->t_insertdata(offset, data);
 }
 
-Variant f_dom_characterdata_delete_data(CVarRef obj, int64 offset,
-                                        int64 count) {
+Variant f_dom_characterdata_delete_data(CVarRef obj, int64_t offset,
+                                        int64_t count) {
   DOM_GET_OBJ(CharacterData);
   return pobj->t_deletedata(offset, count);
 }
 
-Variant f_dom_characterdata_replace_data(CVarRef obj, int64 offset,
-                                         int64 count, CStrRef data) {
+Variant f_dom_characterdata_replace_data(CVarRef obj, int64_t offset,
+                                         int64_t count, CStrRef data) {
   DOM_GET_OBJ(CharacterData);
   return pobj->t_replacedata(offset, count, data);
 }
@@ -5781,7 +5781,7 @@ Variant f_dom_element_set_id_attribute_node(CVarRef obj, CObjRef idattr,
   return pobj->t_setidattributenode(idattr, isid);
 }
 
-Variant f_dom_text_split_text(CVarRef obj, int64 offset) {
+Variant f_dom_text_split_text(CVarRef obj, int64_t offset) {
   DOM_GET_OBJ(Text);
   return pobj->t_splittext(offset);
 }
diff --git a/hphp/runtime/ext/ext_domdocument.h b/hphp/runtime/ext/ext_domdocument.h
index d64c5bbfb9ad7..1aa24e63cd875 100644
--- a/hphp/runtime/ext/ext_domdocument.h
+++ b/hphp/runtime/ext/ext_domdocument.h
@@ -40,10 +40,10 @@ Variant f_dom_document_create_attribute_ns(CVarRef obj, CStrRef namespaceuri, CS
 Variant f_dom_document_get_elements_by_tag_name_ns(CVarRef obj, CStrRef namespaceuri, CStrRef localname);
 Variant f_dom_document_get_element_by_id(CVarRef obj, CStrRef elementid);
 Variant f_dom_document_normalize_document(CVarRef obj);
-Variant f_dom_document_save(CVarRef obj, CStrRef file, int64 options = 0);
-Variant f_dom_document_savexml(CVarRef obj, CObjRef node = null_object, int64 options = 0);
+Variant f_dom_document_save(CVarRef obj, CStrRef file, int64_t options = 0);
+Variant f_dom_document_savexml(CVarRef obj, CObjRef node = null_object, int64_t options = 0);
 Variant f_dom_document_validate(CVarRef obj);
-Variant f_dom_document_xinclude(CVarRef obj, int64 options = 0);
+Variant f_dom_document_xinclude(CVarRef obj, int64_t options = 0);
 Variant f_dom_document_save_html(CVarRef obj);
 Variant f_dom_document_save_html_file(CVarRef obj, CStrRef file);
 Variant f_dom_document_schema_validate_file(CVarRef obj, CStrRef filename);
@@ -63,15 +63,15 @@ Variant f_dom_node_is_same_node(CVarRef obj, CObjRef node);
 Variant f_dom_node_lookup_prefix(CVarRef obj, CStrRef prefix);
 Variant f_dom_node_is_default_namespace(CVarRef obj, CStrRef namespaceuri);
 Variant f_dom_node_lookup_namespace_uri(CVarRef obj, CStrRef namespaceuri);
-Variant f_dom_nodelist_item(CVarRef obj, int64 index);
+Variant f_dom_nodelist_item(CVarRef obj, int64_t index);
 Variant f_dom_namednodemap_get_named_item(CVarRef obj, CStrRef name);
-Variant f_dom_namednodemap_item(CVarRef obj, int64 index);
+Variant f_dom_namednodemap_item(CVarRef obj, int64_t index);
 Variant f_dom_namednodemap_get_named_item_ns(CVarRef obj, CStrRef namespaceuri, CStrRef localname);
-Variant f_dom_characterdata_substring_data(CVarRef obj, int64 offset, int64 count);
+Variant f_dom_characterdata_substring_data(CVarRef obj, int64_t offset, int64_t count);
 Variant f_dom_characterdata_append_data(CVarRef obj, CStrRef arg);
-Variant f_dom_characterdata_insert_data(CVarRef obj, int64 offset, CStrRef data);
-Variant f_dom_characterdata_delete_data(CVarRef obj, int64 offset, int64 count);
-Variant f_dom_characterdata_replace_data(CVarRef obj, int64 offset, int64 count, CStrRef data);
+Variant f_dom_characterdata_insert_data(CVarRef obj, int64_t offset, CStrRef data);
+Variant f_dom_characterdata_delete_data(CVarRef obj, int64_t offset, int64_t count);
+Variant f_dom_characterdata_replace_data(CVarRef obj, int64_t offset, int64_t count, CStrRef data);
 Variant f_dom_attr_is_id(CVarRef obj);
 Variant f_dom_element_get_attribute(CVarRef obj, CStrRef name);
 Variant f_dom_element_set_attribute(CVarRef obj, CStrRef name, CStrRef value);
@@ -91,7 +91,7 @@ Variant f_dom_element_has_attribute_ns(CVarRef obj, CStrRef namespaceuri, CStrRe
 Variant f_dom_element_set_id_attribute(CVarRef obj, CStrRef name, bool isid);
 Variant f_dom_element_set_id_attribute_ns(CVarRef obj, CStrRef namespaceuri, CStrRef localname, bool isid);
 Variant f_dom_element_set_id_attribute_node(CVarRef obj, CObjRef idattr, bool isid);
-Variant f_dom_text_split_text(CVarRef obj, int64 offset);
+Variant f_dom_text_split_text(CVarRef obj, int64_t offset);
 Variant f_dom_text_is_whitespace_in_element_content(CVarRef obj);
 Variant f_dom_xpath_register_ns(CVarRef obj, CStrRef prefix, CStrRef uri);
 Variant f_dom_xpath_query(CVarRef obj, CStrRef expr, CObjRef context = null_object);
@@ -112,7 +112,7 @@ class c_DOMNode : public ExtObjectDataFlags<ObjectData::UseGet|ObjectData::UseSe
   public: void t___construct();
   public: Variant t_appendchild(CObjRef newnode);
   public: Variant t_clonenode(bool deep = false);
-  public: int64 t_getlineno();
+  public: int64_t t_getlineno();
   public: bool t_hasattributes();
   public: bool t_haschildnodes();
   public: Variant t_insertbefore(CObjRef newnode, CObjRef refnode = null);
@@ -174,10 +174,10 @@ class c_DOMCharacterData : public c_DOMNode {
   public: ~c_DOMCharacterData();
   public: void t___construct();
   public: bool t_appenddata(CStrRef arg);
-  public: bool t_deletedata(int64 offset, int64 count);
-  public: bool t_insertdata(int64 offset, CStrRef data);
-  public: bool t_replacedata(int64 offset, int64 count, CStrRef data);
-  public: String t_substringdata(int64 offset, int64 count);
+  public: bool t_deletedata(int64_t offset, int64_t count);
+  public: bool t_insertdata(int64_t offset, CStrRef data);
+  public: bool t_replacedata(int64_t offset, int64_t count, CStrRef data);
+  public: String t_substringdata(int64_t offset, int64_t count);
   public: Variant t___get(Variant name);
   public: Variant t___set(Variant name, Variant value);
   public: bool t___isset(Variant name);
@@ -216,7 +216,7 @@ class c_DOMText : public c_DOMCharacterData {
   public: ~c_DOMText();
   public: void t___construct(CStrRef value = null_string);
   public: bool t_iswhitespaceinelementcontent();
-  public: Variant t_splittext(int64 offset);
+  public: Variant t_splittext(int64_t offset);
   public: Variant t___get(Variant name);
   public: Variant t___set(Variant name, Variant value);
   public: bool t___isset(Variant name);
@@ -268,22 +268,22 @@ class c_DOMDocument : public c_DOMNode, public Sweepable {
   public: Variant t_getelementsbytagname(CStrRef name);
   public: Variant t_getelementsbytagnamens(CStrRef namespaceuri, CStrRef localname);
   public: Variant t_importnode(CObjRef importednode, bool deep = false);
-  public: Variant t_load(CStrRef filename, int64 options = 0);
+  public: Variant t_load(CStrRef filename, int64_t options = 0);
   public: Variant t_loadhtml(CStrRef source);
   public: Variant t_loadhtmlfile(CStrRef filename);
-  public: Variant t_loadxml(CStrRef source, int64 options = 0);
+  public: Variant t_loadxml(CStrRef source, int64_t options = 0);
   public: void t_normalizedocument();
   public: bool t_registernodeclass(CStrRef baseclass, CStrRef extendedclass);
   public: bool t_relaxngvalidate(CStrRef filename);
   public: bool t_relaxngvalidatesource(CStrRef source);
-  public: Variant t_save(CStrRef file, int64 options = 0);
+  public: Variant t_save(CStrRef file, int64_t options = 0);
   public: Variant t_savehtml();
   public: Variant t_savehtmlfile(CStrRef file);
-  public: Variant t_savexml(CObjRef node = null_object, int64 options = 0);
+  public: Variant t_savexml(CObjRef node = null_object, int64_t options = 0);
   public: bool t_schemavalidate(CStrRef filename);
   public: bool t_schemavalidatesource(CStrRef source);
   public: bool t_validate();
-  public: Variant t_xinclude(int64 options = 0);
+  public: Variant t_xinclude(int64_t options = 0);
   public: Variant t___get(Variant name);
   public: Variant t___set(Variant name, Variant value);
   public: bool t___isset(Variant name);
@@ -502,7 +502,7 @@ class c_DOMNamedNodeMap : public ExtObjectDataFlags<ObjectData::UseGet|ObjectDat
   public: void t___construct();
   public: Variant t_getnameditem(CStrRef name);
   public: Variant t_getnameditemns(CStrRef namespaceuri, CStrRef localname);
-  public: Variant t_item(int64 index);
+  public: Variant t_item(int64_t index);
   public: Variant t___get(Variant name);
   public: Variant t___set(Variant name, Variant value);
   public: bool t___isset(Variant name);
@@ -524,7 +524,7 @@ class c_DOMNodeList : public ExtObjectDataFlags<ObjectData::UseGet|ObjectData::U
   public: c_DOMNodeList(VM::Class* cls = c_DOMNodeList::s_cls);
   public: ~c_DOMNodeList();
   public: void t___construct();
-  public: Variant t_item(int64 index);
+  public: Variant t_item(int64_t index);
   public: Variant t___get(Variant name);
   public: Variant t___set(Variant name, Variant value);
   public: bool t___isset(Variant name);
diff --git a/hphp/runtime/ext/ext_error.cpp b/hphp/runtime/ext/ext_error.cpp
index e1a830ef2780f..f5951b72c517d 100644
--- a/hphp/runtime/ext/ext_error.cpp
+++ b/hphp/runtime/ext/ext_error.cpp
@@ -121,7 +121,7 @@ bool f_error_log(CStrRef message, int message_type /* = 0 */,
   return true;
 }
 
-int64 f_error_reporting(CVarRef level /* = null */) {
+int64_t f_error_reporting(CVarRef level /* = null */) {
   int oldErrorReportingLevel = g_context->getErrorReportingLevel();
   if (!level.isNull()) {
     g_context->setErrorReportingLevel(level.toInt32());
diff --git a/hphp/runtime/ext/ext_error.h b/hphp/runtime/ext/ext_error.h
index ed9bafccf2b57..c0475b81dad60 100644
--- a/hphp/runtime/ext/ext_error.h
+++ b/hphp/runtime/ext/ext_error.h
@@ -31,7 +31,7 @@ void f_debug_print_backtrace();
 String debug_string_backtrace(bool skip);
 Array f_error_get_last();
 bool f_error_log(CStrRef message, int message_type = 0, CStrRef destination = null_string, CStrRef extra_headers = null_string);
-int64 f_error_reporting(CVarRef level = null);
+int64_t f_error_reporting(CVarRef level = null);
 bool f_restore_error_handler();
 bool f_restore_exception_handler();
 Variant f_set_error_handler(CVarRef error_handler, int error_types = k_E_ALL);
diff --git a/hphp/runtime/ext/ext_fb.cpp b/hphp/runtime/ext/ext_fb.cpp
index 27789acb3ade9..ae55f8f44b6ef 100644
--- a/hphp/runtime/ext/ext_fb.cpp
+++ b/hphp/runtime/ext/ext_fb.cpp
@@ -49,21 +49,21 @@ static const UChar32 SUBSTITUTION_CHARACTER = 0xFFFD;
 #define FB_UNSERIALIZE_UNRECOGNIZED_OBJECT_TYPE  0x0003
 #define FB_UNSERIALIZE_UNEXPECTED_ARRAY_KEY_TYPE 0x0004
 
-const int64 k_FB_UNSERIALIZE_NONSTRING_VALUE = FB_UNSERIALIZE_NONSTRING_VALUE;
-const int64 k_FB_UNSERIALIZE_UNEXPECTED_END = FB_UNSERIALIZE_UNEXPECTED_END;
-const int64 k_FB_UNSERIALIZE_UNRECOGNIZED_OBJECT_TYPE =
+const int64_t k_FB_UNSERIALIZE_NONSTRING_VALUE = FB_UNSERIALIZE_NONSTRING_VALUE;
+const int64_t k_FB_UNSERIALIZE_UNEXPECTED_END = FB_UNSERIALIZE_UNEXPECTED_END;
+const int64_t k_FB_UNSERIALIZE_UNRECOGNIZED_OBJECT_TYPE =
   FB_UNSERIALIZE_UNRECOGNIZED_OBJECT_TYPE;
-const int64 k_FB_UNSERIALIZE_UNEXPECTED_ARRAY_KEY_TYPE =
+const int64_t k_FB_UNSERIALIZE_UNEXPECTED_ARRAY_KEY_TYPE =
   FB_UNSERIALIZE_UNEXPECTED_ARRAY_KEY_TYPE;
 
-const int64 k_TAINT_NONE = TAINT_BIT_NONE;
-const int64 k_TAINT_HTML = TAINT_BIT_HTML;
-const int64 k_TAINT_MUTATED = TAINT_BIT_MUTATED;
-const int64 k_TAINT_SQL = TAINT_BIT_SQL;
-const int64 k_TAINT_SHELL = TAINT_BIT_SHELL;
-const int64 k_TAINT_TRACE_HTML = TAINT_BIT_TRACE_HTML;
-const int64 k_TAINT_ALL = TAINT_BIT_ALL;
-const int64 k_TAINT_TRACE_SELF = TAINT_BIT_TRACE_SELF;
+const int64_t k_TAINT_NONE = TAINT_BIT_NONE;
+const int64_t k_TAINT_HTML = TAINT_BIT_HTML;
+const int64_t k_TAINT_MUTATED = TAINT_BIT_MUTATED;
+const int64_t k_TAINT_SQL = TAINT_BIT_SQL;
+const int64_t k_TAINT_SHELL = TAINT_BIT_SHELL;
+const int64_t k_TAINT_TRACE_HTML = TAINT_BIT_TRACE_HTML;
+const int64_t k_TAINT_ALL = TAINT_BIT_ALL;
+const int64_t k_TAINT_TRACE_SELF = TAINT_BIT_TRACE_SELF;
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -134,7 +134,7 @@ static int fb_serialized_size(CVarRef thing, int depth, int *bytes) {
       for (ArrayIter iter(arr); iter; ++iter) {
         Variant key = iter.first();
         if (key.isNumeric()) {
-          int64 index = key.toInt64();
+          int64_t index = key.toInt64();
           size += 1 + INT_SIZE(index);
         } else {
           int len = key.toString().size();
@@ -157,7 +157,7 @@ static int fb_serialized_size(CVarRef thing, int depth, int *bytes) {
   return 0;
 }
 
-static void fb_serialize_long_into_buffer(int64 val, char *buff, int *pos) {
+static void fb_serialize_long_into_buffer(int64_t val, char *buff, int *pos) {
   switch (INT_SIZE(val)) {
   case 1:
     buff[(*pos)++] = T_BYTE;
@@ -228,7 +228,7 @@ static bool fb_serialize_into_buffer(CVarRef thing, char *buff, int *pos) {
       for (ArrayIter iter(arr); iter; ++iter) {
         Variant key = iter.first();
         if (key.isNumeric()) {
-          int64 index = key.toInt64();
+          int64_t index = key.toInt64();
           fb_serialize_long_into_buffer(index, buff, pos);
         } else {
           fb_serialize_string_into_buffer(key.toString(), buff, pos);
@@ -298,7 +298,7 @@ int fb_unserialize_from_buffer(Variant &res, const char *buff,
       CHECK_ENOUGH(sizeof(int64_t), *pos, buff_len);
       int64_t ret = (int64_t)ntohll(*(int64_t *)(buff + (*pos)));
       (*pos) += 8;
-      res = (int64)ret;
+      res = (int64_t)ret;
       break;
     }
   case T_DOUBLE:
@@ -339,7 +339,7 @@ int fb_unserialize_from_buffer(Variant &res, const char *buff,
       CHECK_ENOUGH(1, *pos, buff_len);
       while ((type = buff[(*pos)++]) != T_STOP) {
         String key;
-        int64 index = 0;
+        int64_t index = 0;
         switch(type) {
         case T_BYTE:
           CHECK_ENOUGH(sizeof(int8_t), *pos, buff_len);
@@ -681,7 +681,7 @@ static void fb_compact_serialize_array_as_list_map(
   StringData* sd, CArrRef arr, int64_t index_limit, int depth) {
 
   fb_compact_serialize_code(sd, FB_CS_LIST_MAP);
-  for (int64 i = 0; i < index_limit; ++i) {
+  for (int64_t i = 0; i < index_limit; ++i) {
     if (arr.exists(i)) {
       fb_compact_serialize_variant(sd, arr[i], depth + 1);
     } else {
@@ -843,7 +843,7 @@ int fb_compact_unserialize_int64_from_buffer(
   } else if (first == (kCodePrefix | FB_CS_INT64)) {
     p += 1;
     CHECK_ENOUGH(8, p, n);
-    int64 val = (int64_t)ntohll(*reinterpret_cast<const int64_t*>(buf + p));
+    int64_t val = (int64_t)ntohll(*reinterpret_cast<const int64_t*>(buf + p));
     p += 8;
     out = val;
 
@@ -869,7 +869,7 @@ int fb_compact_unserialize_from_buffer(
     if (err) {
       return err;
     }
-    out = (int64)val;
+    out = (int64_t)val;
     return 0;
   }
   p += 1;
@@ -927,7 +927,7 @@ int fb_compact_unserialize_from_buffer(
       // There's no concept of vector in PHP (yet),
       // so return an array in both cases
       Array arr = Array::Create();
-      int64 i = 0;
+      int64_t i = 0;
       while (p < n && buf[p] != (char)(kCodePrefix | FB_CS_STOP)) {
         if (buf[p] == (char)(kCodePrefix | FB_CS_SKIP)) {
           ++i;
@@ -1291,11 +1291,11 @@ static int f_fb_utf8_strlen_impl(CStrRef input, bool deprecated) {
   return num_code_points;
 }
 
-int64 f_fb_utf8_strlen(CStrRef input) {
+int64_t f_fb_utf8_strlen(CStrRef input) {
   return f_fb_utf8_strlen_impl(input, /* deprecated */ false);
 }
 
-int64 f_fb_utf8_strlen_deprecated(CStrRef input) {
+int64_t f_fb_utf8_strlen_deprecated(CStrRef input) {
   return f_fb_utf8_strlen_impl(input, /* deprecated */ true);
 }
 
@@ -1651,7 +1651,7 @@ Array f_fb_get_flush_stat() {
 
     int total = transport->getResponseTotalSize();
     int sent = transport->getResponseSentSize();
-    int64 time = transport->getFlushTime();
+    int64_t time = transport->getFlushTime();
     return CREATE_MAP2(
         "flush_stats", CREATE_MAP3("total", total, "sent", sent, "time", time),
         "chunk_stats", chunkStats);
@@ -1659,7 +1659,7 @@ Array f_fb_get_flush_stat() {
   return NULL;
 }
 
-int64 f_fb_get_last_flush_size() {
+int64_t f_fb_get_last_flush_size() {
   Transport *transport = g_context->getTransport();
   return transport ? transport->getLastChunkSentSize() : 0;
 }
diff --git a/hphp/runtime/ext/ext_fb.h b/hphp/runtime/ext/ext_fb.h
index 33990d582477b..3e8509ae2e9af 100644
--- a/hphp/runtime/ext/ext_fb.h
+++ b/hphp/runtime/ext/ext_fb.h
@@ -39,8 +39,8 @@ void f_fb_renamed_functions(CArrRef names);
 bool f_fb_rename_function(CStrRef orig_func_name, CStrRef new_func_name);
 bool f_fb_autoload_map(CVarRef map, CStrRef root);
 bool f_fb_utf8ize(VRefParam input);
-int64 f_fb_utf8_strlen_deprecated(CStrRef input);
-int64 f_fb_utf8_strlen(CStrRef input);
+int64_t f_fb_utf8_strlen_deprecated(CStrRef input);
+int64_t f_fb_utf8_strlen(CStrRef input);
 Variant f_fb_utf8_substr(CStrRef str, int start, int length = INT_MAX);
 Array f_fb_call_user_func_safe(int _argc, CVarRef function, CArrRef _argv = null_array);
 Variant f_fb_call_user_func_safe_return(int _argc, CVarRef function, CVarRef def, CArrRef _argv = null_array);
@@ -69,32 +69,32 @@ Variant f_fb_const_fetch(CVarRef key);
 bool f_fb_output_compression(bool new_value);
 void f_fb_set_exit_callback(CVarRef function);
 Array f_fb_get_flush_stat();
-int64 f_fb_get_last_flush_size();
+int64_t f_fb_get_last_flush_size();
 Variant f_fb_lazy_stat(CStrRef filename);
 Variant f_fb_lazy_lstat(CStrRef filename);
 String f_fb_lazy_realpath(CStrRef filename);
 void f_fb_setprofile(CVarRef callback);
 String f_fb_gc_collect_cycles();
 void f_fb_gc_detect_cycles(CStrRef filename);
-extern const int64 k_FB_UNSERIALIZE_NONSTRING_VALUE;
-extern const int64 k_FB_UNSERIALIZE_UNEXPECTED_END;
-extern const int64 k_FB_UNSERIALIZE_UNRECOGNIZED_OBJECT_TYPE;
-extern const int64 k_FB_UNSERIALIZE_UNEXPECTED_ARRAY_KEY_TYPE;
-extern const int64 k_XHPROF_FLAGS_NO_BUILTINS;
-extern const int64 k_XHPROF_FLAGS_CPU;
-extern const int64 k_XHPROF_FLAGS_MEMORY;
-extern const int64 k_XHPROF_FLAGS_VTSC;
-extern const int64 k_XHPROF_FLAGS_TRACE;
-extern const int64 k_XHPROF_FLAGS_MEASURE_XHPROF_DISABLE;
-extern const int64 k_XHPROF_FLAGS_MALLOC;
-extern const int64 k_TAINT_NONE;
-extern const int64 k_TAINT_HTML;
-extern const int64 k_TAINT_MUTATED;
-extern const int64 k_TAINT_SQL;
-extern const int64 k_TAINT_SHELL;
-extern const int64 k_TAINT_TRACE_HTML;
-extern const int64 k_TAINT_ALL;
-extern const int64 k_TAINT_TRACE_SELF;
+extern const int64_t k_FB_UNSERIALIZE_NONSTRING_VALUE;
+extern const int64_t k_FB_UNSERIALIZE_UNEXPECTED_END;
+extern const int64_t k_FB_UNSERIALIZE_UNRECOGNIZED_OBJECT_TYPE;
+extern const int64_t k_FB_UNSERIALIZE_UNEXPECTED_ARRAY_KEY_TYPE;
+extern const int64_t k_XHPROF_FLAGS_NO_BUILTINS;
+extern const int64_t k_XHPROF_FLAGS_CPU;
+extern const int64_t k_XHPROF_FLAGS_MEMORY;
+extern const int64_t k_XHPROF_FLAGS_VTSC;
+extern const int64_t k_XHPROF_FLAGS_TRACE;
+extern const int64_t k_XHPROF_FLAGS_MEASURE_XHPROF_DISABLE;
+extern const int64_t k_XHPROF_FLAGS_MALLOC;
+extern const int64_t k_TAINT_NONE;
+extern const int64_t k_TAINT_HTML;
+extern const int64_t k_TAINT_MUTATED;
+extern const int64_t k_TAINT_SQL;
+extern const int64_t k_TAINT_SHELL;
+extern const int64_t k_TAINT_TRACE_HTML;
+extern const int64_t k_TAINT_ALL;
+extern const int64_t k_TAINT_TRACE_SELF;
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/hphp/runtime/ext/ext_file.cpp b/hphp/runtime/ext/ext_file.cpp
index 021f5cba27d65..ba2e8f47923e1 100644
--- a/hphp/runtime/ext/ext_file.cpp
+++ b/hphp/runtime/ext/ext_file.cpp
@@ -97,33 +97,33 @@ static bool check_error(const char *function, int line, bool ret) {
 Array stat_impl(struct stat *stat_sb) {
   Array ret;
 
-  ret.append((int64)stat_sb->st_dev);
-  ret.append((int64)stat_sb->st_ino);
-  ret.append((int64)stat_sb->st_mode);
-  ret.append((int64)stat_sb->st_nlink);
-  ret.append((int64)stat_sb->st_uid);
-  ret.append((int64)stat_sb->st_gid);
-  ret.append((int64)stat_sb->st_rdev);
-  ret.append((int64)stat_sb->st_size);
-  ret.append((int64)stat_sb->st_atime);
-  ret.append((int64)stat_sb->st_mtime);
-  ret.append((int64)stat_sb->st_ctime);
-  ret.append((int64)stat_sb->st_blksize);
-  ret.append((int64)stat_sb->st_blocks);
-
-  ret.set("dev",     (int64)stat_sb->st_dev);
-  ret.set("ino",     (int64)stat_sb->st_ino);
-  ret.set("mode",    (int64)stat_sb->st_mode);
-  ret.set("nlink",   (int64)stat_sb->st_nlink);
-  ret.set("uid",     (int64)stat_sb->st_uid);
-  ret.set("gid",     (int64)stat_sb->st_gid);
-  ret.set("rdev",    (int64)stat_sb->st_rdev);
-  ret.set("size",    (int64)stat_sb->st_size);
-  ret.set("atime",   (int64)stat_sb->st_atime);
-  ret.set("mtime",   (int64)stat_sb->st_mtime);
-  ret.set("ctime",   (int64)stat_sb->st_ctime);
-  ret.set("blksize", (int64)stat_sb->st_blksize);
-  ret.set("blocks",  (int64)stat_sb->st_blocks);
+  ret.append((int64_t)stat_sb->st_dev);
+  ret.append((int64_t)stat_sb->st_ino);
+  ret.append((int64_t)stat_sb->st_mode);
+  ret.append((int64_t)stat_sb->st_nlink);
+  ret.append((int64_t)stat_sb->st_uid);
+  ret.append((int64_t)stat_sb->st_gid);
+  ret.append((int64_t)stat_sb->st_rdev);
+  ret.append((int64_t)stat_sb->st_size);
+  ret.append((int64_t)stat_sb->st_atime);
+  ret.append((int64_t)stat_sb->st_mtime);
+  ret.append((int64_t)stat_sb->st_ctime);
+  ret.append((int64_t)stat_sb->st_blksize);
+  ret.append((int64_t)stat_sb->st_blocks);
+
+  ret.set("dev",     (int64_t)stat_sb->st_dev);
+  ret.set("ino",     (int64_t)stat_sb->st_ino);
+  ret.set("mode",    (int64_t)stat_sb->st_mode);
+  ret.set("nlink",   (int64_t)stat_sb->st_nlink);
+  ret.set("uid",     (int64_t)stat_sb->st_uid);
+  ret.set("gid",     (int64_t)stat_sb->st_gid);
+  ret.set("rdev",    (int64_t)stat_sb->st_rdev);
+  ret.set("size",    (int64_t)stat_sb->st_size);
+  ret.set("atime",   (int64_t)stat_sb->st_atime);
+  ret.set("mtime",   (int64_t)stat_sb->st_mtime);
+  ret.set("ctime",   (int64_t)stat_sb->st_ctime);
+  ret.set("blksize", (int64_t)stat_sb->st_blksize);
+  ret.set("blocks",  (int64_t)stat_sb->st_blocks);
 
   return ret;
 }
@@ -165,8 +165,8 @@ Variant f_pclose(CObjRef handle) {
   return s_file_data->m_pcloseRet;
 }
 
-Variant f_fseek(CObjRef handle, int64 offset,
-                int64 whence /* = k_SEEK_SET */) {
+Variant f_fseek(CObjRef handle, int64_t offset,
+                int64_t whence /* = k_SEEK_SET */) {
   CHECK_HANDLE(handle, f);
   return CHECK_ERROR(f->seek(offset, whence)) ? 0 : -1;
 }
@@ -178,7 +178,7 @@ bool f_rewind(CObjRef handle) {
 
 Variant f_ftell(CObjRef handle) {
   CHECK_HANDLE(handle, f);
-  int64 ret = f->tell();
+  int64_t ret = f->tell();
   if (!CHECK_ERROR(ret != -1)) {
     return false;
   }
@@ -201,7 +201,7 @@ Variant f_fstat(CObjRef handle) {
   return stat_impl(&sb);
 }
 
-Variant f_fread(CObjRef handle, int64 length) {
+Variant f_fread(CObjRef handle, int64_t length) {
   CHECK_HANDLE(handle, f);
   return f->read(length);
 }
@@ -215,7 +215,7 @@ Variant f_fgetc(CObjRef handle) {
   return String::FromChar(result);
 }
 
-Variant f_fgets(CObjRef handle, int64 length /* = 0 */) {
+Variant f_fgets(CObjRef handle, int64_t length /* = 0 */) {
   if (length < 0) {
     throw_invalid_argument("length (negative): %d", length);
     return false;
@@ -228,7 +228,7 @@ Variant f_fgets(CObjRef handle, int64 length /* = 0 */) {
   return false;
 }
 
-Variant f_fgetss(CObjRef handle, int64 length /* = 0 */,
+Variant f_fgetss(CObjRef handle, int64_t length /* = 0 */,
                  CStrRef allowable_tags /* = null_string */) {
   Variant ret = f_fgets(handle, length);
   if (!same(ret, false)) {
@@ -247,16 +247,16 @@ Variant f_fpassthru(CObjRef handle) {
   return f->print();
 }
 
-Variant f_fwrite(CObjRef handle, CStrRef data, int64 length /* = 0 */) {
+Variant f_fwrite(CObjRef handle, CStrRef data, int64_t length /* = 0 */) {
   CHECK_HANDLE(handle, f);
-  int64 ret = f->write(data, length);
+  int64_t ret = f->write(data, length);
   if (ret < 0) ret = 0;
   return ret;
 }
 
-Variant f_fputs(CObjRef handle, CStrRef data, int64 length /* = 0 */) {
+Variant f_fputs(CObjRef handle, CStrRef data, int64_t length /* = 0 */) {
   CHECK_HANDLE(handle, f);
-  int64 ret = f->write(data, length);
+  int64_t ret = f->write(data, length);
   if (ret < 0) ret = 0;
   return ret;
 }
@@ -276,7 +276,7 @@ bool f_fflush(CObjRef handle) {
   return CHECK_ERROR(f->flush());
 }
 
-bool f_ftruncate(CObjRef handle, int64 size) {
+bool f_ftruncate(CObjRef handle, int64_t size) {
   CHECK_HANDLE(handle, f);
   return CHECK_ERROR(f->truncate(size));
 }
@@ -311,7 +311,7 @@ Variant f_fputcsv(CObjRef handle, CArrRef fields, CStrRef delimiter /* = "," */,
   return f->writeCSV(fields, delimiter.charAt(0), enclosure.charAt(0));
 }
 
-Variant f_fgetcsv(CObjRef handle, int64 length /* = 0 */,
+Variant f_fgetcsv(CObjRef handle, int64_t length /* = 0 */,
                   CStrRef delimiter /* = "," */,
                   CStrRef enclosure /* = "\"" */) {
   if (delimiter.size() != 1) {
@@ -333,8 +333,8 @@ Variant f_fgetcsv(CObjRef handle, int64 length /* = 0 */,
 Variant f_file_get_contents(CStrRef filename,
                             bool use_include_path /* = false */,
                             CVarRef context /* = null */,
-                            int64 offset /* = 0 */,
-                            int64 maxlen /* = 0 */) {
+                            int64_t offset /* = 0 */,
+                            int64_t maxlen /* = 0 */) {
   Variant stream = f_fopen(filename, "rb", use_include_path, context);
   if (same(stream, false)) return false;
   return f_stream_get_contents(stream, maxlen, offset);
@@ -557,55 +557,55 @@ Variant f_sha1_file(CStrRef filename, bool raw_output /* = false */) {
 Variant f_fileperms(CStrRef filename) {
   struct stat sb;
   CHECK_SYSTEM(stat(File::TranslatePath(filename, true).data(), &sb));
-  return (int64)sb.st_mode;
+  return (int64_t)sb.st_mode;
 }
 
 Variant f_fileinode(CStrRef filename) {
   struct stat sb;
   CHECK_SYSTEM(stat(File::TranslatePath(filename).data(), &sb));
-  return (int64)sb.st_ino;
+  return (int64_t)sb.st_ino;
 }
 
 Variant f_filesize(CStrRef filename) {
   if (StaticContentCache::TheFileCache) {
-    int64 size =
+    int64_t size =
       StaticContentCache::TheFileCache->fileSize(filename.data(),
         filename.data()[0] != '/');
     if (size >= 0) return size;
   }
   struct stat sb;
   CHECK_SYSTEM(stat(File::TranslatePath(filename, true).data(), &sb));
-  return (int64)sb.st_size;
+  return (int64_t)sb.st_size;
 }
 
 Variant f_fileowner(CStrRef filename) {
   struct stat sb;
   CHECK_SYSTEM(stat(File::TranslatePath(filename, true).data(), &sb));
-  return (int64)sb.st_uid;
+  return (int64_t)sb.st_uid;
 }
 
 Variant f_filegroup(CStrRef filename) {
   struct stat sb;
   CHECK_SYSTEM(stat(File::TranslatePath(filename, true).data(), &sb));
-  return (int64)sb.st_gid;
+  return (int64_t)sb.st_gid;
 }
 
 Variant f_fileatime(CStrRef filename) {
   struct stat sb;
   CHECK_SYSTEM(stat(File::TranslatePath(filename, true).data(), &sb));
-  return (int64)sb.st_atime;
+  return (int64_t)sb.st_atime;
 }
 
 Variant f_filemtime(CStrRef filename) {
   struct stat sb;
   CHECK_SYSTEM(stat(File::TranslatePath(filename, true).data(), &sb));
-  return (int64)sb.st_mtime;
+  return (int64_t)sb.st_mtime;
 }
 
 Variant f_filectime(CStrRef filename) {
   struct stat sb;
   CHECK_SYSTEM(stat(File::TranslatePath(filename, true).data(), &sb));
-  return (int64)sb.st_ctime;
+  return (int64_t)sb.st_ctime;
 }
 
 Variant f_filetype(CStrRef filename) {
@@ -627,7 +627,7 @@ Variant f_filetype(CStrRef filename) {
 Variant f_linkinfo(CStrRef filename) {
   struct stat sb;
   CHECK_SYSTEM(stat(File::TranslatePath(filename).data(), &sb));
-  return (int64)sb.st_dev;
+  return (int64_t)sb.st_dev;
 }
 
 bool f_is_writable(CStrRef filename) {
@@ -892,7 +892,7 @@ Variant f_disk_total_space(CStrRef directory) {
 ///////////////////////////////////////////////////////////////////////////////
 // system wrappers
 
-bool f_chmod(CStrRef filename, int64 mode) {
+bool f_chmod(CStrRef filename, int64_t mode) {
   CHECK_SYSTEM(chmod(File::TranslatePath(filename).data(), mode));
   return true;
 }
@@ -959,7 +959,7 @@ bool f_lchgrp(CStrRef filename, CVarRef group) {
   return true;
 }
 
-bool f_touch(CStrRef filename, int64 mtime /* = 0 */, int64 atime /* = 0 */) {
+bool f_touch(CStrRef filename, int64_t mtime /* = 0 */, int64_t atime /* = 0 */) {
   String translated = File::TranslatePath(filename);
 
   /* create the file if it doesn't exist already */
@@ -1024,7 +1024,7 @@ bool f_rename(CStrRef oldname, CStrRef newname,
   return (ret == 0);
 }
 
-int64 f_umask(CVarRef mask /* = null_variant */) {
+int64_t f_umask(CVarRef mask /* = null_variant */) {
   int oldumask = umask(077);
   if (mask.isNull()) {
     umask(oldumask);
@@ -1200,7 +1200,7 @@ Variant f_tmpfile() {
 ///////////////////////////////////////////////////////////////////////////////
 // directory functions
 
-bool f_mkdir(CStrRef pathname, int64 mode /* = 0777 */,
+bool f_mkdir(CStrRef pathname, int64_t mode /* = 0777 */,
              bool recursive /* = false */, CVarRef context /* = null */) {
   if (recursive) {
     String path = File::TranslatePath(pathname);
diff --git a/hphp/runtime/ext/ext_file.h b/hphp/runtime/ext/ext_file.h
index 14d8ded83e191..2915ce4a80bd1 100644
--- a/hphp/runtime/ext/ext_file.h
+++ b/hphp/runtime/ext/ext_file.h
@@ -36,36 +36,36 @@ Variant f_fopen(CStrRef filename, CStrRef mode, bool use_include_path = false,
 Variant f_popen(CStrRef command, CStrRef mode);
 bool f_fclose(CObjRef handle);
 Variant f_pclose(CObjRef handle);
-Variant f_fseek(CObjRef handle, int64 offset, int64 whence = k_SEEK_SET);
+Variant f_fseek(CObjRef handle, int64_t offset, int64_t whence = k_SEEK_SET);
 bool f_rewind(CObjRef handle);
 Variant f_ftell(CObjRef handle);
 bool f_feof(CObjRef handle);
 Variant f_fstat(CObjRef handle);
-Variant f_fread(CObjRef handle, int64 length);
+Variant f_fread(CObjRef handle, int64_t length);
 Variant f_fgetc(CObjRef handle);
-Variant f_fgets(CObjRef handle, int64 length = 0);
-Variant f_fgetss(CObjRef handle, int64 length = 0,
+Variant f_fgets(CObjRef handle, int64_t length = 0);
+Variant f_fgetss(CObjRef handle, int64_t length = 0,
                 CStrRef allowable_tags = null_string);
 Variant f_fscanf(int _argc, CObjRef handle, CStrRef format, CArrRef _argv = null_array);
 Variant f_fpassthru(CObjRef handle);
-Variant f_fwrite(CObjRef handle, CStrRef data, int64 length = 0);
-Variant f_fputs(CObjRef handle, CStrRef data, int64 length = 0);
+Variant f_fwrite(CObjRef handle, CStrRef data, int64_t length = 0);
+Variant f_fputs(CObjRef handle, CStrRef data, int64_t length = 0);
 Variant f_fprintf(int _argc, CObjRef handle, CStrRef format, CArrRef _argv = null_array);
 Variant f_vfprintf(CObjRef handle, CStrRef format, CArrRef args);
 bool f_fflush(CObjRef handle);
-bool f_ftruncate(CObjRef handle, int64 size);
+bool f_ftruncate(CObjRef handle, int64_t size);
 bool f_flock(CObjRef handle, int operation, VRefParam wouldblock = null);
 Variant f_fputcsv(CObjRef handle, CArrRef fields, CStrRef delimiter = ",",
                   CStrRef enclosure = "\"");
-Variant f_fgetcsv(CObjRef handle, int64 length = 0, CStrRef delimiter = ",",
+Variant f_fgetcsv(CObjRef handle, int64_t length = 0, CStrRef delimiter = ",",
                   CStrRef enclosure = "\"");
 
 ///////////////////////////////////////////////////////////////////////////////
 // file name based file operations
 
 Variant f_file_get_contents(CStrRef filename, bool use_include_path = false,
-                            CVarRef context = null, int64 offset = 0,
-                            int64 maxlen = 0);
+                            CVarRef context = null, int64_t offset = 0,
+                            int64_t maxlen = 0);
 Variant f_file_put_contents(CStrRef filename, CVarRef data, int flags = 0,
                             CVarRef context = null);
 Variant f_file(CStrRef filename, int flags = 0, CVarRef context = null);
@@ -86,15 +86,15 @@ Variant f_sha1_file(CStrRef filename, bool raw_output = false);
 ///////////////////////////////////////////////////////////////////////////////
 // shell commands
 
-bool f_chmod(CStrRef filename, int64 mode);
+bool f_chmod(CStrRef filename, int64_t mode);
 bool f_chown(CStrRef filename, CVarRef user);
 bool f_lchown(CStrRef filename, CVarRef user);
 bool f_chgrp(CStrRef filename, CVarRef group);
 bool f_lchgrp(CStrRef filename, CVarRef group);
-bool f_touch(CStrRef filename, int64 mtime = 0, int64 atime = 0);
+bool f_touch(CStrRef filename, int64_t mtime = 0, int64_t atime = 0);
 bool f_copy(CStrRef source, CStrRef dest, CVarRef context = null);
 bool f_rename(CStrRef oldname, CStrRef newname, CVarRef context = null);
-int64 f_umask(CVarRef mask = null_variant);
+int64_t f_umask(CVarRef mask = null_variant);
 bool f_unlink(CStrRef filename, CVarRef context = null);
 bool f_link(CStrRef target, CStrRef link);
 bool f_symlink(CStrRef target, CStrRef link);
@@ -140,7 +140,7 @@ Variant f_disk_total_space(CStrRef directory);
 ///////////////////////////////////////////////////////////////////////////////
 // directory functions
 
-bool f_mkdir(CStrRef pathname, int64 mode = 0777, bool recursive = false,
+bool f_mkdir(CStrRef pathname, int64_t mode = 0777, bool recursive = false,
              CVarRef context = null);
 bool f_rmdir(CStrRef dirname, CVarRef context = null);
 String f_dirname(CStrRef path);
diff --git a/hphp/runtime/ext/ext_function.cpp b/hphp/runtime/ext/ext_function.cpp
index 5eb02a38f25b8..2bd1be37cb6f9 100644
--- a/hphp/runtime/ext/ext_function.cpp
+++ b/hphp/runtime/ext/ext_function.cpp
@@ -363,7 +363,7 @@ Array func_get_args(int num_args, CArrRef params, CArrRef args) {
   return ret;
 }
 
-int64 f_func_num_args() {
+int64_t f_func_num_args() {
   CallerFrame cf;
   ActRec* ar = cf();
   if (ar == NULL) {
diff --git a/hphp/runtime/ext/ext_function.h b/hphp/runtime/ext/ext_function.h
index b68c61fab10b7..ad5fec0f9ccfb 100644
--- a/hphp/runtime/ext/ext_function.h
+++ b/hphp/runtime/ext/ext_function.h
@@ -60,7 +60,7 @@ Array func_get_args(int num_args, CArrRef params, CArrRef args);
 /**
  * HPHP actually inlines this function, so this is degenerated.
  */
-int64 f_func_num_args();
+int64_t f_func_num_args();
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/hphp/runtime/ext/ext_hash.cpp b/hphp/runtime/ext/ext_hash.cpp
index 633a9d1fb549d..c8306c36f8296 100644
--- a/hphp/runtime/ext/ext_hash.cpp
+++ b/hphp/runtime/ext/ext_hash.cpp
@@ -336,7 +336,7 @@ bool f_hash_update_file(CObjRef init_context, CStrRef filename,
   return true;
 }
 
-int64 f_hash_update_stream(CObjRef context, CObjRef handle,
+int64_t f_hash_update_stream(CObjRef context, CObjRef handle,
                          int length /* = -1 */) {
   HashContext *hash = context.getTyped<HashContext>();
   int didread = 0;
@@ -374,7 +374,7 @@ String f_hash_final(CObjRef context, bool raw_output /* = false */) {
   return StringUtil::HexEncode(raw);
 }
 
-int64 f_furchash_hphp_ext(CStrRef key, int len, int nPart) {
+int64_t f_furchash_hphp_ext(CStrRef key, int len, int nPart) {
   len = std::max(std::min(len, key.size()), 0);
   return furc_hash(key, len, nPart);
 }
@@ -383,7 +383,7 @@ bool f_furchash_hphp_ext_supported() {
   return true;
 }
 
-int64 f_hphp_murmurhash(CStrRef key, int len, int seed) {
+int64_t f_hphp_murmurhash(CStrRef key, int len, int seed) {
   len = std::max(std::min(len, key.size()), 0);
   return murmur_hash_64A(key, len, seed);
 }
diff --git a/hphp/runtime/ext/ext_hash.h b/hphp/runtime/ext/ext_hash.h
index 410ff7a0be872..26c2918cbeb81 100644
--- a/hphp/runtime/ext/ext_hash.h
+++ b/hphp/runtime/ext/ext_hash.h
@@ -33,11 +33,11 @@ String f_hash_final(CObjRef context, bool raw_output = false);
 Variant f_hash_hmac_file(CStrRef algo, CStrRef filename, CStrRef key, bool raw_output = false);
 Variant f_hash_hmac(CStrRef algo, CStrRef data, CStrRef key, bool raw_output = false);
 bool f_hash_update_file(CObjRef init_context, CStrRef filename, CObjRef stream_context = null);
-int64 f_hash_update_stream(CObjRef context, CObjRef handle, int length = -1);
+int64_t f_hash_update_stream(CObjRef context, CObjRef handle, int length = -1);
 bool f_hash_update(CObjRef context, CStrRef data);
-int64 f_furchash_hphp_ext(CStrRef key, int len, int nPart);
+int64_t f_furchash_hphp_ext(CStrRef key, int len, int nPart);
 bool f_furchash_hphp_ext_supported();
-int64 f_hphp_murmurhash(CStrRef key, int len, int seed);
+int64_t f_hphp_murmurhash(CStrRef key, int len, int seed);
 
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/ext/ext_hotprofiler.cpp b/hphp/runtime/ext/ext_hotprofiler.cpp
index 77cd3c0140e48..143ef00205ab3 100644
--- a/hphp/runtime/ext/ext_hotprofiler.cpp
+++ b/hphp/runtime/ext/ext_hotprofiler.cpp
@@ -78,10 +78,10 @@ IMPLEMENT_DEFAULT_EXTENSION(xhprof);
  *
  * @author cjiang
  */
-static inline uint8 hprof_inline_hash(const char * str) {
+static inline uint8_t hprof_inline_hash(const char * str) {
   unsigned long h = 5381;
   uint i = 0;
-  uint8 res = 0;
+  uint8_t res = 0;
 
   while (*str) {
     h += (h << 5);
@@ -89,7 +89,7 @@ static inline uint8 hprof_inline_hash(const char * str) {
   }
 
   for (i = 0; i < sizeof(unsigned long); i++) {
-    res += ((uint8 *)&h)[i];
+    res += ((uint8_t *)&h)[i];
   }
   return res;
 }
@@ -105,7 +105,7 @@ static long get_us_interval(struct timeval *start, struct timeval *end) {
 /**
  * Incr time with the given microseconds.
  */
-static void incr_us_interval(struct timeval *start, uint64 incr) {
+static void incr_us_interval(struct timeval *start, uint64_t incr) {
   incr += (start->tv_sec * 1000000 + start->tv_usec);
   start->tv_sec  = incr/1000000;
   start->tv_usec = incr%1000000;
@@ -121,8 +121,8 @@ static void incr_us_interval(struct timeval *start, uint64 incr) {
  * @return void
  * @author veeve
  */
-static void hp_trunc_time(struct timeval *tv, uint64 intr) {
-  uint64 time_in_micro;
+static void hp_trunc_time(struct timeval *tv, uint64_t intr) {
+  uint64_t time_in_micro;
 
   // Convert to microsecs and trunc that first
   time_in_micro = (tv->tv_sec * 1000000) + tv->tv_usec;
@@ -143,11 +143,11 @@ static void hp_trunc_time(struct timeval *tv, uint64 intr) {
  * @return 64 bit unsigned integer
  * @author cjiang
  */
-inline uint64 tsc() {
-  uint32 __a,__d;
-  uint64 val;
+inline uint64_t tsc() {
+  uint32_t __a,__d;
+  uint64_t val;
   asm volatile("rdtsc" : "=a" (__a), "=d" (__d));
-  (val) = ((uint64)__a) | (((uint64)__d)<<32);
+  (val) = ((uint64_t)__a) | (((uint64_t)__d)<<32);
   return val;
 }
 
@@ -158,7 +158,7 @@ inline uint64 tsc() {
  * @return int64.
  * @author cjiang
  */
-static int64 get_cpu_frequency() {
+static int64_t get_cpu_frequency() {
   struct timeval start;
   struct timeval end;
 
@@ -166,7 +166,7 @@ static int64 get_cpu_frequency() {
     perror("gettimeofday");
     return 0.0;
   }
-  uint64 tsc_start = tsc();
+  uint64_t tsc_start = tsc();
   // Sleep for 5 miliseconds. Comparaing with gettimeofday's  few microseconds
   // execution time, this should be enough.
   usleep(5000);
@@ -174,21 +174,21 @@ static int64 get_cpu_frequency() {
     perror("gettimeofday");
     return 0.0;
   }
-  uint64 tsc_end = tsc();
+  uint64_t tsc_end = tsc();
   return nearbyint((tsc_end - tsc_start) * 1.0
                                    / (get_us_interval(&start, &end)));
 }
 
 #define MAX_LINELENGTH 1024
 
-static int64* get_cpu_frequency_from_file(const char *file, int ncpus)
+static int64_t* get_cpu_frequency_from_file(const char *file, int ncpus)
 {
   std::ifstream cpuinfo(file);
   if (cpuinfo.fail()) {
     return NULL;
   }
   char line[MAX_LINELENGTH];
-  int64* freqs = new int64[ncpus];
+  int64_t* freqs = new int64_t[ncpus];
   for (int i = 0; i < ncpus; ++i) {
     freqs[i] = 0;
   }
@@ -259,7 +259,7 @@ class MachineInfo {
    *
    * @author cjiang
    */
-  static void BindToCPU(uint32 cpu_id) {
+  static void BindToCPU(uint32_t cpu_id) {
     cpu_set_t new_mask;
     CPU_ZERO(&new_mask);
     CPU_SET(cpu_id, &new_mask);
@@ -270,7 +270,7 @@ class MachineInfo {
   // The number of logical CPUs this machine has.
   int m_cpu_num;
   // Store the cpu frequency.  Get it from /proc/cpuinfo if we can.
-  int64* m_cpu_frequencies;
+  int64_t* m_cpu_frequencies;
 
   MachineInfo() {
     m_cpu_num = sysconf(_SC_NPROCESSORS_CONF);
@@ -279,7 +279,7 @@ class MachineInfo {
     if (m_cpu_frequencies)
       return;
 
-    m_cpu_frequencies = new int64[m_cpu_num];
+    m_cpu_frequencies = new int64_t[m_cpu_num];
     for (int i = 0; i < m_cpu_num; i++) {
       cpu_set_t prev_mask;
       GET_AFFINITY(0, sizeof(cpu_set_t), &prev_mask);
@@ -298,16 +298,16 @@ class MachineInfo {
 };
 static MachineInfo s_machine;
 
-static inline uint64
-tv_to_cycles(const struct timeval& tv, int64 MHz)
+static inline uint64_t
+tv_to_cycles(const struct timeval& tv, int64_t MHz)
 {
-  return (((uint64)tv.tv_sec * 1000000) + tv.tv_usec) * MHz;
+  return (((uint64_t)tv.tv_sec * 1000000) + tv.tv_usec) * MHz;
 }
 
-static inline uint64
-to_usec(int64 cycles, int64 MHz, bool cpu_time = false)
+static inline uint64_t
+to_usec(int64_t cycles, int64_t MHz, bool cpu_time = false)
 {
-  static int64 vdso_usable =
+  static int64_t vdso_usable =
     Util::Vdso::ClockGetTimeNS(CLOCK_THREAD_CPUTIME_ID);
 
   if (cpu_time && vdso_usable >= 0)
@@ -317,8 +317,8 @@ to_usec(int64 cycles, int64 MHz, bool cpu_time = false)
 
 static esyscall vtsc_syscall("vtsc");
 
-static inline uint64 vtsc(int64 MHz) {
-  int64 rval = Util::Vdso::ClockGetTimeNS(CLOCK_THREAD_CPUTIME_ID);
+static inline uint64_t vtsc(int64_t MHz) {
+  int64_t rval = Util::Vdso::ClockGetTimeNS(CLOCK_THREAD_CPUTIME_ID);
   if (rval >= 0) {
     return rval;
   }
@@ -362,7 +362,7 @@ mallctl_mib_init()
 }
 #endif
 
-uint64
+uint64_t
 get_allocs()
 {
 #ifdef USE_JEMALLOC
@@ -372,7 +372,7 @@ get_allocs()
         return 0;
       }
     }
-    uint64 stat;
+    uint64_t stat;
     size_t size = sizeof(stat);
     if (mallctlbymib(mallctl_alloc_mib, mallctl_mib_len, &stat, &size, NULL, 0))
     {
@@ -392,7 +392,7 @@ get_allocs()
   return 0;
 }
 
-uint64
+uint64_t
 get_frees()
 {
 #ifdef USE_JEMALLOC
@@ -402,7 +402,7 @@ get_frees()
         return 0;
       }
     }
-    uint64 stat;
+    uint64_t stat;
     size_t size = sizeof(stat);
     if (mallctlbymib(mallctl_free_mib, mallctl_mib_len, &stat, &size, NULL, 0))
     {
@@ -432,13 +432,13 @@ class Frame {
 public:
   Frame          *m_parent;      // ptr to parent frame
   const char     *m_name;        // function name
-  uint8           m_hash_code;   // hash_code for the function name
+  uint8_t           m_hash_code;   // hash_code for the function name
   int             m_recursion;   // recursion level for function
 
-  uint64          m_tsc_start;   // start value for TSC counter
-  int64           m_mu_start;    // memory usage
-  int64           m_pmu_start;   // peak memory usage
-  int64           m_vtsc_start;    // user/sys time start
+  uint64_t          m_tsc_start;   // start value for TSC counter
+  int64_t           m_mu_start;    // memory usage
+  int64_t           m_pmu_start;   // peak memory usage
+  int64_t           m_vtsc_start;    // user/sys time start
 
   /**
    * Returns formatted function name
@@ -573,7 +573,7 @@ class Profiler {
 
   template<class phpret, class Name, class Counts>
   static void returnVals(phpret& ret, const Name& name, const Counts& counts,
-                  int flags, int64 MHz)
+                  int flags, int64_t MHz)
   {
     Array arr;
     arr.set("ct",  counts.count);
@@ -592,7 +592,7 @@ class Profiler {
   }
 
   template<class phpret, class StatsMap>
-  static bool extractStats(phpret& ret, StatsMap& stats, int flags, int64 MHz)
+  static bool extractStats(phpret& ret, StatsMap& stats, int flags, int64_t MHz)
   {
     for (typename StatsMap::const_iterator iter = stats.begin();
          iter != stats.end(); ++iter) {
@@ -603,14 +603,14 @@ class Profiler {
 
   bool m_successful;
 
-  int64    m_MHz; // cpu freq for either the local cpu or the saved trace
+  int64_t    m_MHz; // cpu freq for either the local cpu or the saved trace
   Frame    *m_stack;      // top of the profile stack
 
   static bool s_rand_initialized;
 
   cpu_set_t m_prev_mask;               // saved cpu affinity
   Frame    *m_frame_free_list;         // freelist of Frame
-  uint8     m_func_hash_counters[256]; // counter table by hash code;
+  uint8_t     m_func_hash_counters[256]; // counter table by hash code;
 
   /**
    * Fast allocate a Frame structure. Picks one from the
@@ -713,9 +713,9 @@ class SimpleProfiler : public Profiler {
   public:
     CountMap() : count(0), tsc(0), vtsc(0) {}
 
-    int64 count;
-    int64 tsc;
-    int64 vtsc;
+    int64_t count;
+    int64_t tsc;
+    int64_t vtsc;
   };
   typedef hphp_hash_map<std::string, CountMap, string_hash> StatsMap;
   StatsMap m_stats; // outcome
@@ -780,11 +780,11 @@ class HierarchicalProfiler : public Profiler {
   public:
     CountMap() : count(0), wall_time(0), cpu(0), memory(0), peak_memory(0) {}
 
-    int64 count;
-    int64 wall_time;
-    int64 cpu;
-    int64 memory;
-    int64 peak_memory;
+    int64_t count;
+    int64_t wall_time;
+    int64_t cpu;
+    int64_t memory;
+    int64_t peak_memory;
   };
   typedef hphp_hash_map<std::string, CountMap, string_hash> StatsMap;
   StatsMap m_stats; // outcome
@@ -827,8 +827,8 @@ class HierarchicalProfiler : public Profiler {
     if (m_flags & TrackMemory) {
       MemoryManager *mm = MemoryManager::TheMemoryManager();
       const MemoryUsageStats &stats = mm->getStats(true);
-      int64 mu_end = stats.usage;
-      int64 pmu_end = stats.peakUsage;
+      int64_t mu_end = stats.usage;
+      int64_t pmu_end = stats.peakUsage;
       counts.memory += mu_end - m_stack->m_mu_start;
       counts.peak_memory += pmu_end - m_stack->m_pmu_start;
     } else if (m_flags & TrackMalloc) {
@@ -842,7 +842,7 @@ class HierarchicalProfiler : public Profiler {
   }
 
 private:
-  uint32 m_flags;
+  uint32_t m_flags;
 };
 
 template <class TraceIt, class Stats>
@@ -973,15 +973,15 @@ walkTrace(TraceIt begin, TraceIt end,
 }
 
 struct TraceData {
-  int64 wall_time;
-  int64 cpu;
-  int64 memory;
-  int64 peak_memory;
+  int64_t wall_time;
+  int64_t cpu;
+  int64_t memory;
+  int64_t peak_memory;
 
   void clear() {
     wall_time = cpu = memory = peak_memory = 0;
   }
-  void set(int64 w, int64 c, int64 m, int64 p) {
+  void set(int64_t w, int64_t c, int64_t m, int64_t p) {
     wall_time = w;
     cpu = c;
     memory = m;
@@ -991,7 +991,7 @@ struct TraceData {
 
 struct TraceEntry : TraceData {
   union {
-    int64 index;
+    int64_t index;
     const char *ptr;
   }  symbol;
 
@@ -1016,8 +1016,8 @@ class TraceProfiler : public Profiler {
   static int s_n_backing;
   int nTrace;
   bool full;
-  int64 maxTraceBuffer;
-  int64 overflowCalls;
+  int64_t maxTraceBuffer;
+  int64_t overflowCalls;
 
   bool trace_space_available() {
     // the two slots are reserved for internal use
@@ -1076,7 +1076,7 @@ class TraceProfiler : public Profiler {
 
   class CountMap : public TraceData {
   public:
-    int64 count;
+    int64_t count;
     CountMap() : count(0)  { clear(); }
   };
   typedef hphp_hash_map<std::string, CountMap, string_hash> StatsMap;
@@ -1294,7 +1294,7 @@ class TraceProfiler : public Profiler {
   static String
   unpackTraceData(CStrRef packedTrace) {
     const char *input = packedTrace.c_str();
-    int64 input_length = packedTrace.size();
+    int64_t input_length = packedTrace.size();
 
     int output_length;
     char *output = 0;
@@ -1351,7 +1351,7 @@ class TraceProfiler : public Profiler {
 
 
 private:
-  uint32 m_flags;
+  uint32_t m_flags;
 };
 
 TraceEntry *TraceProfiler::s_trace = NULL;
@@ -1366,15 +1366,15 @@ pthread_mutex_t TraceProfiler::s_in_use = PTHREAD_MUTEX_INITIALIZER;
  */
 class SampleProfiler : public Profiler {
 private:
-  typedef hphp_hash_map<std::string, int64, string_hash> CountMap;
+  typedef hphp_hash_map<std::string, int64_t, string_hash> CountMap;
   typedef hphp_hash_map<std::string, CountMap, string_hash> StatsMap;
   StatsMap m_stats; // outcome
 
 public:
   SampleProfiler() {
     struct timeval  now;
-    uint64 truncated_us;
-    uint64 truncated_tsc;
+    uint64_t truncated_us;
+    uint64_t truncated_tsc;
 
     // Init the last_sample in tsc
     m_last_sample_tsc = tsc();
@@ -1421,8 +1421,8 @@ class SampleProfiler : public Profiler {
   static const int SAMPLING_INTERVAL = 100000; // microsecs
 
   struct timeval m_last_sample_time;
-  uint64 m_last_sample_tsc;
-  uint64 m_sampling_interval_tsc;
+  uint64_t m_last_sample_tsc;
+  uint64_t m_sampling_interval_tsc;
 
   /**
    * Sample the stack. Add it to the stats_count global.
@@ -1719,7 +1719,7 @@ Variant f_xhprof_run_trace(CStrRef packedTrace, int flags) {
 
   for (TraceEntry *toup = begin; toup != end; ++toup) {
     int symIndex = toup->symbol.index;
-    if (symIndex >= 0 && (uint64)symIndex < symbols.size()) {
+    if (symIndex >= 0 && (uint64_t)symIndex < symbols.size()) {
       toup->symbol.ptr = symbols[toup->symbol.index];
     } else if (symIndex == -1) {
       toup->symbol.ptr = NULL;
@@ -1742,14 +1742,14 @@ Variant f_xhprof_run_trace(CStrRef packedTrace, int flags) {
 
 ///////////////////////////////////////////////////////////////////////////////
 // constants
-const int64 k_XHPROF_FLAGS_NO_BUILTINS = TrackBuiltins;
-const int64 k_XHPROF_FLAGS_CPU = TrackCPU;
-const int64 k_XHPROF_FLAGS_MEMORY = TrackMemory;
-const int64 k_XHPROF_FLAGS_VTSC = TrackVtsc;
-const int64 k_XHPROF_FLAGS_TRACE = XhpTrace;
-const int64 k_XHPROF_FLAGS_MEASURE_XHPROF_DISABLE = MeasureXhprofDisable;
-const int64 k_XHPROF_FLAGS_GET_TRACE = GetTrace;
-const int64 k_XHPROF_FLAGS_MALLOC = TrackMalloc;
+const int64_t k_XHPROF_FLAGS_NO_BUILTINS = TrackBuiltins;
+const int64_t k_XHPROF_FLAGS_CPU = TrackCPU;
+const int64_t k_XHPROF_FLAGS_MEMORY = TrackMemory;
+const int64_t k_XHPROF_FLAGS_VTSC = TrackVtsc;
+const int64_t k_XHPROF_FLAGS_TRACE = XhpTrace;
+const int64_t k_XHPROF_FLAGS_MEASURE_XHPROF_DISABLE = MeasureXhprofDisable;
+const int64_t k_XHPROF_FLAGS_GET_TRACE = GetTrace;
+const int64_t k_XHPROF_FLAGS_MALLOC = TrackMalloc;
 
 ///////////////////////////////////////////////////////////////////////////////
 // injected code
diff --git a/hphp/runtime/ext/ext_iconv.cpp b/hphp/runtime/ext/ext_iconv.cpp
index 7781b59dde8ea..8067fcfefbe42 100644
--- a/hphp/runtime/ext/ext_iconv.cpp
+++ b/hphp/runtime/ext/ext_iconv.cpp
@@ -1752,7 +1752,7 @@ Variant f_iconv_strlen(CStrRef str, CStrRef charset /* = null_string */) {
                                           enc.data());
   _php_iconv_show_error(err, GENERIC_SUPERSET_NAME, enc.data());
   if (err == PHP_ICONV_ERR_SUCCESS) {
-    return (int64)retval;
+    return (int64_t)retval;
   }
   return false;
 }
diff --git a/hphp/runtime/ext/ext_icu.cpp b/hphp/runtime/ext/ext_icu.cpp
index e9b4eea92c522..d7b4ed4f939ac 100644
--- a/hphp/runtime/ext/ext_icu.cpp
+++ b/hphp/runtime/ext/ext_icu.cpp
@@ -31,13 +31,13 @@ using namespace U_ICU_NAMESPACE;
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
-const int64 k_UREGEX_CASE_INSENSITIVE = UREGEX_CASE_INSENSITIVE;
-const int64 k_UREGEX_COMMENTS         = UREGEX_COMMENTS;
-const int64 k_UREGEX_DOTALL           = UREGEX_DOTALL;
-const int64 k_UREGEX_MULTILINE        = UREGEX_MULTILINE;
-const int64 k_UREGEX_UWORD            = UREGEX_UWORD;
+const int64_t k_UREGEX_CASE_INSENSITIVE = UREGEX_CASE_INSENSITIVE;
+const int64_t k_UREGEX_COMMENTS         = UREGEX_COMMENTS;
+const int64_t k_UREGEX_DOTALL           = UREGEX_DOTALL;
+const int64_t k_UREGEX_MULTILINE        = UREGEX_MULTILINE;
+const int64_t k_UREGEX_UWORD            = UREGEX_UWORD;
 // Intentionally higher in case ICU adds more constants.
-const int64 k_UREGEX_OFFSET_CAPTURE   = 1LL<<32;
+const int64_t k_UREGEX_OFFSET_CAPTURE   = 1LL<<32;
 
 ///////////////////////////////////////////////////////////////////////////////
 typedef tbb::concurrent_hash_map<const StringData*,const RegexPattern*,
@@ -46,7 +46,7 @@ typedef tbb::concurrent_hash_map<const StringData*,const RegexPattern*,
 static PatternStringMap s_patternCacheMap;
 
 Variant f_icu_match(CStrRef pattern, CStrRef subject,
-                    VRefParam matches /* = null */, int64 flags /* = 0 */) {
+                    VRefParam matches /* = null */, int64_t flags /* = 0 */) {
   UErrorCode status = U_ZERO_ERROR;
 
   if (matches.isReferenced()) {
diff --git a/hphp/runtime/ext/ext_icu.h b/hphp/runtime/ext/ext_icu.h
index 2f57548cce402..6ec25838ed44f 100644
--- a/hphp/runtime/ext/ext_icu.h
+++ b/hphp/runtime/ext/ext_icu.h
@@ -31,15 +31,15 @@ namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
 Variant f_icu_match(CStrRef pattern, CStrRef subject,
-                    VRefParam matches = null, int64 flags = 0);
+                    VRefParam matches = null, int64_t flags = 0);
 String f_icu_transliterate(CStrRef str, bool remove_accents);
 Array f_icu_tokenize(CStrRef text);
-extern const int64 k_UREGEX_CASE_INSENSITIVE;
-extern const int64 k_UREGEX_COMMENTS;
-extern const int64 k_UREGEX_DOTALL;
-extern const int64 k_UREGEX_MULTILINE;
-extern const int64 k_UREGEX_UWORD;
-extern const int64 k_UREGEX_OFFSET_CAPTURE;
+extern const int64_t k_UREGEX_CASE_INSENSITIVE;
+extern const int64_t k_UREGEX_COMMENTS;
+extern const int64_t k_UREGEX_DOTALL;
+extern const int64_t k_UREGEX_MULTILINE;
+extern const int64_t k_UREGEX_UWORD;
+extern const int64_t k_UREGEX_OFFSET_CAPTURE;
 
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/ext/ext_icu_ucnv.cpp b/hphp/runtime/ext/ext_icu_ucnv.cpp
index a4563d5d6a2f5..624ddc0725a9a 100644
--- a/hphp/runtime/ext/ext_icu_ucnv.cpp
+++ b/hphp/runtime/ext/ext_icu_ucnv.cpp
@@ -22,9 +22,9 @@ namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
 #define UCNV_REASON_CONST(v) \
-        const int64 q_UConverter$$REASON_ ## v = UCNV_ ## v ;
+        const int64_t q_UConverter$$REASON_ ## v = UCNV_ ## v ;
 #define UCNV_TYPE_CONST(v) \
-        const int64 q_UConverter$$ ## v        = UCNV_ ## v ;
+        const int64_t q_UConverter$$ ## v        = UCNV_ ## v ;
 
 UCNV_REASON_CONST(UNASSIGNED);
 UCNV_REASON_CONST(ILLEGAL);
@@ -332,7 +332,7 @@ String c_UConverter::t_getdestinationencoding() {
 
 /* Get algorithmic types */
 
-int64 c_UConverter::t_getsourcetype() {
+int64_t c_UConverter::t_getsourcetype() {
   if (!m_src) {
     return UCNV_UNSUPPORTED_CONVERTER;
   }
@@ -340,7 +340,7 @@ int64 c_UConverter::t_getsourcetype() {
   return ucnv_getType(m_src);
 }
 
-int64 c_UConverter::t_getdestinationtype() {
+int64_t c_UConverter::t_getdestinationtype() {
   if (!m_dest) {
     return UCNV_UNSUPPORTED_CONVERTER;
   }
@@ -382,7 +382,7 @@ String c_UConverter::t_getsubstchars() {
 
 /* Callbacks */
 
-Variant c_UConverter::defaultCallback(int64 reason, VRefParam error) {
+Variant c_UConverter::defaultCallback(int64_t reason, VRefParam error) {
   switch(reason) {
     case UCNV_UNASSIGNED:
     case UCNV_ILLEGAL:
@@ -394,13 +394,13 @@ Variant c_UConverter::defaultCallback(int64 reason, VRefParam error) {
   return null;
 }
 
-Variant c_UConverter::t_fromucallback(int64 reason,
-                                      CArrRef source, int64 codepoint,
+Variant c_UConverter::t_fromucallback(int64_t reason,
+                                      CArrRef source, int64_t codepoint,
                                       VRefParam error) {
   return defaultCallback(reason, error);
 }
 
-Variant c_UConverter::t_toucallback(int64 reason,
+Variant c_UConverter::t_toucallback(int64_t reason,
                                     CStrRef source, CStrRef codeunits,
                                     VRefParam error) {
   return defaultCallback(reason, error);
@@ -495,7 +495,7 @@ Variant c_UConverter::ti_transcode(const char* cls , CStrRef str,
 
 /* ext/intl error handling */
 
-int64 c_UConverter::t_geterrorcode() {
+int64_t c_UConverter::t_geterrorcode() {
   return m_error.code;
 }
 
@@ -506,7 +506,7 @@ String c_UConverter::t_geterrormessage() {
 /* Ennumerators and lookups */
 
 #define UCNV_REASON_CASE(v) case UCNV_ ## v : return String("REASON_" #v );
-String c_UConverter::ti_reasontext(const char* cls , int64 reason) {
+String c_UConverter::ti_reasontext(const char* cls , int64_t reason) {
   switch (reason) {
     UCNV_REASON_CASE(UNASSIGNED)
     UCNV_REASON_CASE(ILLEGAL)
diff --git a/hphp/runtime/ext/ext_icu_ucnv.h b/hphp/runtime/ext/ext_icu_ucnv.h
index 359ce850f3681..0ceb810ff9ff7 100644
--- a/hphp/runtime/ext/ext_icu_ucnv.h
+++ b/hphp/runtime/ext/ext_icu_ucnv.h
@@ -34,47 +34,47 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-extern const int64 q_UConverter$$REASON_UNASSIGNED;
-extern const int64 q_UConverter$$REASON_ILLEGAL;
-extern const int64 q_UConverter$$REASON_IRREGULAR;
-extern const int64 q_UConverter$$REASON_RESET;
-extern const int64 q_UConverter$$REASON_CLOSE;
-extern const int64 q_UConverter$$REASON_CLONE;
-extern const int64 q_UConverter$$UNSUPPORTED_CONVERTER;
-extern const int64 q_UConverter$$SBCS;
-extern const int64 q_UConverter$$DBCS;
-extern const int64 q_UConverter$$MBCS;
-extern const int64 q_UConverter$$LATIN_1;
-extern const int64 q_UConverter$$UTF8;
-extern const int64 q_UConverter$$UTF16_BigEndian;
-extern const int64 q_UConverter$$UTF16_LittleEndian;
-extern const int64 q_UConverter$$UTF32_BigEndian;
-extern const int64 q_UConverter$$UTF32_LittleEndian;
-extern const int64 q_UConverter$$EBCDIC_STATEFUL;
-extern const int64 q_UConverter$$ISO_2022;
-extern const int64 q_UConverter$$LMBCS_1;
-extern const int64 q_UConverter$$LMBCS_2;
-extern const int64 q_UConverter$$LMBCS_3;
-extern const int64 q_UConverter$$LMBCS_4;
-extern const int64 q_UConverter$$LMBCS_5;
-extern const int64 q_UConverter$$LMBCS_6;
-extern const int64 q_UConverter$$LMBCS_8;
-extern const int64 q_UConverter$$LMBCS_11;
-extern const int64 q_UConverter$$LMBCS_16;
-extern const int64 q_UConverter$$LMBCS_17;
-extern const int64 q_UConverter$$LMBCS_18;
-extern const int64 q_UConverter$$LMBCS_19;
-extern const int64 q_UConverter$$LMBCS_LAST;
-extern const int64 q_UConverter$$HZ;
-extern const int64 q_UConverter$$SCSU;
-extern const int64 q_UConverter$$ISCII;
-extern const int64 q_UConverter$$US_ASCII;
-extern const int64 q_UConverter$$UTF7;
-extern const int64 q_UConverter$$BOCU1;
-extern const int64 q_UConverter$$UTF16;
-extern const int64 q_UConverter$$UTF32;
-extern const int64 q_UConverter$$CESU8;
-extern const int64 q_UConverter$$IMAP_MAILBOX;
+extern const int64_t q_UConverter$$REASON_UNASSIGNED;
+extern const int64_t q_UConverter$$REASON_ILLEGAL;
+extern const int64_t q_UConverter$$REASON_IRREGULAR;
+extern const int64_t q_UConverter$$REASON_RESET;
+extern const int64_t q_UConverter$$REASON_CLOSE;
+extern const int64_t q_UConverter$$REASON_CLONE;
+extern const int64_t q_UConverter$$UNSUPPORTED_CONVERTER;
+extern const int64_t q_UConverter$$SBCS;
+extern const int64_t q_UConverter$$DBCS;
+extern const int64_t q_UConverter$$MBCS;
+extern const int64_t q_UConverter$$LATIN_1;
+extern const int64_t q_UConverter$$UTF8;
+extern const int64_t q_UConverter$$UTF16_BigEndian;
+extern const int64_t q_UConverter$$UTF16_LittleEndian;
+extern const int64_t q_UConverter$$UTF32_BigEndian;
+extern const int64_t q_UConverter$$UTF32_LittleEndian;
+extern const int64_t q_UConverter$$EBCDIC_STATEFUL;
+extern const int64_t q_UConverter$$ISO_2022;
+extern const int64_t q_UConverter$$LMBCS_1;
+extern const int64_t q_UConverter$$LMBCS_2;
+extern const int64_t q_UConverter$$LMBCS_3;
+extern const int64_t q_UConverter$$LMBCS_4;
+extern const int64_t q_UConverter$$LMBCS_5;
+extern const int64_t q_UConverter$$LMBCS_6;
+extern const int64_t q_UConverter$$LMBCS_8;
+extern const int64_t q_UConverter$$LMBCS_11;
+extern const int64_t q_UConverter$$LMBCS_16;
+extern const int64_t q_UConverter$$LMBCS_17;
+extern const int64_t q_UConverter$$LMBCS_18;
+extern const int64_t q_UConverter$$LMBCS_19;
+extern const int64_t q_UConverter$$LMBCS_LAST;
+extern const int64_t q_UConverter$$HZ;
+extern const int64_t q_UConverter$$SCSU;
+extern const int64_t q_UConverter$$ISCII;
+extern const int64_t q_UConverter$$US_ASCII;
+extern const int64_t q_UConverter$$UTF7;
+extern const int64_t q_UConverter$$BOCU1;
+extern const int64_t q_UConverter$$UTF16;
+extern const int64_t q_UConverter$$UTF32;
+extern const int64_t q_UConverter$$CESU8;
+extern const int64_t q_UConverter$$IMAP_MAILBOX;
 
 ///////////////////////////////////////////////////////////////////////////////
 // class UConverter
@@ -94,13 +94,13 @@ class c_UConverter : public ExtObjectData {
   public: void t_setsourceencoding(CStrRef encoding);
   public: String t_getdestinationencoding();
   public: void t_setdestinationencoding(CStrRef encoding);
-  public: int64 t_getsourcetype();
-  public: int64 t_getdestinationtype();
+  public: int64_t t_getsourcetype();
+  public: int64_t t_getdestinationtype();
   public: String t_getsubstchars();
   public: bool t_setsubstchars(CStrRef chars);
-  public: Variant t_fromucallback(int64 reason, CArrRef source,
-                                  int64 codepoint, VRefParam error);
-  public: Variant t_toucallback(int64 reason, CStrRef source,
+  public: Variant t_fromucallback(int64_t reason, CArrRef source,
+                                  int64_t codepoint, VRefParam error);
+  public: Variant t_toucallback(int64_t reason, CStrRef source,
                                 CStrRef codeunits, VRefParam error);
   public: Variant t_convert(CStrRef str, bool reverse = false);
   public: static Variant ti_transcode(const char* cls , CStrRef str,
@@ -111,10 +111,10 @@ class c_UConverter : public ExtObjectData {
                                      CArrRef options = null_variant) {
     return ti_transcode("uconverter", str, toEncoding, fromEncoding, options);
   }
-  public: int64 t_geterrorcode();
+  public: int64_t t_geterrorcode();
   public: String t_geterrormessage();
-  public: static String ti_reasontext(const char* cls , int64 reason);
-  public: static String t_reasontext(int64 reason) {
+  public: static String ti_reasontext(const char* cls , int64_t reason);
+  public: static String t_reasontext(int64_t reason) {
     return ti_reasontext("uconverter", reason);
   }
   public: static Array ti_getavailable(const char* cls );
@@ -151,7 +151,7 @@ class c_UConverter : public ExtObjectData {
                             intl_error &err);
     static bool setSubstChars(String chars, UConverter *cnv, intl_error &err);
     bool setCallback(UConverter *cnv);
-    Variant defaultCallback(int64 reason, VRefParam error);
+    Variant defaultCallback(int64_t reason, VRefParam error);
     static String doConvert(CStrRef str, UConverter *toCnv,
                             UConverter *fromCnv, intl_error &err);
   public:
diff --git a/hphp/runtime/ext/ext_icu_ucsdet.cpp b/hphp/runtime/ext/ext_icu_ucsdet.cpp
index 4adec00632f9e..ef3834a7627fe 100644
--- a/hphp/runtime/ext/ext_icu_ucsdet.cpp
+++ b/hphp/runtime/ext/ext_icu_ucsdet.cpp
@@ -145,7 +145,7 @@ String c_EncodingMatch::t_getencoding() {
   return String(encoding);
 }
 
-int64 c_EncodingMatch::t_getconfidence() {
+int64_t c_EncodingMatch::t_getconfidence() {
   validate();
 
   UErrorCode status = U_ZERO_ERROR;
diff --git a/hphp/runtime/ext/ext_icu_ucsdet.h b/hphp/runtime/ext/ext_icu_ucsdet.h
index 019e895499dce..624fe4cb22e69 100644
--- a/hphp/runtime/ext/ext_icu_ucsdet.h
+++ b/hphp/runtime/ext/ext_icu_ucsdet.h
@@ -72,7 +72,7 @@ class c_EncodingMatch : public ExtObjectData {
   public: void t___construct();
   public: bool t_isvalid();
   public: String t_getencoding();
-  public: int64 t_getconfidence();
+  public: int64_t t_getconfidence();
   public: String t_getlanguage();
   public: String t_getutf8();
 
diff --git a/hphp/runtime/ext/ext_icu_uspoof.cpp b/hphp/runtime/ext/ext_icu_uspoof.cpp
index c796dbf4edb50..fe21e62d227d0 100644
--- a/hphp/runtime/ext/ext_icu_uspoof.cpp
+++ b/hphp/runtime/ext/ext_icu_uspoof.cpp
@@ -24,16 +24,16 @@ namespace HPHP {
 IMPLEMENT_DEFAULT_EXTENSION(icu_uspoof);
 ///////////////////////////////////////////////////////////////////////////////
 
-const int64 q_SpoofChecker$$SINGLE_SCRIPT_CONFUSABLE =
+const int64_t q_SpoofChecker$$SINGLE_SCRIPT_CONFUSABLE =
   USPOOF_SINGLE_SCRIPT_CONFUSABLE;
-const int64 q_SpoofChecker$$MIXED_SCRIPT_CONFUSABLE =
+const int64_t q_SpoofChecker$$MIXED_SCRIPT_CONFUSABLE =
   USPOOF_MIXED_SCRIPT_CONFUSABLE;
-const int64 q_SpoofChecker$$WHOLE_SCRIPT_CONFUSABLE =
+const int64_t q_SpoofChecker$$WHOLE_SCRIPT_CONFUSABLE =
   USPOOF_WHOLE_SCRIPT_CONFUSABLE;
-const int64 q_SpoofChecker$$ANY_CASE = USPOOF_ANY_CASE;
-const int64 q_SpoofChecker$$SINGLE_SCRIPT = USPOOF_SINGLE_SCRIPT;
-const int64 q_SpoofChecker$$INVISIBLE = USPOOF_INVISIBLE;
-const int64 q_SpoofChecker$$CHAR_LIMIT = USPOOF_CHAR_LIMIT;
+const int64_t q_SpoofChecker$$ANY_CASE = USPOOF_ANY_CASE;
+const int64_t q_SpoofChecker$$SINGLE_SCRIPT = USPOOF_SINGLE_SCRIPT;
+const int64_t q_SpoofChecker$$INVISIBLE = USPOOF_INVISIBLE;
+const int64_t q_SpoofChecker$$CHAR_LIMIT = USPOOF_CHAR_LIMIT;
 
 ///////////////////////////////////////////////////////////////////////////////
 c_SpoofChecker::c_SpoofChecker(VM::Class* cb) :
diff --git a/hphp/runtime/ext/ext_icu_uspoof.h b/hphp/runtime/ext/ext_icu_uspoof.h
index 42e8eb71bb174..38222fbd53580 100644
--- a/hphp/runtime/ext/ext_icu_uspoof.h
+++ b/hphp/runtime/ext/ext_icu_uspoof.h
@@ -32,13 +32,13 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-extern const int64 q_SpoofChecker$$SINGLE_SCRIPT_CONFUSABLE;
-extern const int64 q_SpoofChecker$$MIXED_SCRIPT_CONFUSABLE;
-extern const int64 q_SpoofChecker$$WHOLE_SCRIPT_CONFUSABLE;
-extern const int64 q_SpoofChecker$$ANY_CASE;
-extern const int64 q_SpoofChecker$$SINGLE_SCRIPT;
-extern const int64 q_SpoofChecker$$INVISIBLE;
-extern const int64 q_SpoofChecker$$CHAR_LIMIT;
+extern const int64_t q_SpoofChecker$$SINGLE_SCRIPT_CONFUSABLE;
+extern const int64_t q_SpoofChecker$$MIXED_SCRIPT_CONFUSABLE;
+extern const int64_t q_SpoofChecker$$WHOLE_SCRIPT_CONFUSABLE;
+extern const int64_t q_SpoofChecker$$ANY_CASE;
+extern const int64_t q_SpoofChecker$$SINGLE_SCRIPT;
+extern const int64_t q_SpoofChecker$$INVISIBLE;
+extern const int64_t q_SpoofChecker$$CHAR_LIMIT;
 
 ///////////////////////////////////////////////////////////////////////////////
 // class SpoofChecker
diff --git a/hphp/runtime/ext/ext_image.cpp b/hphp/runtime/ext/ext_image.cpp
index 446538ea15727..5319f5dad5c8f 100644
--- a/hphp/runtime/ext/ext_image.cpp
+++ b/hphp/runtime/ext/ext_image.cpp
@@ -1644,8 +1644,8 @@ Variant f_getimagesize(CStrRef filename, VRefParam imageinfo /* = null */) {
   f_fclose(stream);
 
   if (result) {
-    ret.set(0, (int64)result->width);
-    ret.set(1, (int64)result->height);
+    ret.set(0, (int64_t)result->width);
+    ret.set(1, (int64_t)result->height);
     ret.set(2, itype);
     char *temp;
     php_vspprintf(&temp, 0, "width=\"%d\" height=\"%d\"",
@@ -1653,10 +1653,10 @@ Variant f_getimagesize(CStrRef filename, VRefParam imageinfo /* = null */) {
     ret.set(3, String(temp, CopyString));
     if (temp) IM_FREE(temp);
     if (result->bits != 0) {
-      ret.set("bits", (int64)result->bits);
+      ret.set("bits", (int64_t)result->bits);
     }
     if (result->channels != 0) {
-      ret.set("channels", (int64)result->channels);
+      ret.set("channels", (int64_t)result->channels);
     }
     ret.set("mime", (char*)php_image_type_to_mime_type(itype));
     IM_FREE(result);
@@ -3335,7 +3335,7 @@ Variant f_imagecreate(int width, int height) {
   return Object(new Image(im));
 }
 
-int64 f_imagetypes() {
+int64_t f_imagetypes() {
   int ret=0;
 #ifdef HAVE_GD_GIF_CREATE
   ret = 1;
@@ -3901,11 +3901,11 @@ bool f_imagefilledpolygon(CObjRef image, CArrRef points, int num_points,
   return php_imagepolygon(image, points, num_points, color, 1);
 }
 
-int64 f_imagefontwidth(int font) {
+int64_t f_imagefontwidth(int font) {
   return php_imagefontsize(font, 0);
 }
 
-int64 f_imagefontheight(int font) {
+int64_t f_imagefontheight(int font) {
   return php_imagefontsize(font, 1);
 }
 
@@ -7959,8 +7959,8 @@ Variant f_exif_thumbnail(CStrRef filename, VRefParam width /* = null */,
   if (!ImageInfo.Thumbnail.width || !ImageInfo.Thumbnail.height) {
     exif_scan_thumbnail(&ImageInfo);
   }
-  width = (int64)ImageInfo.Thumbnail.width;
-  height = (int64)ImageInfo.Thumbnail.height;
+  width = (int64_t)ImageInfo.Thumbnail.width;
+  height = (int64_t)ImageInfo.Thumbnail.height;
   imagetype = ImageInfo.Thumbnail.filetype;
   String str(ImageInfo.Thumbnail.data, ImageInfo.Thumbnail.size, CopyString);
   exif_discard_imageinfo(&ImageInfo);
diff --git a/hphp/runtime/ext/ext_image.h b/hphp/runtime/ext/ext_image.h
index 2941da5cc6e2f..bf1682a940731 100644
--- a/hphp/runtime/ext/ext_image.h
+++ b/hphp/runtime/ext/ext_image.h
@@ -103,8 +103,8 @@ bool f_imagefilledpolygon(CObjRef image, CArrRef points, int num_points, int col
 bool f_imagefilledrectangle(CObjRef image, int x1, int y1, int x2, int y2, int color);
 bool f_imagefilltoborder(CObjRef image, int x, int y, int border, int color);
 bool f_imagefilter(CObjRef image, int filtertype, int arg1 = 0, int arg2 = 0, int arg3 = 0, int arg4 = 0);
-int64 f_imagefontheight(int font);
-int64 f_imagefontwidth(int font);
+int64_t f_imagefontheight(int font);
+int64_t f_imagefontwidth(int font);
 Variant f_imageftbbox(double size, double angle, CStrRef font_file, CStrRef text, CArrRef extrainfo = null);
 Variant f_imagefttext(CObjRef image, double size, double angle, int x, int y, int col, CStrRef font_file, CStrRef text, CArrRef extrainfo = null);
 bool f_imagegammacorrect(CObjRef image, double inputgamma, double outputgamma);
@@ -144,7 +144,7 @@ Variant f_imagesy(CObjRef image);
 Variant f_imagetruecolortopalette(CObjRef image, bool dither, int ncolors);
 Variant f_imagettfbbox(double size, double angle, CStrRef fontfile, CStrRef text);
 Variant f_imagettftext(CObjRef image, double size, double angle, int x, int y, int color, CStrRef fontfile, CStrRef text);
-int64 f_imagetypes();
+int64_t f_imagetypes();
 bool f_imagewbmp(CObjRef image, CStrRef filename = null_string, int foreground = -1);
 bool f_imagexbm(CObjRef image, CStrRef filename = null_string, int foreground = -1);
 Variant f_iptcembed(CStrRef iptcdata, CStrRef jpeg_file_name, int spool = 0);
diff --git a/hphp/runtime/ext/ext_imagesprite.cpp b/hphp/runtime/ext/ext_imagesprite.cpp
index 31015b8b26bff..3a3324f0bc7e8 100644
--- a/hphp/runtime/ext/ext_imagesprite.cpp
+++ b/hphp/runtime/ext/ext_imagesprite.cpp
@@ -244,7 +244,7 @@ void Image::load_data_to_gd(int size, const void* data) {
 
 void Image::setOptions(Array options) {
   if (options.exists("padding_top")) {
-    int32 v = options["padding_top"].toInt32();
+    int32_t v = options["padding_top"].toInt32();
     if (v < 0) {
       m_padding[IMAGESPRITE_PAD_TOP] = 0;
     } else {
@@ -253,7 +253,7 @@ void Image::setOptions(Array options) {
   }
 
   if (options.exists("padding_right")) {
-    int32 v = options["padding_right"].toInt32();
+    int32_t v = options["padding_right"].toInt32();
     if (v < 0) {
       m_padding[IMAGESPRITE_PAD_RIGHT] = 0;
     } else {
@@ -262,7 +262,7 @@ void Image::setOptions(Array options) {
   }
 
   if (options.exists("padding_bottom")) {
-    int32 v = options["padding_bottom"].toInt32();
+    int32_t v = options["padding_bottom"].toInt32();
     if (v < 0) {
       m_padding[IMAGESPRITE_PAD_BOTTOM] = 0;
     } else {
@@ -271,7 +271,7 @@ void Image::setOptions(Array options) {
   }
 
   if (options.exists("padding_left")) {
-    int32 v = options["padding_left"].toInt32();
+    int32_t v = options["padding_left"].toInt32();
     if (v < 0) {
       m_padding[IMAGESPRITE_PAD_LEFT] = 0;
     } else {
@@ -433,7 +433,7 @@ void ImageFromHTTP::completed() {
       EVBUFFER_LENGTH(m_request->input_buffer),
       EVBUFFER_DATA(m_request->input_buffer));
   } else {
-    setError(String("Invalid Response code: ") + String((int64)code));
+    setError(String("Invalid Response code: ") + String((int64_t)code));
   }
   m_ev_group->complete(m_conn);
   evhttp_connection_free(m_conn);
@@ -984,7 +984,7 @@ void c_ImageSprite::map() {
 
 String c_ImageSprite::t_output(CStrRef output_file /* = null_string*/,
                                CStrRef format /* = "png" */,
-                               int32 quality /* = 75 */) {
+                               int32_t quality /* = 75 */) {
   t_loadimages(true);
   map();
 
diff --git a/hphp/runtime/ext/ext_imap.cpp b/hphp/runtime/ext/ext_imap.cpp
index b026d323073b8..af459c934568c 100644
--- a/hphp/runtime/ext/ext_imap.cpp
+++ b/hphp/runtime/ext/ext_imap.cpp
@@ -40,7 +40,7 @@ class ImapStream : public SweepableResourceData {
 public:
   DECLARE_OBJECT_ALLOCATION(ImapStream);
 
-  ImapStream(MAILSTREAM *stream, int64 flag)
+  ImapStream(MAILSTREAM *stream, int64_t flag)
       : m_stream(stream), m_flag(flag) {
   }
   ~ImapStream() {
@@ -53,7 +53,7 @@ class ImapStream : public SweepableResourceData {
 
   void close();
 
-  bool checkMsgNumber(int64 msgindex) {
+  bool checkMsgNumber(int64_t msgindex) {
     if ((msgindex < 1) || ((unsigned) msgindex > m_stream->nmsgs)) {
       Logger::Warning("Bad message number");
       return false;
@@ -62,7 +62,7 @@ class ImapStream : public SweepableResourceData {
   }
 
   MAILSTREAM *m_stream;
-  int64 m_flag;
+  int64_t m_flag;
 };
 
 StaticString ImapStream::s_class_name("imap");
@@ -361,11 +361,11 @@ static void _php_imap_add_body(Object &ret, BODY *body, bool do_multipart) {
 
 
   if (body->size.lines) {
-    ret.o_set("lines", (int64)body->size.lines);
+    ret.o_set("lines", (int64_t)body->size.lines);
   }
 
   if (body->size.bytes) {
-    ret.o_set("bytes", (int64)body->size.bytes);
+    ret.o_set("bytes", (int64_t)body->size.bytes);
   }
 
   if (body->disposition.type) {
@@ -805,8 +805,8 @@ Variant f_imap_binary(CStrRef str) {
   return ret;
 }
 
-Variant f_imap_body(CObjRef imap_stream, int64 msg_number,
-                    int64 options /* = 0 */) {
+Variant f_imap_body(CObjRef imap_stream, int64_t msg_number,
+                    int64_t options /* = 0 */) {
   if (options && ((options & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
     raise_warning("invalid value for the options parameter");
     return false;
@@ -838,7 +838,7 @@ Variant f_imap_body(CObjRef imap_stream, int64 msg_number,
   }
 }
 
-Variant f_imap_bodystruct(CObjRef imap_stream, int64 msg_number,
+Variant f_imap_bodystruct(CObjRef imap_stream, int64_t msg_number,
                           CStrRef section) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   if (!obj->checkMsgNumber(msg_number)) {
@@ -868,22 +868,22 @@ Variant f_imap_check(CObjRef imap_stream) {
     ret.o_set("Date", String(date, CopyString));
     ret.o_set("Driver", String(obj->m_stream->dtb->name, CopyString));
     ret.o_set("Mailbox", String(obj->m_stream->mailbox, CopyString));
-    ret.o_set("Nmsgs", (int64)obj->m_stream->nmsgs);
-    ret.o_set("Recent", (int64)obj->m_stream->recent);
+    ret.o_set("Nmsgs", (int64_t)obj->m_stream->nmsgs);
+    ret.o_set("Recent", (int64_t)obj->m_stream->recent);
     return ret;
   }
   return false;
 }
 
 bool f_imap_clearflag_full(CObjRef imap_stream, CStrRef sequence, CStrRef flag,
-                           int64 options /* = 0 */) {
+                           int64_t options /* = 0 */) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   mail_clearflag_full(obj->m_stream, (char *)sequence.data(),
                       (char *)flag.data(), (options ? options : NIL));
   return true;
 }
 
-bool f_imap_close(CObjRef imap_stream, int64 flag /* = 0 */) {
+bool f_imap_close(CObjRef imap_stream, int64_t flag /* = 0 */) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   if (flag) {
     if (flag != PHP_EXPUNGE) {
@@ -907,7 +907,7 @@ bool f_imap_createmailbox(CObjRef imap_stream, CStrRef mailbox) {
 }
 
 bool f_imap_delete(CObjRef imap_stream, CStrRef msg_number,
-                   int64 options /* = 0 */) {
+                   int64_t options /* = 0 */) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   mail_setflag_full(obj->m_stream, (char *)msg_number.data(),
                     "\\DELETED",
@@ -946,7 +946,7 @@ bool f_imap_expunge(CObjRef imap_stream) {
 }
 
 Variant f_imap_fetch_overview(CObjRef imap_stream, CStrRef sequence,
-                              int64 options /* = 0 */) {
+                              int64_t options /* = 0 */) {
   if (options && options != FT_UID) {
     Logger::Warning("invalid value for the options parameter");
     return false;
@@ -990,15 +990,15 @@ Variant f_imap_fetch_overview(CObjRef imap_stream, CStrRef sequence,
         OBJ_SET_ENTRY(myoverview, env, "references",  references);
         OBJ_SET_ENTRY(myoverview, env, "in_reply_to", in_reply_to);
 
-        myoverview.o_set("size",     (int64)elt->rfc822_size);
-        myoverview.o_set("uid",      (int64)mail_uid(obj->m_stream, i));
-        myoverview.o_set("msgno",    (int64)i);
-        myoverview.o_set("recent",   (int64)elt->recent);
-        myoverview.o_set("flagged",  (int64)elt->flagged);
-        myoverview.o_set("answered", (int64)elt->answered);
-        myoverview.o_set("deleted",  (int64)elt->deleted);
-        myoverview.o_set("seen",     (int64)elt->seen);
-        myoverview.o_set("draft",    (int64)elt->draft);
+        myoverview.o_set("size",     (int64_t)elt->rfc822_size);
+        myoverview.o_set("uid",      (int64_t)mail_uid(obj->m_stream, i));
+        myoverview.o_set("msgno",    (int64_t)i);
+        myoverview.o_set("recent",   (int64_t)elt->recent);
+        myoverview.o_set("flagged",  (int64_t)elt->flagged);
+        myoverview.o_set("answered", (int64_t)elt->answered);
+        myoverview.o_set("deleted",  (int64_t)elt->deleted);
+        myoverview.o_set("seen",     (int64_t)elt->seen);
+        myoverview.o_set("draft",    (int64_t)elt->draft);
 
         ret.append(myoverview);
       }
@@ -1008,8 +1008,8 @@ Variant f_imap_fetch_overview(CObjRef imap_stream, CStrRef sequence,
   return ret;
 }
 
-Variant f_imap_fetchbody(CObjRef imap_stream, int64 msg_number,
-                         CStrRef section, int64 options /* = 0 */) {
+Variant f_imap_fetchbody(CObjRef imap_stream, int64_t msg_number,
+                         CStrRef section, int64_t options /* = 0 */) {
   if (options && ((options & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
     raise_warning("invalid value for the options parameter");
     return false;
@@ -1036,8 +1036,8 @@ Variant f_imap_fetchbody(CObjRef imap_stream, int64 msg_number,
   return String(body, len, CopyString);
 }
 
-Variant f_imap_fetchheader(CObjRef imap_stream, int64 msg_number,
-                           int64 options /* = 0 */) {
+Variant f_imap_fetchheader(CObjRef imap_stream, int64_t msg_number,
+                           int64_t options /* = 0 */) {
   if (options && ((options & ~(FT_UID|FT_INTERNAL|FT_PREFETCHTEXT)) != 0)) {
     Logger::Warning("invalid value for the options parameter");
     return false;
@@ -1062,8 +1062,8 @@ Variant f_imap_fetchheader(CObjRef imap_stream, int64 msg_number,
                                       (options ? options : NIL)), CopyString);
 }
 
-Variant f_imap_fetchstructure(CObjRef imap_stream, int64 msg_number,
-                              int64 options /* = 0 */) {
+Variant f_imap_fetchstructure(CObjRef imap_stream, int64_t msg_number,
+                              int64_t options /* = 0 */) {
   if (options && ((options & ~FT_UID) != 0)) {
     raise_warning("invalid value for the options parameter");
     return false;
@@ -1104,7 +1104,7 @@ Variant f_imap_fetchstructure(CObjRef imap_stream, int64 msg_number,
   return ret;
 }
 
-bool f_imap_gc(CObjRef imap_stream, int64 caches) {
+bool f_imap_gc(CObjRef imap_stream, int64_t caches) {
   if (caches && ((caches & ~(GC_TEXTS | GC_ELT | GC_ENV)) != 0)) {
     raise_warning("invalid value for the caches parameter");
     return false;
@@ -1137,17 +1137,17 @@ Variant f_imap_getsubscribed(CObjRef imap_stream, CStrRef ref,
   throw NotImplementedException(__func__);
 }
 
-Variant f_imap_header(CObjRef imap_stream, int64 msg_number,
-                      int64 fromlength /* = 0 */,
-                      int64 subjectlength /* = 0 */,
+Variant f_imap_header(CObjRef imap_stream, int64_t msg_number,
+                      int64_t fromlength /* = 0 */,
+                      int64_t subjectlength /* = 0 */,
                       CStrRef defaulthost /* = "" */) {
   return f_imap_headerinfo(imap_stream, msg_number,
                            fromlength, subjectlength, defaulthost);
 }
 
-Variant f_imap_headerinfo(CObjRef imap_stream, int64 msg_number,
-                          int64 fromlength /* = 0 */,
-                          int64 subjectlength /* = 0 */,
+Variant f_imap_headerinfo(CObjRef imap_stream, int64_t msg_number,
+                          int64_t fromlength /* = 0 */,
+                          int64_t subjectlength /* = 0 */,
                           CStrRef defaulthost /* = "" */) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   if (fromlength < 0 || fromlength > MAILTMPLEN) {
@@ -1191,7 +1191,7 @@ Variant f_imap_headerinfo(CObjRef imap_stream, int64 msg_number,
   snprintf(dummy, sizeof(dummy), "%ld", cache->rfc822_size);
   ret.o_set("Size", String(dummy, CopyString));
 
-  ret.o_set("udate", (int64)mail_longdate(cache));
+  ret.o_set("udate", (int64_t)mail_longdate(cache));
 
   if (en->from && fromlength) {
     fulladdress[0] = 0x00;
@@ -1268,7 +1268,7 @@ Variant f_imap_mail_compose(CArrRef envelope, CArrRef body) {
 }
 
 bool f_imap_mail_copy(CObjRef imap_stream, CStrRef msglist, CStrRef mailbox,
-                      int64 options /* = 0 */) {
+                      int64_t options /* = 0 */) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   if (mail_copy_full(obj->m_stream, (char *)msglist.data(),
                     (char *)mailbox.data(), (options ? options : NIL)) == T) {
@@ -1279,7 +1279,7 @@ bool f_imap_mail_copy(CObjRef imap_stream, CStrRef msglist, CStrRef mailbox,
 }
 
 bool f_imap_mail_move(CObjRef imap_stream, CStrRef msglist, CStrRef mailbox,
-                      int64 options /* = 0 */) {
+                      int64_t options /* = 0 */) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   if (mail_copy_full(obj->m_stream, (char *)msglist.data(),
                     (char *)mailbox.data(),
@@ -1344,7 +1344,7 @@ Variant f_imap_mailboxmsginfo(CObjRef imap_stream) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   Object ret(SystemLib::AllocStdClassObject());
 
-  int64 unreadmsg = 0, deletedmsg = 0, msize = 0;
+  int64_t unreadmsg = 0, deletedmsg = 0, msize = 0;
 
   for (unsigned long i = 1; i <= obj->m_stream->nmsgs; i++) {
     MESSAGECACHE * cache = mail_elt (obj->m_stream, i);
@@ -1360,17 +1360,17 @@ Variant f_imap_mailboxmsginfo(CObjRef imap_stream) {
     msize = msize + cache->rfc822_size;
   }
 
-  ret.o_set("Unread", (int64)unreadmsg);
-  ret.o_set("Deleted", (int64)deletedmsg);
-  ret.o_set("Nmsgs", (int64)obj->m_stream->nmsgs);
-  ret.o_set("Size", (int64)msize);
+  ret.o_set("Unread", (int64_t)unreadmsg);
+  ret.o_set("Deleted", (int64_t)deletedmsg);
+  ret.o_set("Nmsgs", (int64_t)obj->m_stream->nmsgs);
+  ret.o_set("Size", (int64_t)msize);
 
   char date[100];
   rfc822_date(date);
   ret.o_set("Date", String(date, CopyString));
   ret.o_set("Driver", String(obj->m_stream->dtb->name, CopyString));
   ret.o_set("Mailbox", String(obj->m_stream->mailbox, CopyString));
-  ret.o_set("Recent", (int64)msize);
+  ret.o_set("Recent", (int64_t)msize);
 
   return ret;
 }
@@ -1379,22 +1379,22 @@ Variant f_imap_mime_header_decode(CStrRef text) {
   throw NotImplementedException(__func__);
 }
 
-Variant f_imap_msgno(CObjRef imap_stream, int64 uid) {
+Variant f_imap_msgno(CObjRef imap_stream, int64_t uid) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
-  return (int64)mail_msgno(obj->m_stream, uid);
+  return (int64_t)mail_msgno(obj->m_stream, uid);
 }
 
 Variant f_imap_num_msg(CObjRef imap_stream) {
-  return (int64)imap_stream.getTyped<ImapStream>()->m_stream->nmsgs;
+  return (int64_t)imap_stream.getTyped<ImapStream>()->m_stream->nmsgs;
 }
 
 Variant f_imap_num_recent(CObjRef imap_stream) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
-  return (int64)obj->m_stream->recent;
+  return (int64_t)obj->m_stream->recent;
 }
 
 Variant f_imap_open(CStrRef mailbox, CStrRef username, CStrRef password,
-                    int64 options /* = 0 */, int64 retries /* = 0 */) {
+                    int64_t options /* = 0 */, int64_t retries /* = 0 */) {
   String filename = mailbox;
   if (filename[0] != '{') {
     filename = File::TranslatePath(filename);
@@ -1454,7 +1454,7 @@ bool f_imap_renamemailbox(CObjRef imap_stream, CStrRef old_mbox,
 }
 
 bool f_imap_reopen(CObjRef imap_stream, CStrRef mailbox,
-                   int64 options /* = 0 */, int64 retries /* = 0 */) {
+                   int64_t options /* = 0 */, int64_t retries /* = 0 */) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   long flags = NIL;
   long cl_flags = NIL;
@@ -1494,8 +1494,8 @@ Variant f_imap_rfc822_write_address(CStrRef mailbox, CStrRef host,
   throw NotImplementedException(__func__);
 }
 
-bool f_imap_savebody(CObjRef imap_stream, CVarRef file, int64 msg_number,
-                     CStrRef part_number /* = "" */, int64 options /* = 0 */) {
+bool f_imap_savebody(CObjRef imap_stream, CVarRef file, int64_t msg_number,
+                     CStrRef part_number /* = "" */, int64_t options /* = 0 */) {
   throw NotImplementedException(__func__);
 }
 
@@ -1505,7 +1505,7 @@ Variant f_imap_scanmailbox(CObjRef imap_stream, CStrRef ref, CStrRef pattern,
 }
 
 Variant f_imap_search(CObjRef imap_stream, CStrRef criteria,
-                      int64 options /* = 0 */, CStrRef charset /* = "" */) {
+                      int64_t options /* = 0 */, CStrRef charset /* = "" */) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
 
   char *search_criteria = (char*)criteria.data();
@@ -1530,7 +1530,7 @@ Variant f_imap_search(CObjRef imap_stream, CStrRef criteria,
 
   MESSAGELIST *cur = IMAPG(messages);
   while (cur != NIL) {
-    ret.append((int64)cur->msgid);
+    ret.append((int64_t)cur->msgid);
     cur = cur->next;
   }
   mail_free_messagelist(&IMAPG(messages), &IMAPG(messages_tail));
@@ -1538,7 +1538,7 @@ Variant f_imap_search(CObjRef imap_stream, CStrRef criteria,
 }
 
 bool f_imap_set_quota(CObjRef imap_stream, CStrRef quota_root,
-                      int64 quota_limit) {
+                      int64_t quota_limit) {
   throw NotImplementedException(__func__);
 }
 
@@ -1548,42 +1548,42 @@ bool f_imap_setacl(CObjRef imap_stream, CStrRef mailbox, CStrRef id,
 }
 
 bool f_imap_setflag_full(CObjRef imap_stream, CStrRef sequence, CStrRef flag,
-                         int64 options /* = 0 */) {
+                         int64_t options /* = 0 */) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   mail_setflag_full(obj->m_stream, (char*)sequence.data(), (char*)flag.data(),
                     (options ? options : NIL));
   return true;
 }
 
-Variant f_imap_sort(CObjRef imap_stream, int64 criteria, int64 reverse,
-                    int64 options /* = 0 */,
+Variant f_imap_sort(CObjRef imap_stream, int64_t criteria, int64_t reverse,
+                    int64_t options /* = 0 */,
                     CStrRef search_criteria /* = "" */,
                     CStrRef charset /* = "" */) {
   throw NotImplementedException(__func__);
 }
 
 Variant f_imap_status(CObjRef imap_stream, CStrRef mailbox,
-                      int64 options /* = 0 */) {
+                      int64_t options /* = 0 */) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   Object ret(SystemLib::AllocStdClassObject());
 
   if (mail_status(obj->m_stream, (char *)mailbox.data(), options)) {
-    ret.o_set("flags", (int64)IMAPG(status_flags));
+    ret.o_set("flags", (int64_t)IMAPG(status_flags));
 
     if (IMAPG(status_flags) & SA_MESSAGES) {
-      ret.o_set("messages", (int64)IMAPG(status_messages));
+      ret.o_set("messages", (int64_t)IMAPG(status_messages));
     }
     if (IMAPG(status_flags) & SA_RECENT) {
-      ret.o_set("recent", (int64)IMAPG(status_recent));
+      ret.o_set("recent", (int64_t)IMAPG(status_recent));
     }
     if (IMAPG(status_flags) & SA_UNSEEN) {
-      ret.o_set("unseen", (int64)IMAPG(status_unseen));
+      ret.o_set("unseen", (int64_t)IMAPG(status_unseen));
     }
     if (IMAPG(status_flags) & SA_UIDNEXT) {
-      ret.o_set("uidnext", (int64)IMAPG(status_uidnext));
+      ret.o_set("uidnext", (int64_t)IMAPG(status_uidnext));
     }
     if (IMAPG(status_flags) & SA_UIDVALIDITY) {
-      ret.o_set("uidvalidity", (int64)IMAPG(status_uidvalidity));
+      ret.o_set("uidvalidity", (int64_t)IMAPG(status_uidvalidity));
     }
   } else {
     return false;
@@ -1600,11 +1600,11 @@ bool f_imap_subscribe(CObjRef imap_stream, CStrRef mailbox) {
   }
 }
 
-Variant f_imap_thread(CObjRef imap_stream, int64 options /* = 0 */) {
+Variant f_imap_thread(CObjRef imap_stream, int64_t options /* = 0 */) {
   throw NotImplementedException(__func__);
 }
 
-Variant f_imap_timeout(int64 timeout_type, int64 timeout /* = -1 */) {
+Variant f_imap_timeout(int64_t timeout_type, int64_t timeout /* = -1 */) {
   int actual_type;
   if (timeout == -1) {
     switch (timeout_type) {
@@ -1624,7 +1624,7 @@ Variant f_imap_timeout(int64 timeout_type, int64 timeout /* = -1 */) {
         return false;
       break;
     }
-    return (int64)mail_parameters(NIL, actual_type, NIL);
+    return (int64_t)mail_parameters(NIL, actual_type, NIL);
   } else if (timeout >= 0) {
     switch (timeout_type) {
       case 1:
@@ -1643,22 +1643,22 @@ Variant f_imap_timeout(int64 timeout_type, int64 timeout /* = -1 */) {
         return false;
       break;
     }
-    timeout = (int64)mail_parameters(NIL, actual_type, (void *) timeout);
+    timeout = (int64_t)mail_parameters(NIL, actual_type, (void *) timeout);
     return true;
   }
   return false;
 }
 
-Variant f_imap_uid(CObjRef imap_stream, int64 msg_number) {
+Variant f_imap_uid(CObjRef imap_stream, int64_t msg_number) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   if (!obj->checkMsgNumber(msg_number)) {
     return false;
   }
-  return (int64)mail_uid(obj->m_stream, msg_number);
+  return (int64_t)mail_uid(obj->m_stream, msg_number);
 }
 
 bool f_imap_undelete(CObjRef imap_stream, CStrRef msg_number,
-                     int64 flags /* = 0 */) {
+                     int64_t flags /* = 0 */) {
   ImapStream *obj = imap_stream.getTyped<ImapStream>();
   mail_clearflag_full(obj->m_stream, (char *)msg_number.data(),
                       "\\DELETED", (flags ? flags : NIL));
diff --git a/hphp/runtime/ext/ext_imap.h b/hphp/runtime/ext/ext_imap.h
index dec4abe741ded..9862ea175b394 100644
--- a/hphp/runtime/ext/ext_imap.h
+++ b/hphp/runtime/ext/ext_imap.h
@@ -30,28 +30,28 @@ Variant f_imap_alerts();
 bool f_imap_append(CObjRef imap_stream, CStrRef mailbox, CStrRef message, CStrRef options = "");
 Variant f_imap_base64(CStrRef text);
 Variant f_imap_binary(CStrRef str);
-Variant f_imap_body(CObjRef imap_stream, int64 msg_number, int64 options = 0);
-Variant f_imap_bodystruct(CObjRef imap_stream, int64 msg_number, CStrRef section);
+Variant f_imap_body(CObjRef imap_stream, int64_t msg_number, int64_t options = 0);
+Variant f_imap_bodystruct(CObjRef imap_stream, int64_t msg_number, CStrRef section);
 Variant f_imap_check(CObjRef imap_stream);
-bool f_imap_clearflag_full(CObjRef imap_stream, CStrRef sequence, CStrRef flag, int64 options = 0);
-bool f_imap_close(CObjRef imap_stream, int64 flag = 0);
+bool f_imap_clearflag_full(CObjRef imap_stream, CStrRef sequence, CStrRef flag, int64_t options = 0);
+bool f_imap_close(CObjRef imap_stream, int64_t flag = 0);
 bool f_imap_createmailbox(CObjRef imap_stream, CStrRef mailbox);
-bool f_imap_delete(CObjRef imap_stream, CStrRef msg_number, int64 options = 0);
+bool f_imap_delete(CObjRef imap_stream, CStrRef msg_number, int64_t options = 0);
 bool f_imap_deletemailbox(CObjRef imap_stream, CStrRef mailbox);
 Variant f_imap_errors();
 bool f_imap_expunge(CObjRef imap_stream);
-Variant f_imap_fetch_overview(CObjRef imap_stream, CStrRef sequence, int64 options = 0);
-Variant f_imap_fetchbody(CObjRef imap_stream, int64 msg_number, CStrRef section, int64 options = 0);
-Variant f_imap_fetchheader(CObjRef imap_stream, int64 msg_number, int64 options = 0);
-Variant f_imap_fetchstructure(CObjRef imap_stream, int64 msg_number, int64 options = 0);
-bool f_imap_gc(CObjRef imap_stream, int64 caches);
+Variant f_imap_fetch_overview(CObjRef imap_stream, CStrRef sequence, int64_t options = 0);
+Variant f_imap_fetchbody(CObjRef imap_stream, int64_t msg_number, CStrRef section, int64_t options = 0);
+Variant f_imap_fetchheader(CObjRef imap_stream, int64_t msg_number, int64_t options = 0);
+Variant f_imap_fetchstructure(CObjRef imap_stream, int64_t msg_number, int64_t options = 0);
+bool f_imap_gc(CObjRef imap_stream, int64_t caches);
 Variant f_imap_get_quota(CObjRef imap_stream, CStrRef quota_root);
 Variant f_imap_get_quotaroot(CObjRef imap_stream, CStrRef quota_root);
 Variant f_imap_getacl(CObjRef imap_stream, CStrRef mailbox);
 Variant f_imap_getmailboxes(CObjRef imap_stream, CStrRef ref, CStrRef pattern);
 Variant f_imap_getsubscribed(CObjRef imap_stream, CStrRef ref, CStrRef pattern);
-Variant f_imap_header(CObjRef imap_stream, int64 msg_number, int64 fromlength = 0, int64 subjectlength = 0, CStrRef defaulthost = "");
-Variant f_imap_headerinfo(CObjRef imap_stream, int64 msg_number, int64 fromlength = 0, int64 subjectlength = 0, CStrRef defaulthost = "");
+Variant f_imap_header(CObjRef imap_stream, int64_t msg_number, int64_t fromlength = 0, int64_t subjectlength = 0, CStrRef defaulthost = "");
+Variant f_imap_headerinfo(CObjRef imap_stream, int64_t msg_number, int64_t fromlength = 0, int64_t subjectlength = 0, CStrRef defaulthost = "");
 Variant f_imap_headers(CObjRef imap_stream);
 Variant f_imap_last_error();
 Variant f_imap_list(CObjRef imap_stream, CStrRef ref, CStrRef pattern);
@@ -60,35 +60,35 @@ Variant f_imap_listscan(CObjRef imap_stream, CStrRef ref, CStrRef pattern, CStrR
 Variant f_imap_listsubscribed(CObjRef imap_stream, CStrRef ref, CStrRef pattern);
 Variant f_imap_lsub(CObjRef imap_stream, CStrRef ref, CStrRef pattern);
 Variant f_imap_mail_compose(CArrRef envelope, CArrRef body);
-bool f_imap_mail_copy(CObjRef imap_stream, CStrRef msglist, CStrRef mailbox, int64 options = 0);
-bool f_imap_mail_move(CObjRef imap_stream, CStrRef msglist, CStrRef mailbox, int64 options = 0);
+bool f_imap_mail_copy(CObjRef imap_stream, CStrRef msglist, CStrRef mailbox, int64_t options = 0);
+bool f_imap_mail_move(CObjRef imap_stream, CStrRef msglist, CStrRef mailbox, int64_t options = 0);
 bool f_imap_mail(CStrRef to, CStrRef subject, CStrRef message, CStrRef additional_headers = "", CStrRef cc = "", CStrRef bcc = "", CStrRef rpath = "");
 Variant f_imap_mailboxmsginfo(CObjRef imap_stream);
 Variant f_imap_mime_header_decode(CStrRef text);
-Variant f_imap_msgno(CObjRef imap_stream, int64 uid);
+Variant f_imap_msgno(CObjRef imap_stream, int64_t uid);
 Variant f_imap_num_msg(CObjRef imap_stream);
 Variant f_imap_num_recent(CObjRef imap_stream);
-Variant f_imap_open(CStrRef mailbox, CStrRef username, CStrRef password, int64 options = 0, int64 retries = 0);
+Variant f_imap_open(CStrRef mailbox, CStrRef username, CStrRef password, int64_t options = 0, int64_t retries = 0);
 bool f_imap_ping(CObjRef imap_stream);
 Variant f_imap_qprint(CStrRef str);
 bool f_imap_renamemailbox(CObjRef imap_stream, CStrRef old_mbox, CStrRef new_mbox);
-bool f_imap_reopen(CObjRef imap_stream, CStrRef mailbox, int64 options = 0, int64 retries = 0);
+bool f_imap_reopen(CObjRef imap_stream, CStrRef mailbox, int64_t options = 0, int64_t retries = 0);
 Variant f_imap_rfc822_parse_adrlist(CStrRef address, CStrRef default_host);
 Variant f_imap_rfc822_parse_headers(CStrRef headers, CStrRef defaulthost = "");
 Variant f_imap_rfc822_write_address(CStrRef mailbox, CStrRef host, CStrRef personal);
-bool f_imap_savebody(CObjRef imap_stream, CVarRef file, int64 msg_number, CStrRef part_number = "", int64 options = 0);
+bool f_imap_savebody(CObjRef imap_stream, CVarRef file, int64_t msg_number, CStrRef part_number = "", int64_t options = 0);
 Variant f_imap_scanmailbox(CObjRef imap_stream, CStrRef ref, CStrRef pattern, CStrRef content);
-Variant f_imap_search(CObjRef imap_stream, CStrRef criteria, int64 options = 0, CStrRef charset = "");
-bool f_imap_set_quota(CObjRef imap_stream, CStrRef quota_root, int64 quota_limit);
+Variant f_imap_search(CObjRef imap_stream, CStrRef criteria, int64_t options = 0, CStrRef charset = "");
+bool f_imap_set_quota(CObjRef imap_stream, CStrRef quota_root, int64_t quota_limit);
 bool f_imap_setacl(CObjRef imap_stream, CStrRef mailbox, CStrRef id, CStrRef rights);
-bool f_imap_setflag_full(CObjRef imap_stream, CStrRef sequence, CStrRef flag, int64 options = 0);
-Variant f_imap_sort(CObjRef imap_stream, int64 criteria, int64 reverse, int64 options = 0, CStrRef search_criteria = "", CStrRef charset = "");
-Variant f_imap_status(CObjRef imap_stream, CStrRef mailbox, int64 options = 0);
+bool f_imap_setflag_full(CObjRef imap_stream, CStrRef sequence, CStrRef flag, int64_t options = 0);
+Variant f_imap_sort(CObjRef imap_stream, int64_t criteria, int64_t reverse, int64_t options = 0, CStrRef search_criteria = "", CStrRef charset = "");
+Variant f_imap_status(CObjRef imap_stream, CStrRef mailbox, int64_t options = 0);
 bool f_imap_subscribe(CObjRef imap_stream, CStrRef mailbox);
-Variant f_imap_thread(CObjRef imap_stream, int64 options = 0);
-Variant f_imap_timeout(int64 timeout_type, int64 timeout = -1);
-Variant f_imap_uid(CObjRef imap_stream, int64 msg_number);
-bool f_imap_undelete(CObjRef imap_stream, CStrRef msg_number, int64 flags = 0);
+Variant f_imap_thread(CObjRef imap_stream, int64_t options = 0);
+Variant f_imap_timeout(int64_t timeout_type, int64_t timeout = -1);
+Variant f_imap_uid(CObjRef imap_stream, int64_t msg_number);
+bool f_imap_undelete(CObjRef imap_stream, CStrRef msg_number, int64_t flags = 0);
 bool f_imap_unsubscribe(CObjRef imap_stream, CStrRef mailbox);
 Variant f_imap_utf7_decode(CStrRef text);
 Variant f_imap_utf7_encode(CStrRef data);
diff --git a/hphp/runtime/ext/ext_intl.cpp b/hphp/runtime/ext/ext_intl.cpp
index 7d3f538eda5fd..bfba9eb36fe51 100644
--- a/hphp/runtime/ext/ext_intl.cpp
+++ b/hphp/runtime/ext/ext_intl.cpp
@@ -39,7 +39,7 @@ namespace HPHP {
 IMPLEMENT_DEFAULT_EXTENSION(idn);
 ///////////////////////////////////////////////////////////////////////////////
 
-int64 f_intl_get_error_code() {
+int64_t f_intl_get_error_code() {
   return s_intl_error->m_error.code;
 }
 
@@ -50,41 +50,41 @@ String f_intl_get_error_message() {
   return String(u_errorName(s_intl_error->m_error.code), AttachLiteral);
 }
 
-String f_intl_error_name(int64 error_code) {
+String f_intl_error_name(int64_t error_code) {
   return String(u_errorName((UErrorCode)error_code), AttachLiteral);
 }
 
-bool f_intl_is_failure(int64 error_code) {
+bool f_intl_is_failure(int64_t error_code) {
   if (U_FAILURE((UErrorCode)error_code)) return true;
   return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const int64 q_Collator$$SORT_REGULAR = 0;
-const int64 q_Collator$$SORT_STRING = 1;
-const int64 q_Collator$$SORT_NUMERIC = 2;
-const int64 q_Collator$$FRENCH_COLLATION = UCOL_FRENCH_COLLATION;
-const int64 q_Collator$$ALTERNATE_HANDLING = UCOL_ALTERNATE_HANDLING;
-const int64 q_Collator$$CASE_FIRST = UCOL_CASE_FIRST;
-const int64 q_Collator$$CASE_LEVEL = UCOL_CASE_LEVEL;
-const int64 q_Collator$$NORMALIZATION_MODE = UCOL_NORMALIZATION_MODE;
-const int64 q_Collator$$STRENGTH = UCOL_STRENGTH;
-const int64 q_Collator$$HIRAGANA_QUATERNARY_MODE = UCOL_HIRAGANA_QUATERNARY_MODE;
-const int64 q_Collator$$NUMERIC_COLLATION = UCOL_NUMERIC_COLLATION;
-const int64 q_Collator$$DEFAULT_VALUE = UCOL_DEFAULT;
-const int64 q_Collator$$PRIMARY = UCOL_PRIMARY;
-const int64 q_Collator$$SECONDARY = UCOL_SECONDARY;
-const int64 q_Collator$$TERTIARY = UCOL_TERTIARY;
-const int64 q_Collator$$DEFAULT_STRENGTH = UCOL_DEFAULT_STRENGTH;
-const int64 q_Collator$$QUATERNARY = UCOL_QUATERNARY;
-const int64 q_Collator$$IDENTICAL = UCOL_IDENTICAL;
-const int64 q_Collator$$OFF = UCOL_OFF;
-const int64 q_Collator$$ON = UCOL_ON;
-const int64 q_Collator$$SHIFTED = UCOL_SHIFTED;
-const int64 q_Collator$$NON_IGNORABLE = UCOL_NON_IGNORABLE;
-const int64 q_Collator$$LOWER_FIRST = UCOL_LOWER_FIRST;
-const int64 q_Collator$$UPPER_FIRST = UCOL_UPPER_FIRST;
+const int64_t q_Collator$$SORT_REGULAR = 0;
+const int64_t q_Collator$$SORT_STRING = 1;
+const int64_t q_Collator$$SORT_NUMERIC = 2;
+const int64_t q_Collator$$FRENCH_COLLATION = UCOL_FRENCH_COLLATION;
+const int64_t q_Collator$$ALTERNATE_HANDLING = UCOL_ALTERNATE_HANDLING;
+const int64_t q_Collator$$CASE_FIRST = UCOL_CASE_FIRST;
+const int64_t q_Collator$$CASE_LEVEL = UCOL_CASE_LEVEL;
+const int64_t q_Collator$$NORMALIZATION_MODE = UCOL_NORMALIZATION_MODE;
+const int64_t q_Collator$$STRENGTH = UCOL_STRENGTH;
+const int64_t q_Collator$$HIRAGANA_QUATERNARY_MODE = UCOL_HIRAGANA_QUATERNARY_MODE;
+const int64_t q_Collator$$NUMERIC_COLLATION = UCOL_NUMERIC_COLLATION;
+const int64_t q_Collator$$DEFAULT_VALUE = UCOL_DEFAULT;
+const int64_t q_Collator$$PRIMARY = UCOL_PRIMARY;
+const int64_t q_Collator$$SECONDARY = UCOL_SECONDARY;
+const int64_t q_Collator$$TERTIARY = UCOL_TERTIARY;
+const int64_t q_Collator$$DEFAULT_STRENGTH = UCOL_DEFAULT_STRENGTH;
+const int64_t q_Collator$$QUATERNARY = UCOL_QUATERNARY;
+const int64_t q_Collator$$IDENTICAL = UCOL_IDENTICAL;
+const int64_t q_Collator$$OFF = UCOL_OFF;
+const int64_t q_Collator$$ON = UCOL_ON;
+const int64_t q_Collator$$SHIFTED = UCOL_SHIFTED;
+const int64_t q_Collator$$NON_IGNORABLE = UCOL_NON_IGNORABLE;
+const int64_t q_Collator$$LOWER_FIRST = UCOL_LOWER_FIRST;
+const int64_t q_Collator$$UPPER_FIRST = UCOL_UPPER_FIRST;
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -142,7 +142,7 @@ void c_Collator::t___construct(CStrRef locale) {
 }
 
 bool c_Collator::t_asort(VRefParam arr,
-                         int64 sort_flag /* = q_Collator$$SORT_REGULAR */) {
+                         int64_t sort_flag /* = q_Collator$$SORT_REGULAR */) {
   if (!arr.isArray()) {
     throw_bad_array_exception();
     return false;
@@ -187,7 +187,7 @@ Variant c_Collator::t_compare(CStrRef str1, CStrRef str2) {
     free(ustr2);
     return false;
   }
-  int64 ret = ucol_strcoll(m_ucoll, ustr1, ustr1_len, ustr2, ustr2_len);
+  int64_t ret = ucol_strcoll(m_ucoll, ustr1, ustr1_len, ustr2, ustr2_len);
   free(ustr1);
   free(ustr2);
   return ret;
@@ -199,13 +199,13 @@ Variant c_Collator::ti_create(const char* cls, CStrRef locale) {
   return c;
 }
 
-int64 c_Collator::t_getattribute(int64 attr) {
+int64_t c_Collator::t_getattribute(int64_t attr) {
   if (!m_ucoll) {
     raise_warning("getattribute called on uninitialized Collator object");
     return 0;
   }
   m_errcode.clear();
-  int64 ret = (int64)ucol_getAttribute(m_ucoll, (UColAttribute)attr,
+  int64_t ret = (int64_t)ucol_getAttribute(m_ucoll, (UColAttribute)attr,
                                        &(m_errcode.code));
   s_intl_error->m_error.clear();
   s_intl_error->m_error.code = m_errcode.code;
@@ -217,7 +217,7 @@ int64 c_Collator::t_getattribute(int64 attr) {
   return ret;
 }
 
-int64 c_Collator::t_geterrorcode() {
+int64_t c_Collator::t_geterrorcode() {
   return m_errcode.code;
 }
 
@@ -225,7 +225,7 @@ String c_Collator::t_geterrormessage() {
   return String(u_errorName(m_errcode.code), AttachLiteral);
 }
 
-String c_Collator::t_getlocale(int64 type /* = 0 */) {
+String c_Collator::t_getlocale(int64_t type /* = 0 */) {
   if (!m_ucoll) {
     raise_warning("getlocale called on uninitialized Collator object");
     return "";
@@ -245,7 +245,7 @@ String c_Collator::t_getlocale(int64 type /* = 0 */) {
   return ret;
 }
 
-int64 c_Collator::t_getstrength() {
+int64_t c_Collator::t_getstrength() {
   if (!m_ucoll) {
     raise_warning("getstrength called on uninitialized Collator object");
     return 0;
@@ -253,7 +253,7 @@ int64 c_Collator::t_getstrength() {
   return ucol_getStrength(m_ucoll);
 }
 
-bool c_Collator::t_setattribute(int64 attr, int64 val) {
+bool c_Collator::t_setattribute(int64_t attr, int64_t val) {
   if (!m_ucoll) {
     raise_warning("setattribute called on uninitialized Collator object");
     return false;
@@ -271,7 +271,7 @@ bool c_Collator::t_setattribute(int64 attr, int64 val) {
   return true;
 }
 
-bool c_Collator::t_setstrength(int64 strength) {
+bool c_Collator::t_setstrength(int64_t strength) {
   if (!m_ucoll) {
     raise_warning("setstrength called on uninitialized Collator object");
     return false;
@@ -440,7 +440,7 @@ bool c_Collator::t_sortwithsortkeys(VRefParam arr) {
 }
 
 bool c_Collator::t_sort(VRefParam arr,
-                        int64 sort_flag /* = q_Collator$$SORT_REGULAR */) {
+                        int64_t sort_flag /* = q_Collator$$SORT_REGULAR */) {
   if (!arr.isArray()) {
     throw_bad_array_exception();
     return false;
@@ -473,7 +473,7 @@ bool c_Collator::t_sort(VRefParam arr,
   }                                                        \
 
 Variant f_collator_asort(CVarRef obj, VRefParam arr,
-                         int64 sort_flag /* = q_Collator$$SORT_REGULAR */) {
+                         int64_t sort_flag /* = q_Collator$$SORT_REGULAR */) {
   CHECK_COLL(obj);
   return coll->t_asort(ref(arr), sort_flag);
 }
@@ -487,7 +487,7 @@ Variant f_collator_create(CStrRef locale) {
   return c_Collator::ti_create(nullptr, locale);
 }
 
-Variant f_collator_get_attribute(CVarRef obj, int64 attr) {
+Variant f_collator_get_attribute(CVarRef obj, int64_t attr) {
   CHECK_COLL(obj);
   return coll->t_getattribute(attr);
 }
@@ -502,7 +502,7 @@ Variant f_collator_get_error_message(CVarRef obj) {
   return coll->t_geterrormessage();
 }
 
-Variant f_collator_get_locale(CVarRef obj, int64 type /* = 0 */) {
+Variant f_collator_get_locale(CVarRef obj, int64_t type /* = 0 */) {
   CHECK_COLL(obj);
   return coll->t_getlocale(type);
 }
@@ -512,12 +512,12 @@ Variant f_collator_get_strength(CVarRef obj) {
   return coll->t_getstrength();
 }
 
-Variant f_collator_set_attribute(CVarRef obj, int64 attr, int64 val) {
+Variant f_collator_set_attribute(CVarRef obj, int64_t attr, int64_t val) {
   CHECK_COLL(obj);
   return coll->t_setattribute(attr, val);
 }
 
-Variant f_collator_set_strength(CVarRef obj, int64 strength) {
+Variant f_collator_set_strength(CVarRef obj, int64_t strength) {
   CHECK_COLL(obj);
   return coll->t_setstrength(strength);
 }
@@ -528,15 +528,15 @@ Variant f_collator_sort_with_sort_keys(CVarRef obj, VRefParam arr) {
 }
 
 Variant f_collator_sort(CVarRef obj, VRefParam arr,
-                        int64 sort_flag /* = q_Collator$$SORT_REGULAR */) {
+                        int64_t sort_flag /* = q_Collator$$SORT_REGULAR */) {
   CHECK_COLL(obj);
   return coll->t_sort(ref(arr), sort_flag);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const int64 q_Locale$$ACTUAL_LOCALE = 0;
-const int64 q_Locale$$VALID_LOCALE = 1;
+const int64_t q_Locale$$ACTUAL_LOCALE = 0;
+const int64_t q_Locale$$VALID_LOCALE = 1;
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -551,15 +551,15 @@ void c_Locale::t___construct() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const int64 q_Normalizer$$NONE     = UNORM_NONE;
-const int64 q_Normalizer$$FORM_D   = UNORM_NFD;
-const int64 q_Normalizer$$NFD      = UNORM_NFD;
-const int64 q_Normalizer$$FORM_KD  = UNORM_NFKD;
-const int64 q_Normalizer$$NFKD     = UNORM_NFKD;
-const int64 q_Normalizer$$FORM_C   = UNORM_NFC;
-const int64 q_Normalizer$$NFC      = UNORM_NFC;
-const int64 q_Normalizer$$FORM_KC  = UNORM_NFKC;
-const int64 q_Normalizer$$NFKC     = UNORM_NFKC;
+const int64_t q_Normalizer$$NONE     = UNORM_NONE;
+const int64_t q_Normalizer$$FORM_D   = UNORM_NFD;
+const int64_t q_Normalizer$$NFD      = UNORM_NFD;
+const int64_t q_Normalizer$$FORM_KD  = UNORM_NFKD;
+const int64_t q_Normalizer$$NFKD     = UNORM_NFKD;
+const int64_t q_Normalizer$$FORM_C   = UNORM_NFC;
+const int64_t q_Normalizer$$NFC      = UNORM_NFC;
+const int64_t q_Normalizer$$FORM_KC  = UNORM_NFKC;
+const int64_t q_Normalizer$$NFKC     = UNORM_NFKC;
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -575,7 +575,7 @@ void c_Normalizer::t___construct() {
 ///////////////////////////////////////////////////////////////////////////////
 
 Variant c_Normalizer::ti_isnormalized(const char* cls , CStrRef input,
-                                      int64 form /* = q_Normalizer$$FORM_C */) {
+                                      int64_t form /* = q_Normalizer$$FORM_C */) {
   s_intl_error->m_error.clear();
 
   switch (form) {
@@ -622,7 +622,7 @@ Variant c_Normalizer::ti_isnormalized(const char* cls , CStrRef input,
 }
 
 Variant c_Normalizer::ti_normalize(const char* cls , CStrRef input,
-                                   int64 form /* = q_Normalizer$$FORM_C */) {
+                                   int64_t form /* = q_Normalizer$$FORM_C */) {
   s_intl_error->m_error.clear();
 
   int expansion_factor = 1;
@@ -735,7 +735,7 @@ enum {
 };
 
 #ifdef HAVE_46_API
-static Variant php_intl_idn_to_46(CStrRef domain, int64 options, IdnVariant idn_variant, VRefParam idna_info, int mode) {
+static Variant php_intl_idn_to_46(CStrRef domain, int64_t options, IdnVariant idn_variant, VRefParam idna_info, int mode) {
   int32_t     converted_capacity;
   char        *converted = NULL;
   int32_t     converted_len;
@@ -783,7 +783,7 @@ static Variant php_intl_idn_to_46(CStrRef domain, int64 options, IdnVariant idn_
 
 #endif
 
-static Variant php_intl_idn_to(CStrRef domain, int64 options, IdnVariant idn_variant, VRefParam idna_info, int mode) {
+static Variant php_intl_idn_to(CStrRef domain, int64_t options, IdnVariant idn_variant, VRefParam idna_info, int mode) {
   UChar* ustring = NULL;
   int ustring_len = 0;
   UErrorCode status;
@@ -857,15 +857,15 @@ static Variant php_intl_idn_to(CStrRef domain, int64 options, IdnVariant idn_var
   return String(converted_utf8, converted_utf8_len, AttachString);
 }
 
-Variant f_idn_to_ascii(CStrRef domain, int64 options /* = 0 */, int64 variant /* = 0 */, VRefParam idna_info /* = null */) {
+Variant f_idn_to_ascii(CStrRef domain, int64_t options /* = 0 */, int64_t variant /* = 0 */, VRefParam idna_info /* = null */) {
   return php_intl_idn_to(domain, options, (IdnVariant)variant, idna_info, INTL_IDN_TO_ASCII);
 }
 
-Variant f_idn_to_unicode(CStrRef domain, int64 options /* = 0 */, int64 variant /* = 0 */, VRefParam idna_info /* = null */) {
+Variant f_idn_to_unicode(CStrRef domain, int64_t options /* = 0 */, int64_t variant /* = 0 */, VRefParam idna_info /* = null */) {
   return php_intl_idn_to(domain, options, (IdnVariant)variant, idna_info, INTL_IDN_TO_UTF8);
 }
 
-Variant f_idn_to_utf8(CStrRef domain, int64 options /* = 0 */, int64 variant /* = 0 */, VRefParam idna_info /* = null */) {
+Variant f_idn_to_utf8(CStrRef domain, int64_t options /* = 0 */, int64_t variant /* = 0 */, VRefParam idna_info /* = null */) {
   return php_intl_idn_to(domain, options, (IdnVariant)variant, idna_info, INTL_IDN_TO_UTF8);
 }
 
diff --git a/hphp/runtime/ext/ext_intl.h b/hphp/runtime/ext/ext_intl.h
index 33303fe0c3eaf..ec53fc9f44554 100644
--- a/hphp/runtime/ext/ext_intl.h
+++ b/hphp/runtime/ext/ext_intl.h
@@ -24,54 +24,54 @@
 #include <runtime/base/zend/zend_collator.h>
 #include <unicode/ucol.h> // icu
 namespace HPHP {
-extern const int64 q_Collator$$SORT_REGULAR;
+extern const int64_t q_Collator$$SORT_REGULAR;
 }
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-int64 f_intl_get_error_code();
+int64_t f_intl_get_error_code();
 String f_intl_get_error_message();
-String f_intl_error_name(int64 error_code);
-bool f_intl_is_failure(int64 error_code);
-Variant f_collator_asort(CVarRef obj, VRefParam arr, int64 sort_flag = q_Collator$$SORT_REGULAR);
+String f_intl_error_name(int64_t error_code);
+bool f_intl_is_failure(int64_t error_code);
+Variant f_collator_asort(CVarRef obj, VRefParam arr, int64_t sort_flag = q_Collator$$SORT_REGULAR);
 Variant f_collator_compare(CVarRef obj, CStrRef str1, CStrRef str2);
 Variant f_collator_create(CStrRef locale);
-Variant f_collator_get_attribute(CVarRef obj, int64 attr);
+Variant f_collator_get_attribute(CVarRef obj, int64_t attr);
 Variant f_collator_get_error_code(CVarRef obj);
 Variant f_collator_get_error_message(CVarRef obj);
-Variant f_collator_get_locale(CVarRef obj, int64 type = 0);
+Variant f_collator_get_locale(CVarRef obj, int64_t type = 0);
 Variant f_collator_get_strength(CVarRef obj);
-Variant f_collator_set_attribute(CVarRef obj, int64 attr, int64 val);
-Variant f_collator_set_strength(CVarRef obj, int64 strength);
+Variant f_collator_set_attribute(CVarRef obj, int64_t attr, int64_t val);
+Variant f_collator_set_strength(CVarRef obj, int64_t strength);
 Variant f_collator_sort_with_sort_keys(CVarRef obj, VRefParam arr);
-Variant f_collator_sort(CVarRef obj, VRefParam arr, int64 sort_flag = q_Collator$$SORT_REGULAR);
-Variant f_idn_to_ascii(CStrRef domain, int64 options = 0, int64 variant = 0, VRefParam idna_info = null);
-Variant f_idn_to_unicode(CStrRef domain, int64 options = 0, int64 variant = 0, VRefParam idna_info = null);
-Variant f_idn_to_utf8(CStrRef domain, int64 options = 0, int64 variant = 0, VRefParam idna_info = null);
-extern const int64 q_Collator$$SORT_REGULAR;
-extern const int64 q_Collator$$SORT_NUMERIC;
-extern const int64 q_Collator$$SORT_STRING;
-extern const int64 q_Collator$$FRENCH_COLLATION;
-extern const int64 q_Collator$$ALTERNATE_HANDLING;
-extern const int64 q_Collator$$CASE_FIRST;
-extern const int64 q_Collator$$CASE_LEVEL;
-extern const int64 q_Collator$$NORMALIZATION_MODE;
-extern const int64 q_Collator$$STRENGTH;
-extern const int64 q_Collator$$HIRAGANA_QUATERNARY_MODE;
-extern const int64 q_Collator$$NUMERIC_COLLATION;
-extern const int64 q_Collator$$DEFAULT_VALUE;
-extern const int64 q_Collator$$PRIMARY;
-extern const int64 q_Collator$$SECONDARY;
-extern const int64 q_Collator$$TERTIARY;
-extern const int64 q_Collator$$DEFAULT_STRENGTH;
-extern const int64 q_Collator$$QUATERNARY;
-extern const int64 q_Collator$$IDENTICAL;
-extern const int64 q_Collator$$OFF;
-extern const int64 q_Collator$$ON;
-extern const int64 q_Collator$$SHIFTED;
-extern const int64 q_Collator$$NON_IGNORABLE;
-extern const int64 q_Collator$$LOWER_FIRST;
-extern const int64 q_Collator$$UPPER_FIRST;
+Variant f_collator_sort(CVarRef obj, VRefParam arr, int64_t sort_flag = q_Collator$$SORT_REGULAR);
+Variant f_idn_to_ascii(CStrRef domain, int64_t options = 0, int64_t variant = 0, VRefParam idna_info = null);
+Variant f_idn_to_unicode(CStrRef domain, int64_t options = 0, int64_t variant = 0, VRefParam idna_info = null);
+Variant f_idn_to_utf8(CStrRef domain, int64_t options = 0, int64_t variant = 0, VRefParam idna_info = null);
+extern const int64_t q_Collator$$SORT_REGULAR;
+extern const int64_t q_Collator$$SORT_NUMERIC;
+extern const int64_t q_Collator$$SORT_STRING;
+extern const int64_t q_Collator$$FRENCH_COLLATION;
+extern const int64_t q_Collator$$ALTERNATE_HANDLING;
+extern const int64_t q_Collator$$CASE_FIRST;
+extern const int64_t q_Collator$$CASE_LEVEL;
+extern const int64_t q_Collator$$NORMALIZATION_MODE;
+extern const int64_t q_Collator$$STRENGTH;
+extern const int64_t q_Collator$$HIRAGANA_QUATERNARY_MODE;
+extern const int64_t q_Collator$$NUMERIC_COLLATION;
+extern const int64_t q_Collator$$DEFAULT_VALUE;
+extern const int64_t q_Collator$$PRIMARY;
+extern const int64_t q_Collator$$SECONDARY;
+extern const int64_t q_Collator$$TERTIARY;
+extern const int64_t q_Collator$$DEFAULT_STRENGTH;
+extern const int64_t q_Collator$$QUATERNARY;
+extern const int64_t q_Collator$$IDENTICAL;
+extern const int64_t q_Collator$$OFF;
+extern const int64_t q_Collator$$ON;
+extern const int64_t q_Collator$$SHIFTED;
+extern const int64_t q_Collator$$NON_IGNORABLE;
+extern const int64_t q_Collator$$LOWER_FIRST;
+extern const int64_t q_Collator$$UPPER_FIRST;
 
 ///////////////////////////////////////////////////////////////////////////////
 // class Collator
@@ -85,29 +85,29 @@ class c_Collator : public ExtObjectData, public Sweepable {
   public: c_Collator(VM::Class* cls = c_Collator::s_cls);
   public: ~c_Collator();
   public: void t___construct(CStrRef locale);
-  public: bool t_asort(VRefParam arr, int64 sort_flag = q_Collator$$SORT_REGULAR);
+  public: bool t_asort(VRefParam arr, int64_t sort_flag = q_Collator$$SORT_REGULAR);
   public: Variant t_compare(CStrRef str1, CStrRef str2);
   public: static Variant ti_create(const char* cls , CStrRef locale);
   public: static Variant t_create(CStrRef locale) {
     return ti_create("collator", locale);
   }
-  public: int64 t_getattribute(int64 attr);
-  public: int64 t_geterrorcode();
+  public: int64_t t_getattribute(int64_t attr);
+  public: int64_t t_geterrorcode();
   public: String t_geterrormessage();
-  public: String t_getlocale(int64 type = 0);
-  public: int64 t_getstrength();
-  public: bool t_setattribute(int64 attr, int64 val);
-  public: bool t_setstrength(int64 strength);
+  public: String t_getlocale(int64_t type = 0);
+  public: int64_t t_getstrength();
+  public: bool t_setattribute(int64_t attr, int64_t val);
+  public: bool t_setstrength(int64_t strength);
   public: bool t_sortwithsortkeys(VRefParam arr);
-  public: bool t_sort(VRefParam arr, int64 sort_flag = q_Collator$$SORT_REGULAR);
+  public: bool t_sort(VRefParam arr, int64_t sort_flag = q_Collator$$SORT_REGULAR);
 
  private:
   String     m_locale;
   UCollator *m_ucoll;
   intl_error m_errcode;
 };
-extern const int64 q_Locale$$ACTUAL_LOCALE;
-extern const int64 q_Locale$$VALID_LOCALE;
+extern const int64_t q_Locale$$ACTUAL_LOCALE;
+extern const int64_t q_Locale$$VALID_LOCALE;
 
 ///////////////////////////////////////////////////////////////////////////////
 // class Locale
@@ -122,15 +122,15 @@ class c_Locale : public ExtObjectData {
   public: ~c_Locale();
   public: void t___construct();
 };
-extern const int64 q_Normalizer$$NONE;
-extern const int64 q_Normalizer$$FORM_D;
-extern const int64 q_Normalizer$$NFD;
-extern const int64 q_Normalizer$$FORM_KD;
-extern const int64 q_Normalizer$$NFKD;
-extern const int64 q_Normalizer$$FORM_C;
-extern const int64 q_Normalizer$$NFC;
-extern const int64 q_Normalizer$$FORM_KC;
-extern const int64 q_Normalizer$$NFKC;
+extern const int64_t q_Normalizer$$NONE;
+extern const int64_t q_Normalizer$$FORM_D;
+extern const int64_t q_Normalizer$$NFD;
+extern const int64_t q_Normalizer$$FORM_KD;
+extern const int64_t q_Normalizer$$NFKD;
+extern const int64_t q_Normalizer$$FORM_C;
+extern const int64_t q_Normalizer$$NFC;
+extern const int64_t q_Normalizer$$FORM_KC;
+extern const int64_t q_Normalizer$$NFKC;
 
 ///////////////////////////////////////////////////////////////////////////////
 // class Normalizer
@@ -144,12 +144,12 @@ class c_Normalizer : public ExtObjectData, public Sweepable {
   public: c_Normalizer(VM::Class* cls = c_Normalizer::s_cls);
   public: ~c_Normalizer();
   public: void t___construct();
-  public: static Variant ti_isnormalized(const char* cls , CStrRef input, int64 form = q_Normalizer$$FORM_C);
-  public: static Variant t_isnormalized(CStrRef input, int64 form = q_Normalizer$$FORM_C) {
+  public: static Variant ti_isnormalized(const char* cls , CStrRef input, int64_t form = q_Normalizer$$FORM_C);
+  public: static Variant t_isnormalized(CStrRef input, int64_t form = q_Normalizer$$FORM_C) {
     return ti_isnormalized("normalizer", input, form);
   }
-  public: static Variant ti_normalize(const char* cls , CStrRef input, int64 form = q_Normalizer$$FORM_C);
-  public: static Variant t_normalize(CStrRef input, int64 form = q_Normalizer$$FORM_C) {
+  public: static Variant ti_normalize(const char* cls , CStrRef input, int64_t form = q_Normalizer$$FORM_C);
+  public: static Variant t_normalize(CStrRef input, int64_t form = q_Normalizer$$FORM_C) {
     return ti_normalize("normalizer", input, form);
   }
 };
diff --git a/hphp/runtime/ext/ext_ipc.cpp b/hphp/runtime/ext/ext_ipc.cpp
index e58290c3207d1..2d1556f0a317b 100644
--- a/hphp/runtime/ext/ext_ipc.cpp
+++ b/hphp/runtime/ext/ext_ipc.cpp
@@ -50,7 +50,7 @@ IMPLEMENT_DEFAULT_EXTENSION(sysvsem);
 IMPLEMENT_DEFAULT_EXTENSION(sysvshm);
 ///////////////////////////////////////////////////////////////////////////////
 
-int64 f_ftok(CStrRef pathname, CStrRef proj) {
+int64_t f_ftok(CStrRef pathname, CStrRef proj) {
   if (pathname.empty()) {
     raise_warning("Pathname is empty");
     return -1;
@@ -70,7 +70,7 @@ class MessageQueue : public ResourceData {
 public:
   DECLARE_OBJECT_ALLOCATION(MessageQueue)
 
-  int64 key;
+  int64_t key;
   int id;
 
   static StaticString s_class_name;
@@ -81,7 +81,7 @@ IMPLEMENT_OBJECT_ALLOCATION(MessageQueue)
 
 StaticString MessageQueue::s_class_name("MessageQueue");
 
-Variant f_msg_get_queue(int64 key, int64 perms /* = 0666 */) {
+Variant f_msg_get_queue(int64_t key, int64_t perms /* = 0666 */) {
   int id = msgget(key, 0);
   if (id < 0) {
     id = msgget(key, IPC_CREAT | IPC_EXCL | perms);
@@ -97,7 +97,7 @@ Variant f_msg_get_queue(int64 key, int64 perms /* = 0666 */) {
   return Object(q);
 }
 
-bool f_msg_queue_exists(int64 key) {
+bool f_msg_queue_exists(int64_t key) {
   return msgget(key, 0) >= 0;
 }
 
@@ -122,13 +122,13 @@ bool f_msg_set_queue(CObjRef queue, CArrRef data) {
   if (msgctl(q->id, IPC_STAT, &stat) == 0) {
     Variant value;
     value = data["msg_perm.uid"];
-    if (!value.isNull()) stat.msg_perm.uid = (int64)value;
+    if (!value.isNull()) stat.msg_perm.uid = (int64_t)value;
     value = data["msg_perm.gid"];
-    if (!value.isNull()) stat.msg_perm.uid = (int64)value;
+    if (!value.isNull()) stat.msg_perm.uid = (int64_t)value;
     value = data["msg_perm.mode"];
-    if (!value.isNull()) stat.msg_perm.uid = (int64)value;
+    if (!value.isNull()) stat.msg_perm.uid = (int64_t)value;
     value = data["msg_qbytes"];
-    if (!value.isNull()) stat.msg_perm.uid = (int64)value;
+    if (!value.isNull()) stat.msg_perm.uid = (int64_t)value;
 
     return msgctl(q->id, IPC_SET, &stat) == 0;
   }
@@ -146,14 +146,14 @@ Array f_msg_stat_queue(CObjRef queue) {
   struct msqid_ds stat;
   if (msgctl(q->id, IPC_STAT, &stat) == 0) {
     Array data;
-    data.set("msg_perm.uid",  (int64)stat.msg_perm.uid);
-    data.set("msg_perm.gid",  (int64)stat.msg_perm.gid);
+    data.set("msg_perm.uid",  (int64_t)stat.msg_perm.uid);
+    data.set("msg_perm.gid",  (int64_t)stat.msg_perm.gid);
     data.set("msg_perm.mode", stat.msg_perm.mode);
-    data.set("msg_stime",     (int64)stat.msg_stime);
-    data.set("msg_rtime",     (int64)stat.msg_rtime);
-    data.set("msg_ctime",     (int64)stat.msg_ctime);
-    data.set("msg_qnum",      (int64)stat.msg_qnum);
-    data.set("msg_qbytes",    (int64)stat.msg_qbytes);
+    data.set("msg_stime",     (int64_t)stat.msg_stime);
+    data.set("msg_rtime",     (int64_t)stat.msg_rtime);
+    data.set("msg_ctime",     (int64_t)stat.msg_ctime);
+    data.set("msg_qnum",      (int64_t)stat.msg_qnum);
+    data.set("msg_qbytes",    (int64_t)stat.msg_qbytes);
     data.set("msg_lspid",     stat.msg_lspid);
     data.set("msg_lrpid",     stat.msg_lrpid);
     return data;
@@ -162,7 +162,7 @@ Array f_msg_stat_queue(CObjRef queue) {
   return Array();
 }
 
-bool f_msg_send(CObjRef queue, int64 msgtype, CVarRef message,
+bool f_msg_send(CObjRef queue, int64_t msgtype, CVarRef message,
                 bool serialize /* = true */, bool blocking /* = true */,
                 VRefParam errorcode /* = null */) {
   MessageQueue *q = queue.getTyped<MessageQueue>();
@@ -197,10 +197,10 @@ bool f_msg_send(CObjRef queue, int64 msgtype, CVarRef message,
   return true;
 }
 
-bool f_msg_receive(CObjRef queue, int64 desiredmsgtype, VRefParam msgtype,
-                   int64 maxsize, VRefParam message,
+bool f_msg_receive(CObjRef queue, int64_t desiredmsgtype, VRefParam msgtype,
+                   int64_t maxsize, VRefParam message,
                    bool unserialize /* = true */,
-                   int64 flags /* = 0 */, VRefParam errorcode /* = null */) {
+                   int64_t flags /* = 0 */, VRefParam errorcode /* = null */) {
   MessageQueue *q = queue.getTyped<MessageQueue>();
   if (!q) {
     raise_warning("Invalid message queue was specified");
@@ -212,7 +212,7 @@ bool f_msg_receive(CObjRef queue, int64 desiredmsgtype, VRefParam msgtype,
     return false;
   }
 
-  int64 realflags = 0;
+  int64_t realflags = 0;
   if (flags != 0) {
 #if !defined(__APPLE__) && !defined(__FreeBSD__)
     if (flags & k_MSG_EXCEPT) realflags |= MSG_EXCEPT;
@@ -364,8 +364,8 @@ bool f_sem_release(CObjRef sem_identifier) {
  * Return an id for the semaphore with the given key, and allow max_acquire
  * (default 1) processes to acquire it simultaneously.
  */
-Variant f_sem_get(int64 key, int64 max_acquire /* = 1 */,
-                  int64 perm /* = 0666 */, bool auto_release /* = true */) {
+Variant f_sem_get(int64_t key, int64_t max_acquire /* = 1 */,
+                  int64_t perm /* = 0666 */, bool auto_release /* = true */) {
   /* Get/create the semaphore.  Note that we rely on the semaphores
    * being zeroed when they are created.  Despite the fact that
    * the(?)  Linux semget() man page says they are not initialized,
@@ -587,8 +587,8 @@ static int put_shm_data(sysvshm_chunk_head *ptr, long key, char *data,
   return 0;
 }
 
-Variant f_shm_attach(int64 shm_key, int64 shm_size /* = 10000 */,
-                     int64 shm_flag /* = 0666 */) {
+Variant f_shm_attach(int64_t shm_key, int64_t shm_size /* = 10000 */,
+                     int64_t shm_flag /* = 0666 */) {
   char *shm_ptr;
   long shm_id;
 
@@ -633,12 +633,12 @@ Variant f_shm_attach(int64 shm_key, int64 shm_size /* = 10000 */,
   shm_list_ptr->id = shm_id;
   shm_list_ptr->ptr = chunk_ptr;
   Lock lock(g_shm_mutex);
-  int64 ret = (int64)shm_list_ptr.get();
+  int64_t ret = (int64_t)shm_list_ptr.get();
   g_shms.insert(shm_list_ptr.release());
   return ret;
 }
 
-bool f_shm_detach(int64 shm_identifier) {
+bool f_shm_detach(int64_t shm_identifier) {
   Lock lock(g_shm_mutex);
   std::set<sysvshm_shm*>::iterator iter =
     g_shms.find((sysvshm_shm*)shm_identifier);
@@ -652,7 +652,7 @@ bool f_shm_detach(int64 shm_identifier) {
   return true;
 }
 
-bool f_shm_remove(int64 shm_identifier) {
+bool f_shm_remove(int64_t shm_identifier) {
   Lock lock(g_shm_mutex);
   std::set<sysvshm_shm*>::iterator iter =
     g_shms.find((sysvshm_shm*)shm_identifier);
@@ -670,7 +670,7 @@ bool f_shm_remove(int64 shm_identifier) {
   return true;
 }
 
-Variant f_shm_get_var(int64 shm_identifier, int64 variable_key) {
+Variant f_shm_get_var(int64_t shm_identifier, int64_t variable_key) {
   Lock lock(g_shm_mutex);
   std::set<sysvshm_shm*>::iterator iter =
     g_shms.find((sysvshm_shm*)shm_identifier);
@@ -691,7 +691,7 @@ Variant f_shm_get_var(int64 shm_identifier, int64 variable_key) {
   return f_unserialize(String(&shm_var->mem, shm_var->length, AttachLiteral));
 }
 
-bool f_shm_has_var(int64 shm_identifier, int64 variable_key) {
+bool f_shm_has_var(int64_t shm_identifier, int64_t variable_key) {
   Lock lock(g_shm_mutex);
   std::set<sysvshm_shm*>::iterator iter =
     g_shms.find((sysvshm_shm*)shm_identifier);
@@ -706,7 +706,7 @@ bool f_shm_has_var(int64 shm_identifier, int64 variable_key) {
   return shm_varpos >= 0;
 }
 
-bool f_shm_put_var(int64 shm_identifier, int64 variable_key,
+bool f_shm_put_var(int64_t shm_identifier, int64_t variable_key,
                    CVarRef variable) {
   Lock lock(g_shm_mutex);
   std::set<sysvshm_shm*>::iterator iter =
@@ -731,7 +731,7 @@ bool f_shm_put_var(int64 shm_identifier, int64 variable_key,
   return true;
 }
 
-bool f_shm_remove_var(int64 shm_identifier, int64 variable_key) {
+bool f_shm_remove_var(int64_t shm_identifier, int64_t variable_key) {
   Lock lock(g_shm_mutex);
   std::set<sysvshm_shm*>::iterator iter =
     g_shms.find((sysvshm_shm*)shm_identifier);
diff --git a/hphp/runtime/ext/ext_ipc.h b/hphp/runtime/ext/ext_ipc.h
index 5525f4f20cfd6..f2b2b673b4978 100644
--- a/hphp/runtime/ext/ext_ipc.h
+++ b/hphp/runtime/ext/ext_ipc.h
@@ -24,16 +24,16 @@ namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 // message queue
 
-int64 f_ftok(CStrRef pathname, CStrRef proj);
+int64_t f_ftok(CStrRef pathname, CStrRef proj);
 
-Variant f_msg_get_queue(int64 key, int64 perms = 0666);
-bool f_msg_queue_exists(int64 key);
-bool f_msg_send(CObjRef queue, int64 msgtype, CVarRef message,
+Variant f_msg_get_queue(int64_t key, int64_t perms = 0666);
+bool f_msg_queue_exists(int64_t key);
+bool f_msg_send(CObjRef queue, int64_t msgtype, CVarRef message,
                 bool serialize = true, bool blocking = true,
                 VRefParam errorcode = null);
-bool f_msg_receive(CObjRef queue, int64 desiredmsgtype, VRefParam msgtype,
-                   int64 maxsize, VRefParam message, bool unserialize = true,
-                   int64 flags = 0, VRefParam errorcode = null);
+bool f_msg_receive(CObjRef queue, int64_t desiredmsgtype, VRefParam msgtype,
+                   int64_t maxsize, VRefParam message, bool unserialize = true,
+                   int64_t flags = 0, VRefParam errorcode = null);
 bool f_msg_remove_queue(CObjRef queue);
 bool f_msg_set_queue(CObjRef queue, CArrRef data);
 Array f_msg_stat_queue(CObjRef queue);
@@ -42,7 +42,7 @@ Array f_msg_stat_queue(CObjRef queue);
 // semaphore
 
 bool f_sem_acquire(CObjRef sem_identifier);
-Variant f_sem_get(int64 key, int64 max_acquire = 1, int64 perm = 0666,
+Variant f_sem_get(int64_t key, int64_t max_acquire = 1, int64_t perm = 0666,
                   bool auto_release = true);
 bool f_sem_release(CObjRef sem_identifier);
 bool f_sem_remove(CObjRef sem_identifier);
@@ -50,13 +50,13 @@ bool f_sem_remove(CObjRef sem_identifier);
 ///////////////////////////////////////////////////////////////////////////////
 // shared memory
 
-Variant f_shm_attach(int64 shm_key, int64 shm_size = 10000, int64 shm_flag = 0666);
-bool f_shm_detach(int64 shm_identifier);
-bool f_shm_remove(int64 shm_identifier);
-Variant f_shm_get_var(int64 shm_identifier, int64 variable_key);
-bool f_shm_has_var(int64 shm_identifier, int64 variable_key);
-bool f_shm_put_var(int64 shm_identifier, int64 variable_key, CVarRef variable);
-bool f_shm_remove_var(int64 shm_identifier, int64 variable_key);
+Variant f_shm_attach(int64_t shm_key, int64_t shm_size = 10000, int64_t shm_flag = 0666);
+bool f_shm_detach(int64_t shm_identifier);
+bool f_shm_remove(int64_t shm_identifier);
+Variant f_shm_get_var(int64_t shm_identifier, int64_t variable_key);
+bool f_shm_has_var(int64_t shm_identifier, int64_t variable_key);
+bool f_shm_put_var(int64_t shm_identifier, int64_t variable_key, CVarRef variable);
+bool f_shm_remove_var(int64_t shm_identifier, int64_t variable_key);
 
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/ext/ext_iterator.cpp b/hphp/runtime/ext/ext_iterator.cpp
index 19cecea4b0134..b6f3fc312849f 100644
--- a/hphp/runtime/ext/ext_iterator.cpp
+++ b/hphp/runtime/ext/ext_iterator.cpp
@@ -152,7 +152,7 @@ void RecursiveIteratorIterator::sweep() {
   m_iterators.clear();
 }
 
-Object f_hphp_recursiveiteratoriterator___construct(CObjRef obj, CObjRef iterator, int64 mode, int64 flags) {
+Object f_hphp_recursiveiteratoriterator___construct(CObjRef obj, CObjRef iterator, int64_t mode, int64_t flags) {
   if (iterator->o_instanceof("RecursiveDirectoryIterator")) {
     CVarRef rsrc = iterator->o_get("rsrc", true, "SplFileInfo");
     obj->o_set("rsrc", NEWOBJ(RecursiveIteratorIterator)(rsrc, mode, flags),
@@ -199,14 +199,14 @@ Variant f_hphp_recursiveiteratoriterator_key(CObjRef obj) {
 // here and elsewhere in the runtime.
 
 // Class constants that we use from RecursiveIteratorIterator
-static const int64 LEAVES_ONLY = 0L;
-static const int64 SELF_FIRST = 1L;
-static const int64 CHILD_FIRST = 2L;
+static const int64_t LEAVES_ONLY = 0L;
+static const int64_t SELF_FIRST = 1L;
+static const int64_t CHILD_FIRST = 2L;
 
 // Class constants that we use from RecursiveDirectoryIterator
-static const int64 CURRENT_AS_FILEINFO = 16L;
-static const int64 CURRENT_AS_PATHNAME = 32L;
-static const int64 KEY_AS_FILENAME = 256L;
+static const int64_t CURRENT_AS_FILEINFO = 16L;
+static const int64_t CURRENT_AS_PATHNAME = 32L;
+static const int64_t KEY_AS_FILENAME = 256L;
 
 void f_hphp_recursiveiteratoriterator_next(CObjRef obj) {
   RecursiveIteratorIterator *rii = get_recursiveiteratoriterator(obj);
@@ -347,7 +347,7 @@ void f_hphp_directoryiterator_rewind(CObjRef obj) {
   di->rewind();
 }
 
-void f_hphp_directoryiterator_seek(CObjRef obj, int64 position) {
+void f_hphp_directoryiterator_seek(CObjRef obj, int64_t position) {
   DirectoryIterator *di = get_directoryiterator(obj);
   for (int i = 0; i < position - di->m_index; i++) {
     f_hphp_directoryiterator_next(obj);
@@ -374,7 +374,7 @@ bool f_hphp_directoryiterator_isdot(CObjRef obj) {
 }
 
 bool f_hphp_recursivedirectoryiterator___construct(CObjRef obj, CStrRef path,
-    int64 flags) {
+    int64_t flags) {
   SmartObject<RecursiveDirectoryIterator> rsrc =
     NEWOBJ(RecursiveDirectoryIterator)(path, flags);
   obj->o_set("rsrc", rsrc, "SplFileInfo");
@@ -401,7 +401,7 @@ void f_hphp_recursivedirectoryiterator_rewind(CObjRef obj) {
   }
 }
 
-void f_hphp_recursivedirectoryiterator_seek(CObjRef obj, int64 position) {
+void f_hphp_recursivedirectoryiterator_seek(CObjRef obj, int64_t position) {
   f_hphp_directoryiterator_seek(obj, position);
 }
 
diff --git a/hphp/runtime/ext/ext_iterator.h b/hphp/runtime/ext/ext_iterator.h
index 380bd7309800a..f242cb52d8e42 100644
--- a/hphp/runtime/ext/ext_iterator.h
+++ b/hphp/runtime/ext/ext_iterator.h
@@ -92,7 +92,7 @@ class RecursiveIteratorIterator: public SweepableResourceData {
   int m_flags;
 };
 
-Object f_hphp_recursiveiteratoriterator___construct(CObjRef obj, CObjRef iterator, int64 mode, int64 flags);
+Object f_hphp_recursiveiteratoriterator___construct(CObjRef obj, CObjRef iterator, int64_t mode, int64_t flags);
 Object f_hphp_recursiveiteratoriterator_getinneriterator(CObjRef obj);
 Variant f_hphp_recursiveiteratoriterator_current(CObjRef obj);
 Variant f_hphp_recursiveiteratoriterator_key(CObjRef obj);
@@ -104,17 +104,17 @@ bool f_hphp_directoryiterator___construct(CObjRef obj, CStrRef path);
 Variant f_hphp_directoryiterator_key(CObjRef obj);
 void f_hphp_directoryiterator_next(CObjRef obj);
 void f_hphp_directoryiterator_rewind(CObjRef obj);
-void f_hphp_directoryiterator_seek(CObjRef obj, int64 position);
+void f_hphp_directoryiterator_seek(CObjRef obj, int64_t position);
 Variant f_hphp_directoryiterator_current(CObjRef obj);
 String f_hphp_directoryiterator___tostring(CObjRef obj);
 bool f_hphp_directoryiterator_valid(CObjRef obj);
 bool f_hphp_directoryiterator_isdot(CObjRef obj);
 
-bool f_hphp_recursivedirectoryiterator___construct(CObjRef obj, CStrRef path, int64 flags);
+bool f_hphp_recursivedirectoryiterator___construct(CObjRef obj, CStrRef path, int64_t flags);
 Variant f_hphp_recursivedirectoryiterator_key(CObjRef obj);
 void f_hphp_recursivedirectoryiterator_next(CObjRef obj);
 void f_hphp_recursivedirectoryiterator_rewind(CObjRef obj);
-void f_hphp_recursivedirectoryiterator_seek(CObjRef obj, int64 position);
+void f_hphp_recursivedirectoryiterator_seek(CObjRef obj, int64_t position);
 Variant f_hphp_recursivedirectoryiterator_current(CObjRef obj);
 String f_hphp_recursivedirectoryiterator___tostring(CObjRef obj);
 bool f_hphp_recursivedirectoryiterator_valid(CObjRef obj);
diff --git a/hphp/runtime/ext/ext_json.cpp b/hphp/runtime/ext/ext_json.cpp
index cd958c415e384..02b91e4e61d3c 100644
--- a/hphp/runtime/ext/ext_json.cpp
+++ b/hphp/runtime/ext/ext_json.cpp
@@ -23,23 +23,23 @@
 namespace HPHP {
 IMPLEMENT_DEFAULT_EXTENSION(json);
 ///////////////////////////////////////////////////////////////////////////////
-const int64 k_JSON_HEX_TAG       = 1<<0;
-const int64 k_JSON_HEX_AMP       = 1<<1;
-const int64 k_JSON_HEX_APOS      = 1<<2;
-const int64 k_JSON_HEX_QUOT      = 1<<3;
-const int64 k_JSON_FORCE_OBJECT  = 1<<4;
-const int64 k_JSON_NUMERIC_CHECK = 1<<5;
-const int64 k_JSON_UNESCAPED_SLASHES = 1<<6;
-const int64 k_JSON_PRETTY_PRINT  = 1<<7;
+const int64_t k_JSON_HEX_TAG       = 1<<0;
+const int64_t k_JSON_HEX_AMP       = 1<<1;
+const int64_t k_JSON_HEX_APOS      = 1<<2;
+const int64_t k_JSON_HEX_QUOT      = 1<<3;
+const int64_t k_JSON_FORCE_OBJECT  = 1<<4;
+const int64_t k_JSON_NUMERIC_CHECK = 1<<5;
+const int64_t k_JSON_UNESCAPED_SLASHES = 1<<6;
+const int64_t k_JSON_PRETTY_PRINT  = 1<<7;
 // intentionally higher so when PHP adds more options we're fine
-const int64 k_JSON_FB_LOOSE      = 1<<20;
-const int64 k_JSON_FB_UNLIMITED  = 1<<21;
-const int64 k_JSON_FB_EXTRA_ESCAPES = 1<<22;
+const int64_t k_JSON_FB_LOOSE      = 1<<20;
+const int64_t k_JSON_FB_UNLIMITED  = 1<<21;
+const int64_t k_JSON_FB_EXTRA_ESCAPES = 1<<22;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 String f_json_encode(CVarRef value, CVarRef options /* = 0 */) {
-  int64 json_options = options.toInt64();
+  int64_t json_options = options.toInt64();
   if (options.isBoolean() && options.toBooleanVal()) {
     json_options = k_JSON_FB_LOOSE;
   }
@@ -54,7 +54,7 @@ Variant f_json_decode(CStrRef json, bool assoc /* = false */,
     return null;
   }
 
-  int64 json_options = options.toInt64();
+  int64_t json_options = options.toInt64();
   if (options.isBoolean() && options.toBooleanVal()) {
     json_options = k_JSON_FB_LOOSE;
   }
@@ -72,7 +72,7 @@ Variant f_json_decode(CStrRef json, bool assoc /* = false */,
     return false;
   }
 
-  int64 p;
+  int64_t p;
   double d;
   DataType type = json->isNumericWithVal(p, d, 0);
   if (type == KindOfInt64) {
diff --git a/hphp/runtime/ext/ext_json.h b/hphp/runtime/ext/ext_json.h
index b0dc1def97c22..b6a4dffe248f9 100644
--- a/hphp/runtime/ext/ext_json.h
+++ b/hphp/runtime/ext/ext_json.h
@@ -27,18 +27,18 @@ namespace HPHP {
 
 String f_json_encode(CVarRef value, CVarRef options = 0);
 Variant f_json_decode(CStrRef json, bool assoc = false, CVarRef options = 0);
-extern const int64 k_JSON_HEX_TAG;
-extern const int64 k_JSON_HEX_AMP;
-extern const int64 k_JSON_HEX_APOS;
-extern const int64 k_JSON_HEX_QUOT;
-extern const int64 k_JSON_FORCE_OBJECT;
-extern const int64 k_JSON_NUMERIC_CHECK;
-extern const int64 k_JSON_UNESCAPED_SLASHES;
-extern const int64 k_JSON_PRETTY_PRINT;
-extern const int64 k_JSON_FB_LOOSE;
-extern const int64 k_JSON_FB_LOOSE;
-extern const int64 k_JSON_FB_EXTRA_ESCAPES;
-extern const int64 k_JSON_FB_UNLIMITED;
+extern const int64_t k_JSON_HEX_TAG;
+extern const int64_t k_JSON_HEX_AMP;
+extern const int64_t k_JSON_HEX_APOS;
+extern const int64_t k_JSON_HEX_QUOT;
+extern const int64_t k_JSON_FORCE_OBJECT;
+extern const int64_t k_JSON_NUMERIC_CHECK;
+extern const int64_t k_JSON_UNESCAPED_SLASHES;
+extern const int64_t k_JSON_PRETTY_PRINT;
+extern const int64_t k_JSON_FB_LOOSE;
+extern const int64_t k_JSON_FB_LOOSE;
+extern const int64_t k_JSON_FB_EXTRA_ESCAPES;
+extern const int64_t k_JSON_FB_UNLIMITED;
 ///////////////////////////////////////////////////////////////////////////////
 }
 
diff --git a/hphp/runtime/ext/ext_ldap.cpp b/hphp/runtime/ext/ext_ldap.cpp
index 46e2c841d2423..e3c64319b003c 100644
--- a/hphp/runtime/ext/ext_ldap.cpp
+++ b/hphp/runtime/ext/ext_ldap.cpp
@@ -703,7 +703,7 @@ bool f_ldap_get_option(CObjRef link, int option, VRefParam retval) {
       if (ldap_get_option(ld->link, option, &val)) {
         return false;
       }
-      retval = (int64)val;
+      retval = (int64_t)val;
     } break;
 #ifdef LDAP_OPT_NETWORK_TIMEOUT
   case LDAP_OPT_NETWORK_TIMEOUT:
@@ -716,7 +716,7 @@ bool f_ldap_get_option(CObjRef link, int option, VRefParam retval) {
         }
         return false;
       }
-      retval = (int64)timeout->tv_sec;
+      retval = (int64_t)timeout->tv_sec;
       ldap_memfree(timeout);
     } break;
 #elif defined(LDAP_X_OPT_CONNECT_TIMEOUT)
@@ -726,7 +726,7 @@ bool f_ldap_get_option(CObjRef link, int option, VRefParam retval) {
       if (ldap_get_option(ld->link, LDAP_X_OPT_CONNECT_TIMEOUT, &timeout)) {
         return false;
       }
-      retval = (int64)(timeout / 1000);
+      retval = (int64_t)(timeout / 1000);
     } break;
 #endif
   /* options with string value */
@@ -972,7 +972,7 @@ Variant f_ldap_compare(CObjRef link, CStrRef dn, CStrRef attribute,
   return -1LL;
 }
 
-int64 f_ldap_errno(CObjRef link) {
+int64_t f_ldap_errno(CObjRef link) {
   LdapLink *ld = link.getTyped<LdapLink>();
   return _get_lderrno(ld->link);
 }
@@ -996,7 +996,7 @@ Variant f_ldap_get_dn(CObjRef link, CObjRef result_entry) {
   return false;
 }
 
-int64 f_ldap_count_entries(CObjRef link, CObjRef result) {
+int64_t f_ldap_count_entries(CObjRef link, CObjRef result) {
   LdapLink *ld = link.getTyped<LdapLink>();
   LdapResult *res = result.getTyped<LdapResult>();
   return ldap_count_entries(ld->link, res->data);
diff --git a/hphp/runtime/ext/ext_ldap.h b/hphp/runtime/ext/ext_ldap.h
index afd633d9bc155..f084a968811ac 100644
--- a/hphp/runtime/ext/ext_ldap.h
+++ b/hphp/runtime/ext/ext_ldap.h
@@ -48,10 +48,10 @@ Variant f_ldap_search(CVarRef link, CVarRef base_dn, CVarRef filter, CArrRef att
 bool f_ldap_rename(CObjRef link, CStrRef dn, CStrRef newrdn, CStrRef newparent, bool deleteoldrdn);
 bool f_ldap_delete(CObjRef link, CStrRef dn);
 Variant f_ldap_compare(CObjRef link, CStrRef dn, CStrRef attribute, CStrRef value);
-int64 f_ldap_errno(CObjRef link);
+int64_t f_ldap_errno(CObjRef link);
 String f_ldap_error(CObjRef link);
 Variant f_ldap_get_dn(CObjRef link, CObjRef result_entry);
-int64 f_ldap_count_entries(CObjRef link, CObjRef result);
+int64_t f_ldap_count_entries(CObjRef link, CObjRef result);
 Variant f_ldap_get_entries(CObjRef link, CObjRef result);
 Variant f_ldap_first_entry(CObjRef link, CObjRef result);
 Variant f_ldap_next_entry(CObjRef link, CObjRef result_entry);
diff --git a/hphp/runtime/ext/ext_magick.cpp b/hphp/runtime/ext/ext_magick.cpp
index 086a1fbb223d6..df3896606514d 100644
--- a/hphp/runtime/ext/ext_magick.cpp
+++ b/hphp/runtime/ext/ext_magick.cpp
@@ -48,7 +48,7 @@ Array f_magickgetversion() {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetversionnumber() {
+int64_t f_magickgetversionnumber() {
   throw NotImplementedException(__func__);
 }
 
@@ -176,7 +176,7 @@ String f_wandgetexceptionstring(CObjRef wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_wandgetexceptiontype(CObjRef wnd) {
+int64_t f_wandgetexceptiontype(CObjRef wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -224,11 +224,11 @@ String f_drawgetclippath(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_drawgetcliprule(CObjRef drw_wnd) {
+int64_t f_drawgetcliprule(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_drawgetclipunits(CObjRef drw_wnd) {
+int64_t f_drawgetclipunits(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -240,7 +240,7 @@ String f_drawgetexceptionstring(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_drawgetexceptiontype(CObjRef drw_wnd) {
+int64_t f_drawgetexceptiontype(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -256,7 +256,7 @@ double f_drawgetfillopacity(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_drawgetfillrule(CObjRef drw_wnd) {
+int64_t f_drawgetfillrule(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -272,11 +272,11 @@ double f_drawgetfontsize(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_drawgetfontstretch(CObjRef drw_wnd) {
+int64_t f_drawgetfontstretch(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_drawgetfontstyle(CObjRef drw_wnd) {
+int64_t f_drawgetfontstyle(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -284,7 +284,7 @@ double f_drawgetfontweight(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_drawgetgravity(CObjRef drw_wnd) {
+int64_t f_drawgetgravity(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -308,11 +308,11 @@ double f_drawgetstrokedashoffset(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_drawgetstrokelinecap(CObjRef drw_wnd) {
+int64_t f_drawgetstrokelinecap(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_drawgetstrokelinejoin(CObjRef drw_wnd) {
+int64_t f_drawgetstrokelinejoin(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -328,7 +328,7 @@ double f_drawgetstrokewidth(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_drawgettextalignment(CObjRef drw_wnd) {
+int64_t f_drawgettextalignment(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -336,7 +336,7 @@ bool f_drawgettextantialias(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_drawgettextdecoration(CObjRef drw_wnd) {
+int64_t f_drawgettextdecoration(CObjRef drw_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -844,7 +844,7 @@ String f_magickgetexceptionstring(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetexceptiontype(CObjRef mgck_wnd) {
+int64_t f_magickgetexceptiontype(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -888,15 +888,15 @@ double f_magickgetimagecolors(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetimagecolorspace(CObjRef mgck_wnd) {
+int64_t f_magickgetimagecolorspace(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetimagecompose(CObjRef mgck_wnd) {
+int64_t f_magickgetimagecompose(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetimagecompression(CObjRef mgck_wnd) {
+int64_t f_magickgetimagecompression(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -912,7 +912,7 @@ double f_magickgetimagedepth(CObjRef mgck_wnd, int channel_type /* = 0 */) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetimagedispose(CObjRef mgck_wnd) {
+int64_t f_magickgetimagedispose(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -944,11 +944,11 @@ Array f_magickgetimagehistogram(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetimageindex(CObjRef mgck_wnd) {
+int64_t f_magickgetimageindex(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetimageinterlacescheme(CObjRef mgck_wnd) {
+int64_t f_magickgetimageinterlacescheme(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -976,7 +976,7 @@ Array f_magickgetimageredprimary(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetimagerenderingintent(CObjRef mgck_wnd) {
+int64_t f_magickgetimagerenderingintent(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -992,19 +992,19 @@ String f_magickgetimagesignature(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetimagesize(CObjRef mgck_wnd) {
+int64_t f_magickgetimagesize(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetimagetype(CObjRef mgck_wnd) {
+int64_t f_magickgetimagetype(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetimageunits(CObjRef mgck_wnd) {
+int64_t f_magickgetimageunits(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetimagevirtualpixelmethod(CObjRef mgck_wnd) {
+int64_t f_magickgetimagevirtualpixelmethod(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -1020,7 +1020,7 @@ String f_magickgetimagesblob(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_magickgetinterlacescheme(CObjRef mgck_wnd) {
+int64_t f_magickgetinterlacescheme(CObjRef mgck_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -1564,7 +1564,7 @@ String f_pixelgetexceptionstring(CObjRef pxl_wnd) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_pixelgetexceptiontype(CObjRef pxl_wnd) {
+int64_t f_pixelgetexceptiontype(CObjRef pxl_wnd) {
   throw NotImplementedException(__func__);
 }
 
@@ -1712,7 +1712,7 @@ String f_pixelgetiteratorexceptionstring(CObjRef pxl_iter) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_pixelgetiteratorexceptiontype(CObjRef pxl_iter) {
+int64_t f_pixelgetiteratorexceptiontype(CObjRef pxl_iter) {
   throw NotImplementedException(__func__);
 }
 
diff --git a/hphp/runtime/ext/ext_magick.h b/hphp/runtime/ext/ext_magick.h
index 62d78c2de6d69..a5672486140e4 100644
--- a/hphp/runtime/ext/ext_magick.h
+++ b/hphp/runtime/ext/ext_magick.h
@@ -32,7 +32,7 @@ double f_magickgetquantumdepth();
 String f_magickgetreleasedate();
 double f_magickgetresourcelimit(int resource_type);
 Array f_magickgetversion();
-int64 f_magickgetversionnumber();
+int64_t f_magickgetversionnumber();
 String f_magickgetversionstring();
 String f_magickqueryconfigureoption(CStrRef option);
 Array f_magickqueryconfigureoptions(CStrRef pattern);
@@ -64,7 +64,7 @@ Object f_clonedrawingwand(CObjRef drw_wnd);
 Object f_clonemagickwand(CObjRef mgck_wnd);
 Array f_wandgetexception(CObjRef wnd);
 String f_wandgetexceptionstring(CObjRef wnd);
-int64 f_wandgetexceptiontype(CObjRef wnd);
+int64_t f_wandgetexceptiontype(CObjRef wnd);
 bool f_wandhasexception(CObjRef wnd);
 void f_drawaffine(CObjRef drw_wnd, double sx, double sy, double rx, double ry, double tx, double ty);
 void f_drawannotation(CObjRef drw_wnd, double x, double y, CStrRef text);
@@ -76,35 +76,35 @@ void f_drawcomment(CObjRef drw_wnd, CStrRef comment);
 bool f_drawcomposite(CObjRef drw_wnd, int composite_operator, double x, double y, double width, double height, CObjRef mgck_wnd);
 void f_drawellipse(CObjRef drw_wnd, double ox, double oy, double rx, double ry, double start, double end);
 String f_drawgetclippath(CObjRef drw_wnd);
-int64 f_drawgetcliprule(CObjRef drw_wnd);
-int64 f_drawgetclipunits(CObjRef drw_wnd);
+int64_t f_drawgetcliprule(CObjRef drw_wnd);
+int64_t f_drawgetclipunits(CObjRef drw_wnd);
 Array f_drawgetexception(CObjRef drw_wnd);
 String f_drawgetexceptionstring(CObjRef drw_wnd);
-int64 f_drawgetexceptiontype(CObjRef drw_wnd);
+int64_t f_drawgetexceptiontype(CObjRef drw_wnd);
 double f_drawgetfillalpha(CObjRef drw_wnd);
 Object f_drawgetfillcolor(CObjRef drw_wnd);
 double f_drawgetfillopacity(CObjRef drw_wnd);
-int64 f_drawgetfillrule(CObjRef drw_wnd);
+int64_t f_drawgetfillrule(CObjRef drw_wnd);
 String f_drawgetfont(CObjRef drw_wnd);
 String f_drawgetfontfamily(CObjRef drw_wnd);
 double f_drawgetfontsize(CObjRef drw_wnd);
-int64 f_drawgetfontstretch(CObjRef drw_wnd);
-int64 f_drawgetfontstyle(CObjRef drw_wnd);
+int64_t f_drawgetfontstretch(CObjRef drw_wnd);
+int64_t f_drawgetfontstyle(CObjRef drw_wnd);
 double f_drawgetfontweight(CObjRef drw_wnd);
-int64 f_drawgetgravity(CObjRef drw_wnd);
+int64_t f_drawgetgravity(CObjRef drw_wnd);
 double f_drawgetstrokealpha(CObjRef drw_wnd);
 bool f_drawgetstrokeantialias(CObjRef drw_wnd);
 Object f_drawgetstrokecolor(CObjRef drw_wnd);
 Array f_drawgetstrokedasharray(CObjRef drw_wnd);
 double f_drawgetstrokedashoffset(CObjRef drw_wnd);
-int64 f_drawgetstrokelinecap(CObjRef drw_wnd);
-int64 f_drawgetstrokelinejoin(CObjRef drw_wnd);
+int64_t f_drawgetstrokelinecap(CObjRef drw_wnd);
+int64_t f_drawgetstrokelinejoin(CObjRef drw_wnd);
 double f_drawgetstrokemiterlimit(CObjRef drw_wnd);
 double f_drawgetstrokeopacity(CObjRef drw_wnd);
 double f_drawgetstrokewidth(CObjRef drw_wnd);
-int64 f_drawgettextalignment(CObjRef drw_wnd);
+int64_t f_drawgettextalignment(CObjRef drw_wnd);
 bool f_drawgettextantialias(CObjRef drw_wnd);
-int64 f_drawgettextdecoration(CObjRef drw_wnd);
+int64_t f_drawgettextdecoration(CObjRef drw_wnd);
 String f_drawgettextencoding(CObjRef drw_wnd);
 Object f_drawgettextundercolor(CObjRef drw_wnd);
 String f_drawgetvectorgraphics(CObjRef drw_wnd);
@@ -231,7 +231,7 @@ double f_magickgetcharheight(CObjRef mgck_wnd, CObjRef drw_wnd, CStrRef txt, boo
 double f_magickgetcharwidth(CObjRef mgck_wnd, CObjRef drw_wnd, CStrRef txt, bool multiline = false);
 Array f_magickgetexception(CObjRef mgck_wnd);
 String f_magickgetexceptionstring(CObjRef mgck_wnd);
-int64 f_magickgetexceptiontype(CObjRef mgck_wnd);
+int64_t f_magickgetexceptiontype(CObjRef mgck_wnd);
 String f_magickgetfilename(CObjRef mgck_wnd);
 String f_magickgetformat(CObjRef mgck_wnd);
 Object f_magickgetimage(CObjRef mgck_wnd);
@@ -242,13 +242,13 @@ Object f_magickgetimagebordercolor(CObjRef mgck_wnd);
 Array f_magickgetimagechannelmean(CObjRef mgck_wnd, int channel_type);
 Object f_magickgetimagecolormapcolor(CObjRef mgck_wnd, double index);
 double f_magickgetimagecolors(CObjRef mgck_wnd);
-int64 f_magickgetimagecolorspace(CObjRef mgck_wnd);
-int64 f_magickgetimagecompose(CObjRef mgck_wnd);
-int64 f_magickgetimagecompression(CObjRef mgck_wnd);
+int64_t f_magickgetimagecolorspace(CObjRef mgck_wnd);
+int64_t f_magickgetimagecompose(CObjRef mgck_wnd);
+int64_t f_magickgetimagecompression(CObjRef mgck_wnd);
 double f_magickgetimagecompressionquality(CObjRef mgck_wnd);
 double f_magickgetimagedelay(CObjRef mgck_wnd);
 double f_magickgetimagedepth(CObjRef mgck_wnd, int channel_type = 0);
-int64 f_magickgetimagedispose(CObjRef mgck_wnd);
+int64_t f_magickgetimagedispose(CObjRef mgck_wnd);
 Array f_magickgetimageextrema(CObjRef mgck_wnd, int channel_type = 0);
 String f_magickgetimagefilename(CObjRef mgck_wnd);
 String f_magickgetimageformat(CObjRef mgck_wnd);
@@ -256,26 +256,26 @@ double f_magickgetimagegamma(CObjRef mgck_wnd);
 Array f_magickgetimagegreenprimary(CObjRef mgck_wnd);
 double f_magickgetimageheight(CObjRef mgck_wnd);
 Array f_magickgetimagehistogram(CObjRef mgck_wnd);
-int64 f_magickgetimageindex(CObjRef mgck_wnd);
-int64 f_magickgetimageinterlacescheme(CObjRef mgck_wnd);
+int64_t f_magickgetimageindex(CObjRef mgck_wnd);
+int64_t f_magickgetimageinterlacescheme(CObjRef mgck_wnd);
 double f_magickgetimageiterations(CObjRef mgck_wnd);
 Object f_magickgetimagemattecolor(CObjRef mgck_wnd);
 String f_magickgetimagemimetype(CObjRef mgck_wnd);
 Array f_magickgetimagepixels(CObjRef mgck_wnd, int x_offset, int y_offset, double columns, double rows, CStrRef smap, int storage_type);
 String f_magickgetimageprofile(CObjRef mgck_wnd, CStrRef name);
 Array f_magickgetimageredprimary(CObjRef mgck_wnd);
-int64 f_magickgetimagerenderingintent(CObjRef mgck_wnd);
+int64_t f_magickgetimagerenderingintent(CObjRef mgck_wnd);
 Array f_magickgetimageresolution(CObjRef mgck_wnd);
 double f_magickgetimagescene(CObjRef mgck_wnd);
 String f_magickgetimagesignature(CObjRef mgck_wnd);
-int64 f_magickgetimagesize(CObjRef mgck_wnd);
-int64 f_magickgetimagetype(CObjRef mgck_wnd);
-int64 f_magickgetimageunits(CObjRef mgck_wnd);
-int64 f_magickgetimagevirtualpixelmethod(CObjRef mgck_wnd);
+int64_t f_magickgetimagesize(CObjRef mgck_wnd);
+int64_t f_magickgetimagetype(CObjRef mgck_wnd);
+int64_t f_magickgetimageunits(CObjRef mgck_wnd);
+int64_t f_magickgetimagevirtualpixelmethod(CObjRef mgck_wnd);
 Array f_magickgetimagewhitepoint(CObjRef mgck_wnd);
 double f_magickgetimagewidth(CObjRef mgck_wnd);
 String f_magickgetimagesblob(CObjRef mgck_wnd);
-int64 f_magickgetinterlacescheme(CObjRef mgck_wnd);
+int64_t f_magickgetinterlacescheme(CObjRef mgck_wnd);
 double f_magickgetmaxtextadvance(CObjRef mgck_wnd, CObjRef drw_wnd, CStrRef txt, bool multiline = false);
 String f_magickgetmimetype(CObjRef mgck_wnd);
 double f_magickgetnumberimages(CObjRef mgck_wnd);
@@ -411,7 +411,7 @@ double f_pixelgetcyan(CObjRef pxl_wnd);
 double f_pixelgetcyanquantum(CObjRef pxl_wnd);
 Array f_pixelgetexception(CObjRef pxl_wnd);
 String f_pixelgetexceptionstring(CObjRef pxl_wnd);
-int64 f_pixelgetexceptiontype(CObjRef pxl_wnd);
+int64_t f_pixelgetexceptiontype(CObjRef pxl_wnd);
 double f_pixelgetgreen(CObjRef pxl_wnd);
 double f_pixelgetgreenquantum(CObjRef pxl_wnd);
 double f_pixelgetindex(CObjRef pxl_wnd);
@@ -448,7 +448,7 @@ void f_pixelsetyellow(CObjRef pxl_wnd, double yellow);
 void f_pixelsetyellowquantum(CObjRef pxl_wnd, double yellow);
 Array f_pixelgetiteratorexception(CObjRef pxl_iter);
 String f_pixelgetiteratorexceptionstring(CObjRef pxl_iter);
-int64 f_pixelgetiteratorexceptiontype(CObjRef pxl_iter);
+int64_t f_pixelgetiteratorexceptiontype(CObjRef pxl_iter);
 Array f_pixelgetnextiteratorrow(CObjRef pxl_iter);
 void f_pixelresetiterator(CObjRef pxl_iter);
 bool f_pixelsetiteratorrow(CObjRef pxl_iter, int row);
diff --git a/hphp/runtime/ext/ext_mailparse.cpp b/hphp/runtime/ext/ext_mailparse.cpp
index 5fa8bba72949f..f967ba08194f4 100644
--- a/hphp/runtime/ext/ext_mailparse.cpp
+++ b/hphp/runtime/ext/ext_mailparse.cpp
@@ -113,7 +113,7 @@ bool f_mail(CStrRef to, CStrRef subject, CStrRef message, CStrRef additional_hea
   return php_mail(to2, subject2, message2, headers2, params2);
 }
 
-int64 f_ezmlm_hash(CStrRef addr) {
+int64_t f_ezmlm_hash(CStrRef addr) {
   unsigned long h = 5381L;
   int str_len = addr.length();
   for (int i = 0; i < str_len; i++) {
diff --git a/hphp/runtime/ext/ext_mailparse.h b/hphp/runtime/ext/ext_mailparse.h
index b159b0dfe08da..c30ff425e6762 100644
--- a/hphp/runtime/ext/ext_mailparse.h
+++ b/hphp/runtime/ext/ext_mailparse.h
@@ -26,7 +26,7 @@ namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
 bool f_mail(CStrRef to, CStrRef subject, CStrRef message, CStrRef additional_headers = null_string, CStrRef additional_parameters = null_string);
-int64 f_ezmlm_hash(CStrRef addr);
+int64_t f_ezmlm_hash(CStrRef addr);
 Object f_mailparse_msg_create();
 bool f_mailparse_msg_free(CObjRef mimemail);
 Variant f_mailparse_msg_parse_file(CStrRef filename);
diff --git a/hphp/runtime/ext/ext_math.cpp b/hphp/runtime/ext/ext_math.cpp
index 49514aef5b8b6..b61fc3200f831 100644
--- a/hphp/runtime/ext/ext_math.cpp
+++ b/hphp/runtime/ext/ext_math.cpp
@@ -22,10 +22,10 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-const int64 k_PHP_ROUND_HALF_UP =   PHP_ROUND_HALF_UP;
-const int64 k_PHP_ROUND_HALF_DOWN = PHP_ROUND_HALF_DOWN;
-const int64 k_PHP_ROUND_HALF_EVEN = PHP_ROUND_HALF_EVEN;
-const int64 k_PHP_ROUND_HALF_ODD =  PHP_ROUND_HALF_ODD;
+const int64_t k_PHP_ROUND_HALF_UP =   PHP_ROUND_HALF_UP;
+const int64_t k_PHP_ROUND_HALF_DOWN = PHP_ROUND_HALF_DOWN;
+const int64_t k_PHP_ROUND_HALF_EVEN = PHP_ROUND_HALF_EVEN;
+const int64_t k_PHP_ROUND_HALF_ODD =  PHP_ROUND_HALF_ODD;
 
 Variant f_min(int _argc, CVarRef value, CArrRef _argv /* = null_array */) {
   Variant ret;
@@ -94,7 +94,7 @@ Variant f_max(int _argc, CVarRef value, CArrRef _argv /* = null_array */) {
 }
 
 Variant f_abs(CVarRef number) {
-  int64 ival;
+  int64_t ival;
   double dval;
   DataType k = number.toNumeric(ival, dval, true);
   if (k == KindOfDouble) {
@@ -106,9 +106,9 @@ Variant f_abs(CVarRef number) {
   }
 }
 
-double f_round(CVarRef val, int64 precision /* = 0 */,
-               int64 mode /* = PHP_ROUND_HALF_UP */) {
-  int64 ival;
+double f_round(CVarRef val, int64_t precision /* = 0 */,
+               int64_t mode /* = PHP_ROUND_HALF_UP */) {
+  int64_t ival;
   double dval;
   DataType k = val.toNumeric(ival, dval, true);
   if (k == KindOfInt64) {
@@ -124,7 +124,7 @@ double f_round(CVarRef val, int64 precision /* = 0 */,
   return dval;
 }
 
-Variant f_base_convert(CStrRef number, int64 frombase, int64 tobase) {
+Variant f_base_convert(CStrRef number, int64_t frombase, int64_t tobase) {
   if (!string_validate_base(frombase)) {
     throw_invalid_argument("Invalid frombase: %d", frombase);
     return false;
@@ -138,7 +138,7 @@ Variant f_base_convert(CStrRef number, int64 frombase, int64 tobase) {
 }
 
 Numeric f_pow(CVarRef base, CVarRef exp) {
-  int64 bint, eint;
+  int64_t bint, eint;
   double bdbl, edbl;
   DataType bt = base.toNumeric(bint, bdbl, true);
   DataType et = exp.toNumeric(eint, edbl, true);
@@ -147,7 +147,7 @@ Numeric f_pow(CVarRef base, CVarRef exp) {
     if (bint == 0) return 0LL;
 
     // calculate pow(long,long) in O(log exp) operations, bail if overflow
-    int64 l1 = 1;
+    int64_t l1 = 1;
     while (eint >= 1) {
       int overflow;
       double dval = 0.0;
@@ -190,13 +190,13 @@ void f_srand(CVarRef seed /* = null_variant */) {
   }
 }
 
-int64 f_rand(int64 min /* = 0 */, int64 max /* = RAND_MAX */) {
+int64_t f_rand(int64_t min /* = 0 */, int64_t max /* = RAND_MAX */) {
   if (!s_rand_is_seeded) {
     s_rand_is_seeded = true;
     srand(math_generate_seed());
   }
 
-  int64 number = rand();
+  int64_t number = rand();
   if (min != 0 || max != RAND_MAX) {
     RAND_RANGE(number, min, max, RAND_MAX);
   }
diff --git a/hphp/runtime/ext/ext_math.h b/hphp/runtime/ext/ext_math.h
index 746bd55cb0607..4caea3485aebd 100644
--- a/hphp/runtime/ext/ext_math.h
+++ b/hphp/runtime/ext/ext_math.h
@@ -42,10 +42,10 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-extern const int64 k_PHP_ROUND_HALF_UP;
-extern const int64 k_PHP_ROUND_HALF_DOWN;
-extern const int64 k_PHP_ROUND_HALF_EVEN;
-extern const int64 k_PHP_ROUND_HALF_ODD;
+extern const int64_t k_PHP_ROUND_HALF_UP;
+extern const int64_t k_PHP_ROUND_HALF_DOWN;
+extern const int64_t k_PHP_ROUND_HALF_EVEN;
+extern const int64_t k_PHP_ROUND_HALF_ODD;
 
 inline double f_pi() { return k_M_PI;}
 
@@ -59,20 +59,20 @@ inline bool f_is_nan(double val) { return isnan(val);}
 
 inline double f_ceil(double value) { return ceil(value);}
 inline double f_floor(double value) { return floor(value);}
-double f_round(CVarRef val, int64 precision = 0,
-               int64 mode = PHP_ROUND_HALF_UP);
+double f_round(CVarRef val, int64_t precision = 0,
+               int64_t mode = PHP_ROUND_HALF_UP);
 
 inline double f_deg2rad(double number) { return number / 180.0 * k_M_PI;}
 inline double f_rad2deg(double number) { return number / k_M_PI * 180.0;}
 
 // departure from PHP: not using "double" for these conversions
-inline String f_decbin(int64 number) {
+inline String f_decbin(int64_t number) {
   return String(string_long_to_base(number, 2), AttachString);
 }
-inline String f_dechex(int64 number) {
+inline String f_dechex(int64_t number) {
   return String(string_long_to_base(number, 16), AttachString);
 }
-inline String f_decoct(int64 number) {
+inline String f_decoct(int64_t number) {
   return String(string_long_to_base(number, 8), AttachString);
 }
 inline Variant f_bindec(CStrRef binary_string) {
@@ -84,7 +84,7 @@ inline Variant f_hexdec(CStrRef hex_string) {
 inline Variant f_octdec(CStrRef octal_string) {
   return string_base_to_numeric(octal_string.data(), octal_string.size(), 8);
 }
-Variant f_base_convert(CStrRef number, int64 frombase, int64 tobase);
+Variant f_base_convert(CStrRef number, int64_t frombase, int64_t tobase);
 Numeric f_pow(CVarRef base, CVarRef exp);
 inline double f_exp(double arg) { return exp(arg);}
 inline double f_expm1(double arg) { return expm1(arg);}
@@ -112,12 +112,12 @@ inline double f_hypot(double x, double y) { return hypot(x, y);}
 inline double f_fmod(double x, double y) { return fmod(x, y);}
 inline double f_sqrt(double arg) { return sqrt(arg);}
 
-inline int64 f_getrandmax() { return RAND_MAX;}
+inline int64_t f_getrandmax() { return RAND_MAX;}
 void f_srand(CVarRef seed = null_variant);
-int64 f_rand(int64 min = 0, int64 max = RAND_MAX);
-inline int64 f_mt_getrandmax() { return MT_RAND_MAX;}
+int64_t f_rand(int64_t min = 0, int64_t max = RAND_MAX);
+inline int64_t f_mt_getrandmax() { return MT_RAND_MAX;}
 void f_mt_srand(CVarRef seed = null_variant);
-inline int64 f_mt_rand(int64 min = 0, int64 max = RAND_MAX) {
+inline int64_t f_mt_rand(int64_t min = 0, int64_t max = RAND_MAX) {
   return math_mt_rand(min, max);
 }
 inline double f_lcg_value() { return math_combined_lcg();}
diff --git a/hphp/runtime/ext/ext_mb.cpp b/hphp/runtime/ext/ext_mb.cpp
index c639efe1b302b..05be8593c09ea 100644
--- a/hphp/runtime/ext/ext_mb.cpp
+++ b/hphp/runtime/ext/ext_mb.cpp
@@ -2781,7 +2781,7 @@ Variant f_mb_substitute_character(CVarRef substrchar /* = null_variant */) {
     }
   }
 
-  int64 n = substrchar.toInt64();
+  int64_t n = substrchar.toInt64();
   if (n < 0xffff && n > 0) {
     MBSTRG(current_filter_illegal_mode) =
       MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
@@ -3338,7 +3338,7 @@ Variant f_mb_eregi_replace(CVarRef pattern, CStrRef replacement, CStrRef str,
                                          str, option, ONIG_OPTION_IGNORECASE);
 }
 
-int64 f_mb_ereg_search_getpos() {
+int64_t f_mb_ereg_search_getpos() {
   return MBSTRG(search_pos);
 }
 
diff --git a/hphp/runtime/ext/ext_mb.h b/hphp/runtime/ext/ext_mb.h
index a3fe2653134d6..b2e7cc6bbd380 100644
--- a/hphp/runtime/ext/ext_mb.h
+++ b/hphp/runtime/ext/ext_mb.h
@@ -41,7 +41,7 @@ Variant f_mb_encode_mimeheader(CStrRef str, CStrRef charset = null_string, CStrR
 Variant f_mb_encode_numericentity(CStrRef str, CVarRef convmap, CStrRef encoding = null_string);
 bool f_mb_ereg_match(CStrRef pattern, CStrRef str, CStrRef option = null_string);
 Variant f_mb_ereg_replace(CVarRef pattern, CStrRef replacement, CStrRef str, CStrRef option = null_string);
-int64 f_mb_ereg_search_getpos();
+int64_t f_mb_ereg_search_getpos();
 Variant f_mb_ereg_search_getregs();
 bool f_mb_ereg_search_init(CStrRef str, CStrRef pattern = null_string, CStrRef option = null_string);
 Variant f_mb_ereg_search_pos(CStrRef pattern = null_string, CStrRef option = null_string);
diff --git a/hphp/runtime/ext/ext_mcrypt.cpp b/hphp/runtime/ext/ext_mcrypt.cpp
index 16d70ccd6f0df..09d95d211cfb6 100644
--- a/hphp/runtime/ext/ext_mcrypt.cpp
+++ b/hphp/runtime/ext/ext_mcrypt.cpp
@@ -272,14 +272,14 @@ Array f_mcrypt_list_modes(CStrRef lib_dir /* = null_string */) {
   return ret;
 }
 
-int64 f_mcrypt_module_get_algo_block_size(CStrRef algorithm,
+int64_t f_mcrypt_module_get_algo_block_size(CStrRef algorithm,
                                         CStrRef lib_dir /* = null_string */) {
   String dir = lib_dir.empty() ? MCG(algorithms_dir) : lib_dir;
   return mcrypt_module_get_algo_block_size((char*)algorithm.data(),
                                            (char*)dir.data());
 }
 
-int64 f_mcrypt_module_get_algo_key_size(CStrRef algorithm,
+int64_t f_mcrypt_module_get_algo_key_size(CStrRef algorithm,
                                       CStrRef lib_dir /* = null_string */) {
   String dir = lib_dir.empty() ? MCG(algorithms_dir) : lib_dir;
   return mcrypt_module_get_algo_key_size((char*)algorithm.data(),
@@ -406,7 +406,7 @@ Variant f_mcrypt_get_block_size(CStrRef cipher, CStrRef module /* = null_string
     return false;
   }
 
-  int64 ret = mcrypt_enc_get_block_size(td);
+  int64_t ret = mcrypt_enc_get_block_size(td);
   mcrypt_module_close(td);
   return ret;
 }
@@ -444,12 +444,12 @@ Variant f_mcrypt_get_iv_size(CStrRef cipher, CStrRef mode) {
     return false;
   }
 
-  int64 ret = mcrypt_enc_get_iv_size(td);
+  int64_t ret = mcrypt_enc_get_iv_size(td);
   mcrypt_module_close(td);
   return ret;
 }
 
-int64 f_mcrypt_get_key_size(CStrRef cipher, CStrRef module) {
+int64_t f_mcrypt_get_key_size(CStrRef cipher, CStrRef module) {
   MCRYPT td = mcrypt_module_open((char*)cipher.data(),
                                  (char*)MCG(algorithms_dir).data(),
                                  (char*)module.data(),
@@ -459,7 +459,7 @@ int64 f_mcrypt_get_key_size(CStrRef cipher, CStrRef module) {
     return false;
   }
 
-  int64 ret = mcrypt_enc_get_key_size(td);
+  int64_t ret = mcrypt_enc_get_key_size(td);
   mcrypt_module_close(td);
   return ret;
 }
@@ -471,15 +471,15 @@ String f_mcrypt_enc_get_algorithms_name(CObjRef td) {
   return ret;
 }
 
-int64 f_mcrypt_enc_get_block_size(CObjRef td) {
+int64_t f_mcrypt_enc_get_block_size(CObjRef td) {
   return mcrypt_enc_get_block_size(td.getTyped<MCrypt>()->m_td);
 }
 
-int64 f_mcrypt_enc_get_iv_size(CObjRef td) {
+int64_t f_mcrypt_enc_get_iv_size(CObjRef td) {
   return mcrypt_enc_get_iv_size(td.getTyped<MCrypt>()->m_td);
 }
 
-int64 f_mcrypt_enc_get_key_size(CObjRef td) {
+int64_t f_mcrypt_enc_get_key_size(CObjRef td) {
   return mcrypt_enc_get_key_size(td.getTyped<MCrypt>()->m_td);
 }
 
@@ -515,11 +515,11 @@ bool f_mcrypt_enc_is_block_mode(CObjRef td) {
   return mcrypt_enc_is_block_mode(td.getTyped<MCrypt>()->m_td) == 1;
 }
 
-int64 f_mcrypt_enc_self_test(CObjRef td) {
+int64_t f_mcrypt_enc_self_test(CObjRef td) {
   return mcrypt_enc_self_test(td.getTyped<MCrypt>()->m_td);
 }
 
-int64 f_mcrypt_generic_init(CObjRef td, CStrRef key, CStrRef iv) {
+int64_t f_mcrypt_generic_init(CObjRef td, CStrRef key, CStrRef iv) {
   MCrypt *pm = td.getTyped<MCrypt>();
   int max_key_size = mcrypt_enc_get_key_size(pm->m_td);
   int iv_size = mcrypt_enc_get_iv_size(pm->m_td);
diff --git a/hphp/runtime/ext/ext_mcrypt.h b/hphp/runtime/ext/ext_mcrypt.h
index 9c7718732bbae..aff18c989ff50 100644
--- a/hphp/runtime/ext/ext_mcrypt.h
+++ b/hphp/runtime/ext/ext_mcrypt.h
@@ -29,8 +29,8 @@ Variant f_mcrypt_module_open(CStrRef algorithm, CStrRef algorithm_directory, CSt
 bool f_mcrypt_module_close(CObjRef td);
 Array f_mcrypt_list_algorithms(CStrRef lib_dir = null_string);
 Array f_mcrypt_list_modes(CStrRef lib_dir = null_string);
-int64 f_mcrypt_module_get_algo_block_size(CStrRef algorithm, CStrRef lib_dir = null_string);
-int64 f_mcrypt_module_get_algo_key_size(CStrRef algorithm, CStrRef lib_dir = null_string);
+int64_t f_mcrypt_module_get_algo_block_size(CStrRef algorithm, CStrRef lib_dir = null_string);
+int64_t f_mcrypt_module_get_algo_key_size(CStrRef algorithm, CStrRef lib_dir = null_string);
 Array f_mcrypt_module_get_supported_key_sizes(CStrRef algorithm, CStrRef lib_dir = null_string);
 bool f_mcrypt_module_is_block_algorithm_mode(CStrRef mode, CStrRef lib_dir = null_string);
 bool f_mcrypt_module_is_block_algorithm(CStrRef algorithm, CStrRef lib_dir = null_string);
@@ -46,19 +46,19 @@ Variant f_mcrypt_ofb(CStrRef cipher, CStrRef key, CStrRef data, int mode, CStrRe
 Variant f_mcrypt_get_block_size(CStrRef cipher, CStrRef module = null_string);
 Variant f_mcrypt_get_cipher_name(CStrRef cipher);
 Variant f_mcrypt_get_iv_size(CStrRef cipher, CStrRef mode);
-int64 f_mcrypt_get_key_size(CStrRef cipher, CStrRef module);
+int64_t f_mcrypt_get_key_size(CStrRef cipher, CStrRef module);
 String f_mcrypt_enc_get_algorithms_name(CObjRef td);
-int64 f_mcrypt_enc_get_block_size(CObjRef td);
-int64 f_mcrypt_enc_get_iv_size(CObjRef td);
-int64 f_mcrypt_enc_get_key_size(CObjRef td);
+int64_t f_mcrypt_enc_get_block_size(CObjRef td);
+int64_t f_mcrypt_enc_get_iv_size(CObjRef td);
+int64_t f_mcrypt_enc_get_key_size(CObjRef td);
 String f_mcrypt_enc_get_modes_name(CObjRef td);
 Array f_mcrypt_enc_get_supported_key_sizes(CObjRef td);
 bool f_mcrypt_enc_is_block_algorithm_mode(CObjRef td);
 bool f_mcrypt_enc_is_block_algorithm(CObjRef td);
 bool f_mcrypt_enc_is_block_mode(CObjRef td);
-int64 f_mcrypt_enc_self_test(CObjRef td);
+int64_t f_mcrypt_enc_self_test(CObjRef td);
 Variant f_mcrypt_generic(CObjRef td, CStrRef data);
-int64 f_mcrypt_generic_init(CObjRef td, CStrRef key, CStrRef iv);
+int64_t f_mcrypt_generic_init(CObjRef td, CStrRef key, CStrRef iv);
 Variant f_mdecrypt_generic(CObjRef td, CStrRef data);
 bool f_mcrypt_generic_deinit(CObjRef td);
 bool f_mcrypt_generic_end(CObjRef td);
diff --git a/hphp/runtime/ext/ext_memcache.cpp b/hphp/runtime/ext/ext_memcache.cpp
index 36e7befaecddd..f94c93aea968e 100644
--- a/hphp/runtime/ext/ext_memcache.cpp
+++ b/hphp/runtime/ext/ext_memcache.cpp
@@ -311,7 +311,7 @@ bool c_Memcache::t_delete(CStrRef key, int expire /*= 0*/) {
   return (ret == MEMCACHED_SUCCESS);
 }
 
-int64 c_Memcache::t_increment(CStrRef key, int offset /*= 1*/) {
+int64_t c_Memcache::t_increment(CStrRef key, int offset /*= 1*/) {
   if (key.empty()) {
     raise_warning("Key cannot be empty");
     return false;
@@ -322,13 +322,13 @@ int64 c_Memcache::t_increment(CStrRef key, int offset /*= 1*/) {
                                               key.length(), offset, &value);
 
   if (ret == MEMCACHED_SUCCESS) {
-    return (int64)value;
+    return (int64_t)value;
   }
 
   return false;
 }
 
-int64 c_Memcache::t_decrement(CStrRef key, int offset /*= 1*/) {
+int64_t c_Memcache::t_decrement(CStrRef key, int offset /*= 1*/) {
   if (key.empty()) {
     raise_warning("Key cannot be empty");
     return false;
@@ -339,7 +339,7 @@ int64 c_Memcache::t_decrement(CStrRef key, int offset /*= 1*/) {
                                               key.length(), offset, &value);
 
   if (ret == MEMCACHED_SUCCESS) {
-    return (int64)value;
+    return (int64_t)value;
   }
 
   return false;
@@ -380,7 +380,7 @@ bool c_Memcache::t_flush(int expire /*= 0*/) {
   return memcached_flush(&m_memcache, expire) == MEMCACHED_SUCCESS;
 }
 
-bool c_Memcache::t_setoptimeout(int64 timeoutms) {
+bool c_Memcache::t_setoptimeout(int64_t timeoutms) {
   if (timeoutms < 1) {
     timeoutms = 1000; // make default
   }
@@ -390,7 +390,7 @@ bool c_Memcache::t_setoptimeout(int64 timeoutms) {
   return true;
 }
 
-int64 c_Memcache::t_getserverstatus(CStrRef host, int port /* = 0 */) {
+int64_t c_Memcache::t_getserverstatus(CStrRef host, int port /* = 0 */) {
   /* intentionally doing nothing for now */
   return 1;
 }
@@ -595,13 +595,13 @@ bool f_memcache_delete(CObjRef memcache, CStrRef key, int expire /* = 0 */) {
   return memcache_obj->t_delete(key, expire);
 }
 
-int64 f_memcache_increment(CObjRef memcache, CStrRef key,
+int64_t f_memcache_increment(CObjRef memcache, CStrRef key,
                            int offset /* = 1 */) {
   c_Memcache *memcache_obj = memcache.getTyped<c_Memcache>();
   return memcache_obj->t_increment(key, offset);
 }
 
-int64 f_memcache_decrement(CObjRef memcache, CStrRef key,
+int64_t f_memcache_decrement(CObjRef memcache, CStrRef key,
                            int offset /* = 1 */) {
   c_Memcache *memcache_obj = memcache.getTyped<c_Memcache>();
   return memcache_obj->t_decrement(key, offset);
@@ -631,7 +631,7 @@ bool f_memcache_setoptimeout(CObjRef memcache, int timeoutms) {
   return memcache_obj->t_setoptimeout(timeoutms);
 }
 
-int64 f_memcache_get_server_status(CObjRef memcache, CStrRef host,
+int64_t f_memcache_get_server_status(CObjRef memcache, CStrRef host,
                                  int port /* = 0 */) {
   c_Memcache *memcache_obj = memcache.getTyped<c_Memcache>();
   return memcache_obj->t_getserverstatus(host, port);
diff --git a/hphp/runtime/ext/ext_memcache.h b/hphp/runtime/ext/ext_memcache.h
index 1195c3fd9e983..432e0b3a4ed8d 100644
--- a/hphp/runtime/ext/ext_memcache.h
+++ b/hphp/runtime/ext/ext_memcache.h
@@ -32,14 +32,14 @@ bool f_memcache_set(CObjRef memcache, CStrRef key, CVarRef var, int flag = 0, in
 bool f_memcache_replace(CObjRef memcache, CStrRef key, CVarRef var, int flag = 0, int expire = 0);
 Variant f_memcache_get(CObjRef memcache, CVarRef key, VRefParam flags = null);
 bool f_memcache_delete(CObjRef memcache, CStrRef key, int expire = 0);
-int64 f_memcache_increment(CObjRef memcache, CStrRef key, int offset = 1);
-int64 f_memcache_decrement(CObjRef memcache, CStrRef key, int offset = 1);
+int64_t f_memcache_increment(CObjRef memcache, CStrRef key, int offset = 1);
+int64_t f_memcache_decrement(CObjRef memcache, CStrRef key, int offset = 1);
 bool f_memcache_close(CObjRef memcache);
 bool f_memcache_debug(bool onoff);
 Variant f_memcache_get_version(CObjRef memcache);
 bool f_memcache_flush(CObjRef memcache, int timestamp = 0);
 bool f_memcache_setoptimeout(CObjRef memcache, int timeoutms);
-int64 f_memcache_get_server_status(CObjRef memcache, CStrRef host, int port = 0);
+int64_t f_memcache_get_server_status(CObjRef memcache, CStrRef host, int port = 0);
 bool f_memcache_set_compress_threshold(CObjRef memcache, int threshold, double min_savings = 0.2);
 Array f_memcache_get_stats(CObjRef memcache, CStrRef type = null_string, int slabid = 0, int limit = 100);
 Array f_memcache_get_extended_stats(CObjRef memcache, CStrRef type = null_string, int slabid = 0, int limit = 100);
@@ -65,13 +65,13 @@ class c_Memcache : public ExtObjectData, public Sweepable {
   public: bool t_replace(CStrRef key, CVarRef var, int flag = 0, int expire = 0);
   public: Variant t_get(CVarRef key, VRefParam flags = null);
   public: bool t_delete(CStrRef key, int expire = 0);
-  public: int64 t_increment(CStrRef key, int offset = 1);
-  public: int64 t_decrement(CStrRef key, int offset = 1);
+  public: int64_t t_increment(CStrRef key, int offset = 1);
+  public: int64_t t_decrement(CStrRef key, int offset = 1);
   public: Variant t_getversion();
   public: bool t_flush(int expire = 0);
-  public: bool t_setoptimeout(int64 timeoutms);
+  public: bool t_setoptimeout(int64_t timeoutms);
   public: bool t_close();
-  public: int64 t_getserverstatus(CStrRef host, int port = 0);
+  public: int64_t t_getserverstatus(CStrRef host, int port = 0);
   public: bool t_setcompressthreshold(int threshold, double min_savings = 0.2);
   public: Array t_getstats(CStrRef type = null_string, int slabid = 0, int limit = 100);
   public: Array t_getextendedstats(CStrRef type = null_string, int slabid = 0, int limit = 100);
diff --git a/hphp/runtime/ext/ext_memcached.cpp b/hphp/runtime/ext/ext_memcached.cpp
index fee1bbd9f9bcd..5e22d977e1006 100644
--- a/hphp/runtime/ext/ext_memcached.cpp
+++ b/hphp/runtime/ext/ext_memcached.cpp
@@ -45,9 +45,9 @@ IMPLEMENT_THREAD_LOCAL(c_Memcached::ImplMap, c_Memcached::s_persistentMap);
 #define MEMC_COMPRESS_THRESHOLD 100
 
 // Class options
-const int64 q_Memcached$$OPT_COMPRESSION = -1001;
-const int64 q_Memcached$$OPT_PREFIX_KEY  = -1002;
-const int64 q_Memcached$$OPT_SERIALIZER  = -1003;
+const int64_t q_Memcached$$OPT_COMPRESSION = -1001;
+const int64_t q_Memcached$$OPT_PREFIX_KEY  = -1002;
+const int64_t q_Memcached$$OPT_SERIALIZER  = -1003;
 
 // Indicate whether igbinary serializer is available
 const bool q_Memcached$$HAVE_IGBINARY = false;
@@ -56,113 +56,113 @@ const bool q_Memcached$$HAVE_IGBINARY = false;
 const bool q_Memcached$$HAVE_JSON = true;
 
 // libmemcached behavior options
-const int64 q_Memcached$$OPT_HASH
+const int64_t q_Memcached$$OPT_HASH
           = MEMCACHED_BEHAVIOR_HASH;
-const int64 q_Memcached$$HASH_DEFAULT
+const int64_t q_Memcached$$HASH_DEFAULT
           = MEMCACHED_HASH_DEFAULT;
-const int64 q_Memcached$$HASH_MD5
+const int64_t q_Memcached$$HASH_MD5
           = MEMCACHED_HASH_MD5;
-const int64 q_Memcached$$HASH_CRC
+const int64_t q_Memcached$$HASH_CRC
           = MEMCACHED_HASH_CRC;
-const int64 q_Memcached$$HASH_FNV1_64
+const int64_t q_Memcached$$HASH_FNV1_64
           = MEMCACHED_HASH_FNV1_64;
-const int64 q_Memcached$$HASH_FNV1A_64
+const int64_t q_Memcached$$HASH_FNV1A_64
           = MEMCACHED_HASH_FNV1A_64;
-const int64 q_Memcached$$HASH_FNV1_32
+const int64_t q_Memcached$$HASH_FNV1_32
           = MEMCACHED_HASH_FNV1_32;
-const int64 q_Memcached$$HASH_FNV1A_32
+const int64_t q_Memcached$$HASH_FNV1A_32
           = MEMCACHED_HASH_FNV1A_32;
-const int64 q_Memcached$$HASH_HSIEH
+const int64_t q_Memcached$$HASH_HSIEH
           = MEMCACHED_HASH_HSIEH;
-const int64 q_Memcached$$HASH_MURMUR
+const int64_t q_Memcached$$HASH_MURMUR
           = MEMCACHED_HASH_MURMUR;
-const int64 q_Memcached$$OPT_DISTRIBUTION
+const int64_t q_Memcached$$OPT_DISTRIBUTION
           = MEMCACHED_BEHAVIOR_DISTRIBUTION;
-const int64 q_Memcached$$DISTRIBUTION_MODULA
+const int64_t q_Memcached$$DISTRIBUTION_MODULA
           = MEMCACHED_DISTRIBUTION_MODULA;
-const int64 q_Memcached$$DISTRIBUTION_CONSISTENT
+const int64_t q_Memcached$$DISTRIBUTION_CONSISTENT
           = MEMCACHED_DISTRIBUTION_CONSISTENT;
-const int64 q_Memcached$$OPT_LIBKETAMA_COMPATIBLE
+const int64_t q_Memcached$$OPT_LIBKETAMA_COMPATIBLE
           = MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED;
-const int64 q_Memcached$$OPT_BUFFER_WRITES
+const int64_t q_Memcached$$OPT_BUFFER_WRITES
           = MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
-const int64 q_Memcached$$OPT_BINARY_PROTOCOL
+const int64_t q_Memcached$$OPT_BINARY_PROTOCOL
           = MEMCACHED_BEHAVIOR_BINARY_PROTOCOL;
-const int64 q_Memcached$$OPT_NO_BLOCK
+const int64_t q_Memcached$$OPT_NO_BLOCK
           = MEMCACHED_BEHAVIOR_NO_BLOCK;
-const int64 q_Memcached$$OPT_TCP_NODELAY
+const int64_t q_Memcached$$OPT_TCP_NODELAY
           = MEMCACHED_BEHAVIOR_TCP_NODELAY;
-const int64 q_Memcached$$OPT_SOCKET_SEND_SIZE
+const int64_t q_Memcached$$OPT_SOCKET_SEND_SIZE
           = MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE;
-const int64 q_Memcached$$OPT_SOCKET_RECV_SIZE
+const int64_t q_Memcached$$OPT_SOCKET_RECV_SIZE
           = MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE;
-const int64 q_Memcached$$OPT_CONNECT_TIMEOUT
+const int64_t q_Memcached$$OPT_CONNECT_TIMEOUT
           = MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT;
-const int64 q_Memcached$$OPT_RETRY_TIMEOUT
+const int64_t q_Memcached$$OPT_RETRY_TIMEOUT
           = MEMCACHED_BEHAVIOR_RETRY_TIMEOUT;
-const int64 q_Memcached$$OPT_SEND_TIMEOUT
+const int64_t q_Memcached$$OPT_SEND_TIMEOUT
           = MEMCACHED_BEHAVIOR_SND_TIMEOUT;
-const int64 q_Memcached$$OPT_RECV_TIMEOUT
+const int64_t q_Memcached$$OPT_RECV_TIMEOUT
           = MEMCACHED_BEHAVIOR_RCV_TIMEOUT;
-const int64 q_Memcached$$OPT_POLL_TIMEOUT
+const int64_t q_Memcached$$OPT_POLL_TIMEOUT
           = MEMCACHED_BEHAVIOR_POLL_TIMEOUT;
-const int64 q_Memcached$$OPT_CACHE_LOOKUPS
+const int64_t q_Memcached$$OPT_CACHE_LOOKUPS
           = MEMCACHED_BEHAVIOR_CACHE_LOOKUPS;
-const int64 q_Memcached$$OPT_SERVER_FAILURE_LIMIT
+const int64_t q_Memcached$$OPT_SERVER_FAILURE_LIMIT
           = MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT;
 
 // libmemcached result codes
-const int64 q_Memcached$$RES_SUCCESS
+const int64_t q_Memcached$$RES_SUCCESS
           = MEMCACHED_SUCCESS;
-const int64 q_Memcached$$RES_FAILURE
+const int64_t q_Memcached$$RES_FAILURE
           = MEMCACHED_FAILURE;
-const int64 q_Memcached$$RES_HOST_LOOKUP_FAILURE
+const int64_t q_Memcached$$RES_HOST_LOOKUP_FAILURE
           = MEMCACHED_HOST_LOOKUP_FAILURE;
-const int64 q_Memcached$$RES_UNKNOWN_READ_FAILURE
+const int64_t q_Memcached$$RES_UNKNOWN_READ_FAILURE
           = MEMCACHED_UNKNOWN_READ_FAILURE;
-const int64 q_Memcached$$RES_PROTOCOL_ERROR
+const int64_t q_Memcached$$RES_PROTOCOL_ERROR
           = MEMCACHED_PROTOCOL_ERROR;
-const int64 q_Memcached$$RES_CLIENT_ERROR
+const int64_t q_Memcached$$RES_CLIENT_ERROR
           = MEMCACHED_CLIENT_ERROR;
-const int64 q_Memcached$$RES_SERVER_ERROR
+const int64_t q_Memcached$$RES_SERVER_ERROR
           = MEMCACHED_SERVER_ERROR;
-const int64 q_Memcached$$RES_WRITE_FAILURE
+const int64_t q_Memcached$$RES_WRITE_FAILURE
           = MEMCACHED_WRITE_FAILURE;
-const int64 q_Memcached$$RES_DATA_EXISTS
+const int64_t q_Memcached$$RES_DATA_EXISTS
           = MEMCACHED_DATA_EXISTS;
-const int64 q_Memcached$$RES_NOTSTORED
+const int64_t q_Memcached$$RES_NOTSTORED
           = MEMCACHED_NOTSTORED;
-const int64 q_Memcached$$RES_NOTFOUND
+const int64_t q_Memcached$$RES_NOTFOUND
           = MEMCACHED_NOTFOUND;
-const int64 q_Memcached$$RES_PARTIAL_READ
+const int64_t q_Memcached$$RES_PARTIAL_READ
           = MEMCACHED_PARTIAL_READ;
-const int64 q_Memcached$$RES_SOME_ERRORS
+const int64_t q_Memcached$$RES_SOME_ERRORS
           = MEMCACHED_SOME_ERRORS;
-const int64 q_Memcached$$RES_NO_SERVERS
+const int64_t q_Memcached$$RES_NO_SERVERS
           = MEMCACHED_NO_SERVERS;
-const int64 q_Memcached$$RES_END
+const int64_t q_Memcached$$RES_END
           = MEMCACHED_END;
-const int64 q_Memcached$$RES_ERRNO
+const int64_t q_Memcached$$RES_ERRNO
           = MEMCACHED_ERRNO;
-const int64 q_Memcached$$RES_BUFFERED
+const int64_t q_Memcached$$RES_BUFFERED
           = MEMCACHED_BUFFERED;
-const int64 q_Memcached$$RES_TIMEOUT
+const int64_t q_Memcached$$RES_TIMEOUT
           = MEMCACHED_TIMEOUT;
-const int64 q_Memcached$$RES_BAD_KEY_PROVIDED
+const int64_t q_Memcached$$RES_BAD_KEY_PROVIDED
           = MEMCACHED_BAD_KEY_PROVIDED;
-const int64 q_Memcached$$RES_CONNECTION_SOCKET_CREATE_FAILURE
+const int64_t q_Memcached$$RES_CONNECTION_SOCKET_CREATE_FAILURE
           = MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
 
 // Our result codes
-const int64 q_Memcached$$RES_PAYLOAD_FAILURE = -1001;
+const int64_t q_Memcached$$RES_PAYLOAD_FAILURE = -1001;
 
 // Serializer types
-const int64 q_Memcached$$SERIALIZER_PHP      = 1;
-const int64 q_Memcached$$SERIALIZER_IGBINARY = 2;
-const int64 q_Memcached$$SERIALIZER_JSON     = 3;
+const int64_t q_Memcached$$SERIALIZER_PHP      = 1;
+const int64_t q_Memcached$$SERIALIZER_IGBINARY = 2;
+const int64_t q_Memcached$$SERIALIZER_JSON     = 3;
 
 // Flags
-const int64 q_Memcached$$GET_PRESERVE_ORDER = 1;
+const int64_t q_Memcached$$GET_PRESERVE_ORDER = 1;
 
 
 namespace {
@@ -482,7 +482,7 @@ bool c_Memcached::setOperationImpl(SetOperation op, CStrRef server_key,
     return false;
   }
 
-  vector<char> payload; uint32 flags;
+  vector<char> payload; uint32_t flags;
   toPayload(value, payload, flags);
 
   CStrRef myServerKey = server_key.empty() ? key : server_key;
@@ -504,13 +504,13 @@ bool c_Memcached::t_casbykey(double cas_token, CStrRef server_key, CStrRef key,
     return false;
   }
 
-  vector<char> payload; uint32 flags;
+  vector<char> payload; uint32_t flags;
   toPayload(value, payload, flags);
 
   CStrRef myServerKey = server_key.empty() ? key : server_key;
   return handleError(memcached_cas_by_key(&m_impl->memcached,
       myServerKey.c_str(), myServerKey.length(), key.c_str(), key.length(),
-      payload.data(), payload.size(), expiration, flags, (uint64)cas_token));
+      payload.data(), payload.size(), expiration, flags, (uint64_t)cas_token));
 }
 
 bool c_Memcached::t_delete(CStrRef key, int time /*= 0*/) {
@@ -531,16 +531,16 @@ bool c_Memcached::t_deletebykey(CStrRef server_key, CStrRef key,
                      key.c_str(), key.length(), time));
 }
 
-Variant c_Memcached::t_increment(CStrRef key, int64 offset /*= 1*/) {
+Variant c_Memcached::t_increment(CStrRef key, int64_t offset /*= 1*/) {
   return incDecOperationImpl(memcached_increment, key, offset);
 }
 
-Variant c_Memcached::t_decrement(CStrRef key, int64 offset /*= 1*/) {
+Variant c_Memcached::t_decrement(CStrRef key, int64_t offset /*= 1*/) {
   return incDecOperationImpl(memcached_decrement, key, offset);
 }
 
 Variant c_Memcached::incDecOperationImpl(IncDecOperation op, CStrRef key,
-                                         int64 offset) {
+                                         int64_t offset) {
   m_impl->rescode = q_Memcached$$RES_SUCCESS;
   if (key.empty()) {
     m_impl->rescode = q_Memcached$$RES_BAD_KEY_PROVIDED;
@@ -553,10 +553,10 @@ Variant c_Memcached::incDecOperationImpl(IncDecOperation op, CStrRef key,
 
   uint64_t value;
   if (!handleError(op(&m_impl->memcached, key.c_str(), key.length(),
-                      (uint32)offset, &value))) {
+                      (uint32_t)offset, &value))) {
     return false;
   }
-  return (int64)value;
+  return (int64_t)value;
 }
 
 bool c_Memcached::t_addserver(CStrRef host, int port, int weight /*= 0*/) {
@@ -607,8 +607,8 @@ memcached_return_t doServerListCallback(const memcached_st *ptr,
     memcached_server_instance_st server, void *context) {
   Array *returnValue = (Array*) context;
   returnValue->append(CREATE_MAP3("host", String(server->hostname, CopyString),
-                                  "port", (int32)server->port,
-                                  "weight", (int32)server->weight));
+                                  "port", (int32_t)server->port,
+                                  "weight", (int32_t)server->weight));
   return MEMCACHED_SUCCESS;
 }
 }
@@ -636,8 +636,8 @@ Variant c_Memcached::t_getserverbykey(CStrRef server_key) {
   }
 
   Array returnValue = CREATE_MAP3("host", String(server->hostname, CopyString),
-                                  "port", (int32)server->port,
-                                  "weight", (int32)server->weight);
+                                  "port", (int32_t)server->port,
+                                  "weight", (int32_t)server->weight);
   return returnValue;
 }
 
@@ -656,31 +656,31 @@ memcached_return_t doStatsCallback(const memcached_st *ptr,
   ssize_t i = context->returnValue.size();
 
   context->returnValue.set(String(key, CopyString), Array(ArrayInit(24)
-      .set("pid",                        (int64)stats[i].pid)
-      .set("uptime",                     (int64)stats[i].uptime)
-      .set("threads",                    (int64)stats[i].threads)
-      .set("time",                       (int64)stats[i].time)
-      .set("pointer_size",               (int64)stats[i].pointer_size)
-      .set("rusage_user_seconds",        (int64)stats[i].rusage_user_seconds)
-      .set("rusage_user_microseconds",   (int64)stats[i]
+      .set("pid",                        (int64_t)stats[i].pid)
+      .set("uptime",                     (int64_t)stats[i].uptime)
+      .set("threads",                    (int64_t)stats[i].threads)
+      .set("time",                       (int64_t)stats[i].time)
+      .set("pointer_size",               (int64_t)stats[i].pointer_size)
+      .set("rusage_user_seconds",        (int64_t)stats[i].rusage_user_seconds)
+      .set("rusage_user_microseconds",   (int64_t)stats[i]
                                                 .rusage_user_microseconds)
-      .set("rusage_system_seconds",      (int64)stats[i].rusage_system_seconds)
-      .set("rusage_system_microseconds", (int64)stats[i]
+      .set("rusage_system_seconds",      (int64_t)stats[i].rusage_system_seconds)
+      .set("rusage_system_microseconds", (int64_t)stats[i]
                                                 .rusage_system_microseconds)
-      .set("curr_items",                 (int64)stats[i].curr_items)
-      .set("total_items",                (int64)stats[i].total_items)
-      .set("limit_maxbytes",             (int64)stats[i].limit_maxbytes)
-      .set("curr_connections",           (int64)stats[i].curr_connections)
-      .set("total_connections",          (int64)stats[i].total_connections)
-      .set("connection_structures",      (int64)stats[i].connection_structures)
-      .set("bytes",                      (int64)stats[i].bytes)
-      .set("cmd_get",                    (int64)stats[i].cmd_get)
-      .set("cmd_set",                    (int64)stats[i].cmd_set)
-      .set("get_hits",                   (int64)stats[i].get_hits)
-      .set("get_misses",                 (int64)stats[i].get_misses)
-      .set("evictions",                  (int64)stats[i].evictions)
-      .set("bytes_read",                 (int64)stats[i].bytes_read)
-      .set("bytes_written",              (int64)stats[i].bytes_written)
+      .set("curr_items",                 (int64_t)stats[i].curr_items)
+      .set("total_items",                (int64_t)stats[i].total_items)
+      .set("limit_maxbytes",             (int64_t)stats[i].limit_maxbytes)
+      .set("curr_connections",           (int64_t)stats[i].curr_connections)
+      .set("total_connections",          (int64_t)stats[i].total_connections)
+      .set("connection_structures",      (int64_t)stats[i].connection_structures)
+      .set("bytes",                      (int64_t)stats[i].bytes)
+      .set("cmd_get",                    (int64_t)stats[i].cmd_get)
+      .set("cmd_set",                    (int64_t)stats[i].cmd_set)
+      .set("get_hits",                   (int64_t)stats[i].get_hits)
+      .set("get_misses",                 (int64_t)stats[i].get_misses)
+      .set("evictions",                  (int64_t)stats[i].evictions)
+      .set("bytes_read",                 (int64_t)stats[i].bytes_read)
+      .set("bytes_written",              (int64_t)stats[i].bytes_written)
       .set("version",                    String(stats[i].version, CopyString))
       .create()));
 
@@ -758,7 +758,7 @@ Variant c_Memcached::t_getoption(int option) {
 
   default:
     // Assume that it's a libmemcached behavior option
-    return (int64) memcached_behavior_get(&m_impl->memcached,
+    return (int64_t) memcached_behavior_get(&m_impl->memcached,
                                           (memcached_behavior_t)option);
   }
 }
@@ -783,7 +783,7 @@ bool c_Memcached::t_setoption(int option, CVarRef value) {
 
   case MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED:
     {
-      uint64 lValue = value.toInt64();
+      uint64_t lValue = value.toInt64();
       if (memcached_behavior_set(&m_impl->memcached,
           MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, lValue) == MEMCACHED_FAILURE) {
         raise_warning("error setting memcached option");
@@ -822,7 +822,7 @@ bool c_Memcached::t_setoption(int option, CVarRef value) {
   default:
     {
       // Assume that it's a libmemcached behavior option
-      uint64 lValue = value.toInt64();
+      uint64_t lValue = value.toInt64();
       if (memcached_behavior_set(&m_impl->memcached,
           (memcached_behavior_t)option, lValue) == MEMCACHED_FAILURE) {
         raise_warning("error setting memcached option");
@@ -834,7 +834,7 @@ bool c_Memcached::t_setoption(int option, CVarRef value) {
   return true;
 }
 
-int64 c_Memcached::t_getresultcode() {
+int64_t c_Memcached::t_getresultcode() {
   return m_impl->rescode;
 }
 
@@ -865,7 +865,7 @@ bool c_Memcached::handleError(memcached_return status) {
 }
 
 void c_Memcached::toPayload(CVarRef value, vector<char> &payload,
-                            uint32 &flags) {
+                            uint32_t &flags) {
   String encoded;
   if (value.isString() || value.isNumeric()) {
     encoded = value.toString();
@@ -907,7 +907,7 @@ void c_Memcached::toPayload(CVarRef value, vector<char> &payload,
 bool c_Memcached::toObject(Variant& value, const memcached_result_st &result) {
   const char *payload  = memcached_result_value(&result);
   size_t payloadLength = memcached_result_length(&result);
-  uint32 flags         = memcached_result_flags(&result);
+  uint32_t flags         = memcached_result_flags(&result);
 
   String decompPayload;
   if (flags & MEMC_VAL_COMPRESSED) {
@@ -969,7 +969,7 @@ memcached_return c_Memcached::doCacheCallback(CVarRef callback, CStrRef key,
     return MEMCACHED_NOTFOUND;
   }
 
-  vector<char> payload; uint32 flags;
+  vector<char> payload; uint32_t flags;
   toPayload(value, payload, flags);
   return memcached_set(&m_impl->memcached, key.c_str(), key.length(),
                        payload.data(), payload.size(), 0, flags);
diff --git a/hphp/runtime/ext/ext_memcached.h b/hphp/runtime/ext/ext_memcached.h
index f0c4ff5c99e8f..d2920c55ae6e0 100644
--- a/hphp/runtime/ext/ext_memcached.h
+++ b/hphp/runtime/ext/ext_memcached.h
@@ -24,63 +24,63 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-extern const int64 q_Memcached$$OPT_COMPRESSION;
-extern const int64 q_Memcached$$OPT_SERIALIZER;
-extern const int64 q_Memcached$$SERIALIZER_PHP;
-extern const int64 q_Memcached$$SERIALIZER_IGBINARY;
-extern const int64 q_Memcached$$SERIALIZER_JSON;
-extern const int64 q_Memcached$$OPT_PREFIX_KEY;
-extern const int64 q_Memcached$$OPT_HASH;
-extern const int64 q_Memcached$$HASH_DEFAULT;
-extern const int64 q_Memcached$$HASH_MD5;
-extern const int64 q_Memcached$$HASH_CRC;
-extern const int64 q_Memcached$$HASH_FNV1_64;
-extern const int64 q_Memcached$$HASH_FNV1A_64;
-extern const int64 q_Memcached$$HASH_FNV1_32;
-extern const int64 q_Memcached$$HASH_FNV1A_32;
-extern const int64 q_Memcached$$HASH_HSIEH;
-extern const int64 q_Memcached$$HASH_MURMUR;
-extern const int64 q_Memcached$$OPT_DISTRIBUTION;
-extern const int64 q_Memcached$$DISTRIBUTION_MODULA;
-extern const int64 q_Memcached$$DISTRIBUTION_CONSISTENT;
-extern const int64 q_Memcached$$OPT_LIBKETAMA_COMPATIBLE;
-extern const int64 q_Memcached$$OPT_BUFFER_WRITES;
-extern const int64 q_Memcached$$OPT_BINARY_PROTOCOL;
-extern const int64 q_Memcached$$OPT_NO_BLOCK;
-extern const int64 q_Memcached$$OPT_TCP_NODELAY;
-extern const int64 q_Memcached$$OPT_SOCKET_SEND_SIZE;
-extern const int64 q_Memcached$$OPT_SOCKET_RECV_SIZE;
-extern const int64 q_Memcached$$OPT_CONNECT_TIMEOUT;
-extern const int64 q_Memcached$$OPT_RETRY_TIMEOUT;
-extern const int64 q_Memcached$$OPT_SEND_TIMEOUT;
-extern const int64 q_Memcached$$OPT_RECV_TIMEOUT;
-extern const int64 q_Memcached$$OPT_POLL_TIMEOUT;
-extern const int64 q_Memcached$$OPT_CACHE_LOOKUPS;
-extern const int64 q_Memcached$$OPT_SERVER_FAILURE_LIMIT;
+extern const int64_t q_Memcached$$OPT_COMPRESSION;
+extern const int64_t q_Memcached$$OPT_SERIALIZER;
+extern const int64_t q_Memcached$$SERIALIZER_PHP;
+extern const int64_t q_Memcached$$SERIALIZER_IGBINARY;
+extern const int64_t q_Memcached$$SERIALIZER_JSON;
+extern const int64_t q_Memcached$$OPT_PREFIX_KEY;
+extern const int64_t q_Memcached$$OPT_HASH;
+extern const int64_t q_Memcached$$HASH_DEFAULT;
+extern const int64_t q_Memcached$$HASH_MD5;
+extern const int64_t q_Memcached$$HASH_CRC;
+extern const int64_t q_Memcached$$HASH_FNV1_64;
+extern const int64_t q_Memcached$$HASH_FNV1A_64;
+extern const int64_t q_Memcached$$HASH_FNV1_32;
+extern const int64_t q_Memcached$$HASH_FNV1A_32;
+extern const int64_t q_Memcached$$HASH_HSIEH;
+extern const int64_t q_Memcached$$HASH_MURMUR;
+extern const int64_t q_Memcached$$OPT_DISTRIBUTION;
+extern const int64_t q_Memcached$$DISTRIBUTION_MODULA;
+extern const int64_t q_Memcached$$DISTRIBUTION_CONSISTENT;
+extern const int64_t q_Memcached$$OPT_LIBKETAMA_COMPATIBLE;
+extern const int64_t q_Memcached$$OPT_BUFFER_WRITES;
+extern const int64_t q_Memcached$$OPT_BINARY_PROTOCOL;
+extern const int64_t q_Memcached$$OPT_NO_BLOCK;
+extern const int64_t q_Memcached$$OPT_TCP_NODELAY;
+extern const int64_t q_Memcached$$OPT_SOCKET_SEND_SIZE;
+extern const int64_t q_Memcached$$OPT_SOCKET_RECV_SIZE;
+extern const int64_t q_Memcached$$OPT_CONNECT_TIMEOUT;
+extern const int64_t q_Memcached$$OPT_RETRY_TIMEOUT;
+extern const int64_t q_Memcached$$OPT_SEND_TIMEOUT;
+extern const int64_t q_Memcached$$OPT_RECV_TIMEOUT;
+extern const int64_t q_Memcached$$OPT_POLL_TIMEOUT;
+extern const int64_t q_Memcached$$OPT_CACHE_LOOKUPS;
+extern const int64_t q_Memcached$$OPT_SERVER_FAILURE_LIMIT;
 extern const bool q_Memcached$$HAVE_IGBINARY;
 extern const bool q_Memcached$$HAVE_JSON;
-extern const int64 q_Memcached$$GET_PRESERVE_ORDER;
-extern const int64 q_Memcached$$RES_SUCCESS;
-extern const int64 q_Memcached$$RES_FAILURE;
-extern const int64 q_Memcached$$RES_HOST_LOOKUP_FAILURE;
-extern const int64 q_Memcached$$RES_UNKNOWN_READ_FAILURE;
-extern const int64 q_Memcached$$RES_PROTOCOL_ERROR;
-extern const int64 q_Memcached$$RES_CLIENT_ERROR;
-extern const int64 q_Memcached$$RES_SERVER_ERROR;
-extern const int64 q_Memcached$$RES_WRITE_FAILURE;
-extern const int64 q_Memcached$$RES_DATA_EXISTS;
-extern const int64 q_Memcached$$RES_NOTSTORED;
-extern const int64 q_Memcached$$RES_NOTFOUND;
-extern const int64 q_Memcached$$RES_PARTIAL_READ;
-extern const int64 q_Memcached$$RES_SOME_ERRORS;
-extern const int64 q_Memcached$$RES_NO_SERVERS;
-extern const int64 q_Memcached$$RES_END;
-extern const int64 q_Memcached$$RES_ERRNO;
-extern const int64 q_Memcached$$RES_BUFFERED;
-extern const int64 q_Memcached$$RES_TIMEOUT;
-extern const int64 q_Memcached$$RES_BAD_KEY_PROVIDED;
-extern const int64 q_Memcached$$RES_CONNECTION_SOCKET_CREATE_FAILURE;
-extern const int64 q_Memcached$$RES_PAYLOAD_FAILURE;
+extern const int64_t q_Memcached$$GET_PRESERVE_ORDER;
+extern const int64_t q_Memcached$$RES_SUCCESS;
+extern const int64_t q_Memcached$$RES_FAILURE;
+extern const int64_t q_Memcached$$RES_HOST_LOOKUP_FAILURE;
+extern const int64_t q_Memcached$$RES_UNKNOWN_READ_FAILURE;
+extern const int64_t q_Memcached$$RES_PROTOCOL_ERROR;
+extern const int64_t q_Memcached$$RES_CLIENT_ERROR;
+extern const int64_t q_Memcached$$RES_SERVER_ERROR;
+extern const int64_t q_Memcached$$RES_WRITE_FAILURE;
+extern const int64_t q_Memcached$$RES_DATA_EXISTS;
+extern const int64_t q_Memcached$$RES_NOTSTORED;
+extern const int64_t q_Memcached$$RES_NOTFOUND;
+extern const int64_t q_Memcached$$RES_PARTIAL_READ;
+extern const int64_t q_Memcached$$RES_SOME_ERRORS;
+extern const int64_t q_Memcached$$RES_NO_SERVERS;
+extern const int64_t q_Memcached$$RES_END;
+extern const int64_t q_Memcached$$RES_ERRNO;
+extern const int64_t q_Memcached$$RES_BUFFERED;
+extern const int64_t q_Memcached$$RES_TIMEOUT;
+extern const int64_t q_Memcached$$RES_BAD_KEY_PROVIDED;
+extern const int64_t q_Memcached$$RES_CONNECTION_SOCKET_CREATE_FAILURE;
+extern const int64_t q_Memcached$$RES_PAYLOAD_FAILURE;
 
 ///////////////////////////////////////////////////////////////////////////////
 // class Memcached
@@ -102,7 +102,7 @@ class c_Memcached : public ExtObjectData, public Sweepable {
   public: bool t_appendbykey(CStrRef server_key, CStrRef key, CStrRef value);
   public: bool t_cas(double cas_token, CStrRef key, CVarRef value, int expiration = 0);
   public: bool t_casbykey(double cas_token, CStrRef server_key, CStrRef key, CVarRef value, int expiration = 0);
-  public: Variant t_decrement(CStrRef key, int64 offset = 1);
+  public: Variant t_decrement(CStrRef key, int64_t offset = 1);
   public: bool t_delete(CStrRef key, int time = 0);
   public: bool t_deletebykey(CStrRef server_key, CStrRef key, int time = 0);
   public: Variant t_fetch();
@@ -115,13 +115,13 @@ class c_Memcached : public ExtObjectData, public Sweepable {
   public: Variant t_getmulti(CArrRef keys, VRefParam cas_tokens = null_variant, int flags = 0);
   public: Variant t_getmultibykey(CStrRef server_key, CArrRef keys, VRefParam cas_tokens = null_variant, int flags = 0);
   public: Variant t_getoption(int option);
-  public: int64 t_getresultcode();
+  public: int64_t t_getresultcode();
   public: String t_getresultmessage();
   public: Variant t_getserverbykey(CStrRef server_key);
   public: Array t_getserverlist();
   public: Variant t_getstats();
   public: Variant t_getversion();
-  public: Variant t_increment(CStrRef key, int64 offset = 1);
+  public: Variant t_increment(CStrRef key, int64_t offset = 1);
   public: bool t_prepend(CStrRef key, CStrRef value);
   public: bool t_prependbykey(CStrRef server_key, CStrRef key, CStrRef value);
   public: bool t_replace(CStrRef key, CVarRef value, int expiration = 0);
@@ -146,7 +146,7 @@ class c_Memcached : public ExtObjectData, public Sweepable {
   ImplPtr m_impl;
 
   bool handleError(memcached_return status);
-  void toPayload(CVarRef value, std::vector<char> &payload, uint32 &flags);
+  void toPayload(CVarRef value, std::vector<char> &payload, uint32_t &flags);
   bool toObject(Variant& value, const memcached_result_st &result);
   memcached_return doCacheCallback(CVarRef callback, CStrRef key,
                                    Variant& value);
@@ -160,7 +160,7 @@ class c_Memcached : public ExtObjectData, public Sweepable {
                         CStrRef key, CVarRef value, int expiration);
   typedef memcached_return_t (*IncDecOperation)(memcached_st *,
       const char *, size_t, uint32_t, uint64_t *);
-  Variant incDecOperationImpl(IncDecOperation op, CStrRef key, int64 offset);
+  Variant incDecOperationImpl(IncDecOperation op, CStrRef key, int64_t offset);
 
   typedef std::map<std::string, ImplPtr> ImplMap;
   static DECLARE_THREAD_LOCAL(ImplMap, s_persistentMap);
diff --git a/hphp/runtime/ext/ext_misc.cpp b/hphp/runtime/ext/ext_misc.cpp
index 699b557b2607b..b9a0dd8b38302 100644
--- a/hphp/runtime/ext/ext_misc.cpp
+++ b/hphp/runtime/ext/ext_misc.cpp
@@ -37,15 +37,15 @@ const double k_NAN = std::numeric_limits<double>::quiet_NaN();
 
 ///////////////////////////////////////////////////////////////////////////////
 
-int64 f_connection_aborted() {
+int64_t f_connection_aborted() {
   return f_connection_status() == k_CONNECTION_ABORTED;
 }
 
-int64 f_connection_status() {
+int64_t f_connection_status() {
   return k_CONNECTION_NORMAL;
 }
 
-int64 f_connection_timeout() {
+int64_t f_connection_timeout() {
   return f_connection_status() == k_CONNECTION_TIMEOUT;
 }
 
@@ -210,7 +210,7 @@ Variant f_highlight_string(CStrRef str, bool ret /* = false */) {
   throw NotSupportedException(__func__, "PHP specific");
 }
 
-int64 f_ignore_user_abort(bool setting /* = false */) {
+int64_t f_ignore_user_abort(bool setting /* = false */) {
   return 0;
 }
 
@@ -226,7 +226,7 @@ String f_php_strip_whitespace(CStrRef filename) {
   throw NotSupportedException(__func__, "PHP specific");
 }
 
-int64 f_sleep(int seconds) {
+int64_t f_sleep(int seconds) {
   IOStatusHelper io("sleep");
   sleep(seconds);
   return 0;
@@ -256,8 +256,8 @@ Variant f_time_nanosleep(int seconds, int nanoseconds) {
     return true;
   }
   if (errno == EINTR) {
-    return CREATE_MAP2("seconds", (int64)rem.tv_sec,
-                       "nanoseconds", (int64)rem.tv_nsec);
+    return CREATE_MAP2("seconds", (int64_t)rem.tv_sec,
+                       "nanoseconds", (int64_t)rem.tv_nsec);
   }
   return false;
 }
@@ -340,7 +340,7 @@ Array f_token_get_all(CStrRef source) {
   return res;
 }
 
-String f_token_name(int64 token) {
+String f_token_name(int64_t token) {
 
 #undef YYTOKENTYPE
 #ifdef YYTOKEN_MAP
diff --git a/hphp/runtime/ext/ext_misc.h b/hphp/runtime/ext/ext_misc.h
index 7cd862fc9c8a1..0d6d2b1788d01 100644
--- a/hphp/runtime/ext/ext_misc.h
+++ b/hphp/runtime/ext/ext_misc.h
@@ -25,9 +25,9 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-int64 f_connection_aborted();
-int64 f_connection_status();
-int64 f_connection_timeout();
+int64_t f_connection_aborted();
+int64_t f_connection_status();
+int64_t f_connection_timeout();
 Variant f_constant(CStrRef name);
 bool f_define(CStrRef name, CVarRef value, bool case_insensitive = false);
 bool f_defined(CStrRef name, bool autoload = true);
@@ -39,11 +39,11 @@ void f___halt_compiler();
 Variant f_highlight_file(CStrRef filename, bool ret = false);
 Variant f_show_source(CStrRef filename, bool ret = false);
 Variant f_highlight_string(CStrRef str, bool ret = false);
-int64 f_ignore_user_abort(bool setting = false);
+int64_t f_ignore_user_abort(bool setting = false);
 Variant f_pack(int _argc, CStrRef format, CArrRef _argv = null_array);
 bool f_php_check_syntax(CStrRef filename, VRefParam error_message = null);
 String f_php_strip_whitespace(CStrRef filename);
-int64 f_sleep(int seconds);
+int64_t f_sleep(int seconds);
 void f_usleep(int micro_seconds);
 Variant f_time_nanosleep(int seconds, int nanoseconds);
 bool f_time_sleep_until(double timestamp);
@@ -51,7 +51,7 @@ String f_uniqid(CStrRef prefix = null_string, bool more_entropy = false);
 Variant f_unpack(CStrRef format, CStrRef data);
 Array f_sys_getloadavg();
 Array f_token_get_all(CStrRef source);
-String f_token_name(int64 token);
+String f_token_name(int64_t token);
 Variant f_hphp_process_abort(CVarRef magic);
 String f_hphp_to_string(CVarRef v);
 extern const double k_INF;
diff --git a/hphp/runtime/ext/ext_mysql.cpp b/hphp/runtime/ext/ext_mysql.cpp
index 8c46b0ab92fa3..b4230cfcde058 100644
--- a/hphp/runtime/ext/ext_mysql.cpp
+++ b/hphp/runtime/ext/ext_mysql.cpp
@@ -293,7 +293,7 @@ bool MySQL::connect(CStrRef host, int port, CStrRef socket, CStrRef username,
                             client_flags);
   if (ret && RuntimeOption::MySQLWaitTimeout > 0) {
     String query("set session wait_timeout=");
-    query += String((int64)(RuntimeOption::MySQLWaitTimeout / 1000));
+    query += String((int64_t)(RuntimeOption::MySQLWaitTimeout / 1000));
     if (mysql_real_query(m_conn, query.data(), query.size())) {
       raise_notice("MySQL::connect: failed setting session wait timeout: %s",
                    mysql_error(m_conn));
@@ -685,10 +685,10 @@ Variant f_mysql_errno(CVarRef link_identifier /* = null */) {
   }
   MYSQL *conn = mySQL->get();
   if (conn) {
-    return (int64)mysql_errno(conn);
+    return (int64_t)mysql_errno(conn);
   }
   if (mySQL->m_last_error_set) {
-    return (int64)mySQL->m_last_errno;
+    return (int64_t)mySQL->m_last_errno;
   }
   return false;
 }
@@ -717,7 +717,7 @@ Variant f_mysql_warning_count(CVarRef link_identifier /* = null */) {
   }
   MYSQL *conn = mySQL->get();
   if (conn) {
-    return (int64)mysql_warning_count(conn);
+    return (int64_t)mysql_warning_count(conn);
   }
   return false;
 }
@@ -765,7 +765,7 @@ static bool php_mysql_read_rows(MYSQL *mysql, CVarRef result) {
     return false;
   }
 
-  res->setFieldCount((int64)fields);
+  res->setFieldCount((int64_t)fields);
 
   // localizes all the rows
   while (*(cp = net->read_pos) != 254 || pkt_len >= 8) {
@@ -791,7 +791,7 @@ static bool php_mysql_read_rows(MYSQL *mysql, CVarRef result) {
 
   // localizes all the field info
   for (unsigned int i = 0; i < fields; i++) {
-    res->setFieldInfo((int64)i, mysql->fields + i);
+    res->setFieldInfo((int64_t)i, mysql->fields + i);
   }
 
   return true;
@@ -1689,23 +1689,23 @@ void MySQLResult::addField(Variant *value) {
   m_rows->back().push_back(value);
 }
 
-void MySQLResult::setFieldCount(int64 fields) {
+void MySQLResult::setFieldCount(int64_t fields) {
   m_field_count = fields;
   m_fields = new MySQLFieldInfo[fields];
 }
 
-void MySQLResult::setFieldInfo(int64 f, MYSQL_FIELD *field) {
+void MySQLResult::setFieldInfo(int64_t f, MYSQL_FIELD *field) {
   MySQLFieldInfo &info = m_fields[f];
   info.name = NEW(Variant)(String(field->name, CopyString));
   info.table = NEW(Variant)(String(field->table, CopyString));
   info.def = NEW(Variant)(String(field->def, CopyString));
-  info.max_length = (int64)field->max_length;
-  info.length = (int64)field->length;
+  info.max_length = (int64_t)field->max_length;
+  info.length = (int64_t)field->length;
   info.type = (int)field->type;
   info.flags = field->flags;
 }
 
-MySQLFieldInfo *MySQLResult::getFieldInfo(int64 field) {
+MySQLFieldInfo *MySQLResult::getFieldInfo(int64_t field) {
   if (field < 0 || field >= getFieldCount()) {
     return NULL;
   }
@@ -1721,28 +1721,28 @@ MySQLFieldInfo *MySQLResult::getFieldInfo(int64 field) {
   return m_fields + field;
 }
 
-Variant MySQLResult::getField(int64 field) const {
-  if (!m_localized || field < 0 || field >= (int64)m_current_row->size()) {
+Variant MySQLResult::getField(int64_t field) const {
+  if (!m_localized || field < 0 || field >= (int64_t)m_current_row->size()) {
     return null;
   }
   return *(*m_current_row)[field];
 }
 
-int64 MySQLResult::getFieldCount() const {
+int64_t MySQLResult::getFieldCount() const {
   if (!m_localized) {
-    return (int64)mysql_num_fields(m_res);
+    return (int64_t)mysql_num_fields(m_res);
   }
   return m_field_count;
 }
 
-int64 MySQLResult::getRowCount() const {
+int64_t MySQLResult::getRowCount() const {
   if (!m_localized) {
-    return (int64)mysql_num_rows(m_res);
+    return (int64_t)mysql_num_rows(m_res);
   }
   return m_row_count;
 }
 
-bool MySQLResult::seekRow(int64 row) {
+bool MySQLResult::seekRow(int64_t row) {
   if (row < 0 || row >= getRowCount()) {
     raise_warning("Unable to jump to row %" PRId64 " on MySQL result index %d",
                     row, o_getId());
@@ -1768,7 +1768,7 @@ bool MySQLResult::fetchRow() {
   return false;
 }
 
-bool MySQLResult::seekField(int64 field) {
+bool MySQLResult::seekField(int64_t field) {
   if (field < 0 || field >= getFieldCount()) {
     raise_warning("Field %" PRId64 " is invalid for MySQL result index %d",
                     field, o_getId());
diff --git a/hphp/runtime/ext/ext_mysql.h b/hphp/runtime/ext/ext_mysql.h
index bbc2eb2a1853b..c79090111968b 100644
--- a/hphp/runtime/ext/ext_mysql.h
+++ b/hphp/runtime/ext/ext_mysql.h
@@ -139,8 +139,8 @@ class MySQLFieldInfo {
   Variant *name;
   Variant *table;
   Variant *def;
-  int64 max_length;
-  int64 length;
+  int64_t max_length;
+  int64_t length;
   int type;
   unsigned int flags;
 };
@@ -175,20 +175,20 @@ class MySQLResult : public SweepableResourceData {
 
   void addField(Variant *value);
 
-  void setFieldCount(int64 fields);
-  void setFieldInfo(int64 f, MYSQL_FIELD *field);
-  MySQLFieldInfo *getFieldInfo(int64 field);
+  void setFieldCount(int64_t fields);
+  void setFieldInfo(int64_t f, MYSQL_FIELD *field);
+  MySQLFieldInfo *getFieldInfo(int64_t field);
 
   /**
    * Gets the field content. Only for localized result.
    */
-  Variant getField(int64 field) const;
+  Variant getField(int64_t field) const;
 
-  int64 getFieldCount() const;
+  int64_t getFieldCount() const;
 
-  int64 getRowCount() const;
+  int64_t getRowCount() const;
 
-  bool seekRow(int64 row);
+  bool seekRow(int64_t row);
 
   bool fetchRow();
 
@@ -196,7 +196,7 @@ class MySQLResult : public SweepableResourceData {
     return m_row_ready;
   }
 
-  bool seekField(int64 field);
+  bool seekField(int64_t field);
 
   MySQLFieldInfo *fetchFieldInfo();
 
@@ -212,10 +212,10 @@ class MySQLResult : public SweepableResourceData {
   MySQLFieldInfo *m_fields;
   std::list<std::vector<Variant *> > *m_rows;
   std::list<std::vector<Variant *> >::const_iterator m_current_row;
-  int64 m_current_field;
+  int64_t m_current_field;
   bool m_row_ready; // set to false after seekRow, true after fetchRow
-  int64 m_field_count;
-  int64 m_row_count;
+  int64_t m_field_count;
+  int64_t m_row_count;
   MySQL* m_conn;  // only set for async for refcounting underlying buffers
 };
 
@@ -305,7 +305,7 @@ inline Variant f_mysql_get_host_info(CVarRef link_identifier = null) {
 inline Variant f_mysql_get_proto_info(CVarRef link_identifier = null) {
   MYSQL *conn = MySQL::GetConn(link_identifier);
   if (!conn) return false;
-  return (int64)mysql_get_proto_info(conn);
+  return (int64_t)mysql_get_proto_info(conn);
 }
 inline Variant f_mysql_get_server_info(CVarRef link_identifier = null) {
   MYSQL *conn = MySQL::GetConn(link_identifier);
@@ -320,7 +320,7 @@ inline Variant f_mysql_info(CVarRef link_identifier = null) {
 inline Variant f_mysql_insert_id(CVarRef link_identifier = null) {
   MYSQL *conn = MySQL::GetConn(link_identifier);
   if (!conn) return false;
-  return mysql_insert_id(conn);
+  return static_cast<int64_t>(mysql_insert_id(conn));
 }
 inline Variant f_mysql_stat(CVarRef link_identifier = null) {
   MYSQL *conn = MySQL::GetConn(link_identifier);
@@ -330,7 +330,7 @@ inline Variant f_mysql_stat(CVarRef link_identifier = null) {
 inline Variant f_mysql_thread_id(CVarRef link_identifier = null) {
   MYSQL *conn = MySQL::GetConn(link_identifier);
   if (!conn) return false;
-  return (int64)mysql_thread_id(conn);
+  return (int64_t)mysql_thread_id(conn);
 }
 inline Variant f_mysql_create_db(CStrRef db,
                                  CVarRef link_identifier = null) {
@@ -351,7 +351,7 @@ inline Variant f_mysql_drop_db(CStrRef db,
 inline Variant f_mysql_affected_rows(CVarRef link_identifier = null) {
   MYSQL *conn = MySQL::GetConn(link_identifier);
   if (!conn) return false;
-  return mysql_affected_rows(conn);
+  return static_cast<int64_t>(mysql_affected_rows(conn));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/ext/ext_network.cpp b/hphp/runtime/ext/ext_network.cpp
index e7759804039e8..de25ae0aba5e1 100644
--- a/hphp/runtime/ext/ext_network.cpp
+++ b/hphp/runtime/ext/ext_network.cpp
@@ -284,11 +284,11 @@ Variant f_ip2long(CStrRef ip_address) {
      * not -1 or ~0 because of 32/64bit issues.
      */
     if (ip_address == "255.255.255.255") {
-      return (int64)0xFFFFFFFF;
+      return (int64_t)0xFFFFFFFF;
     }
     return false;
   }
-  return (int64)ntohl(ip);
+  return (int64_t)ntohl(ip);
 }
 
 String f_long2ip(int proper_address) {
@@ -368,7 +368,7 @@ static unsigned char *php_parserr(unsigned char *cp, querybuf *answer,
                                   Array &subarray) {
   unsigned short type, cls ATTRIBUTE_UNUSED, dlen;
   unsigned long ttl;
-  int64 n, i;
+  int64_t n, i;
   unsigned short s;
   unsigned char *tp, *p;
   char name[MAXHOSTNAMELEN];
@@ -969,7 +969,7 @@ int f_get_http_request_size() {
 }
 
 bool f_setcookie(CStrRef name, CStrRef value /* = null_string */,
-                 int64 expire /* = 0 */, CStrRef path /* = null_string */,
+                 int64_t expire /* = 0 */, CStrRef path /* = null_string */,
                  CStrRef domain /* = null_string */, bool secure /* = false */,
                  bool httponly /* = false */) {
   Transport *transport = g_context->getTransport();
@@ -981,7 +981,7 @@ bool f_setcookie(CStrRef name, CStrRef value /* = null_string */,
 }
 
 bool f_setrawcookie(CStrRef name, CStrRef value /* = null_string */,
-                    int64 expire /* = 0 */, CStrRef path /* = null_string */,
+                    int64_t expire /* = 0 */, CStrRef path /* = null_string */,
                     CStrRef domain /* = null_string */,
                     bool secure /* = false */,
                     bool httponly /* = false */) {
diff --git a/hphp/runtime/ext/ext_network.h b/hphp/runtime/ext/ext_network.h
index 4d0dfdd74f1d3..7f48018e7998c 100644
--- a/hphp/runtime/ext/ext_network.h
+++ b/hphp/runtime/ext/ext_network.h
@@ -91,11 +91,11 @@ void f_header_remove(CStrRef name = null_string);
 
 int f_get_http_request_size();
 
-bool f_setcookie(CStrRef name, CStrRef value = null_string, int64 expire = 0,
+bool f_setcookie(CStrRef name, CStrRef value = null_string, int64_t expire = 0,
                  CStrRef path = null_string, CStrRef domain = null_string,
                  bool secure = false, bool httponly = false);
 
-bool f_setrawcookie(CStrRef name, CStrRef value = null_string, int64 expire = 0,
+bool f_setrawcookie(CStrRef name, CStrRef value = null_string, int64_t expire = 0,
                     CStrRef path = null_string, CStrRef domain = null_string,
                     bool secure = false, bool httponly = false);
 
diff --git a/hphp/runtime/ext/ext_openssl.cpp b/hphp/runtime/ext/ext_openssl.cpp
index 0b475d14c229f..73571f8b0bdf0 100644
--- a/hphp/runtime/ext/ext_openssl.cpp
+++ b/hphp/runtime/ext/ext_openssl.cpp
@@ -62,8 +62,8 @@ enum php_openssl_cipher_type {
 };
 
 // bitfields
-const int64 k_OPENSSL_RAW_DATA = 1;
-const int64 k_OPENSSL_ZERO_PADDING = 2;
+const int64_t k_OPENSSL_RAW_DATA = 1;
+const int64_t k_OPENSSL_ZERO_PADDING = 2;
 
 static char default_ssl_conf_filename[PATH_MAX];
 
@@ -474,7 +474,7 @@ static const char *read_string(CArrRef args, const char *key, const char *def,
   return def;
 }
 
-static int64 read_integer(CArrRef args, const char *key, int64 def) {
+static int64_t read_integer(CArrRef args, const char *key, int64_t def) {
   if (args.exists(key)) {
     return args[key].toInt64();
   }
@@ -2011,7 +2011,7 @@ static int check_cert(X509_STORE *ctx, X509 *x, STACK_OF(X509) *untrustedchain,
   return ret;
 }
 
-int64 f_openssl_x509_checkpurpose(CVarRef x509cert, int purpose,
+int64_t f_openssl_x509_checkpurpose(CVarRef x509cert, int purpose,
                                 CArrRef cainfo /* = null_array */,
                                 CStrRef untrustedfile /* = null_string */) {
   int ret = -1;
diff --git a/hphp/runtime/ext/ext_openssl.h b/hphp/runtime/ext/ext_openssl.h
index 8d4425dc20940..fe5966768be66 100644
--- a/hphp/runtime/ext/ext_openssl.h
+++ b/hphp/runtime/ext/ext_openssl.h
@@ -58,7 +58,7 @@ Variant f_openssl_seal(CStrRef data, VRefParam sealed_data, VRefParam env_keys,
 bool f_openssl_sign(CStrRef data, VRefParam signature, CVarRef priv_key_id, int signature_alg = k_OPENSSL_ALGO_SHA1);
 Variant f_openssl_verify(CStrRef data, CStrRef signature, CVarRef pub_key_id, int signature_alg = k_OPENSSL_ALGO_SHA1);
 bool f_openssl_x509_check_private_key(CVarRef cert, CVarRef key);
-int64 f_openssl_x509_checkpurpose(CVarRef x509cert, int purpose, CArrRef cainfo = null_array, CStrRef untrustedfile = null_string);
+int64_t f_openssl_x509_checkpurpose(CVarRef x509cert, int purpose, CArrRef cainfo = null_array, CStrRef untrustedfile = null_string);
 bool f_openssl_x509_export_to_file(CVarRef x509, CStrRef outfilename, bool notext = true);
 bool f_openssl_x509_export(CVarRef x509, VRefParam output, bool notext = true);
 void f_openssl_x509_free(CObjRef x509cert);
@@ -71,8 +71,8 @@ Variant f_openssl_decrypt(CStrRef data, CStrRef method, CStrRef password, int op
 Variant f_openssl_digest(CStrRef data, CStrRef method, bool raw_output = false);
 Array f_openssl_get_cipher_methods(bool aliases = false);
 Array f_openssl_get_md_methods(bool aliases = false);
-extern const int64 k_OPENSSL_RAW_DATA;
-extern const int64 k_OPENSSL_ZERO_PADDING;
+extern const int64_t k_OPENSSL_RAW_DATA;
+extern const int64_t k_OPENSSL_ZERO_PADDING;
 
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/ext/ext_options.cpp b/hphp/runtime/ext/ext_options.cpp
index a038ddb507d75..dd1a7234e1f57 100644
--- a/hphp/runtime/ext/ext_options.cpp
+++ b/hphp/runtime/ext/ext_options.cpp
@@ -102,7 +102,7 @@ Variant f_assert(CVarRef assertion) {
   return null;
 }
 
-int64 f_dl(CStrRef library) {
+int64_t f_dl(CStrRef library) {
   return 0;
 }
 
@@ -168,11 +168,11 @@ Array f_inclued_get_data() {
   return Array::Create();
 }
 
-int64 f_get_magic_quotes_gpc() {
+int64_t f_get_magic_quotes_gpc() {
   return RuntimeOption::EnableMagicQuotesGpc ? 1 : 0;
 }
 
-int64 f_get_magic_quotes_runtime() {
+int64_t f_get_magic_quotes_runtime() {
   return 0;
 }
 
@@ -188,23 +188,23 @@ Variant f_getenv(CStrRef varname) {
   return false;
 }
 
-int64 f_getlastmod() {
+int64_t f_getlastmod() {
   throw NotSupportedException(__func__, "page modified time not supported");
 }
 
-int64 f_getmygid() {
+int64_t f_getmygid() {
   return getgid();
 }
 
-int64 f_getmyinode() {
+int64_t f_getmyinode() {
   throw NotSupportedException(__func__, "not exposing operating system info");
 }
 
-int64 f_getmypid() {
+int64_t f_getmypid() {
   return getpid();
 }
 
-int64 f_getmyuid() {
+int64_t f_getmyuid() {
   return getuid();
 }
 
@@ -565,7 +565,7 @@ Array f_getopt(CStrRef options, CVarRef longopts /* = null_variant */) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#define PHP_RUSAGE_PARA(a) #a, (int64)usg.a
+#define PHP_RUSAGE_PARA(a) #a, (int64_t)usg.a
 Array f_getrusage(int who /* = 0 */) {
   struct rusage usg;
   memset(&usg, 0, sizeof(struct rusage));
@@ -601,8 +601,8 @@ bool f_clock_getres(int clk_id, VRefParam sec, VRefParam nsec) {
 #else
   struct timespec ts;
   int ret = clock_getres(clk_id, &ts);
-  sec = (int64)ts.tv_sec;
-  nsec = (int64)ts.tv_nsec;
+  sec = (int64_t)ts.tv_sec;
+  nsec = (int64_t)ts.tv_nsec;
   return ret == 0;
 #endif
 }
@@ -610,12 +610,12 @@ bool f_clock_getres(int clk_id, VRefParam sec, VRefParam nsec) {
 bool f_clock_gettime(int clk_id, VRefParam sec, VRefParam nsec) {
   struct timespec ts;
   int ret = gettime(clk_id, &ts);
-  sec = (int64)ts.tv_sec;
-  nsec = (int64)ts.tv_nsec;
+  sec = (int64_t)ts.tv_sec;
+  nsec = (int64_t)ts.tv_nsec;
   return ret == 0;
 }
 
-bool f_clock_settime(int clk_id, int64 sec, int64 nsec) {
+bool f_clock_settime(int clk_id, int64_t sec, int64_t nsec) {
 #if defined(__APPLE__)
   throw NotSupportedException(__func__, "feature not supported on OSX");
 #else
@@ -650,11 +650,11 @@ String f_ini_set(CStrRef varname, CStrRef newvalue) {
   return oldvalue;
 }
 
-int64 f_memory_get_allocation() {
+int64_t f_memory_get_allocation() {
   if (RuntimeOption::EnableMemoryManager) {
     MemoryManager *mm = MemoryManager::TheMemoryManager();
     const MemoryUsageStats &stats = mm->getStats(true);
-    int64 ret = stats.totalAlloc;
+    int64_t ret = stats.totalAlloc;
     ret -= VM::request_arena().slackEstimate() +
            VM::varenv_arena().slackEstimate();
     return ret;
@@ -662,25 +662,25 @@ int64 f_memory_get_allocation() {
   return 0;
 }
 
-int64 f_memory_get_peak_usage(bool real_usage /* = false */) {
+int64_t f_memory_get_peak_usage(bool real_usage /* = false */) {
   if (RuntimeOption::EnableMemoryManager) {
     MemoryManager *mm = MemoryManager::TheMemoryManager();
     const MemoryUsageStats &stats = mm->getStats(true);
     return real_usage ? stats.peakUsage : stats.peakAlloc;
   }
-  return (int64)Process::GetProcessRSS(Process::GetProcessId()) * 1024 * 1024;
+  return (int64_t)Process::GetProcessRSS(Process::GetProcessId()) * 1024 * 1024;
 }
 
-int64 f_memory_get_usage(bool real_usage /* = false */) {
+int64_t f_memory_get_usage(bool real_usage /* = false */) {
   if (RuntimeOption::EnableMemoryManager) {
     MemoryManager *mm = MemoryManager::TheMemoryManager();
     const MemoryUsageStats &stats = mm->getStats(true);
-    int64 ret = real_usage ? stats.usage : stats.alloc;
+    int64_t ret = real_usage ? stats.usage : stats.alloc;
     ret -= VM::request_arena().slackEstimate() +
            VM::varenv_arena().slackEstimate();
     return ret;
   }
-  return (int64)Process::GetProcessRSS(Process::GetProcessId()) * 1024 * 1024;
+  return (int64_t)Process::GetProcessRSS(Process::GetProcessId()) * 1024 * 1024;
 }
 
 String f_php_ini_scanned_files() {
@@ -771,7 +771,7 @@ String f_zend_logo_guid() {
   throw NotSupportedException(__func__, "not zend anymore");
 }
 
-int64 f_zend_thread_id() {
+int64_t f_zend_thread_id() {
   throw NotSupportedException(__func__, "not zend anymore");
 }
 
@@ -990,7 +990,7 @@ void f_gc_disable() {
                 "collection");
 }
 
-int64 f_gc_collect_cycles() {
+int64_t f_gc_collect_cycles() {
   raise_warning("HipHop currently does not support circular reference "
                 "collection");
   return 0;
diff --git a/hphp/runtime/ext/ext_options.h b/hphp/runtime/ext/ext_options.h
index 313e7555bdbba..61218580ac8ed 100644
--- a/hphp/runtime/ext/ext_options.h
+++ b/hphp/runtime/ext/ext_options.h
@@ -26,7 +26,7 @@ namespace HPHP {
 
 Variant f_assert_options(int what, CVarRef value = null_variant);
 Variant f_assert(CVarRef assertion);
-int64 f_dl(CStrRef library);
+int64_t f_dl(CStrRef library);
 bool f_extension_loaded(CStrRef name);
 Array f_get_loaded_extensions(bool zend_extensions = false);
 Array f_get_extension_funcs(CStrRef module_name);
@@ -38,30 +38,30 @@ void f_restore_include_path();
 String f_set_include_path(CStrRef new_include_path);
 Array f_get_included_files();
 Array f_inclued_get_data();
-int64 f_get_magic_quotes_gpc();
-int64 f_get_magic_quotes_runtime();
+int64_t f_get_magic_quotes_gpc();
+int64_t f_get_magic_quotes_runtime();
 Array f_get_required_files();
 Variant f_getenv(CStrRef varname);
-int64 f_getlastmod();
-int64 f_getmygid();
-int64 f_getmyinode();
-int64 f_getmypid();
-int64 f_getmyuid();
+int64_t f_getlastmod();
+int64_t f_getmygid();
+int64_t f_getmyinode();
+int64_t f_getmypid();
+int64_t f_getmyuid();
 Array f_getopt(CStrRef options, CVarRef longopts = null_variant);
 Array f_getrusage(int who = 0);
 bool f_clock_getres(int clk_id, VRefParam sec, VRefParam nsec);
 bool f_clock_gettime(int clk_id, VRefParam sec, VRefParam nsec);
-bool f_clock_settime(int clk_id, int64 sec, int64 nsec);
-inline int64 f_cpu_get_count() { return Process::GetCPUCount();}
+bool f_clock_settime(int clk_id, int64_t sec, int64_t nsec);
+inline int64_t f_cpu_get_count() { return Process::GetCPUCount();}
 inline String f_cpu_get_model() { return Process::GetCPUModel();}
 String f_ini_alter(CStrRef varname, CStrRef newvalue);
 Array f_ini_get_all(CStrRef extension = null_string);
 String f_ini_get(CStrRef varname);
 void f_ini_restore(CStrRef varname);
 String f_ini_set(CStrRef varname, CStrRef newvalue);
-int64 f_memory_get_allocation();
-int64 f_memory_get_peak_usage(bool real_usage = false);
-int64 f_memory_get_usage(bool real_usage = false);
+int64_t f_memory_get_allocation();
+int64_t f_memory_get_peak_usage(bool real_usage = false);
+int64_t f_memory_get_usage(bool real_usage = false);
 String f_php_ini_scanned_files();
 String f_php_logo_guid();
 String f_php_sapi_name();
@@ -77,9 +77,9 @@ Variant f_version_compare(CStrRef version1, CStrRef version2, CStrRef sop = null
 bool f_gc_enabled();
 void f_gc_enable();
 void f_gc_disable();
-int64 f_gc_collect_cycles();
+int64_t f_gc_collect_cycles();
 String f_zend_logo_guid();
-int64 f_zend_thread_id();
+int64_t f_zend_thread_id();
 String f_zend_version();
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/runtime/ext/ext_output.cpp b/hphp/runtime/ext/ext_output.cpp
index e8fb8385d0e2c..ee686f4c9984f 100644
--- a/hphp/runtime/ext/ext_output.cpp
+++ b/hphp/runtime/ext/ext_output.cpp
@@ -54,7 +54,7 @@ Variant f_hphp_get_timers(bool get_as_float /* = true */) {
   const timespec &tsQueue = transport->getQueueTime();
   const timespec &tsWall = transport->getWallTime();
   const timespec &tsCpu = transport->getCpuTime();
-  const int64 &instStart = transport->getInstructions();
+  const int64_t &instStart = transport->getInstructions();
 
   Array ret;
   if (get_as_float) {
@@ -79,7 +79,7 @@ Variant f_hphp_output_global_state(bool serialize /* = true */) {
   }
 }
 
-int64 f_hphp_instruction_counter(void) {
+int64_t f_hphp_instruction_counter(void) {
   return HardwareCounter::GetInstructionCount();
 }
 
diff --git a/hphp/runtime/ext/ext_output.h b/hphp/runtime/ext/ext_output.h
index 74a392004de48..671708930d005 100644
--- a/hphp/runtime/ext/ext_output.h
+++ b/hphp/runtime/ext/ext_output.h
@@ -61,10 +61,10 @@ inline String f_ob_get_flush() {
   g_context->obFlush();
   return output;
 }
-inline int64 f_ob_get_length() {
+inline int64_t f_ob_get_length() {
   return g_context->obGetContentLength();
 }
-inline int64 f_ob_get_level() {
+inline int64_t f_ob_get_level() {
   return g_context->obGetLevel();
 }
 inline Array f_ob_get_status(bool full_status = false) {
@@ -88,10 +88,10 @@ inline bool f_output_reset_rewrite_vars() {
 
 void f_hphp_crash_log(CStrRef name, CStrRef value);
 
-inline void f_hphp_stats(CStrRef name, int64 value) {
+inline void f_hphp_stats(CStrRef name, int64_t value) {
   ServerStats::Log(name.data(), value);
 }
-inline int64 f_hphp_get_stats(CStrRef name) {
+inline int64_t f_hphp_get_stats(CStrRef name) {
   return ServerStats::Get(name.data());
 }
 Array f_hphp_get_status();
@@ -103,7 +103,7 @@ inline void f_hphp_set_iostatus_address(CStrRef name) {
 }
 Variant f_hphp_get_timers(bool get_as_float = true);
 Variant f_hphp_output_global_state(bool serialize = true);
-int64 f_hphp_instruction_counter(void);
+int64_t f_hphp_instruction_counter(void);
 Variant f_hphp_get_hardware_counters(void);
 bool f_hphp_set_hardware_events(CStrRef events);
 void f_hphp_clear_hardware_events(void);
diff --git a/hphp/runtime/ext/ext_pdo.cpp b/hphp/runtime/ext/ext_pdo.cpp
index 418f2eee966c3..324ebd3e5ad0f 100644
--- a/hphp/runtime/ext/ext_pdo.cpp
+++ b/hphp/runtime/ext/ext_pdo.cpp
@@ -45,103 +45,103 @@ IMPLEMENT_DEFAULT_EXTENSION(PDO);
 ///////////////////////////////////////////////////////////////////////////////
 // PDO constants
 
-const int64 q_PDO$$PARAM_BOOL               = PDO_PARAM_BOOL;
-const int64 q_PDO$$PARAM_NULL               = PDO_PARAM_NULL;
-const int64 q_PDO$$PARAM_INT                = PDO_PARAM_INT;
-const int64 q_PDO$$PARAM_STR                = PDO_PARAM_STR;
-const int64 q_PDO$$PARAM_LOB                = PDO_PARAM_LOB;
-const int64 q_PDO$$PARAM_STMT               = PDO_PARAM_STMT;
-const int64 q_PDO$$PARAM_INPUT_OUTPUT       = PDO_PARAM_INPUT_OUTPUT;
-
-const int64 q_PDO$$PARAM_EVT_ALLOC          = PDO_PARAM_EVT_ALLOC;
-const int64 q_PDO$$PARAM_EVT_FREE           = PDO_PARAM_EVT_FREE;
-const int64 q_PDO$$PARAM_EVT_EXEC_PRE       = PDO_PARAM_EVT_EXEC_PRE;
-const int64 q_PDO$$PARAM_EVT_EXEC_POST      = PDO_PARAM_EVT_EXEC_POST;
-const int64 q_PDO$$PARAM_EVT_FETCH_PRE      = PDO_PARAM_EVT_FETCH_PRE;
-const int64 q_PDO$$PARAM_EVT_FETCH_POST     = PDO_PARAM_EVT_FETCH_POST;
-const int64 q_PDO$$PARAM_EVT_NORMALIZE      = PDO_PARAM_EVT_NORMALIZE;
-
-const int64 q_PDO$$FETCH_USE_DEFAULT        = PDO_FETCH_USE_DEFAULT;
-const int64 q_PDO$$FETCH_LAZY               = PDO_FETCH_LAZY;
-const int64 q_PDO$$FETCH_ASSOC              = PDO_FETCH_ASSOC;
-const int64 q_PDO$$FETCH_NUM                = PDO_FETCH_NUM;
-const int64 q_PDO$$FETCH_BOTH               = PDO_FETCH_BOTH;
-const int64 q_PDO$$FETCH_OBJ                = PDO_FETCH_OBJ;
-const int64 q_PDO$$FETCH_BOUND              = PDO_FETCH_BOUND;
-const int64 q_PDO$$FETCH_COLUMN             = PDO_FETCH_COLUMN;
-const int64 q_PDO$$FETCH_CLASS              = PDO_FETCH_CLASS;
-const int64 q_PDO$$FETCH_INTO               = PDO_FETCH_INTO;
-const int64 q_PDO$$FETCH_FUNC               = PDO_FETCH_FUNC;
-const int64 q_PDO$$FETCH_GROUP              = PDO_FETCH_GROUP;
-const int64 q_PDO$$FETCH_UNIQUE             = PDO_FETCH_UNIQUE;
-const int64 q_PDO$$FETCH_KEY_PAIR           = PDO_FETCH_KEY_PAIR;
-const int64 q_PDO$$FETCH_CLASSTYPE          = PDO_FETCH_CLASSTYPE;
-const int64 q_PDO$$FETCH_SERIALIZE          = PDO_FETCH_SERIALIZE;
-const int64 q_PDO$$FETCH_PROPS_LATE         = PDO_FETCH_PROPS_LATE;
-const int64 q_PDO$$FETCH_NAMED              = PDO_FETCH_NAMED;
-
-const int64 q_PDO$$ATTR_AUTOCOMMIT          = PDO_ATTR_AUTOCOMMIT;
-const int64 q_PDO$$ATTR_PREFETCH            = PDO_ATTR_PREFETCH;
-const int64 q_PDO$$ATTR_TIMEOUT             = PDO_ATTR_TIMEOUT;
-const int64 q_PDO$$ATTR_ERRMODE             = PDO_ATTR_ERRMODE;
-const int64 q_PDO$$ATTR_SERVER_VERSION      = PDO_ATTR_SERVER_VERSION;
-const int64 q_PDO$$ATTR_CLIENT_VERSION      = PDO_ATTR_CLIENT_VERSION;
-const int64 q_PDO$$ATTR_SERVER_INFO         = PDO_ATTR_SERVER_INFO;
-const int64 q_PDO$$ATTR_CONNECTION_STATUS   = PDO_ATTR_CONNECTION_STATUS;
-const int64 q_PDO$$ATTR_CASE                = PDO_ATTR_CASE;
-const int64 q_PDO$$ATTR_CURSOR_NAME         = PDO_ATTR_CURSOR_NAME;
-const int64 q_PDO$$ATTR_CURSOR              = PDO_ATTR_CURSOR;
-const int64 q_PDO$$ATTR_ORACLE_NULLS        = PDO_ATTR_ORACLE_NULLS;
-const int64 q_PDO$$ATTR_PERSISTENT          = PDO_ATTR_PERSISTENT;
-const int64 q_PDO$$ATTR_STATEMENT_CLASS     = PDO_ATTR_STATEMENT_CLASS;
-const int64 q_PDO$$ATTR_FETCH_TABLE_NAMES   = PDO_ATTR_FETCH_TABLE_NAMES;
-const int64 q_PDO$$ATTR_FETCH_CATALOG_NAMES = PDO_ATTR_FETCH_CATALOG_NAMES;
-const int64 q_PDO$$ATTR_DRIVER_NAME         = PDO_ATTR_DRIVER_NAME;
-const int64 q_PDO$$ATTR_STRINGIFY_FETCHES   = PDO_ATTR_STRINGIFY_FETCHES;
-const int64 q_PDO$$ATTR_MAX_COLUMN_LEN      = PDO_ATTR_MAX_COLUMN_LEN;
-const int64 q_PDO$$ATTR_EMULATE_PREPARES    = PDO_ATTR_EMULATE_PREPARES;
-const int64 q_PDO$$ATTR_DEFAULT_FETCH_MODE  = PDO_ATTR_DEFAULT_FETCH_MODE;
-
-const int64 q_PDO$$ERRMODE_SILENT           = PDO_ERRMODE_SILENT;
-const int64 q_PDO$$ERRMODE_WARNING          = PDO_ERRMODE_WARNING;
-const int64 q_PDO$$ERRMODE_EXCEPTION        = PDO_ERRMODE_EXCEPTION;
-
-const int64 q_PDO$$CASE_NATURAL             = PDO_CASE_NATURAL;
-const int64 q_PDO$$CASE_LOWER               = PDO_CASE_LOWER;
-const int64 q_PDO$$CASE_UPPER               = PDO_CASE_UPPER;
-
-const int64 q_PDO$$NULL_NATURAL             = PDO_NULL_NATURAL;
-const int64 q_PDO$$NULL_EMPTY_STRING        = PDO_NULL_EMPTY_STRING;
-const int64 q_PDO$$NULL_TO_STRING           = PDO_NULL_TO_STRING;
+const int64_t q_PDO$$PARAM_BOOL               = PDO_PARAM_BOOL;
+const int64_t q_PDO$$PARAM_NULL               = PDO_PARAM_NULL;
+const int64_t q_PDO$$PARAM_INT                = PDO_PARAM_INT;
+const int64_t q_PDO$$PARAM_STR                = PDO_PARAM_STR;
+const int64_t q_PDO$$PARAM_LOB                = PDO_PARAM_LOB;
+const int64_t q_PDO$$PARAM_STMT               = PDO_PARAM_STMT;
+const int64_t q_PDO$$PARAM_INPUT_OUTPUT       = PDO_PARAM_INPUT_OUTPUT;
+
+const int64_t q_PDO$$PARAM_EVT_ALLOC          = PDO_PARAM_EVT_ALLOC;
+const int64_t q_PDO$$PARAM_EVT_FREE           = PDO_PARAM_EVT_FREE;
+const int64_t q_PDO$$PARAM_EVT_EXEC_PRE       = PDO_PARAM_EVT_EXEC_PRE;
+const int64_t q_PDO$$PARAM_EVT_EXEC_POST      = PDO_PARAM_EVT_EXEC_POST;
+const int64_t q_PDO$$PARAM_EVT_FETCH_PRE      = PDO_PARAM_EVT_FETCH_PRE;
+const int64_t q_PDO$$PARAM_EVT_FETCH_POST     = PDO_PARAM_EVT_FETCH_POST;
+const int64_t q_PDO$$PARAM_EVT_NORMALIZE      = PDO_PARAM_EVT_NORMALIZE;
+
+const int64_t q_PDO$$FETCH_USE_DEFAULT        = PDO_FETCH_USE_DEFAULT;
+const int64_t q_PDO$$FETCH_LAZY               = PDO_FETCH_LAZY;
+const int64_t q_PDO$$FETCH_ASSOC              = PDO_FETCH_ASSOC;
+const int64_t q_PDO$$FETCH_NUM                = PDO_FETCH_NUM;
+const int64_t q_PDO$$FETCH_BOTH               = PDO_FETCH_BOTH;
+const int64_t q_PDO$$FETCH_OBJ                = PDO_FETCH_OBJ;
+const int64_t q_PDO$$FETCH_BOUND              = PDO_FETCH_BOUND;
+const int64_t q_PDO$$FETCH_COLUMN             = PDO_FETCH_COLUMN;
+const int64_t q_PDO$$FETCH_CLASS              = PDO_FETCH_CLASS;
+const int64_t q_PDO$$FETCH_INTO               = PDO_FETCH_INTO;
+const int64_t q_PDO$$FETCH_FUNC               = PDO_FETCH_FUNC;
+const int64_t q_PDO$$FETCH_GROUP              = PDO_FETCH_GROUP;
+const int64_t q_PDO$$FETCH_UNIQUE             = PDO_FETCH_UNIQUE;
+const int64_t q_PDO$$FETCH_KEY_PAIR           = PDO_FETCH_KEY_PAIR;
+const int64_t q_PDO$$FETCH_CLASSTYPE          = PDO_FETCH_CLASSTYPE;
+const int64_t q_PDO$$FETCH_SERIALIZE          = PDO_FETCH_SERIALIZE;
+const int64_t q_PDO$$FETCH_PROPS_LATE         = PDO_FETCH_PROPS_LATE;
+const int64_t q_PDO$$FETCH_NAMED              = PDO_FETCH_NAMED;
+
+const int64_t q_PDO$$ATTR_AUTOCOMMIT          = PDO_ATTR_AUTOCOMMIT;
+const int64_t q_PDO$$ATTR_PREFETCH            = PDO_ATTR_PREFETCH;
+const int64_t q_PDO$$ATTR_TIMEOUT             = PDO_ATTR_TIMEOUT;
+const int64_t q_PDO$$ATTR_ERRMODE             = PDO_ATTR_ERRMODE;
+const int64_t q_PDO$$ATTR_SERVER_VERSION      = PDO_ATTR_SERVER_VERSION;
+const int64_t q_PDO$$ATTR_CLIENT_VERSION      = PDO_ATTR_CLIENT_VERSION;
+const int64_t q_PDO$$ATTR_SERVER_INFO         = PDO_ATTR_SERVER_INFO;
+const int64_t q_PDO$$ATTR_CONNECTION_STATUS   = PDO_ATTR_CONNECTION_STATUS;
+const int64_t q_PDO$$ATTR_CASE                = PDO_ATTR_CASE;
+const int64_t q_PDO$$ATTR_CURSOR_NAME         = PDO_ATTR_CURSOR_NAME;
+const int64_t q_PDO$$ATTR_CURSOR              = PDO_ATTR_CURSOR;
+const int64_t q_PDO$$ATTR_ORACLE_NULLS        = PDO_ATTR_ORACLE_NULLS;
+const int64_t q_PDO$$ATTR_PERSISTENT          = PDO_ATTR_PERSISTENT;
+const int64_t q_PDO$$ATTR_STATEMENT_CLASS     = PDO_ATTR_STATEMENT_CLASS;
+const int64_t q_PDO$$ATTR_FETCH_TABLE_NAMES   = PDO_ATTR_FETCH_TABLE_NAMES;
+const int64_t q_PDO$$ATTR_FETCH_CATALOG_NAMES = PDO_ATTR_FETCH_CATALOG_NAMES;
+const int64_t q_PDO$$ATTR_DRIVER_NAME         = PDO_ATTR_DRIVER_NAME;
+const int64_t q_PDO$$ATTR_STRINGIFY_FETCHES   = PDO_ATTR_STRINGIFY_FETCHES;
+const int64_t q_PDO$$ATTR_MAX_COLUMN_LEN      = PDO_ATTR_MAX_COLUMN_LEN;
+const int64_t q_PDO$$ATTR_EMULATE_PREPARES    = PDO_ATTR_EMULATE_PREPARES;
+const int64_t q_PDO$$ATTR_DEFAULT_FETCH_MODE  = PDO_ATTR_DEFAULT_FETCH_MODE;
+
+const int64_t q_PDO$$ERRMODE_SILENT           = PDO_ERRMODE_SILENT;
+const int64_t q_PDO$$ERRMODE_WARNING          = PDO_ERRMODE_WARNING;
+const int64_t q_PDO$$ERRMODE_EXCEPTION        = PDO_ERRMODE_EXCEPTION;
+
+const int64_t q_PDO$$CASE_NATURAL             = PDO_CASE_NATURAL;
+const int64_t q_PDO$$CASE_LOWER               = PDO_CASE_LOWER;
+const int64_t q_PDO$$CASE_UPPER               = PDO_CASE_UPPER;
+
+const int64_t q_PDO$$NULL_NATURAL             = PDO_NULL_NATURAL;
+const int64_t q_PDO$$NULL_EMPTY_STRING        = PDO_NULL_EMPTY_STRING;
+const int64_t q_PDO$$NULL_TO_STRING           = PDO_NULL_TO_STRING;
 
 const StaticString q_PDO$$ERR_NONE(LITSTR_INIT(PDO_ERR_NONE));
 
-const int64 q_PDO$$FETCH_ORI_NEXT           = PDO_FETCH_ORI_NEXT;
-const int64 q_PDO$$FETCH_ORI_PRIOR          = PDO_FETCH_ORI_PRIOR;
-const int64 q_PDO$$FETCH_ORI_FIRST          = PDO_FETCH_ORI_FIRST;
-const int64 q_PDO$$FETCH_ORI_LAST           = PDO_FETCH_ORI_LAST;
-const int64 q_PDO$$FETCH_ORI_ABS            = PDO_FETCH_ORI_ABS;
-const int64 q_PDO$$FETCH_ORI_REL            = PDO_FETCH_ORI_REL;
+const int64_t q_PDO$$FETCH_ORI_NEXT           = PDO_FETCH_ORI_NEXT;
+const int64_t q_PDO$$FETCH_ORI_PRIOR          = PDO_FETCH_ORI_PRIOR;
+const int64_t q_PDO$$FETCH_ORI_FIRST          = PDO_FETCH_ORI_FIRST;
+const int64_t q_PDO$$FETCH_ORI_LAST           = PDO_FETCH_ORI_LAST;
+const int64_t q_PDO$$FETCH_ORI_ABS            = PDO_FETCH_ORI_ABS;
+const int64_t q_PDO$$FETCH_ORI_REL            = PDO_FETCH_ORI_REL;
 
-const int64 q_PDO$$CURSOR_FWDONLY           = PDO_CURSOR_FWDONLY;
-const int64 q_PDO$$CURSOR_SCROLL            = PDO_CURSOR_SCROLL;
+const int64_t q_PDO$$CURSOR_FWDONLY           = PDO_CURSOR_FWDONLY;
+const int64_t q_PDO$$CURSOR_SCROLL            = PDO_CURSOR_SCROLL;
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const int64 q_PDO$$MYSQL_ATTR_USE_BUFFERED_QUERY =
+const int64_t q_PDO$$MYSQL_ATTR_USE_BUFFERED_QUERY =
   PDO_MYSQL_ATTR_USE_BUFFERED_QUERY;
-const int64 q_PDO$$MYSQL_ATTR_LOCAL_INFILE = PDO_MYSQL_ATTR_LOCAL_INFILE;
-const int64 q_PDO$$MYSQL_ATTR_MAX_BUFFER_SIZE =
+const int64_t q_PDO$$MYSQL_ATTR_LOCAL_INFILE = PDO_MYSQL_ATTR_LOCAL_INFILE;
+const int64_t q_PDO$$MYSQL_ATTR_MAX_BUFFER_SIZE =
   PDO_MYSQL_ATTR_MAX_BUFFER_SIZE;
-const int64 q_PDO$$MYSQL_ATTR_INIT_COMMAND = PDO_MYSQL_ATTR_INIT_COMMAND;
-const int64 q_PDO$$MYSQL_ATTR_READ_DEFAULT_FILE =
+const int64_t q_PDO$$MYSQL_ATTR_INIT_COMMAND = PDO_MYSQL_ATTR_INIT_COMMAND;
+const int64_t q_PDO$$MYSQL_ATTR_READ_DEFAULT_FILE =
   PDO_MYSQL_ATTR_READ_DEFAULT_FILE;
-const int64 q_PDO$$MYSQL_ATTR_READ_DEFAULT_GROUP =
+const int64_t q_PDO$$MYSQL_ATTR_READ_DEFAULT_GROUP =
   PDO_MYSQL_ATTR_READ_DEFAULT_GROUP;
-const int64 q_PDO$$MYSQL_ATTR_COMPRESS     = PDO_MYSQL_ATTR_COMPRESS;
-const int64 q_PDO$$MYSQL_ATTR_DIRECT_QUERY = PDO_MYSQL_ATTR_DIRECT_QUERY;
-const int64 q_PDO$$MYSQL_ATTR_FOUND_ROWS   = PDO_MYSQL_ATTR_FOUND_ROWS;
-const int64 q_PDO$$MYSQL_ATTR_IGNORE_SPACE = PDO_MYSQL_ATTR_IGNORE_SPACE;
+const int64_t q_PDO$$MYSQL_ATTR_COMPRESS     = PDO_MYSQL_ATTR_COMPRESS;
+const int64_t q_PDO$$MYSQL_ATTR_DIRECT_QUERY = PDO_MYSQL_ATTR_DIRECT_QUERY;
+const int64_t q_PDO$$MYSQL_ATTR_FOUND_ROWS   = PDO_MYSQL_ATTR_FOUND_ROWS;
+const int64_t q_PDO$$MYSQL_ATTR_IGNORE_SPACE = PDO_MYSQL_ATTR_IGNORE_SPACE;
 
 ///////////////////////////////////////////////////////////////////////////////
 // extension functions
@@ -507,7 +507,7 @@ static void pdo_handle_error(sp_PDOConnection dbh, sp_PDOStatement stmt) {
   /* hash sqlstate to error messages */
   const char *msg = s_err_hash.description(*pdo_err);
 
-  int64 native_code = 0;
+  int64_t native_code = 0;
   String supp;
   Array info;
   if (dbh->support(PDOConnection::MethodFetchErr)) {
@@ -539,8 +539,8 @@ static void pdo_handle_error(sp_PDOConnection dbh, sp_PDOStatement stmt) {
 ///////////////////////////////////////////////////////////////////////////////
 // helpers for PDO class
 
-static inline int64 pdo_attr_lval(CArrRef options, PDOAttributeType name,
-                                  int64 defval) {
+static inline int64_t pdo_attr_lval(CArrRef options, PDOAttributeType name,
+                                  int64_t defval) {
   if (options.exists(name)) {
     return options[name].toInt64();
   }
@@ -666,7 +666,7 @@ static bool pdo_stmt_describe_columns(sp_PDOStatement stmt) {
   return true;
 }
 
-static bool pdo_stmt_verify_mode(sp_PDOStatement stmt, int64 mode,
+static bool pdo_stmt_verify_mode(sp_PDOStatement stmt, int64_t mode,
                                  bool fetch_all) {
   int flags = mode & PDO_FETCH_FLAGS;
   mode = mode & ~PDO_FETCH_FLAGS;
@@ -748,7 +748,7 @@ static bool do_fetch_class_prepare(sp_PDOStatement stmt) {
   return true; /* no ctor no args is also ok */
 }
 
-static bool pdo_stmt_set_fetch_mode(sp_PDOStatement stmt, int _argc, int64 mode,
+static bool pdo_stmt_set_fetch_mode(sp_PDOStatement stmt, int _argc, int64_t mode,
                                     CArrRef _argv) {
   _argc = _argv.size() + 1;
 
@@ -1139,7 +1139,7 @@ bool c_PDO::t_rollback() {
   return false;
 }
 
-bool c_PDO::t_setattribute(int64 attribute, CVarRef value) {
+bool c_PDO::t_setattribute(int64_t attribute, CVarRef value) {
   assert(m_dbh->driver);
 
 #define PDO_LONG_PARAM_CHECK                                           \
@@ -1254,7 +1254,7 @@ bool c_PDO::t_setattribute(int64 attribute, CVarRef value) {
   return false;
 }
 
-Variant c_PDO::t_getattribute(int64 attribute) {
+Variant c_PDO::t_getattribute(int64_t attribute) {
   assert(m_dbh->driver);
   strcpy(m_dbh->error_code, PDO_ERR_NONE);
   m_dbh->query_stmt = NULL;
@@ -1265,13 +1265,13 @@ Variant c_PDO::t_getattribute(int64 attribute) {
     return (bool)m_dbh->is_persistent;
 
   case PDO_ATTR_CASE:
-    return (int64)m_dbh->desired_case;
+    return (int64_t)m_dbh->desired_case;
 
   case PDO_ATTR_ORACLE_NULLS:
-    return (int64)m_dbh->oracle_nulls;
+    return (int64_t)m_dbh->oracle_nulls;
 
   case PDO_ATTR_ERRMODE:
-    return (int64)m_dbh->error_mode;
+    return (int64_t)m_dbh->error_mode;
 
   case PDO_ATTR_DRIVER_NAME:
     return String(m_dbh->driver->getName());
@@ -1285,7 +1285,7 @@ Variant c_PDO::t_getattribute(int64 attribute) {
     return ret;
   }
   case PDO_ATTR_DEFAULT_FETCH_MODE:
-    return (int64)m_dbh->default_fetch_type;
+    return (int64_t)m_dbh->default_fetch_type;
   }
 
   if (!m_dbh->support(PDOConnection::MethodGetAttribute)) {
@@ -1318,7 +1318,7 @@ Variant c_PDO::t_exec(CStrRef query) {
   strcpy(m_dbh->error_code, PDO_ERR_NONE);
   m_dbh->query_stmt = NULL;
 
-  int64 ret = m_dbh->doer(query);
+  int64_t ret = m_dbh->doer(query);
   if (ret == -1) {
     PDO_HANDLE_DBH_ERR(m_dbh);
     return false;
@@ -1450,7 +1450,7 @@ Variant c_PDO::t_query(CStrRef sql) {
   return false;
 }
 
-Variant c_PDO::t_quote(CStrRef str, int64 paramtype /* = q_PDO$$PARAM_STR */) {
+Variant c_PDO::t_quote(CStrRef str, int64_t paramtype /* = q_PDO$$PARAM_STR */) {
   assert(m_dbh->driver);
   strcpy(m_dbh->error_code, PDO_ERR_NONE);
   m_dbh->query_stmt = NULL;
@@ -1996,8 +1996,8 @@ static bool do_fetch(sp_PDOStatement stmt, bool do_bind, Variant &ret,
   return true;
 }
 
-static int register_bound_param(CVarRef paramno, VRefParam param, int64 type,
-                                int64 max_value_len, CVarRef driver_params,
+static int register_bound_param(CVarRef paramno, VRefParam param, int64_t type,
+                                int64_t max_value_len, CVarRef driver_params,
                                 sp_PDOStatement stmt, bool is_param) {
   SmartObject<PDOBoundParam> p(new PDOBoundParam);
   // need to make sure this is NULL, in case a fatal errors occurs before its set
@@ -2625,7 +2625,7 @@ Variant c_PDOStatement::t_execute(CArrRef params /* = null_array */) {
         param->name = iter.first();
         param->paramno = -1;
       } else {
-        int64 num_index = iter.first().toInt64();
+        int64_t num_index = iter.first().toInt64();
         /* we're okay to be zero based here */
         if (num_index < 0) {
           pdo_raise_impl_error(m_stmt->dbh, m_stmt, "HY093", NULL);
@@ -2682,9 +2682,9 @@ Variant c_PDOStatement::t_execute(CArrRef params /* = null_array */) {
   return false;
 }
 
-Variant c_PDOStatement::t_fetch(int64 how /* = 0 */,
-                                int64 orientation /* = q_PDO$$FETCH_ORI_NEXT */,
-                                int64 offset /* = 0 */) {
+Variant c_PDOStatement::t_fetch(int64_t how /* = 0 */,
+                                int64_t orientation /* = q_PDO$$FETCH_ORI_NEXT */,
+                                int64_t offset /* = 0 */) {
   strcpy(m_stmt->error_code, PDO_ERR_NONE);
   if (!pdo_stmt_verify_mode(m_stmt, how, false)) {
     return false;
@@ -2743,7 +2743,7 @@ Variant c_PDOStatement::t_fetchobject(CStrRef class_name /* = null_string */,
   return ret;
 }
 
-Variant c_PDOStatement::t_fetchcolumn(int64 column_numner /* = 0 */) {
+Variant c_PDOStatement::t_fetchcolumn(int64_t column_numner /* = 0 */) {
   strcpy(m_stmt->error_code, PDO_ERR_NONE);
   if (!do_fetch_common(m_stmt, PDO_FETCH_ORI_NEXT, 0, true)) {
     PDO_HANDLE_STMT_ERR(m_stmt);
@@ -2754,7 +2754,7 @@ Variant c_PDOStatement::t_fetchcolumn(int64 column_numner /* = 0 */) {
   return ret;
 }
 
-Variant c_PDOStatement::t_fetchall(int64 how /* = 0 */,
+Variant c_PDOStatement::t_fetchall(int64_t how /* = 0 */,
                                    CVarRef class_name /* = null */,
                                    CVarRef ctor_args /* = null */) {
   if (!pdo_stmt_verify_mode(m_stmt, how, true)) {
@@ -2878,27 +2878,27 @@ Variant c_PDOStatement::t_fetchall(int64 how /* = 0 */,
 }
 
 bool c_PDOStatement::t_bindvalue(CVarRef paramno, CVarRef param,
-                                 int64 type /* = q_PDO$$PARAM_STR */) {
+                                 int64_t type /* = q_PDO$$PARAM_STR */) {
   return register_bound_param(paramno, param, type, 0, null, m_stmt, true);
 }
 
 bool c_PDOStatement::t_bindparam(CVarRef paramno, VRefParam param,
-                                 int64 type /* = q_PDO$$PARAM_STR */,
-                                 int64 max_value_len /* = 0 */,
+                                 int64_t type /* = q_PDO$$PARAM_STR */,
+                                 int64_t max_value_len /* = 0 */,
                                  CVarRef driver_params /*= null */) {
   return register_bound_param(paramno, ref(param), type, max_value_len,
                               driver_params, m_stmt, true);
 }
 
 bool c_PDOStatement::t_bindcolumn(CVarRef paramno, VRefParam param,
-                                  int64 type /* = q_PDO$$PARAM_STR */,
-                                  int64 max_value_len /* = 0 */,
+                                  int64_t type /* = q_PDO$$PARAM_STR */,
+                                  int64_t max_value_len /* = 0 */,
                                   CVarRef driver_params /* = null */) {
   return register_bound_param(paramno, ref(param), type, max_value_len,
                               driver_params, m_stmt, false);
 }
 
-int64 c_PDOStatement::t_rowcount() {
+int64_t c_PDOStatement::t_rowcount() {
   return m_stmt->row_count;
 }
 
@@ -2928,7 +2928,7 @@ Array c_PDOStatement::t_errorinfo() {
   return ret;
 }
 
-Variant c_PDOStatement::t_setattribute(int64 attribute, CVarRef value) {
+Variant c_PDOStatement::t_setattribute(int64_t attribute, CVarRef value) {
   if (!m_stmt->support(PDOStatement::MethodSetAttribute)) {
     pdo_raise_impl_error(m_stmt->dbh, m_stmt, "IM001",
                          "This driver doesn't support setting attributes");
@@ -2943,7 +2943,7 @@ Variant c_PDOStatement::t_setattribute(int64 attribute, CVarRef value) {
   return false;
 }
 
-Variant c_PDOStatement::t_getattribute(int64 attribute) {
+Variant c_PDOStatement::t_getattribute(int64_t attribute) {
   Variant ret;
   if (!m_stmt->support(PDOStatement::MethodGetAttribute)) {
     if (!generic_stmt_attr_get(m_stmt, ret, attribute)) {
@@ -2973,11 +2973,11 @@ Variant c_PDOStatement::t_getattribute(int64 attribute) {
   return ret;
 }
 
-int64 c_PDOStatement::t_columncount() {
+int64_t c_PDOStatement::t_columncount() {
   return m_stmt->column_count;
 }
 
-Variant c_PDOStatement::t_getcolumnmeta(int64 column) {
+Variant c_PDOStatement::t_getcolumnmeta(int64_t column) {
   if (column < 0) {
     pdo_raise_impl_error(m_stmt->dbh, m_stmt, "42P10",
                          "column number must be non-negative");
@@ -3000,16 +3000,16 @@ Variant c_PDOStatement::t_getcolumnmeta(int64 column) {
   /* add stock items */
   PDOColumn *col = m_stmt->columns[column].toObject().getTyped<PDOColumn>();
   ret.set("name", col->name);
-  ret.set("len", (int64)col->maxlen); /* FIXME: unsigned ? */
-  ret.set("precision", (int64)col->precision);
+  ret.set("len", (int64_t)col->maxlen); /* FIXME: unsigned ? */
+  ret.set("precision", (int64_t)col->precision);
   if (col->param_type != PDO_PARAM_ZVAL) {
     // if param_type is PDO_PARAM_ZVAL the driver has to provide correct data
-    ret.set("pdo_type", (int64)col->param_type);
+    ret.set("pdo_type", (int64_t)col->param_type);
   }
   return ret;
 }
 
-bool c_PDOStatement::t_setfetchmode(int _argc, int64 mode,
+bool c_PDOStatement::t_setfetchmode(int _argc, int64_t mode,
                                     CArrRef _argv /* = null_array */) {
   return pdo_stmt_set_fetch_mode(m_stmt, _argc, mode, _argv);
 }
diff --git a/hphp/runtime/ext/ext_pdo.h b/hphp/runtime/ext/ext_pdo.h
index d82ed74eb468d..eac340bfe5fa5 100644
--- a/hphp/runtime/ext/ext_pdo.h
+++ b/hphp/runtime/ext/ext_pdo.h
@@ -26,87 +26,87 @@ namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
 Array f_pdo_drivers();
-extern const int64 q_PDO$$PARAM_BOOL;
-extern const int64 q_PDO$$PARAM_NULL;
-extern const int64 q_PDO$$PARAM_INT;
-extern const int64 q_PDO$$PARAM_STR;
-extern const int64 q_PDO$$PARAM_LOB;
-extern const int64 q_PDO$$PARAM_STMT;
-extern const int64 q_PDO$$PARAM_INPUT_OUTPUT;
-extern const int64 q_PDO$$PARAM_EVT_ALLOC;
-extern const int64 q_PDO$$PARAM_EVT_FREE;
-extern const int64 q_PDO$$PARAM_EVT_EXEC_PRE;
-extern const int64 q_PDO$$PARAM_EVT_EXEC_POST;
-extern const int64 q_PDO$$PARAM_EVT_FETCH_PRE;
-extern const int64 q_PDO$$PARAM_EVT_FETCH_POST;
-extern const int64 q_PDO$$PARAM_EVT_NORMALIZE;
-extern const int64 q_PDO$$FETCH_USE_DEFAULT;
-extern const int64 q_PDO$$FETCH_LAZY;
-extern const int64 q_PDO$$FETCH_ASSOC;
-extern const int64 q_PDO$$FETCH_NUM;
-extern const int64 q_PDO$$FETCH_BOTH;
-extern const int64 q_PDO$$FETCH_OBJ;
-extern const int64 q_PDO$$FETCH_BOUND;
-extern const int64 q_PDO$$FETCH_COLUMN;
-extern const int64 q_PDO$$FETCH_CLASS;
-extern const int64 q_PDO$$FETCH_INTO;
-extern const int64 q_PDO$$FETCH_FUNC;
-extern const int64 q_PDO$$FETCH_GROUP;
-extern const int64 q_PDO$$FETCH_UNIQUE;
-extern const int64 q_PDO$$FETCH_KEY_PAIR;
-extern const int64 q_PDO$$FETCH_CLASSTYPE;
-extern const int64 q_PDO$$FETCH_SERIALIZE;
-extern const int64 q_PDO$$FETCH_PROPS_LATE;
-extern const int64 q_PDO$$FETCH_NAMED;
-extern const int64 q_PDO$$ATTR_AUTOCOMMIT;
-extern const int64 q_PDO$$ATTR_PREFETCH;
-extern const int64 q_PDO$$ATTR_TIMEOUT;
-extern const int64 q_PDO$$ATTR_ERRMODE;
-extern const int64 q_PDO$$ATTR_SERVER_VERSION;
-extern const int64 q_PDO$$ATTR_CLIENT_VERSION;
-extern const int64 q_PDO$$ATTR_SERVER_INFO;
-extern const int64 q_PDO$$ATTR_CONNECTION_STATUS;
-extern const int64 q_PDO$$ATTR_CASE;
-extern const int64 q_PDO$$ATTR_CURSOR_NAME;
-extern const int64 q_PDO$$ATTR_CURSOR;
-extern const int64 q_PDO$$ATTR_ORACLE_NULLS;
-extern const int64 q_PDO$$ATTR_PERSISTENT;
-extern const int64 q_PDO$$ATTR_STATEMENT_CLASS;
-extern const int64 q_PDO$$ATTR_FETCH_TABLE_NAMES;
-extern const int64 q_PDO$$ATTR_FETCH_CATALOG_NAMES;
-extern const int64 q_PDO$$ATTR_DRIVER_NAME;
-extern const int64 q_PDO$$ATTR_STRINGIFY_FETCHES;
-extern const int64 q_PDO$$ATTR_MAX_COLUMN_LEN;
-extern const int64 q_PDO$$ATTR_EMULATE_PREPARES;
-extern const int64 q_PDO$$ATTR_DEFAULT_FETCH_MODE;
-extern const int64 q_PDO$$ERRMODE_SILENT;
-extern const int64 q_PDO$$ERRMODE_WARNING;
-extern const int64 q_PDO$$ERRMODE_EXCEPTION;
-extern const int64 q_PDO$$CASE_NATURAL;
-extern const int64 q_PDO$$CASE_LOWER;
-extern const int64 q_PDO$$CASE_UPPER;
-extern const int64 q_PDO$$NULL_NATURAL;
-extern const int64 q_PDO$$NULL_EMPTY_STRING;
-extern const int64 q_PDO$$NULL_TO_STRING;
+extern const int64_t q_PDO$$PARAM_BOOL;
+extern const int64_t q_PDO$$PARAM_NULL;
+extern const int64_t q_PDO$$PARAM_INT;
+extern const int64_t q_PDO$$PARAM_STR;
+extern const int64_t q_PDO$$PARAM_LOB;
+extern const int64_t q_PDO$$PARAM_STMT;
+extern const int64_t q_PDO$$PARAM_INPUT_OUTPUT;
+extern const int64_t q_PDO$$PARAM_EVT_ALLOC;
+extern const int64_t q_PDO$$PARAM_EVT_FREE;
+extern const int64_t q_PDO$$PARAM_EVT_EXEC_PRE;
+extern const int64_t q_PDO$$PARAM_EVT_EXEC_POST;
+extern const int64_t q_PDO$$PARAM_EVT_FETCH_PRE;
+extern const int64_t q_PDO$$PARAM_EVT_FETCH_POST;
+extern const int64_t q_PDO$$PARAM_EVT_NORMALIZE;
+extern const int64_t q_PDO$$FETCH_USE_DEFAULT;
+extern const int64_t q_PDO$$FETCH_LAZY;
+extern const int64_t q_PDO$$FETCH_ASSOC;
+extern const int64_t q_PDO$$FETCH_NUM;
+extern const int64_t q_PDO$$FETCH_BOTH;
+extern const int64_t q_PDO$$FETCH_OBJ;
+extern const int64_t q_PDO$$FETCH_BOUND;
+extern const int64_t q_PDO$$FETCH_COLUMN;
+extern const int64_t q_PDO$$FETCH_CLASS;
+extern const int64_t q_PDO$$FETCH_INTO;
+extern const int64_t q_PDO$$FETCH_FUNC;
+extern const int64_t q_PDO$$FETCH_GROUP;
+extern const int64_t q_PDO$$FETCH_UNIQUE;
+extern const int64_t q_PDO$$FETCH_KEY_PAIR;
+extern const int64_t q_PDO$$FETCH_CLASSTYPE;
+extern const int64_t q_PDO$$FETCH_SERIALIZE;
+extern const int64_t q_PDO$$FETCH_PROPS_LATE;
+extern const int64_t q_PDO$$FETCH_NAMED;
+extern const int64_t q_PDO$$ATTR_AUTOCOMMIT;
+extern const int64_t q_PDO$$ATTR_PREFETCH;
+extern const int64_t q_PDO$$ATTR_TIMEOUT;
+extern const int64_t q_PDO$$ATTR_ERRMODE;
+extern const int64_t q_PDO$$ATTR_SERVER_VERSION;
+extern const int64_t q_PDO$$ATTR_CLIENT_VERSION;
+extern const int64_t q_PDO$$ATTR_SERVER_INFO;
+extern const int64_t q_PDO$$ATTR_CONNECTION_STATUS;
+extern const int64_t q_PDO$$ATTR_CASE;
+extern const int64_t q_PDO$$ATTR_CURSOR_NAME;
+extern const int64_t q_PDO$$ATTR_CURSOR;
+extern const int64_t q_PDO$$ATTR_ORACLE_NULLS;
+extern const int64_t q_PDO$$ATTR_PERSISTENT;
+extern const int64_t q_PDO$$ATTR_STATEMENT_CLASS;
+extern const int64_t q_PDO$$ATTR_FETCH_TABLE_NAMES;
+extern const int64_t q_PDO$$ATTR_FETCH_CATALOG_NAMES;
+extern const int64_t q_PDO$$ATTR_DRIVER_NAME;
+extern const int64_t q_PDO$$ATTR_STRINGIFY_FETCHES;
+extern const int64_t q_PDO$$ATTR_MAX_COLUMN_LEN;
+extern const int64_t q_PDO$$ATTR_EMULATE_PREPARES;
+extern const int64_t q_PDO$$ATTR_DEFAULT_FETCH_MODE;
+extern const int64_t q_PDO$$ERRMODE_SILENT;
+extern const int64_t q_PDO$$ERRMODE_WARNING;
+extern const int64_t q_PDO$$ERRMODE_EXCEPTION;
+extern const int64_t q_PDO$$CASE_NATURAL;
+extern const int64_t q_PDO$$CASE_LOWER;
+extern const int64_t q_PDO$$CASE_UPPER;
+extern const int64_t q_PDO$$NULL_NATURAL;
+extern const int64_t q_PDO$$NULL_EMPTY_STRING;
+extern const int64_t q_PDO$$NULL_TO_STRING;
 extern const StaticString q_PDO$$ERR_NONE;
-extern const int64 q_PDO$$FETCH_ORI_NEXT;
-extern const int64 q_PDO$$FETCH_ORI_PRIOR;
-extern const int64 q_PDO$$FETCH_ORI_FIRST;
-extern const int64 q_PDO$$FETCH_ORI_LAST;
-extern const int64 q_PDO$$FETCH_ORI_ABS;
-extern const int64 q_PDO$$FETCH_ORI_REL;
-extern const int64 q_PDO$$CURSOR_FWDONLY;
-extern const int64 q_PDO$$CURSOR_SCROLL;
-extern const int64 q_PDO$$MYSQL_ATTR_USE_BUFFERED_QUERY;
-extern const int64 q_PDO$$MYSQL_ATTR_LOCAL_INFILE;
-extern const int64 q_PDO$$MYSQL_ATTR_MAX_BUFFER_SIZE;
-extern const int64 q_PDO$$MYSQL_ATTR_INIT_COMMAND;
-extern const int64 q_PDO$$MYSQL_ATTR_READ_DEFAULT_FILE;
-extern const int64 q_PDO$$MYSQL_ATTR_READ_DEFAULT_GROUP;
-extern const int64 q_PDO$$MYSQL_ATTR_COMPRESS;
-extern const int64 q_PDO$$MYSQL_ATTR_DIRECT_QUERY;
-extern const int64 q_PDO$$MYSQL_ATTR_FOUND_ROWS;
-extern const int64 q_PDO$$MYSQL_ATTR_IGNORE_SPACE;
+extern const int64_t q_PDO$$FETCH_ORI_NEXT;
+extern const int64_t q_PDO$$FETCH_ORI_PRIOR;
+extern const int64_t q_PDO$$FETCH_ORI_FIRST;
+extern const int64_t q_PDO$$FETCH_ORI_LAST;
+extern const int64_t q_PDO$$FETCH_ORI_ABS;
+extern const int64_t q_PDO$$FETCH_ORI_REL;
+extern const int64_t q_PDO$$CURSOR_FWDONLY;
+extern const int64_t q_PDO$$CURSOR_SCROLL;
+extern const int64_t q_PDO$$MYSQL_ATTR_USE_BUFFERED_QUERY;
+extern const int64_t q_PDO$$MYSQL_ATTR_LOCAL_INFILE;
+extern const int64_t q_PDO$$MYSQL_ATTR_MAX_BUFFER_SIZE;
+extern const int64_t q_PDO$$MYSQL_ATTR_INIT_COMMAND;
+extern const int64_t q_PDO$$MYSQL_ATTR_READ_DEFAULT_FILE;
+extern const int64_t q_PDO$$MYSQL_ATTR_READ_DEFAULT_GROUP;
+extern const int64_t q_PDO$$MYSQL_ATTR_COMPRESS;
+extern const int64_t q_PDO$$MYSQL_ATTR_DIRECT_QUERY;
+extern const int64_t q_PDO$$MYSQL_ATTR_FOUND_ROWS;
+extern const int64_t q_PDO$$MYSQL_ATTR_IGNORE_SPACE;
 
 ///////////////////////////////////////////////////////////////////////////////
 // class PDO
@@ -124,14 +124,14 @@ class c_PDO : public ExtObjectData, public Sweepable {
   public: bool t_begintransaction();
   public: bool t_commit();
   public: bool t_rollback();
-  public: bool t_setattribute(int64 attribute, CVarRef value);
-  public: Variant t_getattribute(int64 attribute);
+  public: bool t_setattribute(int64_t attribute, CVarRef value);
+  public: Variant t_getattribute(int64_t attribute);
   public: Variant t_exec(CStrRef query);
   public: Variant t_lastinsertid(CStrRef seqname = null_string);
   public: Variant t_errorcode();
   public: Array t_errorinfo();
   public: Variant t_query(CStrRef sql);
-  public: Variant t_quote(CStrRef str, int64 paramtype = q_PDO$$PARAM_STR);
+  public: Variant t_quote(CStrRef str, int64_t paramtype = q_PDO$$PARAM_STR);
   public: Variant t___wakeup();
   public: Variant t___sleep();
   public: static Array ti_getavailabledrivers(const char* cls );
@@ -155,21 +155,21 @@ class c_PDOStatement : public ExtObjectData, public Sweepable {
   public: ~c_PDOStatement();
   public: void t___construct();
   public: Variant t_execute(CArrRef params = null_array);
-  public: Variant t_fetch(int64 how = 0, int64 orientation = q_PDO$$FETCH_ORI_NEXT, int64 offset = 0);
+  public: Variant t_fetch(int64_t how = 0, int64_t orientation = q_PDO$$FETCH_ORI_NEXT, int64_t offset = 0);
   public: Variant t_fetchobject(CStrRef class_name = null_string, CVarRef ctor_args = null);
-  public: Variant t_fetchcolumn(int64 column_numner = 0);
-  public: Variant t_fetchall(int64 how = 0, CVarRef class_name = null, CVarRef ctor_args = null);
-  public: bool t_bindvalue(CVarRef paramno, CVarRef param, int64 type = q_PDO$$PARAM_STR);
-  public: bool t_bindparam(CVarRef paramno, VRefParam param, int64 type = q_PDO$$PARAM_STR, int64 max_value_len = 0, CVarRef driver_params = null);
-  public: bool t_bindcolumn(CVarRef paramno, VRefParam param, int64 type = q_PDO$$PARAM_STR, int64 max_value_len = 0, CVarRef driver_params = null);
-  public: int64 t_rowcount();
+  public: Variant t_fetchcolumn(int64_t column_numner = 0);
+  public: Variant t_fetchall(int64_t how = 0, CVarRef class_name = null, CVarRef ctor_args = null);
+  public: bool t_bindvalue(CVarRef paramno, CVarRef param, int64_t type = q_PDO$$PARAM_STR);
+  public: bool t_bindparam(CVarRef paramno, VRefParam param, int64_t type = q_PDO$$PARAM_STR, int64_t max_value_len = 0, CVarRef driver_params = null);
+  public: bool t_bindcolumn(CVarRef paramno, VRefParam param, int64_t type = q_PDO$$PARAM_STR, int64_t max_value_len = 0, CVarRef driver_params = null);
+  public: int64_t t_rowcount();
   public: Variant t_errorcode();
   public: Array t_errorinfo();
-  public: Variant t_setattribute(int64 attribute, CVarRef value);
-  public: Variant t_getattribute(int64 attribute);
-  public: int64 t_columncount();
-  public: Variant t_getcolumnmeta(int64 column);
-  public: bool t_setfetchmode(int _argc, int64 mode, CArrRef _argv = null_array);
+  public: Variant t_setattribute(int64_t attribute, CVarRef value);
+  public: Variant t_getattribute(int64_t attribute);
+  public: int64_t t_columncount();
+  public: Variant t_getcolumnmeta(int64_t column);
+  public: bool t_setfetchmode(int _argc, int64_t mode, CArrRef _argv = null_array);
   public: bool t_nextrowset();
   public: bool t_closecursor();
   public: Variant t_debugdumpparams();
diff --git a/hphp/runtime/ext/ext_posix.h b/hphp/runtime/ext/ext_posix.h
index af227031bf226..e99de014f4b29 100644
--- a/hphp/runtime/ext/ext_posix.h
+++ b/hphp/runtime/ext/ext_posix.h
@@ -35,7 +35,7 @@ inline String f_posix_ctermid() {
   return s.setSize(strlen(buffer));
 }
 
-inline int64 f_posix_get_last_error() {
+inline int64_t f_posix_get_last_error() {
   return errno;
 }
 
@@ -48,15 +48,15 @@ inline String f_posix_getcwd() {
   return s.setSize(strlen(buffer));
 }
 
-inline int64 f_posix_getegid() {
+inline int64_t f_posix_getegid() {
   return getegid();
 }
 
-inline int64 f_posix_geteuid() {
+inline int64_t f_posix_geteuid() {
   return geteuid();
 }
 
-inline int64 f_posix_getgid() {
+inline int64_t f_posix_getgid() {
   return getgid();
 }
 
@@ -80,15 +80,15 @@ inline Variant f_posix_getpgid(int pid) {
   return ret;
 }
 
-inline int64 f_posix_getpgrp() {
+inline int64_t f_posix_getpgrp() {
   return getpgrp();
 }
 
-inline int64 f_posix_getpid() {
+inline int64_t f_posix_getpid() {
   return getpid();
 }
 
-inline int64 f_posix_getppid() {
+inline int64_t f_posix_getppid() {
   return getppid();
 }
 
@@ -104,7 +104,7 @@ inline Variant f_posix_getsid(int pid) {
   return ret;
 }
 
-inline int64 f_posix_getuid() {
+inline int64_t f_posix_getuid() {
   return getuid();
 }
 
@@ -141,7 +141,7 @@ inline bool f_posix_setpgid(int pid, int pgid) {
   return setpgid(pid, pgid) >= 0;
 }
 
-inline int64 f_posix_setsid() {
+inline int64_t f_posix_setsid() {
   return setsid();
 }
 
diff --git a/hphp/runtime/ext/ext_preg.cpp b/hphp/runtime/ext/ext_preg.cpp
index 3dc43e0b53447..8f6d847112120 100644
--- a/hphp/runtime/ext/ext_preg.cpp
+++ b/hphp/runtime/ext/ext_preg.cpp
@@ -76,7 +76,7 @@ String f_preg_quote(CStrRef str, CStrRef delimiter /* = null_string */) {
   return preg_quote(str, delimiter);
 }
 
-int64 f_preg_last_error() {
+int64_t f_preg_last_error() {
   return preg_last_error();
 }
 
diff --git a/hphp/runtime/ext/ext_preg.h b/hphp/runtime/ext/ext_preg.h
index 14744e7699614..bf9eef19bf9ba 100644
--- a/hphp/runtime/ext/ext_preg.h
+++ b/hphp/runtime/ext/ext_preg.h
@@ -46,7 +46,7 @@ Variant f_preg_split(CVarRef pattern, CVarRef subject, int limit = -1,
 
 String f_preg_quote(CStrRef str, CStrRef delimiter = null_string);
 
-int64 f_preg_last_error();
+int64_t f_preg_last_error();
 
 ///////////////////////////////////////////////////////////////////////////////
 // deprecating these
diff --git a/hphp/runtime/ext/ext_process.cpp b/hphp/runtime/ext/ext_process.cpp
index cf09d6f1e1d15..52fc65dccc3e4 100644
--- a/hphp/runtime/ext/ext_process.cpp
+++ b/hphp/runtime/ext/ext_process.cpp
@@ -143,7 +143,7 @@ void f_pcntl_exec(CStrRef path, CArrRef args /* = null_array */,
   free(argv);
 }
 
-int64 f_pcntl_fork() {
+int64_t f_pcntl_fork() {
   if (RuntimeOption::serverExecutionMode()) {
     raise_error("forking is disallowed in server mode");
     return -1;
@@ -313,7 +313,7 @@ bool f_pcntl_signal(int signo, CVarRef handler,
                     bool restart_syscalls /* = true */) {
   /* Special long value case for SIG_DFL and SIG_IGN */
   if (handler.isInteger()) {
-    int64 handle = handler.toInt64();
+    int64_t handle = handler.toInt64();
     if (handle != (long)SIG_DFL && handle != (long)SIG_IGN) {
       raise_warning("Invalid value for handle argument specified");
     }
@@ -339,7 +339,7 @@ bool f_pcntl_signal(int signo, CVarRef handler,
   return true;
 }
 
-int64 f_pcntl_wait(VRefParam status, int options /* = 0 */) {
+int64_t f_pcntl_wait(VRefParam status, int options /* = 0 */) {
   int child_id;
   int nstatus = 0;
   child_id = LightProcess::pcntl_waitpid(-1, &nstatus, options);
@@ -352,7 +352,7 @@ int64 f_pcntl_wait(VRefParam status, int options /* = 0 */) {
   return child_id;
 }
 
-int64 f_pcntl_waitpid(int pid, VRefParam status, int options /* = 0 */) {
+int64_t f_pcntl_waitpid(int pid, VRefParam status, int options /* = 0 */) {
   int nstatus = status;
   pid_t child_id = LightProcess::pcntl_waitpid((pid_t)pid, &nstatus, options);
   status = nstatus;
@@ -813,7 +813,7 @@ bool f_proc_terminate(CObjRef process, int signal /* = 0 */) {
   return kill(proc->child, signal <= 0 ? SIGTERM : signal) == 0;
 }
 
-int64 f_proc_close(CObjRef process) {
+int64_t f_proc_close(CObjRef process) {
   return process.getTyped<ChildProcess>()->close();
 }
 
diff --git a/hphp/runtime/ext/ext_process.h b/hphp/runtime/ext/ext_process.h
index 42c9838d44eba..f5c7a2f4fb85d 100644
--- a/hphp/runtime/ext/ext_process.h
+++ b/hphp/runtime/ext/ext_process.h
@@ -24,21 +24,21 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-inline int64 f_pcntl_alarm(int seconds) {
+inline int64_t f_pcntl_alarm(int seconds) {
   return alarm(seconds);
 }
 void f_pcntl_exec(CStrRef path, CArrRef args = null_array, CArrRef envs = null_array);
 
-int64 f_pcntl_fork();
+int64_t f_pcntl_fork();
 Variant f_pcntl_getpriority(int pid = 0, int process_identifier = 0);
 bool f_pcntl_setpriority(int priority, int pid = 0,
                          int process_identifier = 0);
 
 bool f_pcntl_signal(int signo, CVarRef handler, bool restart_syscalls = true);
-int64 f_pcntl_wait(VRefParam status, int options = 0);
-int64 f_pcntl_waitpid(int pid, VRefParam status, int options = 0);
+int64_t f_pcntl_wait(VRefParam status, int options = 0);
+int64_t f_pcntl_waitpid(int pid, VRefParam status, int options = 0);
 
-inline int64 f_pcntl_wexitstatus(int status) {
+inline int64_t f_pcntl_wexitstatus(int status) {
   return WEXITSTATUS(status);
 }
 
@@ -51,8 +51,8 @@ bool f_pcntl_signal_dispatch();
 inline bool f_pcntl_wifexited(int status) { return WIFEXITED(status);}
 inline bool f_pcntl_wifsignaled(int status) { return WIFSIGNALED(status);}
 inline bool f_pcntl_wifstopped(int status) { return WIFSTOPPED(status);}
-inline int64 f_pcntl_wstopsig(int status) { return WSTOPSIG(status);}
-inline int64 f_pcntl_wtermsig(int status) { return WTERMSIG(status);}
+inline int64_t f_pcntl_wstopsig(int status) { return WSTOPSIG(status);}
+inline int64_t f_pcntl_wtermsig(int status) { return WTERMSIG(status);}
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -68,7 +68,7 @@ Variant f_proc_open(CStrRef cmd, CArrRef descriptorspec, VRefParam pipes,
                     CStrRef cwd = null_string, CVarRef env = null_variant,
                     CVarRef other_options = null_variant);
 bool f_proc_terminate(CObjRef process, int signal = 0);
-int64 f_proc_close(CObjRef process);
+int64_t f_proc_close(CObjRef process);
 Array f_proc_get_status(CObjRef process);
 bool f_proc_nice(int increment);
 
diff --git a/hphp/runtime/ext/ext_server.cpp b/hphp/runtime/ext/ext_server.cpp
index 626a7263138e1..63bb4787ffd5b 100644
--- a/hphp/runtime/ext/ext_server.cpp
+++ b/hphp/runtime/ext/ext_server.cpp
@@ -103,9 +103,9 @@ bool f_dangling_server_proxy_new_request(CStrRef host) {
 ///////////////////////////////////////////////////////////////////////////////
 // Pagelet Server
 
-const int64 k_PAGELET_NOT_READY = PAGELET_NOT_READY;
-const int64 k_PAGELET_READY     = PAGELET_READY;
-const int64 k_PAGELET_DONE      = PAGELET_DONE;
+const int64_t k_PAGELET_NOT_READY = PAGELET_NOT_READY;
+const int64_t k_PAGELET_READY     = PAGELET_READY;
+const int64_t k_PAGELET_DONE      = PAGELET_DONE;
 
 bool f_pagelet_server_is_enabled() {
   return PageletServer::Enabled();
@@ -128,12 +128,12 @@ Object f_pagelet_server_task_start(CStrRef url,
   return PageletServer::TaskStart(url, headers, remote_host, post_data);
 }
 
-int64 f_pagelet_server_task_status(CObjRef task) {
+int64_t f_pagelet_server_task_status(CObjRef task) {
   return PageletServer::TaskStatus(task);
 }
 
 String f_pagelet_server_task_result(CObjRef task, VRefParam headers,
-                                    VRefParam code, int64 timeout_ms /* = 0 */) {
+                                    VRefParam code, int64_t timeout_ms /* = 0 */) {
   Array rheaders;
   int rcode;
   String response = PageletServer::TaskResult(task, rheaders, rcode,
@@ -160,7 +160,7 @@ void f_pagelet_server_flush() {
 ///////////////////////////////////////////////////////////////////////////////
 // xbox
 
-bool f_xbox_send_message(CStrRef msg, VRefParam ret, int64 timeout_ms,
+bool f_xbox_send_message(CStrRef msg, VRefParam ret, int64_t timeout_ms,
                          CStrRef host /* = "localhost" */) {
   return XboxServer::SendMessage(msg, ret, timeout_ms, host);
 }
@@ -177,7 +177,7 @@ bool f_xbox_task_status(CObjRef task) {
   return XboxServer::TaskStatus(task);
 }
 
-int64 f_xbox_task_result(CObjRef task, int64 timeout_ms, VRefParam ret) {
+int64_t f_xbox_task_result(CObjRef task, int64_t timeout_ms, VRefParam ret) {
   return XboxServer::TaskResult(task, timeout_ms, ret);
 }
 
@@ -206,7 +206,7 @@ Variant f_xbox_process_call_message(CStrRef msg) {
   return f_call_user_func_array(fn, args.toArray());
 }
 
-int64 f_xbox_get_thread_timeout() {
+int64_t f_xbox_get_thread_timeout() {
   XboxServerInfoPtr server_info = XboxServer::GetServerInfo();
   if (server_info) {
     return server_info->getMaxDuration();
@@ -236,7 +236,7 @@ void f_xbox_schedule_thread_reset() {
   }
 }
 
-int64 f_xbox_get_thread_time() {
+int64_t f_xbox_get_thread_time() {
   RPCRequestHandler *handler = XboxServer::GetRequestHandler();
   if (handler) {
     return time(NULL) - handler->getCreationTime();
diff --git a/hphp/runtime/ext/ext_server.h b/hphp/runtime/ext/ext_server.h
index 31d86838240b6..999be921dc8a5 100644
--- a/hphp/runtime/ext/ext_server.h
+++ b/hphp/runtime/ext/ext_server.h
@@ -25,9 +25,9 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-extern const int64 k_PAGELET_NOT_READY;
-extern const int64 k_PAGELET_READY;
-extern const int64 k_PAGELET_DONE;
+extern const int64_t k_PAGELET_NOT_READY;
+extern const int64_t k_PAGELET_READY;
+extern const int64_t k_PAGELET_DONE;
 
 enum PageletStatusType {
   PAGELET_NOT_READY,
@@ -41,19 +41,19 @@ bool f_dangling_server_proxy_old_request();
 bool f_dangling_server_proxy_new_request(CStrRef host);
 bool f_pagelet_server_is_enabled();
 Object f_pagelet_server_task_start(CStrRef url, CArrRef headers = null_array, CStrRef post_data = null_string, CArrRef files = null_array);
-int64 f_pagelet_server_task_status(CObjRef task);
-String f_pagelet_server_task_result(CObjRef task, VRefParam headers, VRefParam code, int64 timeout_ms);
+int64_t f_pagelet_server_task_status(CObjRef task);
+String f_pagelet_server_task_result(CObjRef task, VRefParam headers, VRefParam code, int64_t timeout_ms);
 void f_pagelet_server_flush();
-bool f_xbox_send_message(CStrRef msg, VRefParam ret, int64 timeout_ms, CStrRef host = "localhost");
+bool f_xbox_send_message(CStrRef msg, VRefParam ret, int64_t timeout_ms, CStrRef host = "localhost");
 bool f_xbox_post_message(CStrRef msg, CStrRef host = "localhost");
 Object f_xbox_task_start(CStrRef message);
 bool f_xbox_task_status(CObjRef task);
-int64 f_xbox_task_result(CObjRef task, int64 timeout_ms, VRefParam ret);
+int64_t f_xbox_task_result(CObjRef task, int64_t timeout_ms, VRefParam ret);
 Variant f_xbox_process_call_message(CStrRef msg);
-int64 f_xbox_get_thread_timeout();
+int64_t f_xbox_get_thread_timeout();
 void f_xbox_set_thread_timeout(int timeout);
 void f_xbox_schedule_thread_reset();
-int64 f_xbox_get_thread_time();
+int64_t f_xbox_get_thread_time();
 
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/ext/ext_session.cpp b/hphp/runtime/ext/ext_session.cpp
index d30dc0feb9a5e..5bbc36e1bef27 100644
--- a/hphp/runtime/ext/ext_session.cpp
+++ b/hphp/runtime/ext/ext_session.cpp
@@ -61,9 +61,9 @@ class Session {
   std::string m_session_name;
   std::string m_extern_referer_chk;
   std::string m_entropy_file;
-  int64       m_entropy_length;
+  int64_t       m_entropy_length;
   std::string m_cache_limiter;
-  int64       m_cookie_lifetime;
+  int64_t       m_cookie_lifetime;
   std::string m_cookie_path;
   std::string m_cookie_domain;
   bool        m_cookie_secure;
@@ -72,11 +72,11 @@ class Session {
   SessionModule *m_mod;
 
   Status m_session_status;
-  int64  m_gc_probability;
-  int64  m_gc_divisor;
-  int64  m_gc_maxlifetime;
+  int64_t  m_gc_probability;
+  int64_t  m_gc_divisor;
+  int64_t  m_gc_maxlifetime;
   int    m_module_number;
-  int64  m_cache_expire;
+  int64_t  m_cache_expire;
 
   std::string m_ps_open;
   std::string m_ps_close;
@@ -94,7 +94,7 @@ class Session {
   bool m_apply_trans_sid; // whether to enable trans-sid for current request
 
   std::string m_hash_func;
-  int64 m_hash_bits_per_character;
+  int64_t m_hash_bits_per_character;
 
   int  m_send_cookie;
   int  m_define_sid;
@@ -747,7 +747,7 @@ class UserSessionModule : public SessionModule {
   virtual bool gc(int maxlifetime, int *nrdels) {
     return f_call_user_func_array
       (String(PS(ps_gc)),
-       CREATE_VECTOR1((int64)maxlifetime));
+       CREATE_VECTOR1((int64_t)maxlifetime));
   }
 };
 static UserSessionModule s_user_session_module;
@@ -1281,7 +1281,7 @@ static int php_session_cache_limiter() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void f_session_set_cookie_params(int64 lifetime,
+void f_session_set_cookie_params(int64_t lifetime,
                                  CStrRef path /* = null_string */,
                                  CStrRef domain /* = null_string */,
                                  CVarRef secure /* = null */,
@@ -1421,8 +1421,8 @@ String f_session_cache_limiter(CStrRef new_cache_limiter /* = null_string */) {
   return ret;
 }
 
-int64 f_session_cache_expire(CStrRef new_cache_expire /* = null_string */) {
-  int64 ret = PS(cache_expire);
+int64_t f_session_cache_expire(CStrRef new_cache_expire /* = null_string */) {
+  int64_t ret = PS(cache_expire);
   if (!new_cache_expire.isNull()) {
     IniSetting::Set("session.cache_expire", new_cache_expire.toInt64());
   }
diff --git a/hphp/runtime/ext/ext_session.h b/hphp/runtime/ext/ext_session.h
index afe371f3a50a3..729b1da5b0367 100644
--- a/hphp/runtime/ext/ext_session.h
+++ b/hphp/runtime/ext/ext_session.h
@@ -25,7 +25,7 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-void f_session_set_cookie_params(int64 lifetime, CStrRef path = null_string, CStrRef domain = null_string, CVarRef secure = null, CVarRef httponly = null);
+void f_session_set_cookie_params(int64_t lifetime, CStrRef path = null_string, CStrRef domain = null_string, CVarRef secure = null, CVarRef httponly = null);
 Array f_session_get_cookie_params();
 String f_session_name(CStrRef newname = null_string);
 Variant f_session_module_name(CStrRef newname = null_string);
@@ -34,7 +34,7 @@ String f_session_save_path(CStrRef newname = null_string);
 String f_session_id(CStrRef newid = null_string);
 bool f_session_regenerate_id(bool delete_old_session = false);
 String f_session_cache_limiter(CStrRef new_cache_limiter = null_string);
-int64 f_session_cache_expire(CStrRef new_cache_expire = null_string);
+int64_t f_session_cache_expire(CStrRef new_cache_expire = null_string);
 Variant f_session_encode();
 bool f_session_decode(CStrRef data);
 bool f_session_start();
diff --git a/hphp/runtime/ext/ext_simplexml.cpp b/hphp/runtime/ext/ext_simplexml.cpp
index f8dca7c0e5e40..40aed313643fd 100644
--- a/hphp/runtime/ext/ext_simplexml.cpp
+++ b/hphp/runtime/ext/ext_simplexml.cpp
@@ -229,7 +229,7 @@ static StaticString s_SimpleXMLElement("SimpleXMLElement");
 
 Variant f_simplexml_load_string(CStrRef data,
                                 CStrRef class_name /* = "SimpleXMLElement" */,
-                                int64 options /* = 0 */,
+                                int64_t options /* = 0 */,
                                 CStrRef ns /* = "" */,
                                 bool is_prefix /* = false */) {
   if (!class_name->isame(s_SimpleXMLElement.get())) {
@@ -260,7 +260,7 @@ Variant f_simplexml_load_string(CStrRef data,
 
 Variant f_simplexml_load_file(CStrRef filename,
                               CStrRef class_name /* = "SimpleXMLElement" */,
-                              int64 options /* = 0 */, CStrRef ns /* = "" */,
+                              int64_t options /* = 0 */, CStrRef ns /* = "" */,
                               bool is_prefix /* = false */) {
   String str = f_file_get_contents(filename);
   return f_simplexml_load_string(str, class_name, options, ns, is_prefix);
@@ -291,7 +291,7 @@ void c_SimpleXMLElement::sweep() {
   }
 }
 
-void c_SimpleXMLElement::t___construct(CStrRef data, int64 options /* = 0 */,
+void c_SimpleXMLElement::t___construct(CStrRef data, int64_t options /* = 0 */,
                                        bool data_is_url /* = false */,
                                        CStrRef ns /* = "" */,
                                        bool is_prefix /* = false */) {
@@ -825,7 +825,7 @@ bool c_SimpleXMLElement::o_toBoolean() const {
   return m_node != NULL || getProperties().size();
 }
 
-int64 c_SimpleXMLElement::o_toInt64() const {
+int64_t c_SimpleXMLElement::o_toInt64() const {
   Variant prop;
   ArrayIter iter(m_children);
   if (iter) {
@@ -859,12 +859,12 @@ Variant c_SimpleXMLElement::t_getiterator() {
   return Object(iter);
 }
 
-int64 c_SimpleXMLElement::t_count() {
+int64_t c_SimpleXMLElement::t_count() {
   if (m_is_attribute) {
     return m_attributes.toArray().size();
   }
   if (m_is_property) {
-    int64 n = 0; Variant var(this);
+    int64_t n = 0; Variant var(this);
     for (ArrayIter iter = var.begin(); !iter.end(); iter.next()) {
       ++n;
     }
@@ -878,7 +878,7 @@ int64 c_SimpleXMLElement::t_count() {
 
 bool c_SimpleXMLElement::t_offsetexists(CVarRef index) {
   if (index.isInteger()) {
-    int64 n = 0; int64 nIndex = index.toInt64(); Variant var(this);
+    int64_t n = 0; int64_t nIndex = index.toInt64(); Variant var(this);
     for (ArrayIter iter = var.begin(); !iter.end(); iter.next()) {
       if (n++ == nIndex) {
         return true;
@@ -892,7 +892,7 @@ bool c_SimpleXMLElement::t_offsetexists(CVarRef index) {
 Variant c_SimpleXMLElement::t_offsetget(CVarRef index) {
   if (index.isInteger()) {
     if (m_is_property) {
-      int64 n = 0; int64 nIndex = index.toInt64(); Variant var(this);
+      int64_t n = 0; int64_t nIndex = index.toInt64(); Variant var(this);
       for (ArrayIter iter = var.begin(); !iter.end(); iter.next()) {
         if (n++ == nIndex) {
           return iter.second();
diff --git a/hphp/runtime/ext/ext_simplexml.h b/hphp/runtime/ext/ext_simplexml.h
index c5ada0d8f39fc..b7bdbf8f42d26 100644
--- a/hphp/runtime/ext/ext_simplexml.h
+++ b/hphp/runtime/ext/ext_simplexml.h
@@ -25,8 +25,8 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-Variant f_simplexml_load_string(CStrRef data, CStrRef class_name = "SimpleXMLElement", int64 options = 0, CStrRef ns = "", bool is_prefix = false);
-Variant f_simplexml_load_file(CStrRef filename, CStrRef class_name = "SimpleXMLElement", int64 options = 0, CStrRef ns = "", bool is_prefix = false);
+Variant f_simplexml_load_string(CStrRef data, CStrRef class_name = "SimpleXMLElement", int64_t options = 0, CStrRef ns = "", bool is_prefix = false);
+Variant f_simplexml_load_file(CStrRef filename, CStrRef class_name = "SimpleXMLElement", int64_t options = 0, CStrRef ns = "", bool is_prefix = false);
 Variant f_libxml_get_errors();
 Variant f_libxml_get_last_error();
 void f_libxml_clear_errors();
@@ -50,13 +50,13 @@ class c_SimpleXMLElement :
   // need to implement
   public: c_SimpleXMLElement(VM::Class* cls = c_SimpleXMLElement::s_cls);
   public: ~c_SimpleXMLElement();
-  public: void t___construct(CStrRef data, int64 options = 0, bool data_is_url = false, CStrRef ns = "", bool is_prefix = false);
+  public: void t___construct(CStrRef data, int64_t options = 0, bool data_is_url = false, CStrRef ns = "", bool is_prefix = false);
   public: bool t_offsetexists(CVarRef index);
   public: Variant t_offsetget(CVarRef index);
   public: void t_offsetset(CVarRef index, CVarRef newvalue);
   public: void t_offsetunset(CVarRef index);
   public: Variant t_getiterator();
-  public: int64 t_count();
+  public: int64_t t_count();
   public: Variant t_xpath(CStrRef path);
   public: bool t_registerxpathnamespace(CStrRef prefix, CStrRef ns);
   public: Variant t_asxml(CStrRef filename = "");
@@ -85,7 +85,7 @@ class c_SimpleXMLElement :
   bool m_is_children;
   bool m_is_property;
   virtual bool o_toBoolean() const;
-  virtual int64 o_toInt64() const;
+  virtual int64_t o_toInt64() const;
   virtual double o_toDouble() const;
   virtual Array o_toArray() const;
   virtual Variant *___lval(Variant v_name);
diff --git a/hphp/runtime/ext/ext_soap.cpp b/hphp/runtime/ext/ext_soap.cpp
index 0ff0e99f82e74..5b6a89c391fbf 100644
--- a/hphp/runtime/ext/ext_soap.cpp
+++ b/hphp/runtime/ext/ext_soap.cpp
@@ -121,7 +121,7 @@ class SoapServiceScope {
   xmlCharEncodingHandlerPtr m_old_encoding;
   Array m_old_classmap;
   encodeMap *m_old_typemap;
-  int64 m_old_features;
+  int64_t m_old_features;
   int m_old_soap_version;
 
   void save() {
@@ -415,7 +415,7 @@ static xmlDocPtr serialize_function_call
                        BAD_CAST(header->m_actor.toString().data()));
           }
         } else if (header->m_actor.isInteger()) {
-          int64 actor = header->m_actor.toInt64();
+          int64_t actor = header->m_actor.toInt64();
           if (client->m_soap_version == SOAP_1_1) {
             if (actor == SOAP_ACTOR_NEXT) {
               xmlSetProp(h, BAD_CAST(SOAP_1_1_ENV_NS_PREFIX":actor"),
@@ -1123,7 +1123,7 @@ static int serialize_response_call2(xmlNodePtr body, sdlFunction *function,
       Variant data = iter.second();
       Variant key = iter.first();
       String param_name;
-      int64 param_index = i;
+      int64_t param_index = i;
       if (key.isString()) {
         param_name = key.toString();
       } else {
@@ -1804,7 +1804,7 @@ bool f_is_soap_fault(CVarRef fault) {
   return fault.isObject() && fault.toObject()->o_instanceof("SoapFault");
 }
 
-int64 f__soap_active_version() {
+int64_t f__soap_active_version() {
   USE_SOAP_GLOBAL;
   return SOAP_GLOBAL(soap_version);
 }
@@ -1839,13 +1839,13 @@ void c_SoapServer::t___construct(CVarRef wsdl,
 
   m_send_errors = 1;
 
-  int64 cache_wsdl = SOAP_GLOBAL(cache);
+  int64_t cache_wsdl = SOAP_GLOBAL(cache);
 
   int version = SOAP_1_1;
   Array typemap_ht;
   if (!options.empty()) {
     if (options["soap_version"].isInteger()) {
-      int64 tmp = options["soap_version"].toInt64();
+      int64_t tmp = options["soap_version"].toInt64();
       if (tmp == SOAP_1_1 || tmp == SOAP_1_2) {
         version = tmp;
       }
@@ -2231,7 +2231,7 @@ void c_SoapServer::t_handle(CStrRef request /* = null_string */) {
   }
 }
 
-void c_SoapServer::t_setpersistence(int64 mode) {
+void c_SoapServer::t_setpersistence(int64_t mode) {
   SoapServerScope ss(this);
   if (m_type == SOAP_CLASS) {
     if (mode == SOAP_PERSISTENCE_SESSION || mode == SOAP_PERSISTENCE_REQUEST) {
@@ -2302,7 +2302,7 @@ void c_SoapClient::t___construct(CVarRef wsdl,
     throw SoapException("wsdl must be string or null");
   }
 
-  int64 cache_wsdl = SOAP_GLOBAL(cache);
+  int64_t cache_wsdl = SOAP_GLOBAL(cache);
   if (!options.empty()) {
     m_location = options["location"];
 
@@ -2615,7 +2615,7 @@ Variant c_SoapClient::t___gettypes() {
 }
 
 Variant c_SoapClient::t___dorequest(CStrRef buf, CStrRef location, CStrRef action,
-                                    int64 version, bool oneway /* = false */) {
+                                    int64_t version, bool oneway /* = false */) {
   if (location.empty()) {
     m_soap_fault =
       Object(SystemLib::AllocSoapFaultObject("HTTP", "Unable to parse URL"));
@@ -2758,7 +2758,7 @@ void c_SoapVar::t___construct(CVarRef data, CVarRef type,
     m_type = UNKNOWN_TYPE;
   } else {
     std::map<int, encodePtr> &defEncIndex = SOAP_GLOBAL(defEncIndex);
-    int64 ntype = type.toInt64();
+    int64_t ntype = type.toInt64();
     if (defEncIndex.find(ntype) != defEncIndex.end()) {
       m_type = ntype;
     } else {
diff --git a/hphp/runtime/ext/ext_soap.h b/hphp/runtime/ext/ext_soap.h
index 26fc6ccfb59a3..ebafd0a99fdbf 100644
--- a/hphp/runtime/ext/ext_soap.h
+++ b/hphp/runtime/ext/ext_soap.h
@@ -27,7 +27,7 @@ namespace HPHP {
 
 bool f_use_soap_error_handler(bool handler = true);
 bool f_is_soap_fault(CVarRef fault);
-int64 f__soap_active_version();
+int64_t f__soap_active_version();
 
 ///////////////////////////////////////////////////////////////////////////////
 // class SoapServer
@@ -46,7 +46,7 @@ class c_SoapServer : public ExtObjectData {
   public: void t_addfunction(CVarRef func);
   public: Variant t_getfunctions();
   public: void t_handle(CStrRef request = null_string);
-  public: void t_setpersistence(int64 mode);
+  public: void t_setpersistence(int64_t mode);
   public: void t_fault(CVarRef code, CStrRef fault, CStrRef actor = null_string, CVarRef detail = null, CStrRef name = null_string);
   public: void t_addsoapheader(CObjRef fault);
 
@@ -88,7 +88,7 @@ class c_SoapClient : public ExtObjectDataFlags<ObjectData::HasCall> {
   public: Variant t___getlastresponseheaders();
   public: Variant t___getfunctions();
   public: Variant t___gettypes();
-  public: Variant t___dorequest(CStrRef buf, CStrRef location, CStrRef action, int64 version, bool oneway = false);
+  public: Variant t___dorequest(CStrRef buf, CStrRef location, CStrRef action, int64_t version, bool oneway = false);
   public: Variant t___setcookie(CStrRef name, CStrRef value = null_string);
   public: Variant t___setlocation(CStrRef new_location = null_string);
   public: bool t___setsoapheaders(CVarRef headers = null_variant);
@@ -147,7 +147,7 @@ class c_SoapVar : public ExtObjectData {
 
 
   public: Variant m_value;
-  public: int64   m_type;
+  public: int64_t   m_type;
   public: String  m_stype;
   public: String  m_ns;
   public: String  m_name;
diff --git a/hphp/runtime/ext/ext_socket.cpp b/hphp/runtime/ext/ext_socket.cpp
index f770da8150b4d..4ae0eb1b64d66 100644
--- a/hphp/runtime/ext/ext_socket.cpp
+++ b/hphp/runtime/ext/ext_socket.cpp
@@ -948,7 +948,7 @@ String f_socket_strerror(int errnum) {
   return String(Util::safe_strerror(errnum));
 }
 
-int64 f_socket_last_error(CObjRef socket /* = null_object */) {
+int64_t f_socket_last_error(CObjRef socket /* = null_object */) {
   if (!socket.isNull()) {
     Socket *sock = socket.getTyped<Socket>();
     return sock->getError();
@@ -1166,8 +1166,8 @@ Variant f_getaddrinfo(CStrRef host, CStrRef port, int family /* = 0 */,
           a = (struct sockaddr_in6 *)res->ai_addr;
           sockinfo.set("address", buffer);
           sockinfo.set("port", ntohs(a->sin6_port));
-          sockinfo.set("flow_info", (int32)a->sin6_flowinfo);
-          sockinfo.set("scope_id", (int32)a->sin6_scope_id);
+          sockinfo.set("flow_info", (int32_t)a->sin6_flowinfo);
+          sockinfo.set("scope_id", (int32_t)a->sin6_scope_id);
         }
         break;
       }
diff --git a/hphp/runtime/ext/ext_socket.h b/hphp/runtime/ext/ext_socket.h
index 333bd7017000a..7f451a443ac7c 100644
--- a/hphp/runtime/ext/ext_socket.h
+++ b/hphp/runtime/ext/ext_socket.h
@@ -54,7 +54,7 @@ Variant f_socket_recvfrom(CObjRef socket, VRefParam buf, int len, int flags,
 bool f_socket_shutdown(CObjRef socket, int how = 0);
 void f_socket_close(CObjRef socket);
 String f_socket_strerror(int errnum);
-int64 f_socket_last_error(CObjRef socket = null_object);
+int64_t f_socket_last_error(CObjRef socket = null_object);
 void f_socket_clear_error(CObjRef socket = null_object);
 Variant f_getaddrinfo(CStrRef host, CStrRef port, int family = 0,
                       int socktype = 0, int protocol = 0, int flags = 0);
diff --git a/hphp/runtime/ext/ext_spl.cpp b/hphp/runtime/ext/ext_spl.cpp
index 2060c9d475e35..50c05813d2f69 100644
--- a/hphp/runtime/ext/ext_spl.cpp
+++ b/hphp/runtime/ext/ext_spl.cpp
@@ -100,7 +100,7 @@ void throw_spl_exception(const char *fmt, ...) {
 }
 
 static bool s_inited = false;
-static int64 s_hash_mask_handle = 0;
+static int64_t s_hash_mask_handle = 0;
 static Mutex s_mutex;
 
 String f_spl_object_hash(CObjRef obj) {
@@ -118,7 +118,7 @@ String f_spl_object_hash(CObjRef obj) {
 
   char buf[33];
   snprintf(buf, sizeof(buf), "%032" PRIx64,
-           s_hash_mask_handle ^ (int64)obj.get());
+           s_hash_mask_handle ^ (int64_t)obj.get());
   return String(buf, CopyString);
 }
 
@@ -213,7 +213,7 @@ Variant f_iterator_apply(CVarRef obj, CVarRef func,
   }
   Object pobj = obj.toObject();
   pobj->o_invoke("rewind", null_array, -1);
-  int64 count = 0;
+  int64_t count = 0;
   while (same(pobj->o_invoke("valid", null_array, -1), true)) {
     if (!same(f_call_user_func_array(func, params), true)) {
       break;
@@ -230,7 +230,7 @@ Variant f_iterator_count(CVarRef obj) {
   }
   Object pobj = obj.toObject();
   pobj->o_invoke("rewind", null_array, -1);
-  int64 count = 0;
+  int64_t count = 0;
   while (same(pobj->o_invoke("valid", null_array, -1), true)) {
     ++count;
     pobj->o_invoke("next", null_array, -1);
diff --git a/hphp/runtime/ext/ext_spl.h b/hphp/runtime/ext/ext_spl.h
index b1cc6e08fa1b7..17a263831e719 100644
--- a/hphp/runtime/ext/ext_spl.h
+++ b/hphp/runtime/ext/ext_spl.h
@@ -27,7 +27,7 @@ namespace HPHP {
 
 Array f_spl_classes();
 String f_spl_object_hash(CObjRef obj);
-inline int64 f_hphp_object_pointer(CObjRef obj) { return (int64)obj.get();}
+inline int64_t f_hphp_object_pointer(CObjRef obj) { return (int64_t)obj.get();}
 Variant f_hphp_get_this();
 Variant f_class_implements(CVarRef obj, bool autoload = true);
 Variant f_class_parents(CVarRef obj, bool autoload = true);
diff --git a/hphp/runtime/ext/ext_splfile.cpp b/hphp/runtime/ext/ext_splfile.cpp
index 8c91636814e5a..67f2648b82f1f 100644
--- a/hphp/runtime/ext/ext_splfile.cpp
+++ b/hphp/runtime/ext/ext_splfile.cpp
@@ -65,7 +65,7 @@ Object f_hphp_splfileinfo___construct(CObjRef obj, CStrRef file_name) {
   return obj;
 }
 
-int64 f_hphp_splfileinfo_getatime(CObjRef obj) {
+int64_t f_hphp_splfileinfo_getatime(CObjRef obj) {
   SplFileInfo *fileInfo = get_splfileinfo(obj);
   return f_fileatime(fileInfo->getFileName());
 }
@@ -75,7 +75,7 @@ String f_hphp_splfileinfo_getbasename(CObjRef obj, CStrRef suffix) {
   return f_basename(fileInfo->getFileName(), suffix);
 }
 
-int64 f_hphp_splfileinfo_getctime(CObjRef obj) {
+int64_t f_hphp_splfileinfo_getctime(CObjRef obj) {
   SplFileInfo *fileInfo = get_splfileinfo(obj);
   return f_filectime(fileInfo->getFileName());
 }
@@ -89,12 +89,12 @@ String f_hphp_splfileinfo_getfilename(CObjRef obj) {
   return f_basename(fileInfo->getFileName());
 }
 
-int64 f_hphp_splfileinfo_getgroup(CObjRef obj) {
+int64_t f_hphp_splfileinfo_getgroup(CObjRef obj) {
   SplFileInfo *fileInfo = get_splfileinfo(obj);
   return f_filegroup(fileInfo->getFileName());
 }
 
-int64 f_hphp_splfileinfo_getinode(CObjRef obj) {
+int64_t f_hphp_splfileinfo_getinode(CObjRef obj) {
   SplFileInfo *fileInfo = get_splfileinfo(obj);
   return f_fileinode(fileInfo->getFileName());
 }
@@ -110,12 +110,12 @@ String f_hphp_splfileinfo_getlinktarget(CObjRef obj) {
   return ret;
 }
 
-int64 f_hphp_splfileinfo_getmtime(CObjRef obj) {
+int64_t f_hphp_splfileinfo_getmtime(CObjRef obj) {
   SplFileInfo *fileInfo = get_splfileinfo(obj);
   return f_filemtime(fileInfo->getFileName());
 }
 
-int64 f_hphp_splfileinfo_getowner(CObjRef obj) {
+int64_t f_hphp_splfileinfo_getowner(CObjRef obj) {
   SplFileInfo *fileInfo = get_splfileinfo(obj);
   return f_fileowner(fileInfo->getFileName());
 }
@@ -137,7 +137,7 @@ String f_hphp_splfileinfo_getpathname(CObjRef obj) {
   return fileInfo->getFileName();
 }
 
-int64 f_hphp_splfileinfo_getperms(CObjRef obj) {
+int64_t f_hphp_splfileinfo_getperms(CObjRef obj) {
   SplFileInfo *fileInfo = get_splfileinfo(obj);
   return f_fileperms(fileInfo->getFileName());
 }
@@ -147,7 +147,7 @@ Variant f_hphp_splfileinfo_getrealpath(CObjRef obj) {
   return f_realpath(fileInfo->getFileName());
 }
 
-int64 f_hphp_splfileinfo_getsize(CObjRef obj) {
+int64_t f_hphp_splfileinfo_getsize(CObjRef obj) {
   SplFileInfo *fileInfo = get_splfileinfo(obj);
   return f_filesize(fileInfo->getFileName());
 }
@@ -245,15 +245,15 @@ bool f_hphp_splfileobject_flock(CObjRef obj, VRefParam wouldblock) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_hphp_splfileobject_fpassthru(CObjRef obj) {
+int64_t f_hphp_splfileobject_fpassthru(CObjRef obj) {
   throw NotImplementedException(__func__);
 }
 
-Variant f_hphp_splfileobject_fscanf(int64 _argc, CObjRef obj, CStrRef format, CVarRef _argv) {
+Variant f_hphp_splfileobject_fscanf(int64_t _argc, CObjRef obj, CStrRef format, CVarRef _argv) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_hphp_splfileobject_fseek(CObjRef obj, int64 offset, int64 whence) {
+int64_t f_hphp_splfileobject_fseek(CObjRef obj, int64_t offset, int64_t whence) {
   throw NotImplementedException(__func__);
 }
 
@@ -261,15 +261,15 @@ Variant f_hphp_splfileobject_fstat(CObjRef obj) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_hphp_splfileobject_ftell(CObjRef obj) {
+int64_t f_hphp_splfileobject_ftell(CObjRef obj) {
   throw NotImplementedException(__func__);
 }
 
-bool f_hphp_splfileobject_ftruncate(CObjRef obj, int64 size) {
+bool f_hphp_splfileobject_ftruncate(CObjRef obj, int64_t size) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_hphp_splfileobject_fwrite(CObjRef obj, CStrRef str, int64 length) {
+int64_t f_hphp_splfileobject_fwrite(CObjRef obj, CStrRef str, int64_t length) {
   SplFileObject *fileObject = get_splfileobject(obj);
   Object file = fileObject->getFile();
   if (!file.isNull()) {
@@ -283,11 +283,11 @@ Variant f_hphp_splfileobject_getcvscontrol(CObjRef obj) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_hphp_splfileobject_getflags(CObjRef obj) {
+int64_t f_hphp_splfileobject_getflags(CObjRef obj) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_hphp_splfileobject_getmaxlinelen(CObjRef obj) {
+int64_t f_hphp_splfileobject_getmaxlinelen(CObjRef obj) {
   throw NotImplementedException(__func__);
 }
 
@@ -295,7 +295,7 @@ bool f_hphp_splfileobject_haschildren(CObjRef obj) {
   throw NotImplementedException(__func__);
 }
 
-int64 f_hphp_splfileobject_key(CObjRef obj) {
+int64_t f_hphp_splfileobject_key(CObjRef obj) {
   throw NotImplementedException(__func__);
 }
 
@@ -311,7 +311,7 @@ bool f_hphp_splfileobject_valid(CObjRef obj) {
   throw NotImplementedException(__func__);
 }
 
-void f_hphp_splfileobject_seek(CObjRef obj, int64 line_pos) {
+void f_hphp_splfileobject_seek(CObjRef obj, int64_t line_pos) {
   throw NotImplementedException(__func__);
 }
 
@@ -319,11 +319,11 @@ void f_hphp_splfileobject_setcsvcontrol(CObjRef obj, CStrRef delimiter, CStrRef
   throw NotImplementedException(__func__);
 }
 
-void f_hphp_splfileobject_setflags(CObjRef obj, int64 flags) {
+void f_hphp_splfileobject_setflags(CObjRef obj, int64_t flags) {
   throw NotImplementedException(__func__);
 }
 
-void f_hphp_splfileobject_setmaxlinelen(CObjRef obj, int64 max_len) {
+void f_hphp_splfileobject_setmaxlinelen(CObjRef obj, int64_t max_len) {
   throw NotImplementedException(__func__);
 }
 
diff --git a/hphp/runtime/ext/ext_splfile.h b/hphp/runtime/ext/ext_splfile.h
index 0bd7a7d0d7137..8d8b4bd154760 100644
--- a/hphp/runtime/ext/ext_splfile.h
+++ b/hphp/runtime/ext/ext_splfile.h
@@ -61,22 +61,22 @@ class SplFileObject: public ResourceData {
 };
 
 Object f_hphp_splfileinfo___construct(CObjRef obj, CStrRef file_name);
-int64 f_hphp_splfileinfo_getatime(CObjRef obj);
+int64_t f_hphp_splfileinfo_getatime(CObjRef obj);
 String f_hphp_splfileinfo_getbasename(CObjRef obj, CStrRef suffix);
-int64 f_hphp_splfileinfo_getctime(CObjRef obj);
+int64_t f_hphp_splfileinfo_getctime(CObjRef obj);
 Object f_hphp_splfileinfo_getfileinfo(CObjRef obj, CStrRef class_name);
 String f_hphp_splfileinfo_getfilename(CObjRef obj);
-int64 f_hphp_splfileinfo_getgroup(CObjRef obj);
-int64 f_hphp_splfileinfo_getinode(CObjRef obj);
+int64_t f_hphp_splfileinfo_getgroup(CObjRef obj);
+int64_t f_hphp_splfileinfo_getinode(CObjRef obj);
 String f_hphp_splfileinfo_getlinktarget(CObjRef obj);
-int64 f_hphp_splfileinfo_getmtime(CObjRef obj);
-int64 f_hphp_splfileinfo_getowner(CObjRef obj);
+int64_t f_hphp_splfileinfo_getmtime(CObjRef obj);
+int64_t f_hphp_splfileinfo_getowner(CObjRef obj);
 String f_hphp_splfileinfo_getpath(CObjRef obj);
 Object f_hphp_splfileinfo_getpathinfo(CObjRef obj, CStrRef class_name);
 String f_hphp_splfileinfo_getpathname(CObjRef obj);
-int64 f_hphp_splfileinfo_getperms(CObjRef obj);
+int64_t f_hphp_splfileinfo_getperms(CObjRef obj);
 Variant f_hphp_splfileinfo_getrealpath(CObjRef obj);
-int64 f_hphp_splfileinfo_getsize(CObjRef obj);
+int64_t f_hphp_splfileinfo_getsize(CObjRef obj);
 String f_hphp_splfileinfo_gettype(CObjRef obj);
 bool f_hphp_splfileinfo_isdir(CObjRef obj);
 bool f_hphp_splfileinfo_isexecutable(CObjRef obj);
@@ -97,24 +97,24 @@ Variant f_hphp_splfileobject_fgetcsv(CObjRef obj, CStrRef delimiter, CStrRef enc
 String f_hphp_splfileobject_fgets(CObjRef obj);
 String f_hphp_splfileobject_fgetss(CObjRef obj, CStrRef allowable_tags);
 bool f_hphp_splfileobject_flock(CObjRef obj, VRefParam wouldblock);
-int64 f_hphp_splfileobject_fpassthru(CObjRef obj);
-Variant f_hphp_splfileobject_fscanf(int64 _argc, CObjRef obj, CStrRef format, CVarRef _argv);
-int64 f_hphp_splfileobject_fseek(CObjRef obj, int64 offset, int64 whence);
+int64_t f_hphp_splfileobject_fpassthru(CObjRef obj);
+Variant f_hphp_splfileobject_fscanf(int64_t _argc, CObjRef obj, CStrRef format, CVarRef _argv);
+int64_t f_hphp_splfileobject_fseek(CObjRef obj, int64_t offset, int64_t whence);
 Variant f_hphp_splfileobject_fstat(CObjRef obj);
-int64 f_hphp_splfileobject_ftell(CObjRef obj);
-bool f_hphp_splfileobject_ftruncate(CObjRef obj, int64 size);
-int64 f_hphp_splfileobject_fwrite(CObjRef obj, CStrRef str, int64 length);
+int64_t f_hphp_splfileobject_ftell(CObjRef obj);
+bool f_hphp_splfileobject_ftruncate(CObjRef obj, int64_t size);
+int64_t f_hphp_splfileobject_fwrite(CObjRef obj, CStrRef str, int64_t length);
 Variant f_hphp_splfileobject_getcvscontrol(CObjRef obj);
-int64 f_hphp_splfileobject_getflags(CObjRef obj);
-int64 f_hphp_splfileobject_getmaxlinelen(CObjRef obj);
-int64 f_hphp_splfileobject_key(CObjRef obj);
+int64_t f_hphp_splfileobject_getflags(CObjRef obj);
+int64_t f_hphp_splfileobject_getmaxlinelen(CObjRef obj);
+int64_t f_hphp_splfileobject_key(CObjRef obj);
 void f_hphp_splfileobject_next(CObjRef obj);
 void f_hphp_splfileobject_rewind(CObjRef obj);
 bool f_hphp_splfileobject_valid(CObjRef obj);
-void f_hphp_splfileobject_seek(CObjRef obj, int64 line_pos);
+void f_hphp_splfileobject_seek(CObjRef obj, int64_t line_pos);
 void f_hphp_splfileobject_setcsvcontrol(CObjRef obj, CStrRef delimiter, CStrRef enclosure, CStrRef escape);
-void f_hphp_splfileobject_setflags(CObjRef obj, int64 flags);
-void f_hphp_splfileobject_setmaxlinelen(CObjRef obj, int64 max_len);
+void f_hphp_splfileobject_setflags(CObjRef obj, int64_t flags);
+void f_hphp_splfileobject_setmaxlinelen(CObjRef obj, int64_t max_len);
 
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/ext/ext_sqlite3.cpp b/hphp/runtime/ext/ext_sqlite3.cpp
index bae2d3b29e887..f76fd4df6ab13 100644
--- a/hphp/runtime/ext/ext_sqlite3.cpp
+++ b/hphp/runtime/ext/ext_sqlite3.cpp
@@ -30,24 +30,24 @@ IMPLEMENT_DEFAULT_EXTENSION(sqlite3);
 #define PHP_SQLITE3_NUM    1<<1
 #define PHP_SQLITE3_BOTH   (PHP_SQLITE3_ASSOC|PHP_SQLITE3_NUM)
 
-const int64 k_SQLITE3_ASSOC = PHP_SQLITE3_ASSOC;
-const int64 k_SQLITE3_NUM = PHP_SQLITE3_NUM;
-const int64 k_SQLITE3_BOTH = PHP_SQLITE3_BOTH;
-const int64 k_SQLITE3_INTEGER = SQLITE_INTEGER;
-const int64 k_SQLITE3_FLOAT = SQLITE_FLOAT;
-const int64 k_SQLITE3_TEXT = SQLITE3_TEXT;
-const int64 k_SQLITE3_BLOB = SQLITE_BLOB;
-const int64 k_SQLITE3_NULL = SQLITE_NULL;
-const int64 k_SQLITE3_OPEN_READONLY = SQLITE_OPEN_READONLY;
-const int64 k_SQLITE3_OPEN_READWRITE = SQLITE_OPEN_READWRITE;
-const int64 k_SQLITE3_OPEN_CREATE = SQLITE_OPEN_CREATE;
+const int64_t k_SQLITE3_ASSOC = PHP_SQLITE3_ASSOC;
+const int64_t k_SQLITE3_NUM = PHP_SQLITE3_NUM;
+const int64_t k_SQLITE3_BOTH = PHP_SQLITE3_BOTH;
+const int64_t k_SQLITE3_INTEGER = SQLITE_INTEGER;
+const int64_t k_SQLITE3_FLOAT = SQLITE_FLOAT;
+const int64_t k_SQLITE3_TEXT = SQLITE3_TEXT;
+const int64_t k_SQLITE3_BLOB = SQLITE_BLOB;
+const int64_t k_SQLITE3_NULL = SQLITE_NULL;
+const int64_t k_SQLITE3_OPEN_READONLY = SQLITE_OPEN_READONLY;
+const int64_t k_SQLITE3_OPEN_READWRITE = SQLITE_OPEN_READWRITE;
+const int64_t k_SQLITE3_OPEN_CREATE = SQLITE_OPEN_CREATE;
 
 ///////////////////////////////////////////////////////////////////////////////
 // helpers
 
 struct php_sqlite3_agg_context {
   Variant context;
-  int64 row_count;
+  int64_t row_count;
 };
 
 static Variant get_column_value(sqlite3_stmt *stmt, int column) {
@@ -55,7 +55,7 @@ static Variant get_column_value(sqlite3_stmt *stmt, int column) {
   Variant data;
   switch (sqlite3_column_type(stmt, column)) {
   case SQLITE_INTEGER:
-    data = (int64)sqlite3_column_int64(stmt, column);
+    data = (int64_t)sqlite3_column_int64(stmt, column);
     break;
   case SQLITE_FLOAT:
     data = (double)sqlite3_column_double(stmt, column);
@@ -77,7 +77,7 @@ static Variant get_value(sqlite3_value *argv) {
   Variant value;
   switch (sqlite3_value_type(argv)) {
   case SQLITE_INTEGER:
-    value = (int64)sqlite3_value_int(argv);
+    value = (int64_t)sqlite3_value_int(argv);
     break;
   case SQLITE_FLOAT:
     value = (double)sqlite3_value_double(argv);
@@ -173,7 +173,7 @@ c_SQLite3::~c_SQLite3() {
 }
 
 void c_SQLite3::t___construct(CStrRef filename,
-                       int64 flags /* = k_SQLITE3_OPEN_READWRITE |
+                       int64_t flags /* = k_SQLITE3_OPEN_READWRITE |
                                       k_SQLITE3_OPEN_CREATE */,
                        CStrRef encryption_key /* = null_string */) {
   t_open(filename, flags, encryption_key);
@@ -186,7 +186,7 @@ void c_SQLite3::validate() const {
 }
 
 void c_SQLite3::t_open(CStrRef filename,
-                       int64 flags /* = k_SQLITE3_OPEN_READWRITE |
+                       int64_t flags /* = k_SQLITE3_OPEN_READWRITE |
                                       k_SQLITE3_OPEN_CREATE */,
                        CStrRef encryption_key /* = null_string */) {
   if (m_raw_db) {
@@ -213,7 +213,7 @@ void c_SQLite3::t_open(CStrRef filename,
 #endif
 }
 
-bool c_SQLite3::t_busytimeout(int64 msecs) {
+bool c_SQLite3::t_busytimeout(int64_t msecs) {
   validate();
   int errcode = sqlite3_busy_timeout(m_raw_db, msecs);
   if (errcode != SQLITE_OK) {
@@ -252,16 +252,16 @@ bool c_SQLite3::t_exec(CStrRef sql) {
 Array c_SQLite3::t_version() {
   Array ret;
   ret.set("versionString", String((char*)sqlite3_libversion(), CopyString));
-  ret.set("versionNumber", (int64)sqlite3_libversion_number());
+  ret.set("versionNumber", (int64_t)sqlite3_libversion_number());
   return ret;
 }
 
-int64 c_SQLite3::t_lastinsertrowid() {
+int64_t c_SQLite3::t_lastinsertrowid() {
   validate();
   return sqlite3_last_insert_rowid(m_raw_db);
 }
 
-int64 c_SQLite3::t_lasterrorcode() {
+int64_t c_SQLite3::t_lasterrorcode() {
   validate();
   return sqlite3_errcode(m_raw_db);
 }
@@ -293,7 +293,7 @@ bool c_SQLite3::t_loadextension(CStrRef extension) {
   return true;
 }
 
-int64 c_SQLite3::t_changes() {
+int64_t c_SQLite3::t_changes() {
   validate();
   return sqlite3_changes(m_raw_db);
 }
@@ -368,7 +368,7 @@ Variant c_SQLite3::t_querysingle(CStrRef sql, bool entire_row /* = false */) {
 }
 
 bool c_SQLite3::t_createfunction(CStrRef name, CVarRef callback,
-                                 int64 argcount /* = -1 */) {
+                                 int64_t argcount /* = -1 */) {
   validate();
   if (name.empty()) {
     return false;
@@ -392,7 +392,7 @@ bool c_SQLite3::t_createfunction(CStrRef name, CVarRef callback,
 }
 
 bool c_SQLite3::t_createaggregate(CStrRef name, CVarRef step, CVarRef final,
-                                  int64 argcount /* = -1 */) {
+                                  int64_t argcount /* = -1 */) {
   validate();
   if (name.empty()) {
     return false;
@@ -422,7 +422,7 @@ bool c_SQLite3::t_createaggregate(CStrRef name, CVarRef step, CVarRef final,
   return false;
 }
 
-bool c_SQLite3::t_openblob(CStrRef table, CStrRef column, int64 rowid,
+bool c_SQLite3::t_openblob(CStrRef table, CStrRef column, int64_t rowid,
                            CStrRef dbname /* = null_string */) {
   throw NotSupportedException(__func__, "sqlite3 stream");
 }
@@ -460,7 +460,7 @@ void c_SQLite3Stmt::validate() const {
   }
 }
 
-int64 c_SQLite3Stmt::t_paramcount() {
+int64_t c_SQLite3Stmt::t_paramcount() {
   validate();
   return sqlite3_bind_parameter_count(m_raw_stmt);
 }
@@ -495,7 +495,7 @@ bool c_SQLite3Stmt::t_clear() {
 }
 
 bool c_SQLite3Stmt::t_bindparam(CVarRef name, VRefParam parameter,
-                                int64 type /* = k_SQLITE3_TEXT */) {
+                                int64_t type /* = k_SQLITE3_TEXT */) {
   BoundParamPtr param(new BoundParam());
   param->type = type;
   param->value.assignRef(parameter);
@@ -519,7 +519,7 @@ bool c_SQLite3Stmt::t_bindparam(CVarRef name, VRefParam parameter,
 }
 
 bool c_SQLite3Stmt::t_bindvalue(CVarRef name, CVarRef parameter,
-                                int64 type /* = k_SQLITE3_TEXT */) {
+                                int64_t type /* = k_SQLITE3_TEXT */) {
   Variant v = parameter;
   return t_bindparam(name, v, type);
 }
@@ -614,23 +614,23 @@ void c_SQLite3Result::validate() const {
   m_stmt->validate();
 }
 
-int64 c_SQLite3Result::t_numcolumns() {
+int64_t c_SQLite3Result::t_numcolumns() {
   validate();
   return sqlite3_column_count(m_stmt->m_raw_stmt);
 }
 
-String c_SQLite3Result::t_columnname(int64 column) {
+String c_SQLite3Result::t_columnname(int64_t column) {
   validate();
   return String((char*)sqlite3_column_name(m_stmt->m_raw_stmt, column),
                 CopyString);
 }
 
-int64 c_SQLite3Result::t_columntype(int64 column) {
+int64_t c_SQLite3Result::t_columntype(int64_t column) {
   validate();
   return sqlite3_column_type(m_stmt->m_raw_stmt, column);
 }
 
-Variant c_SQLite3Result::t_fetcharray(int64 mode /* = k_SQLITE3_BOTH */) {
+Variant c_SQLite3Result::t_fetcharray(int64_t mode /* = k_SQLITE3_BOTH */) {
   validate();
 
   switch (sqlite3_step(m_stmt->m_raw_stmt)) {
diff --git a/hphp/runtime/ext/ext_sqlite3.h b/hphp/runtime/ext/ext_sqlite3.h
index 8558c6f89486b..918e6975f9b63 100644
--- a/hphp/runtime/ext/ext_sqlite3.h
+++ b/hphp/runtime/ext/ext_sqlite3.h
@@ -25,17 +25,17 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-extern const int64 k_SQLITE3_ASSOC;
-extern const int64 k_SQLITE3_NUM;
-extern const int64 k_SQLITE3_BOTH;
-extern const int64 k_SQLITE3_INTEGER;
-extern const int64 k_SQLITE3_FLOAT;
-extern const int64 k_SQLITE3_TEXT;
-extern const int64 k_SQLITE3_BLOB;
-extern const int64 k_SQLITE3_NULL;
-extern const int64 k_SQLITE3_OPEN_READONLY;
-extern const int64 k_SQLITE3_OPEN_READWRITE;
-extern const int64 k_SQLITE3_OPEN_CREATE;
+extern const int64_t k_SQLITE3_ASSOC;
+extern const int64_t k_SQLITE3_NUM;
+extern const int64_t k_SQLITE3_BOTH;
+extern const int64_t k_SQLITE3_INTEGER;
+extern const int64_t k_SQLITE3_FLOAT;
+extern const int64_t k_SQLITE3_TEXT;
+extern const int64_t k_SQLITE3_BLOB;
+extern const int64_t k_SQLITE3_NULL;
+extern const int64_t k_SQLITE3_OPEN_READONLY;
+extern const int64_t k_SQLITE3_OPEN_READWRITE;
+extern const int64_t k_SQLITE3_OPEN_CREATE;
 
 ///////////////////////////////////////////////////////////////////////////////
 // class SQLite3
@@ -48,24 +48,24 @@ class c_SQLite3 : public ExtObjectData {
   // need to implement
   public: c_SQLite3(VM::Class* cls = c_SQLite3::s_cls);
   public: ~c_SQLite3();
-  public: void t___construct(CStrRef filename, int64 flags = k_SQLITE3_OPEN_READWRITE|k_SQLITE3_OPEN_CREATE, CStrRef encryption_key = null_string);
-  public: void t_open(CStrRef filename, int64 flags = k_SQLITE3_OPEN_READWRITE|k_SQLITE3_OPEN_CREATE, CStrRef encryption_key = null_string);
-  public: bool t_busytimeout(int64 msecs);
+  public: void t___construct(CStrRef filename, int64_t flags = k_SQLITE3_OPEN_READWRITE|k_SQLITE3_OPEN_CREATE, CStrRef encryption_key = null_string);
+  public: void t_open(CStrRef filename, int64_t flags = k_SQLITE3_OPEN_READWRITE|k_SQLITE3_OPEN_CREATE, CStrRef encryption_key = null_string);
+  public: bool t_busytimeout(int64_t msecs);
   public: bool t_close();
   public: bool t_exec(CStrRef sql);
   public: Array t_version();
-  public: int64 t_lastinsertrowid();
-  public: int64 t_lasterrorcode();
+  public: int64_t t_lastinsertrowid();
+  public: int64_t t_lasterrorcode();
   public: String t_lasterrormsg();
   public: bool t_loadextension(CStrRef extension);
-  public: int64 t_changes();
+  public: int64_t t_changes();
   public: String t_escapestring(CStrRef sql);
   public: Variant t_prepare(CStrRef sql);
   public: Variant t_query(CStrRef sql);
   public: Variant t_querysingle(CStrRef sql, bool entire_row = false);
-  public: bool t_createfunction(CStrRef name, CVarRef callback, int64 argcount = -1);
-  public: bool t_createaggregate(CStrRef name, CVarRef step, CVarRef final, int64 argcount = -1);
-  public: bool t_openblob(CStrRef table, CStrRef column, int64 rowid, CStrRef dbname = null_string);
+  public: bool t_createfunction(CStrRef name, CVarRef callback, int64_t argcount = -1);
+  public: bool t_createaggregate(CStrRef name, CVarRef step, CVarRef final, int64_t argcount = -1);
+  public: bool t_openblob(CStrRef table, CStrRef column, int64_t rowid, CStrRef dbname = null_string);
 
 
   public: void validate() const;
@@ -92,12 +92,12 @@ class c_SQLite3Stmt : public ExtObjectData {
   public: c_SQLite3Stmt(VM::Class* cls = c_SQLite3Stmt::s_cls);
   public: ~c_SQLite3Stmt();
   public: void t___construct(CObjRef dbobject, CStrRef statement);
-  public: int64 t_paramcount();
+  public: int64_t t_paramcount();
   public: bool t_close();
   public: bool t_reset();
   public: bool t_clear();
-  public: bool t_bindparam(CVarRef name, VRefParam parameter, int64 type = k_SQLITE3_TEXT);
-  public: bool t_bindvalue(CVarRef name, CVarRef parameter, int64 type = k_SQLITE3_TEXT);
+  public: bool t_bindparam(CVarRef name, VRefParam parameter, int64_t type = k_SQLITE3_TEXT);
+  public: bool t_bindvalue(CVarRef name, CVarRef parameter, int64_t type = k_SQLITE3_TEXT);
   public: Variant t_execute();
 
 
@@ -126,10 +126,10 @@ class c_SQLite3Result : public ExtObjectData {
   public: c_SQLite3Result(VM::Class* cls = c_SQLite3Result::s_cls);
   public: ~c_SQLite3Result();
   public: void t___construct();
-  public: int64 t_numcolumns();
-  public: String t_columnname(int64 column);
-  public: int64 t_columntype(int64 column);
-  public: Variant t_fetcharray(int64 mode = k_SQLITE3_BOTH);
+  public: int64_t t_numcolumns();
+  public: String t_columnname(int64_t column);
+  public: int64_t t_columntype(int64_t column);
+  public: Variant t_fetcharray(int64_t mode = k_SQLITE3_BOTH);
   public: bool t_reset();
   public: bool t_finalize();
 
diff --git a/hphp/runtime/ext/ext_stream.cpp b/hphp/runtime/ext/ext_stream.cpp
index ce4dfccfa8af1..b6d975b3ccd73 100644
--- a/hphp/runtime/ext/ext_stream.cpp
+++ b/hphp/runtime/ext/ext_stream.cpp
@@ -150,7 +150,7 @@ bool f_stream_set_timeout(CObjRef stream, int seconds,
   return false;
 }
 
-int64 f_stream_set_write_buffer(CObjRef stream, int buffer) {
+int64_t f_stream_set_write_buffer(CObjRef stream, int buffer) {
   PlainFile *file = stream.getTyped<PlainFile>(false, true);
   if (file) {
     switch (buffer) {
@@ -308,7 +308,7 @@ Variant f_stream_socket_accept(CObjRef server_socket,
   p.events = (POLLIN|POLLERR|POLLHUP);
   p.revents = 0;
   IOStatusHelper io("socket_accept");
-  n = poll(&p, 1, (uint64)(timeout * 1000.0));
+  n = poll(&p, 1, (uint64_t)(timeout * 1000.0));
   if (n > 0) {
     struct sockaddr sa;
     socklen_t salen = sizeof(sa);
diff --git a/hphp/runtime/ext/ext_stream.h b/hphp/runtime/ext/ext_stream.h
index 359adc14b01b1..d41a734d6b96d 100644
--- a/hphp/runtime/ext/ext_stream.h
+++ b/hphp/runtime/ext/ext_stream.h
@@ -153,9 +153,9 @@ bool f_stream_set_blocking(CObjRef stream, int mode);
 
 bool f_stream_set_timeout(CObjRef stream, int seconds, int microseconds = 0);
 
-int64 f_stream_set_write_buffer(CObjRef stream, int buffer);
+int64_t f_stream_set_write_buffer(CObjRef stream, int buffer);
 
-inline int64 f_set_file_buffer(CObjRef stream, int buffer) {
+inline int64_t f_set_file_buffer(CObjRef stream, int buffer) {
   return f_stream_set_write_buffer(stream, buffer);
 }
 
diff --git a/hphp/runtime/ext/ext_string.cpp b/hphp/runtime/ext/ext_string.cpp
index c8360caf90ca6..0bbdbb9d173b2 100644
--- a/hphp/runtime/ext/ext_string.cpp
+++ b/hphp/runtime/ext/ext_string.cpp
@@ -493,7 +493,7 @@ Variant f_strcspn(CStrRef str1, CStrRef str2, int start /* = 0 */,
   return length;
 }
 
-Variant f_count_chars(CStrRef str, int64 mode /* = 0 */) {
+Variant f_count_chars(CStrRef str, int64_t mode /* = 0 */) {
   int chars[256];
   memset((void*)chars, 0, sizeof(chars));
   const unsigned char *buf = (const unsigned char *)(const char *)str;
@@ -555,7 +555,7 @@ Variant f_count_chars(CStrRef str, int64 mode /* = 0 */) {
  * string containing alphabetic characters, which also may contain, but not
  * start with "'" and "-" characters.
  */
-Variant f_str_word_count(CStrRef str, int64 format /* = 0 */,
+Variant f_str_word_count(CStrRef str, int64_t format /* = 0 */,
                          CStrRef charlist /* = "" */) {
   int str_len = str.size();
   switch (format) {
diff --git a/hphp/runtime/ext/ext_string.h b/hphp/runtime/ext/ext_string.h
index c310d58cebf2c..c9751f5006415 100644
--- a/hphp/runtime/ext/ext_string.h
+++ b/hphp/runtime/ext/ext_string.h
@@ -200,8 +200,8 @@ inline Variant f_convert_uuencode(CStrRef data) {
 inline String f_str_rot13(CStrRef str) {
   return StringUtil::ROT13(str);
 }
-inline int64 f_crc32(CStrRef str) {
-  return (uint32)StringUtil::CRC32(str);
+inline int64_t f_crc32(CStrRef str) {
+  return (uint32_t)StringUtil::CRC32(str);
 }
 inline String f_crypt(CStrRef str, CStrRef salt = "") {
   return StringUtil::Crypt(str, salt);
@@ -260,12 +260,12 @@ inline Variant f_vsprintf(CStrRef format, CArrRef args) {
 
 Variant f_sscanf(int _argc, CStrRef str, CStrRef format, CArrRef _argv = null_array);
 
-inline String f_chr(int64 ascii) {
+inline String f_chr(int64_t ascii) {
   char buf[2]; buf[0] = ascii; buf[1] = 0;
   return String(buf, 1, CopyString);
 }
-inline int64 f_ord(CStrRef str) {
-  return (int64)(unsigned char)(*((const char *)str));
+inline int64_t f_ord(CStrRef str) {
+  return (int64_t)(unsigned char)(*((const char *)str));
 }
 inline Variant f_money_format(CStrRef format, double number) {
   String s = StringUtil::MoneyFormat(format, number);
@@ -278,29 +278,29 @@ String f_number_format(double number, int decimals = 0, CStrRef dec_point = ".",
 ///////////////////////////////////////////////////////////////////////////////
 // analysis
 
-inline int64 f_strcmp(CStrRef str1, CStrRef str2) {
+inline int64_t f_strcmp(CStrRef str1, CStrRef str2) {
   return string_strcmp(str1.data(), str1.size(), str2.data(), str2.size());
 }
-inline int64 f_strncmp(CStrRef str1, CStrRef str2, int len) {
+inline int64_t f_strncmp(CStrRef str1, CStrRef str2, int len) {
   return string_strncmp(str1.data(), str1.size(), str2.data(), str2.size(),
                         len);
 }
-inline int64 f_strnatcmp(CStrRef str1, CStrRef str2) {
+inline int64_t f_strnatcmp(CStrRef str1, CStrRef str2) {
   return string_natural_cmp(str1.data(), str1.size(), str2.data(), str2.size(),
                             false);
 }
-inline int64 f_strcasecmp(CStrRef str1, CStrRef str2) {
+inline int64_t f_strcasecmp(CStrRef str1, CStrRef str2) {
   return bstrcasecmp(str1.data(), str1.size(), str2.data(), str2.size());
 }
-inline int64 f_strncasecmp(CStrRef str1, CStrRef str2, int len) {
+inline int64_t f_strncasecmp(CStrRef str1, CStrRef str2, int len) {
   return string_strncasecmp(str1.data(), str1.size(), str2.data(), str2.size(),
                             len);
 }
-inline int64 f_strnatcasecmp(CStrRef str1, CStrRef str2) {
+inline int64_t f_strnatcasecmp(CStrRef str1, CStrRef str2) {
   return string_natural_cmp(str1.data(), str1.size(), str2.data(), str2.size(),
                             true);
 }
-inline int64 f_strcoll(CStrRef str1, CStrRef str2) {
+inline int64_t f_strcoll(CStrRef str1, CStrRef str2) {
   return strcoll(str1, str2);
 }
 
@@ -348,16 +348,16 @@ inline Variant f_strlen(CVarRef vstr) {
   }
 }
 
-Variant f_count_chars(CStrRef str, int64 mode = 0);
+Variant f_count_chars(CStrRef str, int64_t mode = 0);
 
-Variant f_str_word_count(CStrRef str, int64 format = 0, CStrRef charlist = "");
+Variant f_str_word_count(CStrRef str, int64_t format = 0, CStrRef charlist = "");
 
-inline int64 f_levenshtein(CStrRef str1, CStrRef str2, int cost_ins = 1,
+inline int64_t f_levenshtein(CStrRef str1, CStrRef str2, int cost_ins = 1,
                          int cost_rep = 1, int cost_del = 1) {
   return string_levenshtein(str1, str1.size(), str2, str2.size(),
                             cost_ins, cost_rep, cost_del);
 }
-inline int64 f_similar_text(CStrRef first, CStrRef second, VRefParam percent = null) {
+inline int64_t f_similar_text(CStrRef first, CStrRef second, VRefParam percent = null) {
   float p;
   int ret = string_similar_text(first, first.size(), second, second.size(),
                                 &p);
diff --git a/hphp/runtime/ext/ext_thread.cpp b/hphp/runtime/ext/ext_thread.cpp
index 2203d243353b1..b56e0ff1195dd 100644
--- a/hphp/runtime/ext/ext_thread.cpp
+++ b/hphp/runtime/ext/ext_thread.cpp
@@ -56,11 +56,11 @@ void f_hphp_thread_set_warmup_enabled() {
                 "config");
 }
 
-int64 f_hphp_get_thread_id() {
+int64_t f_hphp_get_thread_id() {
   return  (unsigned long)Process::GetThreadId();
 }
 
-int32 f_hphp_gettid() {
+int32_t f_hphp_gettid() {
     return (unsigned int)Process::GetThreadPid();
 }
 
diff --git a/hphp/runtime/ext/ext_thread.h b/hphp/runtime/ext/ext_thread.h
index 49fedee4ae6b6..b6eb3e7f7d0a8 100644
--- a/hphp/runtime/ext/ext_thread.h
+++ b/hphp/runtime/ext/ext_thread.h
@@ -30,8 +30,8 @@ void f_hphp_service_thread_started();
 bool f_hphp_service_thread_stopped(int timeout);
 bool f_hphp_thread_is_warmup_enabled();
 void f_hphp_thread_set_warmup_enabled();
-int64 f_hphp_get_thread_id();
-int32 f_hphp_gettid();
+int64_t f_hphp_get_thread_id();
+int32_t f_hphp_gettid();
 
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/ext/ext_thrift.h b/hphp/runtime/ext/ext_thrift.h
index d5c5ea4a82dbd..c92c603ed8264 100644
--- a/hphp/runtime/ext/ext_thrift.h
+++ b/hphp/runtime/ext/ext_thrift.h
@@ -27,7 +27,7 @@ namespace HPHP {
 
 void f_thrift_protocol_write_binary(CObjRef transportobj,
   CStrRef method_name,
-  int64 msgtype,
+  int64_t msgtype,
   CObjRef request_struct,
   int seqid,
   bool strict_write);
@@ -40,7 +40,7 @@ int f_thrift_protocol_set_compact_version(int version);
 
 void f_thrift_protocol_write_compact(CObjRef transportobj,
   CStrRef method_name,
-  int64 msgtype,
+  int64_t msgtype,
   CObjRef request_struct,
   int seqid);
 
diff --git a/hphp/runtime/ext/ext_url.cpp b/hphp/runtime/ext/ext_url.cpp
index dd38f52f031f7..0d89771e2840e 100644
--- a/hphp/runtime/ext/ext_url.cpp
+++ b/hphp/runtime/ext/ext_url.cpp
@@ -254,7 +254,7 @@ Variant f_parse_url(CStrRef url, int component /* = -1 */) {
   SET_COMPONENT(query);
   SET_COMPONENT(fragment);
   if (resource.port) {
-    ret.set("port", (int64)resource.port);
+    ret.set("port", (int64_t)resource.port);
   }
   return ret;
 }
diff --git a/hphp/runtime/ext/ext_variable.cpp b/hphp/runtime/ext/ext_variable.cpp
index c1455007e81aa..4ea05008e605b 100644
--- a/hphp/runtime/ext/ext_variable.cpp
+++ b/hphp/runtime/ext/ext_variable.cpp
@@ -160,7 +160,7 @@ bool f_import_request_variables(CStrRef types, CStrRef prefix /* = "" */) {
                               "this function is called.");
 }
 
-int64 f_extract(CArrRef var_array, int extract_type /* = EXTR_OVERWRITE */,
+int64_t f_extract(CArrRef var_array, int extract_type /* = EXTR_OVERWRITE */,
                 CStrRef prefix /* = "" */) {
   if (hhvm) {
     bool reference = extract_type & EXTR_REFS;
diff --git a/hphp/runtime/ext/ext_variable.h b/hphp/runtime/ext/ext_variable.h
index 1319ad37b97c2..448f3e10657e4 100644
--- a/hphp/runtime/ext/ext_variable.h
+++ b/hphp/runtime/ext/ext_variable.h
@@ -28,7 +28,7 @@ inline bool f_is_bool(bool    v) { return true;}
 inline bool f_is_bool(char    v) { return false;}
 inline bool f_is_bool(short   v) { return false;}
 inline bool f_is_bool(int     v) { return false;}
-inline bool f_is_bool(int64   v) { return false;}
+inline bool f_is_bool(int64_t   v) { return false;}
 inline bool f_is_bool(double  v) { return false;}
 inline bool f_is_bool(litstr  v) { return false;}
 inline bool f_is_bool(const StringData *v) { not_reached(); }
@@ -41,7 +41,7 @@ inline bool f_is_int(bool    v) { return false;}
 inline bool f_is_int(char    v) { return true;}
 inline bool f_is_int(short   v) { return true;}
 inline bool f_is_int(int     v) { return true;}
-inline bool f_is_int(int64   v) { return true;}
+inline bool f_is_int(int64_t   v) { return true;}
 inline bool f_is_int(double  v) { return false;}
 inline bool f_is_int(litstr  v) { return false;}
 inline bool f_is_int(const StringData *v) { not_reached(); }
@@ -54,7 +54,7 @@ inline bool f_is_integer(bool    v) { return false;}
 inline bool f_is_integer(char    v) { return true;}
 inline bool f_is_integer(short   v) { return true;}
 inline bool f_is_integer(int     v) { return true;}
-inline bool f_is_integer(int64   v) { return true;}
+inline bool f_is_integer(int64_t   v) { return true;}
 inline bool f_is_integer(double  v) { return false;}
 inline bool f_is_integer(litstr  v) { return false;}
 inline bool f_is_integer(const StringData *v) { not_reached(); }
@@ -67,7 +67,7 @@ inline bool f_is_long(bool    v) { return false;}
 inline bool f_is_long(char    v) { return true;}
 inline bool f_is_long(short   v) { return true;}
 inline bool f_is_long(int     v) { return true;}
-inline bool f_is_long(int64   v) { return true;}
+inline bool f_is_long(int64_t   v) { return true;}
 inline bool f_is_long(double  v) { return false;}
 inline bool f_is_long(litstr  v) { return false;}
 inline bool f_is_long(const StringData *v) { not_reached(); }
@@ -80,7 +80,7 @@ inline bool f_is_double(bool    v) { return false;}
 inline bool f_is_double(char    v) { return false;}
 inline bool f_is_double(short   v) { return false;}
 inline bool f_is_double(int     v) { return false;}
-inline bool f_is_double(int64   v) { return false;}
+inline bool f_is_double(int64_t   v) { return false;}
 inline bool f_is_double(double  v) { return true;}
 inline bool f_is_double(litstr  v) { return false;}
 inline bool f_is_double(const StringData *v) { not_reached(); }
@@ -93,7 +93,7 @@ inline bool f_is_float(bool    v) { return false;}
 inline bool f_is_float(char    v) { return false;}
 inline bool f_is_float(short   v) { return false;}
 inline bool f_is_float(int     v) { return false;}
-inline bool f_is_float(int64   v) { return false;}
+inline bool f_is_float(int64_t   v) { return false;}
 inline bool f_is_float(double  v) { return true;}
 inline bool f_is_float(litstr  v) { return false;}
 inline bool f_is_float(const StringData *v) { not_reached(); }
@@ -106,7 +106,7 @@ inline bool f_is_numeric(bool    v) { return false;}
 inline bool f_is_numeric(char    v) { return true;}
 inline bool f_is_numeric(short   v) { return true;}
 inline bool f_is_numeric(int     v) { return true;}
-inline bool f_is_numeric(int64   v) { return true;}
+inline bool f_is_numeric(int64_t   v) { return true;}
 inline bool f_is_numeric(double  v) { return true;}
 inline bool f_is_numeric(litstr  v) { return String(v).isNumeric();}
 inline bool f_is_numeric(const StringData *v) { not_reached(); }
@@ -119,7 +119,7 @@ inline bool f_is_real(bool    v) { return false;}
 inline bool f_is_real(char    v) { return false;}
 inline bool f_is_real(short   v) { return false;}
 inline bool f_is_real(int     v) { return false;}
-inline bool f_is_real(int64   v) { return false;}
+inline bool f_is_real(int64_t   v) { return false;}
 inline bool f_is_real(double  v) { return true;}
 inline bool f_is_real(litstr  v) { return false;}
 inline bool f_is_real(const StringData *v) { not_reached(); }
@@ -132,7 +132,7 @@ inline bool f_is_string(bool    v) { return false;}
 inline bool f_is_string(char    v) { return false;}
 inline bool f_is_string(short   v) { return false;}
 inline bool f_is_string(int     v) { return false;}
-inline bool f_is_string(int64   v) { return false;}
+inline bool f_is_string(int64_t   v) { return false;}
 inline bool f_is_string(double  v) { return false;}
 inline bool f_is_string(litstr  v) { return true;}
 inline bool f_is_string(const StringData *v) { not_reached(); }
@@ -145,7 +145,7 @@ inline bool f_is_scalar(bool    v) { return true;}
 inline bool f_is_scalar(char    v) { return true;}
 inline bool f_is_scalar(short   v) { return true;}
 inline bool f_is_scalar(int     v) { return true;}
-inline bool f_is_scalar(int64   v) { return true;}
+inline bool f_is_scalar(int64_t   v) { return true;}
 inline bool f_is_scalar(double  v) { return true;}
 inline bool f_is_scalar(litstr  v) { return true;}
 inline bool f_is_scalar(const StringData *v) { not_reached(); }
@@ -158,7 +158,7 @@ inline bool f_is_array(bool    v) { return false;}
 inline bool f_is_array(char    v) { return false;}
 inline bool f_is_array(short   v) { return false;}
 inline bool f_is_array(int     v) { return false;}
-inline bool f_is_array(int64   v) { return false;}
+inline bool f_is_array(int64_t   v) { return false;}
 inline bool f_is_array(double  v) { return false;}
 inline bool f_is_array(litstr  v) { return false;}
 inline bool f_is_array(const StringData *v) { not_reached(); }
@@ -171,7 +171,7 @@ inline bool f_is_object(bool    v) { return false;}
 inline bool f_is_object(char    v) { return false;}
 inline bool f_is_object(short   v) { return false;}
 inline bool f_is_object(int     v) { return false;}
-inline bool f_is_object(int64   v) { return false;}
+inline bool f_is_object(int64_t   v) { return false;}
 inline bool f_is_object(double  v) { return false;}
 inline bool f_is_object(litstr  v) { return false;}
 inline bool f_is_object(const StringData *v) { not_reached(); }
@@ -184,7 +184,7 @@ inline bool f_is_resource(bool    v) { return false;}
 inline bool f_is_resource(char    v) { return false;}
 inline bool f_is_resource(short   v) { return false;}
 inline bool f_is_resource(int     v) { return false;}
-inline bool f_is_resource(int64   v) { return false;}
+inline bool f_is_resource(int64_t   v) { return false;}
 inline bool f_is_resource(double  v) { return false;}
 inline bool f_is_resource(litstr  v) { return false;}
 inline bool f_is_resource(const StringData *v) { not_reached(); }
@@ -197,7 +197,7 @@ inline bool f_is_null(bool    v) { return false;}
 inline bool f_is_null(char    v) { return false;}
 inline bool f_is_null(short   v) { return false;}
 inline bool f_is_null(int     v) { return false;}
-inline bool f_is_null(int64   v) { return false;}
+inline bool f_is_null(int64_t   v) { return false;}
 inline bool f_is_null(double  v) { return false;}
 inline bool f_is_null(litstr  v) { return false;}
 inline bool f_is_null(const StringData *v) { not_reached(); }
@@ -210,7 +210,7 @@ inline String f_gettype(bool    v) { return "boolean";}
 inline String f_gettype(char    v) { return "integer";}
 inline String f_gettype(short   v) { return "integer";}
 inline String f_gettype(int     v) { return "integer";}
-inline String f_gettype(int64   v) { return "integer";}
+inline String f_gettype(int64_t   v) { return "integer";}
 inline String f_gettype(double  v) { return "double";}
 inline String f_gettype(litstr  v) { return "string";}
 inline String f_gettype(const StringData *v) { not_reached(); }
@@ -223,7 +223,7 @@ String f_get_resource_type(CObjRef handle);
 ///////////////////////////////////////////////////////////////////////////////
 // type conversion
 
-inline int64 f_intval(CVarRef v, int64 base = 10) { return v.toInt64(base);}
+inline int64_t f_intval(CVarRef v, int64_t base = 10) { return v.toInt64(base);}
 inline double f_doubleval(CVarRef v) { return v.toDouble();}
 inline double f_floatval(CVarRef v) { return v.toDouble();}
 inline String f_strval(CVarRef v) { return v.toString();}
@@ -262,7 +262,7 @@ bool f_import_request_variables(CStrRef types, CStrRef prefix = "");
 /**
  * LVariableTable parameter is added by HPHP.
  */
-int64 f_extract(CArrRef var_array, int extract_type = EXTR_OVERWRITE,
+int64_t f_extract(CArrRef var_array, int extract_type = EXTR_OVERWRITE,
                 CStrRef prefix = "");
 int extract(LVariableTable *variables, CArrRef var_array,
             int extract_type = EXTR_OVERWRITE, String prefix = "");
diff --git a/hphp/runtime/ext/ext_xml.cpp b/hphp/runtime/ext/ext_xml.cpp
index 27e87d414f6eb..52f8931037a87 100644
--- a/hphp/runtime/ext/ext_xml.cpp
+++ b/hphp/runtime/ext/ext_xml.cpp
@@ -691,7 +691,7 @@ bool f_xml_parser_free(CObjRef parser) {
   return true;
 }
 
-int64 f_xml_parse(CObjRef parser, CStrRef data, bool is_final /* = true */) {
+int64_t f_xml_parse(CObjRef parser, CStrRef data, bool is_final /* = true */) {
   // XML_Parse can reenter the VM, and it will do so after we've lost
   // the frame pointer by calling through the system's copy of XML_Parse
   // in libexpat.so.
@@ -706,7 +706,7 @@ int64 f_xml_parse(CObjRef parser, CStrRef data, bool is_final /* = true */) {
   return ret;
 }
 
-int64 f_xml_parse_into_struct(CObjRef parser, CStrRef data, VRefParam values,
+int64_t f_xml_parse_into_struct(CObjRef parser, CStrRef data, VRefParam values,
                             VRefParam index /* = null */) {
   int ret;
   XmlParser * p = parser.getTyped<XmlParser>();
@@ -846,22 +846,22 @@ bool f_xml_set_object(CObjRef parser, VRefParam object) {
   return true;
 }
 
-int64 f_xml_get_current_byte_index(CObjRef parser) {
+int64_t f_xml_get_current_byte_index(CObjRef parser) {
   XmlParser * p = parser.getTyped<XmlParser>();
   return XML_GetCurrentByteIndex(p->parser);
 }
 
-int64 f_xml_get_current_column_number(CObjRef parser) {
+int64_t f_xml_get_current_column_number(CObjRef parser) {
   XmlParser * p = parser.getTyped<XmlParser>();
   return XML_GetCurrentColumnNumber(p->parser);
 }
 
-int64 f_xml_get_current_line_number(CObjRef parser) {
+int64_t f_xml_get_current_line_number(CObjRef parser) {
   XmlParser * p = parser.getTyped<XmlParser>();
   return XML_GetCurrentLineNumber(p->parser);
 }
 
-int64 f_xml_get_error_code(CObjRef parser) {
+int64_t f_xml_get_error_code(CObjRef parser) {
   XmlParser * p = parser.getTyped<XmlParser>();
   return XML_GetErrorCode(p->parser);
 }
diff --git a/hphp/runtime/ext/ext_xml.h b/hphp/runtime/ext/ext_xml.h
index 93fad42a6163e..00db0291abbac 100644
--- a/hphp/runtime/ext/ext_xml.h
+++ b/hphp/runtime/ext/ext_xml.h
@@ -27,8 +27,8 @@ namespace HPHP {
 
 Object f_xml_parser_create(CStrRef encoding = null_string);
 bool f_xml_parser_free(CObjRef parser);
-int64 f_xml_parse(CObjRef parser, CStrRef data, bool is_final = true);
-int64 f_xml_parse_into_struct(CObjRef parser, CStrRef data, VRefParam values, VRefParam index = null);
+int64_t f_xml_parse(CObjRef parser, CStrRef data, bool is_final = true);
+int64_t f_xml_parse_into_struct(CObjRef parser, CStrRef data, VRefParam values, VRefParam index = null);
 Object f_xml_parser_create_ns(CStrRef encoding = null_string, CStrRef separator = null_string);
 Variant f_xml_parser_get_option(CObjRef parser, int option);
 bool f_xml_parser_set_option(CObjRef parser, int option, CVarRef value);
@@ -42,10 +42,10 @@ bool f_xml_set_unparsed_entity_decl_handler(CObjRef parser, CVarRef handler);
 bool f_xml_set_external_entity_ref_handler(CObjRef parser, CVarRef handler);
 bool f_xml_set_notation_decl_handler(CObjRef parser, CVarRef handler);
 bool f_xml_set_object(CObjRef parser, VRefParam object);
-int64 f_xml_get_current_byte_index(CObjRef parser);
-int64 f_xml_get_current_column_number(CObjRef parser);
-int64 f_xml_get_current_line_number(CObjRef parser);
-int64 f_xml_get_error_code(CObjRef parser);
+int64_t f_xml_get_current_byte_index(CObjRef parser);
+int64_t f_xml_get_current_column_number(CObjRef parser);
+int64_t f_xml_get_current_line_number(CObjRef parser);
+int64_t f_xml_get_error_code(CObjRef parser);
 String f_xml_error_string(int code);
 String f_utf8_decode(CStrRef data);
 String f_utf8_encode(CStrRef data);
diff --git a/hphp/runtime/ext/ext_xmlreader.cpp b/hphp/runtime/ext/ext_xmlreader.cpp
index e5399d9af9976..1c7f8d908de8c 100644
--- a/hphp/runtime/ext/ext_xmlreader.cpp
+++ b/hphp/runtime/ext/ext_xmlreader.cpp
@@ -23,28 +23,28 @@ namespace HPHP {
 IMPLEMENT_DEFAULT_EXTENSION(xmlreader);
 ///////////////////////////////////////////////////////////////////////////////
 // constants
-const int64 q_XMLReader$$NONE = XML_READER_TYPE_NONE;
-const int64 q_XMLReader$$ELEMENT = XML_READER_TYPE_ELEMENT;
-const int64 q_XMLReader$$ATTRIBUTE = XML_READER_TYPE_ATTRIBUTE;
-const int64 q_XMLReader$$TEXT = XML_READER_TYPE_TEXT;
-const int64 q_XMLReader$$CDATA = XML_READER_TYPE_CDATA;
-const int64 q_XMLReader$$ENTITY_REF = XML_READER_TYPE_ENTITY_REFERENCE;
-const int64 q_XMLReader$$ENTITY = XML_READER_TYPE_ENTITY;
-const int64 q_XMLReader$$PI = XML_READER_TYPE_PROCESSING_INSTRUCTION;
-const int64 q_XMLReader$$COMMENT = XML_READER_TYPE_COMMENT;
-const int64 q_XMLReader$$DOC = XML_READER_TYPE_DOCUMENT;
-const int64 q_XMLReader$$DOC_TYPE = XML_READER_TYPE_DOCUMENT_TYPE;
-const int64 q_XMLReader$$DOC_FRAGMENT = XML_READER_TYPE_DOCUMENT_FRAGMENT;
-const int64 q_XMLReader$$NOTATION = XML_READER_TYPE_NOTATION;
-const int64 q_XMLReader$$WHITESPACE = XML_READER_TYPE_WHITESPACE;
-const int64 q_XMLReader$$SIGNIFICANT_WHITESPACE = XML_READER_TYPE_SIGNIFICANT_WHITESPACE;
-const int64 q_XMLReader$$END_ELEMENT = XML_READER_TYPE_END_ELEMENT;
-const int64 q_XMLReader$$END_ENTITY = XML_READER_TYPE_END_ENTITY;
-const int64 q_XMLReader$$XML_DECLARATION = XML_READER_TYPE_XML_DECLARATION;
-const int64 q_XMLReader$$LOADDTD = XML_PARSER_LOADDTD;
-const int64 q_XMLReader$$DEFAULTATTRS = XML_PARSER_DEFAULTATTRS;
-const int64 q_XMLReader$$VALIDATE = XML_PARSER_VALIDATE;
-const int64 q_XMLReader$$SUBST_ENTITIES = XML_PARSER_SUBST_ENTITIES;
+const int64_t q_XMLReader$$NONE = XML_READER_TYPE_NONE;
+const int64_t q_XMLReader$$ELEMENT = XML_READER_TYPE_ELEMENT;
+const int64_t q_XMLReader$$ATTRIBUTE = XML_READER_TYPE_ATTRIBUTE;
+const int64_t q_XMLReader$$TEXT = XML_READER_TYPE_TEXT;
+const int64_t q_XMLReader$$CDATA = XML_READER_TYPE_CDATA;
+const int64_t q_XMLReader$$ENTITY_REF = XML_READER_TYPE_ENTITY_REFERENCE;
+const int64_t q_XMLReader$$ENTITY = XML_READER_TYPE_ENTITY;
+const int64_t q_XMLReader$$PI = XML_READER_TYPE_PROCESSING_INSTRUCTION;
+const int64_t q_XMLReader$$COMMENT = XML_READER_TYPE_COMMENT;
+const int64_t q_XMLReader$$DOC = XML_READER_TYPE_DOCUMENT;
+const int64_t q_XMLReader$$DOC_TYPE = XML_READER_TYPE_DOCUMENT_TYPE;
+const int64_t q_XMLReader$$DOC_FRAGMENT = XML_READER_TYPE_DOCUMENT_FRAGMENT;
+const int64_t q_XMLReader$$NOTATION = XML_READER_TYPE_NOTATION;
+const int64_t q_XMLReader$$WHITESPACE = XML_READER_TYPE_WHITESPACE;
+const int64_t q_XMLReader$$SIGNIFICANT_WHITESPACE = XML_READER_TYPE_SIGNIFICANT_WHITESPACE;
+const int64_t q_XMLReader$$END_ELEMENT = XML_READER_TYPE_END_ELEMENT;
+const int64_t q_XMLReader$$END_ENTITY = XML_READER_TYPE_END_ENTITY;
+const int64_t q_XMLReader$$XML_DECLARATION = XML_READER_TYPE_XML_DECLARATION;
+const int64_t q_XMLReader$$LOADDTD = XML_PARSER_LOADDTD;
+const int64_t q_XMLReader$$DEFAULTATTRS = XML_PARSER_DEFAULTATTRS;
+const int64_t q_XMLReader$$VALIDATE = XML_PARSER_VALIDATE;
+const int64_t q_XMLReader$$SUBST_ENTITIES = XML_PARSER_SUBST_ENTITIES;
 
 #define XMLREADER_LOAD_STRING 0
 #define XMLREADER_LOAD_FILE 1
@@ -132,7 +132,7 @@ c_XMLReader::~c_XMLReader() {
 void c_XMLReader::t___construct() {
 }
 
-bool c_XMLReader::t_open(CStrRef uri, CStrRef encoding /*= null_string*/, int64 options /*= 0*/) {
+bool c_XMLReader::t_open(CStrRef uri, CStrRef encoding /*= null_string*/, int64_t options /*= 0*/) {
   if (m_ptr) {
     t_close();
   }
@@ -159,7 +159,7 @@ bool c_XMLReader::t_open(CStrRef uri, CStrRef encoding /*= null_string*/, int64
   return true;
 }
 
-bool c_XMLReader::t_xml(CStrRef source, CStrRef encoding /*= null_string*/, int64 options /*= 0*/) {
+bool c_XMLReader::t_xml(CStrRef source, CStrRef encoding /*= null_string*/, int64_t options /*= 0*/) {
   xmlParserInputBufferPtr inputbfr = xmlParserInputBufferCreateMem(source.c_str(), source.size(), XML_CHAR_ENCODING_NONE);
 
   if (inputbfr != NULL) {
@@ -319,7 +319,7 @@ Variant c_XMLReader::t_getattribute(CStrRef name) {
   return string_func_string_arg(name, xmlTextReaderGetAttribute);
 }
 
-Variant c_XMLReader::t_getattributeno(int64 index) {
+Variant c_XMLReader::t_getattributeno(int64_t index) {
   char *retchar = NULL;
   if (m_ptr) {
     retchar = (char *)xmlTextReaderGetAttributeNo(m_ptr, index);
@@ -370,7 +370,7 @@ bool c_XMLReader::t_movetoattribute(CStrRef name) {
   return false;
 }
 
-bool c_XMLReader::t_movetoattributeno(int64 index) {
+bool c_XMLReader::t_movetoattributeno(int64_t index) {
   if (m_ptr) {
     int ret = xmlTextReaderMoveToAttributeNo(m_ptr, index);
     if (ret == 1) {
@@ -416,7 +416,7 @@ bool c_XMLReader::t_expand() {
   throw NotImplementedException(__func__);
 }
 
-bool c_XMLReader::t_getparserproperty(int64 property) {
+bool c_XMLReader::t_getparserproperty(int64_t property) {
   int ret = 0;
   if (m_ptr) {
     ret = xmlTextReaderGetParserProp(m_ptr, property);
@@ -448,7 +448,7 @@ bool c_XMLReader::t_setschema(CStrRef source) {
   return false;
 }
 
-bool c_XMLReader::t_setparserproperty(int64 property, bool value) {
+bool c_XMLReader::t_setparserproperty(int64_t property, bool value) {
   if (m_ptr) {
     int ret = xmlTextReaderSetParserProp(m_ptr, property, value);
     if (ret == -1) {
diff --git a/hphp/runtime/ext/ext_xmlreader.h b/hphp/runtime/ext/ext_xmlreader.h
index 5aa68db1ebb2f..9b3c9e903826a 100644
--- a/hphp/runtime/ext/ext_xmlreader.h
+++ b/hphp/runtime/ext/ext_xmlreader.h
@@ -33,28 +33,28 @@ typedef unsigned char *(*xmlreader_read_one_char_t)(xmlTextReaderPtr reader, con
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-extern const int64 q_XMLReader$$NONE;
-extern const int64 q_XMLReader$$ELEMENT;
-extern const int64 q_XMLReader$$ATTRIBUTE;
-extern const int64 q_XMLReader$$TEXT;
-extern const int64 q_XMLReader$$CDATA;
-extern const int64 q_XMLReader$$ENTITY_REF;
-extern const int64 q_XMLReader$$ENTITY;
-extern const int64 q_XMLReader$$PI;
-extern const int64 q_XMLReader$$COMMENT;
-extern const int64 q_XMLReader$$DOC;
-extern const int64 q_XMLReader$$DOC_TYPE;
-extern const int64 q_XMLReader$$DOC_FRAGMENT;
-extern const int64 q_XMLReader$$NOTATION;
-extern const int64 q_XMLReader$$WHITESPACE;
-extern const int64 q_XMLReader$$SIGNIFICANT_WHITESPACE;
-extern const int64 q_XMLReader$$END_ELEMENT;
-extern const int64 q_XMLReader$$END_ENTITY;
-extern const int64 q_XMLReader$$XML_DECLARATION;
-extern const int64 q_XMLReader$$LOADDTD;
-extern const int64 q_XMLReader$$DEFAULTATTRS;
-extern const int64 q_XMLReader$$VALIDATE;
-extern const int64 q_XMLReader$$SUBST_ENTITIES;
+extern const int64_t q_XMLReader$$NONE;
+extern const int64_t q_XMLReader$$ELEMENT;
+extern const int64_t q_XMLReader$$ATTRIBUTE;
+extern const int64_t q_XMLReader$$TEXT;
+extern const int64_t q_XMLReader$$CDATA;
+extern const int64_t q_XMLReader$$ENTITY_REF;
+extern const int64_t q_XMLReader$$ENTITY;
+extern const int64_t q_XMLReader$$PI;
+extern const int64_t q_XMLReader$$COMMENT;
+extern const int64_t q_XMLReader$$DOC;
+extern const int64_t q_XMLReader$$DOC_TYPE;
+extern const int64_t q_XMLReader$$DOC_FRAGMENT;
+extern const int64_t q_XMLReader$$NOTATION;
+extern const int64_t q_XMLReader$$WHITESPACE;
+extern const int64_t q_XMLReader$$SIGNIFICANT_WHITESPACE;
+extern const int64_t q_XMLReader$$END_ELEMENT;
+extern const int64_t q_XMLReader$$END_ENTITY;
+extern const int64_t q_XMLReader$$XML_DECLARATION;
+extern const int64_t q_XMLReader$$LOADDTD;
+extern const int64_t q_XMLReader$$DEFAULTATTRS;
+extern const int64_t q_XMLReader$$VALIDATE;
+extern const int64_t q_XMLReader$$SUBST_ENTITIES;
 
 ///////////////////////////////////////////////////////////////////////////////
 // class XMLReader
@@ -68,8 +68,8 @@ class c_XMLReader : public ExtObjectDataFlags<ObjectData::UseGet>, public Sweepa
   public: c_XMLReader(VM::Class* cls = c_XMLReader::s_cls);
   public: ~c_XMLReader();
   public: void t___construct();
-  public: bool t_open(CStrRef uri, CStrRef encoding = null_string, int64 options = 0);
-  public: bool t_xml(CStrRef source, CStrRef encoding = null_string, int64 options = 0);
+  public: bool t_open(CStrRef uri, CStrRef encoding = null_string, int64_t options = 0);
+  public: bool t_xml(CStrRef source, CStrRef encoding = null_string, int64_t options = 0);
   public: bool t_close();
   public: bool t_read();
   public: bool t_next(CStrRef localname = null_string);
@@ -78,20 +78,20 @@ class c_XMLReader : public ExtObjectDataFlags<ObjectData::UseGet>, public Sweepa
   public: String t_readouterxml();
   public: bool t_movetonextattribute();
   public: Variant t_getattribute(CStrRef name);
-  public: Variant t_getattributeno(int64 index);
+  public: Variant t_getattributeno(int64_t index);
   public: Variant t_getattributens(CStrRef name, CStrRef namespaceURI);
   public: bool t_movetoattribute(CStrRef name);
-  public: bool t_movetoattributeno(int64 index);
+  public: bool t_movetoattributeno(int64_t index);
   public: bool t_movetoattributens(CStrRef name, CStrRef namespaceURI);
   public: bool t_movetoelement();
   public: bool t_movetofirstattribute();
   public: bool t_isvalid();
   public: bool t_expand();
   public: Variant t___get(Variant name);
-  public: bool t_getparserproperty(int64 property);
+  public: bool t_getparserproperty(int64_t property);
   public: Variant t_lookupnamespace(CStrRef prefix);
   public: bool t_setschema(CStrRef source);
-  public: bool t_setparserproperty(int64 property, bool value);
+  public: bool t_setparserproperty(int64_t property, bool value);
   public: bool t_setrelaxngschema(CStrRef filename);
   public: bool t_setrelaxngschemasource(CStrRef source);
   public: Variant t___destruct();
diff --git a/hphp/runtime/ext/ext_zlib.cpp b/hphp/runtime/ext/ext_zlib.cpp
index a3cbe3e8e4d73..6dff72a711155 100644
--- a/hphp/runtime/ext/ext_zlib.cpp
+++ b/hphp/runtime/ext/ext_zlib.cpp
@@ -415,9 +415,9 @@ Variant f_qlzuncompress(CStrRef data, int level /* = 1 */) {
   }
 
   size_t size = QuickLZ1::qlz_size_decompressed(data.data());
-  if ((int64)size < 0 ||
+  if ((int64_t)size < 0 ||
       (RuntimeOption::SerializationSizeLimit > 0 &&
-       (int64)size > RuntimeOption::SerializationSizeLimit)) {
+       (int64_t)size > RuntimeOption::SerializationSizeLimit)) {
     raise_notice("invalid size in compressed header: %zd", size);
     return false;
   }
diff --git a/hphp/runtime/ext/ext_zlib.h b/hphp/runtime/ext/ext_zlib.h
index 20fde5931ccf0..6e69f477b65e5 100644
--- a/hphp/runtime/ext/ext_zlib.h
+++ b/hphp/runtime/ext/ext_zlib.h
@@ -55,10 +55,10 @@ Object f_gzopen(CStrRef filename, CStrRef mode, bool use_include_path = false);
 inline bool f_gzclose(CObjRef zp) {
   return f_fclose(zp);
 }
-inline Variant f_gzread(CObjRef zp, int64 length = 0) {
+inline Variant f_gzread(CObjRef zp, int64_t length = 0) {
   return f_fread(zp, length);
 }
-inline Variant f_gzseek(CObjRef zp, int64 offset, int64 whence = k_SEEK_SET) {
+inline Variant f_gzseek(CObjRef zp, int64_t offset, int64_t whence = k_SEEK_SET) {
   return f_fseek(zp, offset, whence);
 }
 inline Variant f_gztell(CObjRef zp) {
@@ -73,20 +73,20 @@ inline bool f_gzrewind(CObjRef zp) {
 inline Variant f_gzgetc(CObjRef zp) {
   return f_fgetc(zp);
 }
-inline Variant f_gzgets(CObjRef zp, int64 length = 1024) {
+inline Variant f_gzgets(CObjRef zp, int64_t length = 1024) {
   return f_fgets(zp, length);
 }
-inline Variant f_gzgetss(CObjRef zp, int64 length = 0,
+inline Variant f_gzgetss(CObjRef zp, int64_t length = 0,
                         CStrRef allowable_tags = null_string) {
   return f_fgetss(zp, length, allowable_tags);
 }
 inline Variant f_gzpassthru(CObjRef zp) {
   return f_fpassthru(zp);
 }
-inline Variant f_gzputs(CObjRef zp, CStrRef str, int64 length = 0) {
+inline Variant f_gzputs(CObjRef zp, CStrRef str, int64_t length = 0) {
   return f_fwrite(zp, str, length);
 }
-inline Variant f_gzwrite(CObjRef zp, CStrRef str, int64 length = 0) {
+inline Variant f_gzwrite(CObjRef zp, CStrRef str, int64_t length = 0) {
   return f_fwrite(zp, str, length);
 }
 
diff --git a/hphp/runtime/ext/hash/hash_sha.cpp b/hphp/runtime/ext/hash/hash_sha.cpp
index f314d7aa73a97..2bee432ff8d5e 100644
--- a/hphp/runtime/ext/hash/hash_sha.cpp
+++ b/hphp/runtime/ext/hash/hash_sha.cpp
@@ -43,8 +43,8 @@ hash_sha256::hash_sha256() : HashEngine(32, 64, sizeof(PHP_SHA256_CTX)) {
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef struct {
-  uint64 state[8];     /* state */
-  uint64 count[2];     /* number of bits, modulo 2^128 */
+  uint64_t state[8];     /* state */
+  uint64_t count[2];     /* number of bits, modulo 2^128 */
   unsigned char buffer[128];  /* input buffer */
 } PHP_SHA384_CTX;
 
@@ -54,8 +54,8 @@ hash_sha384::hash_sha384() : HashEngine(48, 128, sizeof(PHP_SHA384_CTX)) {
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef struct {
-  uint64 state[8];     /* state */
-  uint64 count[2];     /* number of bits, modulo 2^128 */
+  uint64_t state[8];     /* state */
+  uint64_t count[2];     /* number of bits, modulo 2^128 */
   unsigned char buffer[128];  /* input buffer */
 } PHP_SHA512_CTX;
 
@@ -527,7 +527,7 @@ void hash_sha256::hash_final(unsigned char *digest, void *context_) {
 /* OM1 */
 #define SHA512_F5(x)		(ROTR64(19, x) ^ ROTR64(61, x) ^ SHR(6, x))
 
-static const uint64 SHA512_K[128] = {
+static const uint64_t SHA512_K[128] = {
   L64(0x428a2f98d728ae22), L64(0x7137449123ef65cd), L64(0xb5c0fbcfec4d3b2f), L64(0xe9b5dba58189dbbc),
   L64(0x3956c25bf348b538), L64(0x59f111f1b605d019), L64(0x923f82a4af194f9b), L64(0xab1c5ed5da6d8118),
   L64(0xd807aa98a3030242), L64(0x12835b0145706fbe), L64(0x243185be4ee4b28c), L64(0x550c7dc3d5ffb4e2),
@@ -553,7 +553,7 @@ static const uint64 SHA512_K[128] = {
   Encodes input (uint64) into output (unsigned char). Assumes len is
   a multiple of 8.
 */
-static void SHAEncode64(unsigned char *output, uint64 *input,
+static void SHAEncode64(unsigned char *output, uint64_t *input,
                         unsigned int len) {
   unsigned int i, j;
 
@@ -573,20 +573,20 @@ static void SHAEncode64(unsigned char *output, uint64 *input,
   Decodes input (unsigned char) into output (uint64). Assumes len is
   a multiple of 8.
 */
-static void SHADecode64(uint64 *output, const unsigned char *input,
+static void SHADecode64(uint64_t *output, const unsigned char *input,
                         unsigned int len) {
   unsigned int i, j;
 
   for (i = 0, j = 0; j < len; i++, j += 8)
     output[i] =
-      ((uint64) input[j + 7]) |
-      (((uint64) input[j + 6]) << 8) |
-      (((uint64) input[j + 5]) << 16) |
-      (((uint64) input[j + 4]) << 24) |
-      (((uint64) input[j + 3]) << 32) |
-      (((uint64) input[j + 2]) << 40) |
-      (((uint64) input[j + 1]) << 48) |
-      (((uint64) input[j]) << 56);
+      ((uint64_t) input[j + 7]) |
+      (((uint64_t) input[j + 6]) << 8) |
+      (((uint64_t) input[j + 5]) << 16) |
+      (((uint64_t) input[j + 4]) << 24) |
+      (((uint64_t) input[j + 3]) << 32) |
+      (((uint64_t) input[j + 2]) << 40) |
+      (((uint64_t) input[j + 1]) << 48) |
+      (((uint64_t) input[j]) << 56);
 }
 
 /*
@@ -611,11 +611,11 @@ void hash_sha384::hash_init(void *context_) {
  * SHA512 basic transformation. Transforms state based on block.
  * SHA384 uses the exact same algorithm
  */
-static void SHA512Transform(uint64 state[8],
+static void SHA512Transform(uint64_t state[8],
                             const unsigned char block[128]) {
-  uint64 a = state[0], b = state[1], c = state[2], d = state[3];
-  uint64 e = state[4], f = state[5], g = state[6], h = state[7];
-  uint64 x[16], T1, T2, W[80];
+  uint64_t a = state[0], b = state[1], c = state[2], d = state[3];
+  uint64_t e = state[4], f = state[5], g = state[6], h = state[7];
+  uint64_t x[16], T1, T2, W[80];
   int i;
 
   SHADecode64(x, block, 128);
@@ -663,10 +663,10 @@ void hash_sha384::hash_update(void *context_, const unsigned char *input,
 
   /* Update number of bits */
   if ((context->count[0] +=
-       ((uint64) inputLen << 3)) < ((uint64) inputLen << 3)) {
+       ((uint64_t) inputLen << 3)) < ((uint64_t) inputLen << 3)) {
     context->count[1]++;
   }
-  context->count[1] += ((uint64) inputLen >> 61);
+  context->count[1] += ((uint64_t) inputLen >> 61);
 
   partLen = 128 - index;
 
@@ -765,10 +765,10 @@ void hash_sha512::hash_update(void *context_, const unsigned char *input,
 
   /* Update number of bits */
   if ((context->count[0] +=
-       ((uint64) inputLen << 3)) < ((uint64) inputLen << 3)) {
+       ((uint64_t) inputLen << 3)) < ((uint64_t) inputLen << 3)) {
     context->count[1]++;
   }
-  context->count[1] += ((uint64) inputLen >> 61);
+  context->count[1] += ((uint64_t) inputLen >> 61);
 
   partLen = 128 - index;
 
diff --git a/hphp/runtime/ext/hash/hash_tiger.cpp b/hphp/runtime/ext/hash/hash_tiger.cpp
index 7b47d65508e32..eb0a427489ab9 100644
--- a/hphp/runtime/ext/hash/hash_tiger.cpp
+++ b/hphp/runtime/ext/hash/hash_tiger.cpp
@@ -32,8 +32,8 @@ namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef struct {
-  uint64 state[3];
-  uint64 passed;
+  uint64_t state[3];
+  uint64_t passed;
   unsigned char passes:1;
   unsigned char length:7;
   unsigned char buffer[64];
@@ -115,7 +115,7 @@ hash_tiger::hash_tiger(bool tiger3, int digest)
 #	define split(str)                       \
   {                                             \
     int i;                                      \
-    uint64 tmp[8];                       \
+    uint64_t tmp[8];                       \
                                                 \
     for (i = 0; i < 64; ++i) {                                          \
       ((unsigned char *) tmp)[i^7] = ((unsigned char *) str)[i];        \
@@ -128,8 +128,8 @@ hash_tiger::hash_tiger(bool tiger3, int digest)
 
 #define tiger_compress(passes, str, state)                              \
   {                                                                     \
-    register uint64 a, b, c, tmpa, x0, x1, x2, x3, x4, x5, x6, x7; \
-    uint64 aa, bb, cc;                                           \
+    register uint64_t a, b, c, tmpa, x0, x1, x2, x3, x4, x5, x6, x7; \
+    uint64_t aa, bb, cc;                                           \
     int pass_no;                                                        \
                                                                         \
     a = state[0];                                                       \
@@ -146,7 +146,7 @@ hash_tiger::hash_tiger(bool tiger3, int digest)
   }
 
 static inline void TigerFinalize(PHP_TIGER_CTX *context) {
-  context->passed += (uint64) context->length << 3;
+  context->passed += (uint64_t) context->length << 3;
 
   context->buffer[context->length++] = 0x1;
   if (context->length % 8) {
@@ -156,7 +156,7 @@ static inline void TigerFinalize(PHP_TIGER_CTX *context) {
 
   if (context->length > 56) {
     memset(&context->buffer[context->length], 0, 64 - context->length);
-    tiger_compress(context->passes, ((uint64 *) context->buffer),
+    tiger_compress(context->passes, ((uint64_t *) context->buffer),
                    context->state);
     memset(context->buffer, 0, 56);
   } else {
@@ -164,7 +164,7 @@ static inline void TigerFinalize(PHP_TIGER_CTX *context) {
   }
 
 #ifndef WORDS_BIGENDIAN
-  memcpy(&context->buffer[56], &context->passed, sizeof(uint64));
+  memcpy(&context->buffer[56], &context->passed, sizeof(uint64_t));
 #else
   context->buffer[56] = (unsigned char) (context->passed & 0xff);
   context->buffer[57] = (unsigned char) ((context->passed >> 8) & 0xff);
@@ -175,7 +175,7 @@ static inline void TigerFinalize(PHP_TIGER_CTX *context) {
   context->buffer[62] = (unsigned char) ((context->passed >> 48) & 0xff);
   context->buffer[63] = (unsigned char) ((context->passed >> 56) & 0xff);
 #endif
-  tiger_compress(context->passes, ((uint64 *) context->buffer),
+  tiger_compress(context->passes, ((uint64_t *) context->buffer),
                  context->state);
 }
 
@@ -204,7 +204,7 @@ void hash_tiger::hash_update(void *context_, const unsigned char *input,
       i = 64 - context->length;
       memcpy(&context->buffer[context->length], input, i);
       tiger_compress(context->passes,
-                     ((const uint64 *) context->buffer),
+                     ((const uint64_t *) context->buffer),
                      context->state);
       memset(context->buffer, 0, 64);
       context->passed += 512;
@@ -213,7 +213,7 @@ void hash_tiger::hash_update(void *context_, const unsigned char *input,
     for (; i + 64 <= len; i += 64) {
       memcpy(context->buffer, &input[i], 64);
       tiger_compress(context->passes,
-                     ((const uint64 *) context->buffer),
+                     ((const uint64_t *) context->buffer),
                      context->state);
       context->passed += 512;
     }
diff --git a/hphp/runtime/ext/hash/hash_whirlpool.cpp b/hphp/runtime/ext/hash/hash_whirlpool.cpp
index cbc52c49cde5e..c43bb61b6602b 100644
--- a/hphp/runtime/ext/hash/hash_whirlpool.cpp
+++ b/hphp/runtime/ext/hash/hash_whirlpool.cpp
@@ -21,7 +21,7 @@ namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef struct {
-  uint64 state[8];
+  uint64_t state[8];
   unsigned char bitlength[32];
   struct {
     int pos;
@@ -45,10 +45,10 @@ hash_whirlpool::hash_whirlpool() :
 
 static void WhirlpoolTransform(PHP_WHIRLPOOL_CTX *context) {
   int i, r;
-  uint64 K[8];        /* the round key */
-  uint64 block[8];    /* mu(buffer) */
-  uint64 state[8];    /* the cipher state */
-  uint64 L[8];
+  uint64_t K[8];        /* the round key */
+  uint64_t block[8];    /* mu(buffer) */
+  uint64_t state[8];    /* the cipher state */
+  uint64_t L[8];
   unsigned char *buffer = context->buffer.data;
 
   /*
@@ -56,14 +56,14 @@ static void WhirlpoolTransform(PHP_WHIRLPOOL_CTX *context) {
    */
   for (i = 0; i < 8; i++, buffer += 8) {
     block[i] =
-      (((uint64)buffer[0]        ) << 56) ^
-      (((uint64)buffer[1] & 0xffL) << 48) ^
-      (((uint64)buffer[2] & 0xffL) << 40) ^
-      (((uint64)buffer[3] & 0xffL) << 32) ^
-      (((uint64)buffer[4] & 0xffL) << 24) ^
-      (((uint64)buffer[5] & 0xffL) << 16) ^
-      (((uint64)buffer[6] & 0xffL) <<  8) ^
-      (((uint64)buffer[7] & 0xffL)      );
+      (((uint64_t)buffer[0]        ) << 56) ^
+      (((uint64_t)buffer[1] & 0xffL) << 48) ^
+      (((uint64_t)buffer[2] & 0xffL) << 40) ^
+      (((uint64_t)buffer[3] & 0xffL) << 32) ^
+      (((uint64_t)buffer[4] & 0xffL) << 24) ^
+      (((uint64_t)buffer[5] & 0xffL) << 16) ^
+      (((uint64_t)buffer[6] & 0xffL) <<  8) ^
+      (((uint64_t)buffer[7] & 0xffL)      );
   }
   /*
    * compute and apply K^0 to the cipher state:
@@ -280,7 +280,7 @@ void hash_whirlpool::hash_update(void *context_, const unsigned char *input,
                                  unsigned int len) {
   PHP_WHIRLPOOL_CTX *context = (PHP_WHIRLPOOL_CTX*)context_;
 
-  uint64 sourceBits = len * 8;
+  uint64_t sourceBits = len * 8;
   /* index of leftmost source unsigned char containing data (1 to 8 bits). */
   int sourcePos    = 0;
   /* space on source[sourcePos]. */
@@ -298,7 +298,7 @@ void hash_whirlpool::hash_update(void *context_, const unsigned char *input,
   /*
    * tally the length of the added data:
    */
-  uint64 value = sourceBits;
+  uint64_t value = sourceBits;
   for (i = 31, carry = 0; i >= 0 && (carry != 0 || value != L64(0)); i--) {
     carry += bitLength[i] + ((unsigned int)value & 0xff);
     bitLength[i] = (unsigned char)carry;
diff --git a/hphp/runtime/ext/hash/php_hash_tiger_tables.h b/hphp/runtime/ext/hash/php_hash_tiger_tables.h
index dde217c311cea..cd2bd849e559a 100644
--- a/hphp/runtime/ext/hash/php_hash_tiger_tables.h
+++ b/hphp/runtime/ext/hash/php_hash_tiger_tables.h
@@ -24,7 +24,7 @@
 
 namespace HPHP {
 
-static const uint64 table[4*256] = {
+static const uint64_t table[4*256] = {
 	L64(0x02AAB17CF7E90C5E)   /*    0 */,    L64(0xAC424B03E243A8EC)   /*    1 */,
 	L64(0x72CD5BE30DD5FCD3)   /*    2 */,    L64(0x6D019B93F6F97F3A)   /*    3 */,
 	L64(0xCD9978FFD21F9193)   /*    4 */,    L64(0x7573A1C9708029E2)   /*    5 */,
diff --git a/hphp/runtime/ext/hash/php_hash_whirlpool_tables.h b/hphp/runtime/ext/hash/php_hash_whirlpool_tables.h
index 95883260ef0b6..e425f7997740f 100644
--- a/hphp/runtime/ext/hash/php_hash_whirlpool_tables.h
+++ b/hphp/runtime/ext/hash/php_hash_whirlpool_tables.h
@@ -24,7 +24,7 @@ namespace HPHP {
 
 #define R 10
 
-static const uint64 rc[R + 1] = {
+static const uint64_t rc[R + 1] = {
     L64(0x0000000000000000),
     L64(0x1823c6e887b8014f),
     L64(0x36a6d2f5796f9152),
@@ -38,7 +38,7 @@ static const uint64 rc[R + 1] = {
     L64(0xca2dbf07ad5a8333),
 };
 
-static const uint64 C0[256] = {
+static const uint64_t C0[256] = {
     L64(0x18186018c07830d8), L64(0x23238c2305af4626), L64(0xc6c63fc67ef991b8), L64(0xe8e887e8136fcdfb),
     L64(0x878726874ca113cb), L64(0xb8b8dab8a9626d11), L64(0x0101040108050209), L64(0x4f4f214f426e9e0d),
     L64(0x3636d836adee6c9b), L64(0xa6a6a2a6590451ff), L64(0xd2d26fd2debdb90c), L64(0xf5f5f3f5fb06f70e),
@@ -105,7 +105,7 @@ static const uint64 C0[256] = {
     L64(0x2828a0285d885075), L64(0x5c5c6d5cda31b886), L64(0xf8f8c7f8933fed6b), L64(0x8686228644a411c2),
 };
 
-static const uint64 C1[256] = {
+static const uint64_t C1[256] = {
     L64(0xd818186018c07830), L64(0x2623238c2305af46), L64(0xb8c6c63fc67ef991), L64(0xfbe8e887e8136fcd),
     L64(0xcb878726874ca113), L64(0x11b8b8dab8a9626d), L64(0x0901010401080502), L64(0x0d4f4f214f426e9e),
     L64(0x9b3636d836adee6c), L64(0xffa6a6a2a6590451), L64(0x0cd2d26fd2debdb9), L64(0x0ef5f5f3f5fb06f7),
@@ -172,7 +172,7 @@ static const uint64 C1[256] = {
     L64(0x752828a0285d8850), L64(0x865c5c6d5cda31b8), L64(0x6bf8f8c7f8933fed), L64(0xc28686228644a411),
 };
 
-static const uint64 C2[256] = {
+static const uint64_t C2[256] = {
     L64(0x30d818186018c078), L64(0x462623238c2305af), L64(0x91b8c6c63fc67ef9), L64(0xcdfbe8e887e8136f),
     L64(0x13cb878726874ca1), L64(0x6d11b8b8dab8a962), L64(0x0209010104010805), L64(0x9e0d4f4f214f426e),
     L64(0x6c9b3636d836adee), L64(0x51ffa6a6a2a65904), L64(0xb90cd2d26fd2debd), L64(0xf70ef5f5f3f5fb06),
@@ -239,7 +239,7 @@ static const uint64 C2[256] = {
     L64(0x50752828a0285d88), L64(0xb8865c5c6d5cda31), L64(0xed6bf8f8c7f8933f), L64(0x11c28686228644a4),
 };
 
-static const uint64 C3[256] = {
+static const uint64_t C3[256] = {
     L64(0x7830d818186018c0), L64(0xaf462623238c2305), L64(0xf991b8c6c63fc67e), L64(0x6fcdfbe8e887e813),
     L64(0xa113cb878726874c), L64(0x626d11b8b8dab8a9), L64(0x0502090101040108), L64(0x6e9e0d4f4f214f42),
     L64(0xee6c9b3636d836ad), L64(0x0451ffa6a6a2a659), L64(0xbdb90cd2d26fd2de), L64(0x06f70ef5f5f3f5fb),
@@ -306,7 +306,7 @@ static const uint64 C3[256] = {
     L64(0x8850752828a0285d), L64(0x31b8865c5c6d5cda), L64(0x3fed6bf8f8c7f893), L64(0xa411c28686228644),
 };
 
-static const uint64 C4[256] = {
+static const uint64_t C4[256] = {
     L64(0xc07830d818186018), L64(0x05af462623238c23), L64(0x7ef991b8c6c63fc6), L64(0x136fcdfbe8e887e8),
     L64(0x4ca113cb87872687), L64(0xa9626d11b8b8dab8), L64(0x0805020901010401), L64(0x426e9e0d4f4f214f),
     L64(0xadee6c9b3636d836), L64(0x590451ffa6a6a2a6), L64(0xdebdb90cd2d26fd2), L64(0xfb06f70ef5f5f3f5),
@@ -373,7 +373,7 @@ static const uint64 C4[256] = {
     L64(0x5d8850752828a028), L64(0xda31b8865c5c6d5c), L64(0x933fed6bf8f8c7f8), L64(0x44a411c286862286),
 };
 
-static const uint64 C5[256] = {
+static const uint64_t C5[256] = {
     L64(0x18c07830d8181860), L64(0x2305af462623238c), L64(0xc67ef991b8c6c63f), L64(0xe8136fcdfbe8e887),
     L64(0x874ca113cb878726), L64(0xb8a9626d11b8b8da), L64(0x0108050209010104), L64(0x4f426e9e0d4f4f21),
     L64(0x36adee6c9b3636d8), L64(0xa6590451ffa6a6a2), L64(0xd2debdb90cd2d26f), L64(0xf5fb06f70ef5f5f3),
@@ -440,7 +440,7 @@ static const uint64 C5[256] = {
     L64(0x285d8850752828a0), L64(0x5cda31b8865c5c6d), L64(0xf8933fed6bf8f8c7), L64(0x8644a411c2868622),
 };
 
-static const uint64 C6[256] = {
+static const uint64_t C6[256] = {
     L64(0x6018c07830d81818), L64(0x8c2305af46262323), L64(0x3fc67ef991b8c6c6), L64(0x87e8136fcdfbe8e8),
     L64(0x26874ca113cb8787), L64(0xdab8a9626d11b8b8), L64(0x0401080502090101), L64(0x214f426e9e0d4f4f),
     L64(0xd836adee6c9b3636), L64(0xa2a6590451ffa6a6), L64(0x6fd2debdb90cd2d2), L64(0xf3f5fb06f70ef5f5),
@@ -507,7 +507,7 @@ static const uint64 C6[256] = {
     L64(0xa0285d8850752828), L64(0x6d5cda31b8865c5c), L64(0xc7f8933fed6bf8f8), L64(0x228644a411c28686),
 };
 
-static const uint64 C7[256] = {
+static const uint64_t C7[256] = {
     L64(0x186018c07830d818), L64(0x238c2305af462623), L64(0xc63fc67ef991b8c6), L64(0xe887e8136fcdfbe8),
     L64(0x8726874ca113cb87), L64(0xb8dab8a9626d11b8), L64(0x0104010805020901), L64(0x4f214f426e9e0d4f),
     L64(0x36d836adee6c9b36), L64(0xa6a2a6590451ffa6), L64(0xd26fd2debdb90cd2), L64(0xf5f3f5fb06f70ef5),
diff --git a/hphp/runtime/ext/pdo_driver.cpp b/hphp/runtime/ext/pdo_driver.cpp
index b51751daeeb05..c014e73d56334 100644
--- a/hphp/runtime/ext/pdo_driver.cpp
+++ b/hphp/runtime/ext/pdo_driver.cpp
@@ -107,7 +107,7 @@ bool PDOConnection::preparer(CStrRef sql, sp_PDOStatement *stmt,
   return false;
 }
 
-int64 PDOConnection::doer(CStrRef sql) {
+int64_t PDOConnection::doer(CStrRef sql) {
   throw_pdo_exception(null, null, "This driver doesn't support %s", __func__);
   return 0;
 }
@@ -133,7 +133,7 @@ bool PDOConnection::rollback() {
   return false;
 }
 
-bool PDOConnection::setAttribute(int64 attr, CVarRef value) {
+bool PDOConnection::setAttribute(int64_t attr, CVarRef value) {
   throw_pdo_exception(null, null, "This driver doesn't support %s", __func__);
   return false;
 }
@@ -148,7 +148,7 @@ bool PDOConnection::fetchErr(PDOStatement *stmt, Array &info) {
   return false;
 }
 
-int PDOConnection::getAttribute(int64 attr, Variant &value) {
+int PDOConnection::getAttribute(int64_t attr, Variant &value) {
   throw_pdo_exception(null, null, "This driver doesn't support %s", __func__);
   return -1;
 }
@@ -234,17 +234,17 @@ bool PDOStatement::paramHook(PDOBoundParam *param, PDOParamEvent event_type) {
   return false;
 }
 
-bool PDOStatement::setAttribute(int64 attr, CVarRef value) {
+bool PDOStatement::setAttribute(int64_t attr, CVarRef value) {
   throw_pdo_exception(null, null, "This driver doesn't support %s", __func__);
   return false;
 }
 
-int PDOStatement::getAttribute(int64 attr, Variant &value) {
+int PDOStatement::getAttribute(int64_t attr, Variant &value) {
   throw_pdo_exception(null, null, "This driver doesn't support %s", __func__);
   return -1;
 }
 
-bool PDOStatement::getColumnMeta(int64 colno, Array &return_value) {
+bool PDOStatement::getColumnMeta(int64_t colno, Array &return_value) {
   throw_pdo_exception(null, null, "This driver doesn't support %s", __func__);
   return false;
 }
diff --git a/hphp/runtime/ext/pdo_driver.h b/hphp/runtime/ext/pdo_driver.h
index bace955ec73a7..77241fde577b5 100644
--- a/hphp/runtime/ext/pdo_driver.h
+++ b/hphp/runtime/ext/pdo_driver.h
@@ -277,7 +277,7 @@ class PDOConnection : public ResourceData {
   virtual bool preparer(CStrRef sql, sp_PDOStatement *stmt, CVarRef options);
 
   /* execute a statement (that does not return a result set) */
-  virtual int64 doer(CStrRef sql);
+  virtual int64_t doer(CStrRef sql);
 
   /* quote a string */
   virtual bool quoter(CStrRef input, String &quoted, PDOParamType paramtype);
@@ -288,7 +288,7 @@ class PDOConnection : public ResourceData {
   virtual bool rollback();
 
   /* setting of attributes */
-  virtual bool setAttribute(int64 attr, CVarRef value);
+  virtual bool setAttribute(int64_t attr, CVarRef value);
 
   /* return last insert id.  NULL indicates error condition, otherwise,
      the return value MUST be an emalloc'd NULL terminated string. */
@@ -304,7 +304,7 @@ class PDOConnection : public ResourceData {
   virtual bool fetchErr(PDOStatement *stmt, Array &info);
 
   /* fetching of attributes: -1: error, 0: unsupported attribute */
-  virtual int getAttribute(int64 attr, Variant &value);
+  virtual int getAttribute(int64_t attr, Variant &value);
 
   /* checking/pinging persistent connections; return SUCCESS if the connection
      is still alive and ready to be used, FAILURE otherwise.
@@ -417,11 +417,11 @@ class PDOBoundParam : public ResourceData {
   virtual CStrRef o_getClassNameHook() const { return s_class_name; }
 
 public:
-  int64 paramno;           /* if -1, then it has a name, and we don't
+  int64_t paramno;           /* if -1, then it has a name, and we don't
                               know the index *yet* */
   String name;
 
-  int64 max_value_len;     /* as a hint for pre-allocation */
+  int64_t max_value_len;     /* as a hint for pre-allocation */
 
   Variant parameter;       /* the variable itself */
   PDOParamType param_type; /* desired or suggested type */
@@ -488,10 +488,10 @@ class PDOStatement : public ResourceData {
   virtual bool paramHook(PDOBoundParam *param, PDOParamEvent event_type);
 
   /* setting of attributes */
-  virtual bool setAttribute(int64 attr, CVarRef value);
+  virtual bool setAttribute(int64_t attr, CVarRef value);
 
   /* fetching of attributes: -1: error, 0: unsupported attribute */
-  virtual int getAttribute(int64 attr, Variant &value);
+  virtual int getAttribute(int64_t attr, Variant &value);
 
   /* retrieves meta data for a numbered column.
    * Returns SUCCESS/FAILURE.
@@ -524,7 +524,7 @@ class PDOStatement : public ResourceData {
    *   'flags' => array('not_null', 'mysql:some_flag'); // to add data to an
    *      existing key
    */
-  virtual bool getColumnMeta(int64 colno, Array &return_value);
+  virtual bool getColumnMeta(int64_t colno, Array &return_value);
 
   /* advances the statement to the next rowset of the batch.
    * If it returns 1, PDO will tear down its idea of columns
diff --git a/hphp/runtime/ext/pdo_mysql.cpp b/hphp/runtime/ext/pdo_mysql.cpp
index 1ae6af14597cd..70e97267cf253 100644
--- a/hphp/runtime/ext/pdo_mysql.cpp
+++ b/hphp/runtime/ext/pdo_mysql.cpp
@@ -54,15 +54,15 @@ class PDOMySqlConnection : public PDOConnection {
   virtual bool support(SupportedMethod method);
   virtual bool closer();
   virtual bool preparer(CStrRef sql, sp_PDOStatement *stmt, CVarRef options);
-  virtual int64 doer(CStrRef sql);
+  virtual int64_t doer(CStrRef sql);
   virtual bool quoter(CStrRef input, String &quoted, PDOParamType paramtype);
   virtual bool begin();
   virtual bool commit();
   virtual bool rollback();
-  virtual bool setAttribute(int64 attr, CVarRef value);
+  virtual bool setAttribute(int64_t attr, CVarRef value);
   virtual String lastId(const char *name);
   virtual bool fetchErr(PDOStatement *stmt, Array &info);
-  virtual int getAttribute(int64 attr, Variant &value);
+  virtual int getAttribute(int64_t attr, Variant &value);
   virtual bool checkLiveness();
   virtual void persistentShutdown();
 
@@ -94,7 +94,7 @@ class PDOMySqlStatement : public PDOStatement {
   virtual bool describer(int colno);
   virtual bool getColumn(int colno, Variant &value);
   virtual bool paramHook(PDOBoundParam *param, PDOParamEvent event_type);
-  virtual bool getColumnMeta(int64 colno, Array &return_value);
+  virtual bool getColumnMeta(int64_t colno, Array &return_value);
   virtual bool nextRowset();
   virtual bool cursorCloser();
 
@@ -485,7 +485,7 @@ bool PDOMySqlConnection::preparer(CStrRef sql, sp_PDOStatement *stmt,
   return false;
 }
 
-int64 PDOMySqlConnection::doer(CStrRef sql) {
+int64_t PDOMySqlConnection::doer(CStrRef sql) {
   if (mysql_real_query(m_server, sql.data(), sql.size())) {
     handleError(__FILE__, __LINE__);
     return -1;
@@ -535,7 +535,7 @@ bool PDOMySqlConnection::rollback() {
   return mysql_rollback(m_server) >= 0;
 }
 
-bool PDOMySqlConnection::setAttribute(int64 attr, CVarRef value) {
+bool PDOMySqlConnection::setAttribute(int64_t attr, CVarRef value) {
   switch (attr) {
   case PDO_ATTR_AUTOCOMMIT:
     /* ignore if the new value equals the old one */
@@ -569,18 +569,18 @@ bool PDOMySqlConnection::setAttribute(int64 attr, CVarRef value) {
 }
 
 String PDOMySqlConnection::lastId(const char *name) {
-  return (int64)mysql_insert_id(m_server);
+  return (int64_t)mysql_insert_id(m_server);
 }
 
 bool PDOMySqlConnection::fetchErr(PDOStatement *stmt, Array &info) {
   if (m_einfo.errcode) {
-    info.append((int64)m_einfo.errcode);
+    info.append((int64_t)m_einfo.errcode);
     info.append(String(m_einfo.errmsg, CopyString));
   }
   return true;
 }
 
-int PDOMySqlConnection::getAttribute(int64 attr, Variant &value) {
+int PDOMySqlConnection::getAttribute(int64_t attr, Variant &value) {
   switch (attr) {
   case PDO_ATTR_CLIENT_VERSION:
     value = String((char *)mysql_get_client_info(), CopyString);
@@ -602,16 +602,16 @@ int PDOMySqlConnection::getAttribute(int64 attr, Variant &value) {
     break;
   }
   case PDO_ATTR_AUTOCOMMIT:
-    value = (int64)auto_commit;
+    value = (int64_t)auto_commit;
     break;
   case PDO_MYSQL_ATTR_USE_BUFFERED_QUERY:
-    value = (int64)m_buffered;
+    value = (int64_t)m_buffered;
     break;
   case PDO_MYSQL_ATTR_DIRECT_QUERY:
-    value = (int64)m_emulate_prepare;
+    value = (int64_t)m_emulate_prepare;
     break;
   case PDO_MYSQL_ATTR_MAX_BUFFER_SIZE:
-    value = (int64)m_max_buffer_size;
+    value = (int64_t)m_max_buffer_size;
     break;
   default:
     return 0;
@@ -1147,7 +1147,7 @@ bool PDOMySqlStatement::paramHook(PDOBoundParam *param,
   return true;
 }
 
-bool PDOMySqlStatement::getColumnMeta(int64 colno, Array &return_value) {
+bool PDOMySqlStatement::getColumnMeta(int64_t colno, Array &return_value) {
   if (!m_result) {
     return false;
   }
diff --git a/hphp/runtime/ext/pdo_sqlite.cpp b/hphp/runtime/ext/pdo_sqlite.cpp
index fe8c28074d58e..a4898f57fc976 100644
--- a/hphp/runtime/ext/pdo_sqlite.cpp
+++ b/hphp/runtime/ext/pdo_sqlite.cpp
@@ -41,15 +41,15 @@ class PDOSqliteConnection : public PDOConnection {
   virtual bool support(SupportedMethod method);
   virtual bool closer();
   virtual bool preparer(CStrRef sql, sp_PDOStatement *stmt, CVarRef options);
-  virtual int64 doer(CStrRef sql);
+  virtual int64_t doer(CStrRef sql);
   virtual bool quoter(CStrRef input, String &quoted, PDOParamType paramtype);
   virtual bool begin();
   virtual bool commit();
   virtual bool rollback();
-  virtual bool setAttribute(int64 attr, CVarRef value);
+  virtual bool setAttribute(int64_t attr, CVarRef value);
   virtual String lastId(const char *name);
   virtual bool fetchErr(PDOStatement *stmt, Array &info);
-  virtual int getAttribute(int64 attr, Variant &value);
+  virtual int getAttribute(int64_t attr, Variant &value);
   virtual void persistentShutdown();
 
 private:
@@ -68,7 +68,7 @@ class PDOSqliteStatement : public PDOStatement {
   virtual bool describer(int colno);
   virtual bool getColumn(int colno, Variant &value);
   virtual bool paramHook(PDOBoundParam *param, PDOParamEvent event_type);
-  virtual bool getColumnMeta(int64 colno, Array &return_value);
+  virtual bool getColumnMeta(int64_t colno, Array &return_value);
   virtual bool cursorCloser();
 
 private:
@@ -217,7 +217,7 @@ bool PDOSqliteConnection::preparer(CStrRef sql, sp_PDOStatement *stmt,
   return false;
 }
 
-int64 PDOSqliteConnection::doer(CStrRef sql) {
+int64_t PDOSqliteConnection::doer(CStrRef sql) {
   char *errmsg = NULL;
   if (sqlite3_exec(m_db, sql.data(), NULL, NULL, &errmsg) != SQLITE_OK) {
     handleError(__FILE__, __LINE__);
@@ -267,7 +267,7 @@ bool PDOSqliteConnection::rollback() {
   return true;
 }
 
-bool PDOSqliteConnection::setAttribute(int64 attr, CVarRef value) {
+bool PDOSqliteConnection::setAttribute(int64_t attr, CVarRef value) {
   switch (attr) {
   case PDO_ATTR_TIMEOUT:
     sqlite3_busy_timeout(m_db, value.toInt64() * 1000);
@@ -277,18 +277,18 @@ bool PDOSqliteConnection::setAttribute(int64 attr, CVarRef value) {
 }
 
 String PDOSqliteConnection::lastId(const char *name) {
-  return (int64)sqlite3_last_insert_rowid(m_db);
+  return (int64_t)sqlite3_last_insert_rowid(m_db);
 }
 
 bool PDOSqliteConnection::fetchErr(PDOStatement *stmt, Array &info) {
   if (m_einfo.errcode) {
-    info.append((int64)m_einfo.errcode);
+    info.append((int64_t)m_einfo.errcode);
     info.append(String(m_einfo.errmsg, CopyString));
   }
   return true;
 }
 
-int PDOSqliteConnection::getAttribute(int64 attr, Variant &value) {
+int PDOSqliteConnection::getAttribute(int64_t attr, Variant &value) {
   switch (attr) {
   case PDO_ATTR_CLIENT_VERSION:
   case PDO_ATTR_SERVER_VERSION:
@@ -550,7 +550,7 @@ bool PDOSqliteStatement::paramHook(PDOBoundParam *param,
   return true;
 }
 
-bool PDOSqliteStatement::getColumnMeta(int64 colno, Array &ret) {
+bool PDOSqliteStatement::getColumnMeta(int64_t colno, Array &ret) {
   if (!m_stmt) {
     return false;
   }
diff --git a/hphp/runtime/ext/soap/encoding.cpp b/hphp/runtime/ext/soap/encoding.cpp
index 93784cb6c06d4..8361508c93b31 100644
--- a/hphp/runtime/ext/soap/encoding.cpp
+++ b/hphp/runtime/ext/soap/encoding.cpp
@@ -445,11 +445,11 @@ static encodePtr find_encoder_by_type_name(sdl *sdl, const char *type) {
 
 static bool soap_check_zval_ref(CVarRef data, xmlNodePtr node) {
   USE_SOAP_GLOBAL;
-  int64 hash = 0;
+  int64_t hash = 0;
   if (data.isObject()) {
-    hash = (int64)data.getObjectData();
+    hash = (int64_t)data.getObjectData();
   } else if (data.isReferenced()) {
-    hash = (int64)data.getRefData();
+    hash = (int64_t)data.getRefData();
   }
   if (hash) {
     Array &ref_map = SOAP_GLOBAL(ref_map);
@@ -500,7 +500,7 @@ static bool soap_check_zval_ref(CVarRef data, xmlNodePtr node) {
       }
       return true;
     }
-    ref_map.set(hash, (int64)node);
+    ref_map.set(hash, (int64_t)node);
   }
   return false;
 }
@@ -508,8 +508,8 @@ static bool soap_check_zval_ref(CVarRef data, xmlNodePtr node) {
 static bool soap_check_xml_ref(Variant &data, xmlNodePtr node) {
   USE_SOAP_GLOBAL;
   Array &ref_map = SOAP_GLOBAL(ref_map);
-  if (ref_map.exists((int64)node)) {
-    Variant &data2 = ref_map.lvalAt((int64)node);
+  if (ref_map.exists((int64_t)node)) {
+    Variant &data2 = ref_map.lvalAt((int64_t)node);
     if (!(data.isObject() && data2.isObject() &&
           data.getObjectData() == data2.getObjectData()) &&
         !(data.isReferenced() && data2.isReferenced() &&
@@ -518,7 +518,7 @@ static bool soap_check_xml_ref(Variant &data, xmlNodePtr node) {
       return true;
     }
   } else {
-    ref_map.set((int64)node, ref(data));
+    ref_map.set((int64_t)node, ref(data));
   }
   return false;
 }
@@ -993,7 +993,7 @@ static Variant to_zval_double(encodeTypePtr type, xmlNodePtr data) {
   if (data && data->children) {
     if (data->children->type == XML_TEXT_NODE &&
         data->children->next == NULL) {
-      int64 lval; double dval;
+      int64_t lval; double dval;
       whiteSpace_collapse(data->children->content);
       String content((char*)data->children->content, CopyString);
       switch (is_numeric_string((const char *)data->children->content,
@@ -1029,13 +1029,13 @@ static Variant to_zval_long(encodeTypePtr type, xmlNodePtr data) {
   if (data && data->children) {
     if (data->children->type == XML_TEXT_NODE &&
         data->children->next == NULL) {
-      int64 lval; double dval;
+      int64_t lval; double dval;
       whiteSpace_collapse(data->children->content);
       switch (is_numeric_string((const char *)data->children->content,
                                 data->children->content ?
                                 strlen((char*)data->children->content) : 0,
                                 &lval, &dval, 0)) {
-      case KindOfInt64:  ret = (int64)lval; break;
+      case KindOfInt64:  ret = (int64_t)lval; break;
       case KindOfDouble: ret = dval; break;
       default:
         throw SoapException("Encoding: Violation of encoding rules");
diff --git a/hphp/runtime/ext/soap/soap.h b/hphp/runtime/ext/soap/soap.h
index 23535f202bc43..fb2366a878033 100644
--- a/hphp/runtime/ext/soap/soap.h
+++ b/hphp/runtime/ext/soap/soap.h
@@ -85,10 +85,10 @@ class SoapData : public RequestEventHandler {
   typedef StringTosdlCacheBucketPtrMap sdlCache;
 
 public:
-  int64 m_cache;
+  int64_t m_cache;
 
 private:
-  int64 m_cache_ttl;
+  int64_t m_cache_ttl;
   sdlCache m_mem_cache; // URL => sdl
 
 public:
diff --git a/hphp/runtime/ext/thrift/binary.cpp b/hphp/runtime/ext/thrift/binary.cpp
index 7026a3386985e..12a12f2dbc287 100644
--- a/hphp/runtime/ext/thrift/binary.cpp
+++ b/hphp/runtime/ext/thrift/binary.cpp
@@ -108,23 +108,23 @@ Variant binary_deserialize(int8_t thrift_typeID, PHPInputTransport& transport,
     case T_BYTE: {
       uint8_t c;
       transport.readBytes(&c, 1);
-      return Variant((int8)c);
+      return Variant((int8_t)c);
     }
     case T_I16: {
       uint16_t c;
       transport.readBytes(&c, 2);
-      return Variant((int16)ntohs(c));
+      return Variant((int16_t)ntohs(c));
     }
     case T_I32: {
       uint32_t c;
       transport.readBytes(&c, 4);
-      return Variant((int32)ntohl(c));
+      return Variant((int32_t)ntohl(c));
     }
     case T_U64:
     case T_I64: {
       uint64_t c;
       transport.readBytes(&c, 8);
-      return Variant((int64)ntohll(c));
+      return Variant((int64_t)ntohll(c));
     }
     case T_DOUBLE: {
       union {
@@ -452,7 +452,7 @@ void binary_serialize_spec(CObjRef zthis, PHPOutputTransport& transport,
 }
 
 void f_thrift_protocol_write_binary(CObjRef transportobj, CStrRef method_name,
-                                    int64 msgtype, CObjRef request_struct,
+                                    int64_t msgtype, CObjRef request_struct,
                                     int seqid, bool strict_write) {
 
   PHPOutputTransport transport(transportobj);
diff --git a/hphp/runtime/ext/thrift/compact.cpp b/hphp/runtime/ext/thrift/compact.cpp
index 13c27eaa95ec6..f6d13a8841d06 100644
--- a/hphp/runtime/ext/thrift/compact.cpp
+++ b/hphp/runtime/ext/thrift/compact.cpp
@@ -917,7 +917,7 @@ int f_thrift_protocol_set_compact_version(int version) {
 
 void f_thrift_protocol_write_compact(CObjRef transportobj,
                                      CStrRef method_name,
-                                     int64 msgtype,
+                                     int64_t msgtype,
                                      CObjRef request_struct,
                                      int seqid) {
   CompactWriter writer(transportobj);
diff --git a/hphp/runtime/ext/thrift/transport.h b/hphp/runtime/ext/thrift/transport.h
index d6519c200be74..09a93ae5794d4 100644
--- a/hphp/runtime/ext/thrift/transport.h
+++ b/hphp/runtime/ext/thrift/transport.h
@@ -300,7 +300,7 @@ class PHPInputTransport : public PHPTransport {
   void refill() {
     assert(buffer_used == 0);
     String ret = t->o_invoke(s_read,
-                             CREATE_VECTOR1((int64)buffer_size), -1).toString();
+                             CREATE_VECTOR1((int64_t)buffer_size), -1).toString();
     buffer_used = ret.size();
     memcpy(buffer, ret.data(), buffer_used);
     buffer_ptr = buffer;
diff --git a/hphp/runtime/ext_hhvm/ext_hhvm_noinline.cpp b/hphp/runtime/ext_hhvm/ext_hhvm_noinline.cpp
index 92680d8e66873..12263d59e67d1 100644
--- a/hphp/runtime/ext_hhvm/ext_hhvm_noinline.cpp
+++ b/hphp/runtime/ext_hhvm/ext_hhvm_noinline.cpp
@@ -80,7 +80,7 @@ Variant fni_array_shift(VRefParamValue const& array) {
   return f_array_shift(ref(array));
 }
 
-int64 fni_sizeof(Variant const& var, bool recursive) {
+int64_t fni_sizeof(Variant const& var, bool recursive) {
   return f_sizeof(var, recursive);
 }
 
@@ -191,7 +191,7 @@ void fni_date_modify(Object const& object, String const& modify) {
   return f_date_modify(object, modify);
 }
 
-int64 fni_date_offset_get(Object const& object) {
+int64_t fni_date_offset_get(Object const& object) {
   return f_date_offset_get(object);
 }
 
@@ -219,11 +219,11 @@ void fni_date_time_set(Object const& object, int hour, int minute, int second) {
   return f_date_time_set(object, hour, minute, second);
 }
 
-int64 fni_date_timestamp_get(CObjRef datetime) {
+int64_t fni_date_timestamp_get(CObjRef datetime) {
   return f_date_timestamp_get(datetime);
 }
 
-Object fni_date_timestamp_set(CObjRef datetime, int64 timestamp) {
+Object fni_date_timestamp_set(CObjRef datetime, int64_t timestamp) {
   return f_date_timestamp_set(datetime, timestamp);
 }
 
@@ -287,7 +287,7 @@ Variant fni_strtotime(String const& input, int64_t timestamp) {
   return f_strtotime(input, timestamp);
 }
 
-int64 fni_time() {
+int64_t fni_time() {
   return f_time();
 }
 
@@ -311,7 +311,7 @@ String fni_timezone_name_get(Object const& object) {
   return f_timezone_name_get(object);
 }
 
-int64 fni_timezone_offset_get(Object const& object, Object const& dt) {
+int64_t fni_timezone_offset_get(Object const& object, Object const& dt) {
   return f_timezone_offset_get(object, dt);
 }
 
@@ -633,7 +633,7 @@ bool fni_syslog(int priority, String const& message) {
   return f_syslog(priority, message);
 }
 
-int64 fni_cpu_get_count() {
+int64_t fni_cpu_get_count() {
   return f_cpu_get_count();
 }
 
@@ -677,11 +677,11 @@ String fni_ob_get_flush() {
   return f_ob_get_flush();
 }
 
-int64 fni_ob_get_length() {
+int64_t fni_ob_get_length() {
   return f_ob_get_length();
 }
 
-int64 fni_ob_get_level() {
+int64_t fni_ob_get_level() {
   return f_ob_get_level();
 }
 
@@ -729,7 +729,7 @@ String fni_posix_ctermid() {
   return f_posix_ctermid();
 }
 
-int64 fni_posix_get_last_error() {
+int64_t fni_posix_get_last_error() {
   return f_posix_get_last_error();
 }
 
@@ -737,15 +737,15 @@ String fni_posix_getcwd() {
   return f_posix_getcwd();
 }
 
-int64 fni_posix_getegid() {
+int64_t fni_posix_getegid() {
   return f_posix_getegid();
 }
 
-int64 fni_posix_geteuid() {
+int64_t fni_posix_geteuid() {
   return f_posix_geteuid();
 }
 
-int64 fni_posix_getgid() {
+int64_t fni_posix_getgid() {
   return f_posix_getgid();
 }
 
@@ -757,15 +757,15 @@ Variant fni_posix_getpgid(int pid) {
   return f_posix_getpgid(pid);
 }
 
-int64 fni_posix_getpgrp() {
+int64_t fni_posix_getpgrp() {
   return f_posix_getpgrp();
 }
 
-int64 fni_posix_getpid() {
+int64_t fni_posix_getpid() {
   return f_posix_getpid();
 }
 
-int64 fni_posix_getppid() {
+int64_t fni_posix_getppid() {
   return f_posix_getppid();
 }
 
@@ -773,7 +773,7 @@ Variant fni_posix_getsid(int pid) {
   return f_posix_getsid(pid);
 }
 
-int64 fni_posix_getuid() {
+int64_t fni_posix_getuid() {
   return f_posix_getuid();
 }
 
@@ -805,7 +805,7 @@ bool fni_posix_setpgid(int pid, int pgid) {
   return f_posix_setpgid(pid, pgid);
 }
 
-int64 fni_posix_setsid() {
+int64_t fni_posix_setsid() {
   return f_posix_setsid();
 }
 
@@ -817,11 +817,11 @@ String fni_posix_strerror(int errnum) {
   return f_posix_strerror(errnum);
 }
 
-int64 fni_pcntl_alarm(int seconds) {
+int64_t fni_pcntl_alarm(int seconds) {
   return f_pcntl_alarm(seconds);
 }
 
-int64 fni_pcntl_wexitstatus(int status) {
+int64_t fni_pcntl_wexitstatus(int status) {
   return f_pcntl_wexitstatus(status);
 }
 
@@ -837,11 +837,11 @@ bool fni_pcntl_wifstopped(int status) {
   return f_pcntl_wifstopped(status);
 }
 
-int64 fni_pcntl_wstopsig(int status) {
+int64_t fni_pcntl_wstopsig(int status) {
   return f_pcntl_wstopsig(status);
 }
 
-int64 fni_pcntl_wtermsig(int status) {
+int64_t fni_pcntl_wtermsig(int status) {
   return f_pcntl_wtermsig(status);
 }
 
@@ -921,7 +921,7 @@ String fni_stream_resolve_include_path(String const& filename, Object const& con
   return f_stream_resolve_include_path(filename, context);
 }
 
-int64 fni_set_file_buffer(Object const& stream, int buffer) {
+int64_t fni_set_file_buffer(Object const& stream, int buffer) {
   return f_set_file_buffer(stream, buffer);
 }
 
@@ -1129,31 +1129,31 @@ Variant fni_money_format(String const& format, double number) {
   return f_money_format(format, number);
 }
 
-int64 fni_strcmp(String const& str1, String const& str2) {
+int64_t fni_strcmp(String const& str1, String const& str2) {
   return f_strcmp(str1, str2);
 }
 
-int64 fni_strncmp(String const& str1, String const& str2, int len) {
+int64_t fni_strncmp(String const& str1, String const& str2, int len) {
   return f_strncmp(str1, str2, len);
 }
 
-int64 fni_strnatcmp(String const& str1, String const& str2) {
+int64_t fni_strnatcmp(String const& str1, String const& str2) {
   return f_strnatcmp(str1, str2);
 }
 
-int64 fni_strcasecmp(String const& str1, String const& str2) {
+int64_t fni_strcasecmp(String const& str1, String const& str2) {
   return f_strcasecmp(str1, str2);
 }
 
-int64 fni_strncasecmp(String const& str1, String const& str2, int len) {
+int64_t fni_strncasecmp(String const& str1, String const& str2, int len) {
   return f_strncasecmp(str1, str2, len);
 }
 
-int64 fni_strnatcasecmp(String const& str1, String const& str2) {
+int64_t fni_strnatcasecmp(String const& str1, String const& str2) {
   return f_strnatcasecmp(str1, str2);
 }
 
-int64 fni_strcoll(String const& str1, String const& str2) {
+int64_t fni_strcoll(String const& str1, String const& str2) {
   return f_strcoll(str1, str2);
 }
 
@@ -1165,11 +1165,11 @@ Variant fni_strlen(CVarRef str) {
   return f_strlen(str);
 }
 
-int64 fni_levenshtein(String const& str1, String const& str2, int cost_ins, int cost_rep, int cost_del) {
+int64_t fni_levenshtein(String const& str1, String const& str2, int cost_ins, int cost_rep, int cost_del) {
   return f_levenshtein(str1, str2, cost_ins, cost_rep, cost_del);
 }
 
-int64 fni_similar_text(String const& first, String const& second, VRefParamValue const& percent) {
+int64_t fni_similar_text(String const& first, String const& second, VRefParamValue const& percent) {
   return f_similar_text(first, second, ref(percent));
 }
 
diff --git a/hphp/runtime/vm/as.cpp b/hphp/runtime/vm/as.cpp
index 8b72ed8c58bd3..05f4589ee8c1e 100644
--- a/hphp/runtime/vm/as.cpp
+++ b/hphp/runtime/vm/as.cpp
@@ -816,9 +816,9 @@ void read_immvector_immediate(AsmState& as, std::vector<uchar>& ret,
     }
     encodeIvaToVector(ret, as.getLocalId("$" + name));
   } else if (memberCodeImmIsString(mcode)) {
-    encodeToVector<int32>(ret, as.ue->mergeLitstr(read_litstr(as)));
+    encodeToVector<int32_t>(ret, as.ue->mergeLitstr(read_litstr(as)));
   } else if (memberCodeImmIsInt(mcode)) {
-    encodeToVector<int64>(ret, read_opcode_arg<int64>(as));
+    encodeToVector<int64_t>(ret, read_opcode_arg<int64_t>(as));
   } else {
     as.error(std::string("don't understand immediate for member code ") +
              memberCodeString(mcode));
diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp
index 68538bcfde5f6..6e542b065ee99 100644
--- a/hphp/runtime/vm/bytecode.cpp
+++ b/hphp/runtime/vm/bytecode.cpp
@@ -157,7 +157,7 @@ static StaticString s___callStatic(LITSTR_INIT("__callStatic"));
   DECODE_JMP(type, var);                                                      \
   pc += sizeof(type)
 #define DECODE_IVA(var)                                                       \
-  int32 var UNUSED = decodeVariableSizeImm(&pc);                              \
+  int32_t var UNUSED = decodeVariableSizeImm(&pc);                              \
   ONTRACE(2,                                                                  \
           Trace::trace("decode:     Immediate int32 %" PRIi64"\n",            \
                        (int64_t)var));
@@ -893,7 +893,7 @@ string Stack::toString(const ActRec* fp, int offset,
   return os.str();
 }
 
-void Stack::clearEvalStack(ActRec *fp, int32 numLocals) {
+void Stack::clearEvalStack(ActRec *fp, int32_t numLocals) {
 }
 
 UnwindStatus Stack::unwindFrag(ActRec* fp, int offset,
@@ -3338,7 +3338,7 @@ inline void OPTBLD_INLINE VMExecutionContext::getHelperPre(
   while (vec < pc) {
     mcode = MemberCode(*vec++);
     if (memberCodeHasImm(mcode)) {
-      int64 memberImm = decodeMemberCodeImm(&vec, mcode);
+      int64_t memberImm = decodeMemberCodeImm(&vec, mcode);
       if (memberCodeImmIsString(mcode)) {
         tvAsVariant(&tvLiteral) =
           m_fp->m_func->unit()->lookupLitstrId(memberImm);
@@ -3645,7 +3645,7 @@ inline bool OPTBLD_INLINE VMExecutionContext::setHelperPre(
   while (vec < pc) {
     mcode = MemberCode(*vec++);
     if (memberCodeHasImm(mcode)) {
-      int64 memberImm = decodeMemberCodeImm(&vec, mcode);
+      int64_t memberImm = decodeMemberCodeImm(&vec, mcode);
       if (memberCodeImmIsString(mcode)) {
         tvAsVariant(&tvLiteral) =
           m_fp->m_func->unit()->lookupLitstrId(memberImm);
@@ -3843,7 +3843,7 @@ inline void OPTBLD_INLINE VMExecutionContext::iopDir(PC& pc) {
 
 inline void OPTBLD_INLINE VMExecutionContext::iopInt(PC& pc) {
   NEXT();
-  DECODE(int64, i);
+  DECODE(int64_t, i);
   m_stack.pushInt(i);
 }
 
@@ -4060,8 +4060,8 @@ inline void OPTBLD_INLINE VMExecutionContext::iopConcat(PC& pc) {
   Cell* c1 = m_stack.topC();                                                  \
   Cell* c2 = m_stack.indC(1);                                                 \
   if (c2->m_type == KindOfInt64 && c1->m_type == KindOfInt64) {               \
-    int64 a = c2->m_data.num;                                                 \
-    int64 b = c1->m_data.num;                                                 \
+    int64_t a = c2->m_data.num;                                                 \
+    int64_t b = c1->m_data.num;                                                 \
     MATHOP_DIVCHECK(0)                                                        \
     c2->m_data.num = a OP b;                                                  \
     m_stack.popX();                                                           \
@@ -4108,7 +4108,7 @@ inline void OPTBLD_INLINE VMExecutionContext::iopDiv(PC& pc) {
   // Special handling for evenly divisible ints
   if (c2->m_type == KindOfInt64 && c1->m_type == KindOfInt64
       && c1->m_data.num != 0 && c2->m_data.num % c1->m_data.num == 0) {
-    int64 b = c1->m_data.num;
+    int64_t b = c1->m_data.num;
     MATHOP_DIVCHECK(0)
     c2->m_data.num /= b;
     m_stack.popX();
@@ -4155,13 +4155,13 @@ inline void OPTBLD_INLINE VMExecutionContext::iopNot(PC& pc) {
   Cell* c1 = m_stack.topC();                                                  \
   Cell* c2 = m_stack.indC(1);                                                 \
   if (c2->m_type == KindOfInt64 && c1->m_type == KindOfInt64) {               \
-    int64 a = c2->m_data.num;                                                 \
-    int64 b = c1->m_data.num;                                                 \
+    int64_t a = c2->m_data.num;                                                 \
+    int64_t b = c1->m_data.num;                                                 \
     c2->m_data.num = (a OP b);                                                \
     c2->m_type = KindOfBoolean;                                               \
     m_stack.popX();                                                           \
   } else {                                                                    \
-    int64 result = VOP(tvCellAsVariant(c2), tvCellAsCVarRef(c1));             \
+    int64_t result = VOP(tvCellAsVariant(c2), tvCellAsCVarRef(c1));             \
     tvRefcountedDecRefCell(c2);                                               \
     c2->m_data.num = result;                                                  \
     c2->m_type = KindOfBoolean;                                               \
@@ -4225,7 +4225,7 @@ inline void OPTBLD_INLINE VMExecutionContext::iopBitNot(PC& pc) {
     c1->m_data.num = ~c1->m_data.num;
   } else if (c1->m_type == KindOfDouble) {
     c1->m_type = KindOfInt64;
-    c1->m_data.num = ~int64(c1->m_data.dbl);
+    c1->m_data.num = ~int64_t(c1->m_data.dbl);
   } else if (IS_STRING_TYPE(c1->m_type)) {
     tvCellAsVariant(c1) = ~tvCellAsVariant(c1);
   } else {
@@ -4238,8 +4238,8 @@ inline void OPTBLD_INLINE VMExecutionContext::iopBitNot(PC& pc) {
   Cell* c1 = m_stack.topC();                                                  \
   Cell* c2 = m_stack.indC(1);                                                 \
   if (c2->m_type == KindOfInt64 && c1->m_type == KindOfInt64) {               \
-    int64 a = c2->m_data.num;                                                 \
-    int64 b = c1->m_data.num;                                                 \
+    int64_t a = c2->m_data.num;                                                 \
+    int64_t b = c1->m_data.num;                                                 \
     c2->m_data.num = a OP b;                                                  \
     m_stack.popX();                                                           \
   } else {                                                                    \
@@ -4427,7 +4427,7 @@ inline void OPTBLD_INLINE VMExecutionContext::iopJmp(PC& pc) {
 #define JMPOP(OP, VOP) do {                                                   \
   Cell* c1 = m_stack.topC();                                                  \
   if (c1->m_type == KindOfInt64 || c1->m_type == KindOfBoolean) {             \
-    int64 n = c1->m_data.num;                                                 \
+    int64_t n = c1->m_data.num;                                                 \
     if (n OP 0) {                                                             \
       NEXT();                                                                 \
       DECODE_JMP(Offset, offset);                                             \
@@ -4467,8 +4467,8 @@ enum SwitchMatch {
   MATCH_DEFAULT, // can't be converted to an int: match default case
 };
 
-static SwitchMatch doubleCheck(double d, int64& out) {
-  if (int64(d) == d) {
+static SwitchMatch doubleCheck(double d, int64_t& out) {
+  if (int64_t(d) == d) {
     out = d;
     return MATCH_NORMAL;
   } else {
@@ -4483,20 +4483,20 @@ inline void OPTBLD_INLINE VMExecutionContext::iopSwitch(PC& pc) {
   assert(veclen > 0);
   Offset* jmptab = (Offset*)pc;
   pc += veclen * sizeof(*jmptab);
-  DECODE(int64, base);
+  DECODE(int64_t, base);
   DECODE_IVA(bounded);
 
   TypedValue* val = m_stack.topTV();
   if (!bounded) {
     assert(val->m_type == KindOfInt64);
     // Continuation switch: no bounds checking needed
-    int64 label = val->m_data.num;
+    int64_t label = val->m_data.num;
     m_stack.popX();
     assert(label >= 0 && label < veclen);
     pc = origPC + jmptab[label];
   } else {
     // Generic integer switch
-    int64 intval;
+    int64_t intval;
     SwitchMatch match = MATCH_NORMAL;
 
     switch (val->m_type) {
@@ -4582,7 +4582,7 @@ inline void OPTBLD_INLINE VMExecutionContext::iopSwitch(PC& pc) {
 inline void OPTBLD_INLINE VMExecutionContext::iopSSwitch(PC& pc) {
   PC origPC = pc;
   NEXT();
-  DECODE(int32, veclen);
+  DECODE(int32_t, veclen);
   assert(veclen > 1);
   unsigned cases = veclen - 1; // the last vector item is the default case
   StrVecItem* jmptab = (StrVecItem*)pc;
@@ -6849,7 +6849,7 @@ VMExecutionContext::createContinuation(ActRec* fp,
   cont->incRefCount();
   cont->setNoDestruct();
   try {
-    cont->t___construct((int64)0, (int64)genFunc, isMethod,
+    cont->t___construct((int64_t)0, (int64_t)genFunc, isMethod,
                         StrNR(const_cast<StringData*>(origName)), obj, args);
   } catch (...) {
     decRefObj(cont);
@@ -7138,7 +7138,7 @@ inline void OPTBLD_INLINE VMExecutionContext::iopStrlen(PC& pc) {
   NEXT();
   TypedValue* subj = m_stack.topTV();
   if (LIKELY(IS_STRING_TYPE(subj->m_type))) {
-    int64 ans = subj->m_data.pstr->size();
+    int64_t ans = subj->m_data.pstr->size();
     tvRefcountedDecRef(subj);
     subj->m_type = KindOfInt64;
     subj->m_data.num = ans;
diff --git a/hphp/runtime/vm/bytecode.h b/hphp/runtime/vm/bytecode.h
index 7cc10100a9ae1..9f53fa5a5d93a 100644
--- a/hphp/runtime/vm/bytecode.h
+++ b/hphp/runtime/vm/bytecode.h
@@ -376,15 +376,15 @@ struct ActRec {
   }
 };
 
-inline int32 arOffset(const ActRec* ar, const ActRec* other) {
+inline int32_t arOffset(const ActRec* ar, const ActRec* other) {
   return (intptr_t(other) - intptr_t(ar)) / sizeof(TypedValue);
 }
 
-inline ActRec* arAtOffset(const ActRec* ar, int32 offset) {
+inline ActRec* arAtOffset(const ActRec* ar, int32_t offset) {
   return (ActRec*)(intptr_t(ar) + intptr_t(offset * sizeof(TypedValue)));
 }
 
-inline ActRec* arFromSpOffset(const ActRec *sp, int32 offset) {
+inline ActRec* arFromSpOffset(const ActRec *sp, int32_t offset) {
   return arAtOffset(sp, offset);
 }
 
@@ -464,7 +464,7 @@ class Stack {
   void toStringElm(std::ostream& os, TypedValue* vv, const ActRec* fp)
     const;
   void toStringIter(std::ostream& os, Iter* it, bool itRef) const;
-  void clearEvalStack(ActRec* fp, int32 numLocals);
+  void clearEvalStack(ActRec* fp, int32_t numLocals);
   void protect();
   void unprotect();
   void requestInit();
@@ -658,7 +658,7 @@ class Stack {
     m_top->_count = 0;                                                        \
     m_top->m_type = type;                                                     \
   }
-  PUSH_METHOD_ARG(Int, KindOfInt64, num, int64, i)
+  PUSH_METHOD_ARG(Int, KindOfInt64, num, int64_t, i)
   PUSH_METHOD_ARG(Double, KindOfDouble, dbl, double, d)
 
   // This should only be called directly when the caller has
diff --git a/hphp/runtime/vm/class.cpp b/hphp/runtime/vm/class.cpp
index 45ec636ce5e72..2fe8c315cb84a 100644
--- a/hphp/runtime/vm/class.cpp
+++ b/hphp/runtime/vm/class.cpp
@@ -300,7 +300,7 @@ void PreClassEmitter::commit(RepoTxn& txn) const {
   Repo& repo = Repo::get();
   PreClassRepoProxy& pcrp = repo.pcrp();
   int repoId = m_ue.repoId();
-  int64 usn = m_ue.sn();
+  int64_t usn = m_ue.sn();
   pcrp.insertPreClass(repoId)
       .insert(*this, txn, usn, m_id, m_name, m_hoistable);
 
@@ -428,7 +428,7 @@ void PreClassRepoProxy::createSchema(int repoId, RepoTxn& txn) {
 
 void PreClassRepoProxy::InsertPreClassStmt
                       ::insert(const PreClassEmitter& pce, RepoTxn& txn,
-                               int64 unitSn, Id preClassId,
+                               int64_t unitSn, Id preClassId,
                                const StringData* name,
                                PreClass::Hoistable hoistable) {
   if (!prepared()) {
@@ -582,7 +582,7 @@ void Class::initInstanceBits() {
   // trying to profile instance checks.
   typedef std::pair<const StringData*, unsigned> Count;
   std::vector<Count> counts;
-  uint64 total = 0;
+  uint64_t total = 0;
   {
     // If you think of the read-write lock as a shared-exclusive lock instead,
     // the fact that we're grabbing a write lock to iterate over the table
@@ -602,7 +602,7 @@ void Class::initInstanceBits() {
   // Next, initialize s_instanceBits with the top 127 most checked classes. Bit
   // 0 is reserved as an 'initialized' flag
   unsigned i = 1;
-  uint64 accum = 0;
+  uint64_t accum = 0;
   for (auto& item : counts) {
     if (i >= kInstanceBits) break;
     s_instanceBits[item.first] = i;
@@ -670,7 +670,7 @@ bool Class::haveInstanceBit(const StringData* name) {
 }
 
 bool Class::getInstanceBitMask(const StringData* name,
-                               int& offset, uint8& mask) {
+                               int& offset, uint8_t& mask) {
   assert(Transl::Translator::WriteLease().amOwner());
   assert(s_instanceBitsInit.load(std::memory_order_acquire));
   const size_t bitWidth = sizeof(mask) * CHAR_BIT;
diff --git a/hphp/runtime/vm/class.h b/hphp/runtime/vm/class.h
index 24c91f715c2b0..fb8a4e5b47840 100644
--- a/hphp/runtime/vm/class.h
+++ b/hphp/runtime/vm/class.h
@@ -495,7 +495,7 @@ class PreClassRepoProxy : public RepoProxy {
   class InsertPreClassStmt : public RepoProxy::Stmt {
    public:
     InsertPreClassStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
-    void insert(const PreClassEmitter& pce, RepoTxn& txn, int64 unitSn,
+    void insert(const PreClassEmitter& pce, RepoTxn& txn, int64_t unitSn,
                 Id preClassId, const StringData* name,
                 PreClass::Hoistable hoistable);
   };
@@ -793,11 +793,11 @@ class Class : public AtomicCountable {
   static void initInstanceBits();
   static bool haveInstanceBit(const StringData* name);
   static bool getInstanceBitMask(const StringData* name,
-                                 int& offset, uint8& mask);
+                                 int& offset, uint8_t& mask);
 
 private:
   typedef tbb::concurrent_hash_map<
-    const StringData*, uint64, pointer_hash<StringData>> InstanceCounts;
+    const StringData*, uint64_t, pointer_hash<StringData>> InstanceCounts;
   typedef hphp_hash_map<const StringData*, unsigned,
                         pointer_hash<StringData>> InstanceBitsMap;
   typedef std::bitset<128> InstanceBits;
diff --git a/hphp/runtime/vm/func.cpp b/hphp/runtime/vm/func.cpp
index c99b4f03281c8..b72aba50660c9 100644
--- a/hphp/runtime/vm/func.cpp
+++ b/hphp/runtime/vm/func.cpp
@@ -328,7 +328,7 @@ bool Func::isNameBindingImmutable(const Unit* fromUnit) const {
   return top() && (fromUnit == m_unit);
 }
 
-bool Func::byRef(int32 arg) const {
+bool Func::byRef(int32_t arg) const {
   // Super special case. A handful of builtins are varargs functions where the
   // (not formally declared) varargs are pass-by-reference. psychedelic-kitten
   if (arg >= m_numParams && isBuiltin() &&
@@ -342,7 +342,7 @@ bool Func::byRef(int32 arg) const {
   return retval;
 }
 
-bool Func::mustBeRef(int32 arg) const {
+bool Func::mustBeRef(int32_t arg) const {
   // return true if the argument is required to be a reference
   // (and thus should be an lvalue)
   if (arg >= m_numParams && isBuiltin() &&
@@ -375,10 +375,10 @@ void Func::appendParam(bool ref, const Func::ParamInfo& info,
     shared()->m_refBitVec[m_numParams / kBitsPerQword] =
       (m_attrs & AttrVariadicByRef) ? -1ull : 0;
   }
-  assert(!!(shared()->m_refBitVec[qword] & (uint64(1) << bit)) ==
+  assert(!!(shared()->m_refBitVec[qword] & (uint64_t(1) << bit)) ==
     !!(m_attrs & AttrVariadicByRef));
   shared()->m_refBitVec[qword] &= ~(1ull << bit);
-  shared()->m_refBitVec[qword] |= uint64(ref) << bit;
+  shared()->m_refBitVec[qword] |= uint64_t(ref) << bit;
   pBuilder.push_back(info);
 }
 
@@ -801,7 +801,7 @@ void FuncEmitter::commit(RepoTxn& txn) const {
   Repo& repo = Repo::get();
   FuncRepoProxy& frp = repo.frp();
   int repoId = m_ue.repoId();
-  int64 usn = m_ue.sn();
+  int64_t usn = m_ue.sn();
 
   frp.insertFunc(repoId)
      .insert(*this, txn, usn, m_sn, m_pce ? m_pce->id() : -1, m_name, m_top);
@@ -971,7 +971,7 @@ void FuncRepoProxy::createSchema(int repoId, RepoTxn& txn) {
 
 void FuncRepoProxy::InsertFuncStmt
                   ::insert(const FuncEmitter& fe,
-                           RepoTxn& txn, int64 unitSn, int funcSn,
+                           RepoTxn& txn, int64_t unitSn, int funcSn,
                            Id preClassId, const StringData* name,
                            bool top) {
   if (!prepared()) {
diff --git a/hphp/runtime/vm/func.h b/hphp/runtime/vm/func.h
index 9f431b6e45b38..e8fc5a8d6b3d2 100644
--- a/hphp/runtime/vm/func.h
+++ b/hphp/runtime/vm/func.h
@@ -188,8 +188,8 @@ struct Func {
     return m_maxStackCells;
   }
 
-  bool byRef(int32 arg) const;
-  bool mustBeRef(int32 arg) const;
+  bool byRef(int32_t arg) const;
+  bool mustBeRef(int32_t arg) const;
   void prettyPrint(std::ostream& out) const;
 
   bool isPseudoMain() const { return m_name->empty(); }
@@ -667,7 +667,7 @@ class FuncRepoProxy : public RepoProxy {
   public:
     InsertFuncStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
     void insert(const FuncEmitter& fe,
-                RepoTxn& txn, int64 unitSn, int funcSn, Id preClassId,
+                RepoTxn& txn, int64_t unitSn, int funcSn, Id preClassId,
                 const StringData* name, bool top);
   };
   class GetFuncsStmt : public RepoProxy::Stmt {
diff --git a/hphp/runtime/vm/hhbc.cpp b/hphp/runtime/vm/hhbc.cpp
index 57fb9ca648529..577550aa6a922 100644
--- a/hphp/runtime/vm/hhbc.cpp
+++ b/hphp/runtime/vm/hhbc.cpp
@@ -215,7 +215,7 @@ T decodeImm(const unsigned char** immPtr) {
   return val;
 }
 
-int64 decodeMemberCodeImm(const unsigned char** immPtr, MemberCode mcode) {
+int64_t decodeMemberCodeImm(const unsigned char** immPtr, MemberCode mcode) {
   switch (mcode) {
     case MEL:
     case MPL:
@@ -223,10 +223,10 @@ int64 decodeMemberCodeImm(const unsigned char** immPtr, MemberCode mcode) {
 
     case MET:
     case MPT:
-      return decodeImm<int32>(immPtr);
+      return decodeImm<int32_t>(immPtr);
 
     case MEI:
-      return decodeImm<int64>(immPtr);
+      return decodeImm<int64_t>(immPtr);
 
     default:
       not_reached();
@@ -736,7 +736,7 @@ std::string instrToString(const Opcode* it, const Unit* u /* = NULL */) {
                      memberCodeString(MemberCode(immVal)) : "?");       \
       it += sizeof(uchar);                                              \
       if (memberCodeHasImm(MemberCode(immVal))) {                       \
-        int64 imm = decodeMemberCodeImm(&it, MemberCode(immVal));       \
+        int64_t imm = decodeMemberCodeImm(&it, MemberCode(immVal));       \
         out << ':';                                                     \
         if (memberCodeImmIsString(MemberCode(immVal)) && u) {           \
           const StringData* str = u->lookupLitstrId(imm);               \
@@ -798,7 +798,7 @@ std::string instrToString(const Opcode* it, const Unit* u /* = NULL */) {
 #define H_BLA READSVEC()
 #define H_SLA READSVEC()
 #define H_IVA READIVA()
-#define H_I64A READ(int64)
+#define H_I64A READ(int64_t)
 #define H_HA READV()
 #define H_IA READV()
 #define H_DA READ(double)
diff --git a/hphp/runtime/vm/hhbc.h b/hphp/runtime/vm/hhbc.h
index e9c6c5e03577e..f5434af60e2b7 100644
--- a/hphp/runtime/vm/hhbc.h
+++ b/hphp/runtime/vm/hhbc.h
@@ -726,19 +726,19 @@ ArgUnion* getImmPtr(const Opcode* opcode, int idx);
 
 // Pass a pointer to the pointer to the immediate; this function will advance
 // the pointer past the immediate
-inline int32 decodeVariableSizeImm(const unsigned char** immPtr) {
+inline int32_t decodeVariableSizeImm(const unsigned char** immPtr) {
   const unsigned char small = **immPtr;
   if (UNLIKELY(small & 0x1)) {
     const unsigned int large = *((const unsigned int*)*immPtr);
     *immPtr += sizeof(large);
-    return (int32)(large >> 1);
+    return (int32_t)(large >> 1);
   } else {
     *immPtr += sizeof(small);
-    return (int32)(small >> 1);
+    return (int32_t)(small >> 1);
   }
 }
 
-int64 decodeMemberCodeImm(const unsigned char** immPtr, MemberCode mcode);
+int64_t decodeMemberCodeImm(const unsigned char** immPtr, MemberCode mcode);
 
 // Encodes a variable sized immediate for `val' into `buf'.  Returns
 // the number of bytes used taken.  At most 4 bytes can be used.
diff --git a/hphp/runtime/vm/instrumentation.h b/hphp/runtime/vm/instrumentation.h
index 048fdbcab1295..f90a99584e0fc 100644
--- a/hphp/runtime/vm/instrumentation.h
+++ b/hphp/runtime/vm/instrumentation.h
@@ -66,7 +66,7 @@ struct InjectionHashCompare {
   }
   size_t hash(const Injection *i) const {
     assert(i);
-    return i->m_desc->hash() ^ hash_int64((int64)i->m_unit);
+    return i->m_desc->hash() ^ hash_int64((int64_t)i->m_unit);
   }
 };
 
@@ -115,7 +115,7 @@ class InjectionCache {
   friend class InjectionCacheHolder;
 };
 
-typedef hphp_hash_map<int64, const Injection*, int64_hash> InjectionTableInt64;
+typedef hphp_hash_map<int64_t, const Injection*, int64_hash> InjectionTableInt64;
 typedef hphp_hash_map<const StringData*, const Injection*, string_data_hash,
                       string_data_same>  InjectionTableSD;
 
diff --git a/hphp/runtime/vm/instrumentation_hook.h b/hphp/runtime/vm/instrumentation_hook.h
index 67208d7a3c920..0ba3b15627bb2 100644
--- a/hphp/runtime/vm/instrumentation_hook.h
+++ b/hphp/runtime/vm/instrumentation_hook.h
@@ -23,14 +23,14 @@
 namespace HPHP {
 namespace VM {
 
-static inline void instHookInt64Impl(InjectionTableInt64* table, int64 val) {
+static inline void instHookInt64Impl(InjectionTableInt64* table, int64_t val) {
   if (!table) return;
   InjectionTableInt64::const_iterator it = table->find(val);
   if (LIKELY(it == table->end())) return;
   it->second->execute();
 }
 
-static inline void instHookInt64(int type, int64 val) {
+static inline void instHookInt64(int type, int64_t val) {
   assert(type < InstHookTypeInt64Count);
   InjectionTableInt64* injTable = g_vmContext->m_injTables ?
     g_vmContext->m_injTables->getInt64Table(type) : nullptr;
@@ -52,7 +52,7 @@ static inline void instHookStr(int type, const char* str) {
   instHookSD(type, &sd);
 }
 
-#define INST_HOOK_PC(table, pc) instHookInt64Impl(table, (int64)pc)
+#define INST_HOOK_PC(table, pc) instHookInt64Impl(table, (int64_t)pc)
 
 #define INST_HOOK_EVT_STR(str)  instHookStr(InstHookTypeCustomEvt, str)
 #define INST_HOOK_EVT_SD(sd)    instHookSD(InstHookTypeCustomEvt, sd)
diff --git a/hphp/runtime/vm/member_operations.h b/hphp/runtime/vm/member_operations.h
index 3c364758cd64f..d8f9f87ee8845 100644
--- a/hphp/runtime/vm/member_operations.h
+++ b/hphp/runtime/vm/member_operations.h
@@ -48,7 +48,7 @@ template<KeyType kt>
 struct KeyTypeTraits {};
 template<> struct KeyTypeTraits<AnyKey> {
   typedef CVarRef valType;
-  typedef int64 rawType; // This is never actually used but it's
+  typedef int64_t rawType; // This is never actually used but it's
                          // needed to keep the compiler happy
 };
 template<> struct KeyTypeTraits<StrKey> {
@@ -56,8 +56,8 @@ template<> struct KeyTypeTraits<StrKey> {
   typedef StringData* rawType;
 };
 template<> struct KeyTypeTraits<IntKey> {
-  typedef int64 valType;
-  typedef int64 rawType;
+  typedef int64_t valType;
+  typedef int64_t rawType;
 };
 
 static inline DataType keyDataType(KeyType t) {
@@ -73,8 +73,8 @@ static inline DataType keyDataType(KeyType t) {
 template<KeyType kt>
 inline typename KeyTypeTraits<kt>::valType keyAsValue(TypedValue* key);
 template<>
-inline int64 keyAsValue<IntKey>(TypedValue* key) {
-  return reinterpret_cast<int64>(key);
+inline int64_t keyAsValue<IntKey>(TypedValue* key) {
+  return reinterpret_cast<int64_t>(key);
 }
 template<>
 inline CVarRef keyAsValue<AnyKey>(TypedValue* key) {
@@ -99,7 +99,7 @@ template<KeyType kt>
 inline void initScratchKey(TypedValue& tv, TypedValue*& key) {
   if (kt != AnyKey) {
     tv.m_type = keyDataType(kt);
-    tv.m_data.num = reinterpret_cast<int64>(key);
+    tv.m_data.num = reinterpret_cast<int64_t>(key);
     key = &tv;
   }
 }
@@ -148,14 +148,14 @@ static inline void opPre(TypedValue*& base, DataType& type) {
 }
 
 static inline TypedValue* ElemArrayRawKey(ArrayData* base,
-                                          int64 key) {
+                                          int64_t key) {
   TypedValue* result = base->nvGet(key);
   return result ? result : (TypedValue*)&null_variant;
 }
 
 static inline TypedValue* ElemArrayRawKey(ArrayData* base,
                                           StringData* key) {
-  int64 n;
+  int64_t n;
   TypedValue* result = !key->isStrictlyInteger(n) ? base->nvGet(key) :
                        base->nvGet(n);
   return result ? result : (TypedValue*)&null_variant;
@@ -223,14 +223,14 @@ static inline TypedValue* Elem(TypedValue& tvScratch, TypedValue& tvRef,
     if (baseStrOff) {
       raise_error("Cannot use string offset as an array");
     }
-    int64 x;
+    int64_t x;
     if (keyType == IntKey) {
-      x = reinterpret_cast<int64>(key);
+      x = reinterpret_cast<int64_t>(key);
     } else if (keyType == StrKey) {
       x = reinterpret_cast<StringData*>(key)->toInt64(10);
     } else {
       x = IS_INT_TYPE(key->m_type) ? key->m_data.num
-        : int64(tvCellAsCVarRef(key));
+        : int64_t(tvCellAsCVarRef(key));
     }
     if (x < 0 || x >= base->m_data.pstr->size()) {
       if (warn) {
@@ -525,7 +525,7 @@ static inline void SetElemNumberish(Cell* value) {
 }
 
 static inline ArrayData* SetElemArrayRawKey(ArrayData* a,
-                                            int64 key,
+                                            int64_t key,
                                             Cell* value,
                                             bool copy) {
   return a->set(key, tvCellAsCVarRef(value), copy);
@@ -535,7 +535,7 @@ static inline ArrayData* SetElemArrayRawKey(ArrayData* a,
                                             StringData* key,
                                             Cell* value,
                                             bool copy) {
-  int64 n;
+  int64_t n;
   if (key->isStrictlyInteger(n)) {
     return a->set(n, tvCellAsCVarRef(value), copy);
   } else {
@@ -613,7 +613,7 @@ static inline void SetElem(TypedValue* base, TypedValue* key, Cell* value) {
       SetElemEmptyish(base, key, value);
     } else {
       // Convert key to string offset.
-      int64 x;
+      int64_t x;
       {
         TypedValue tv;
         tvDup(key, &tv);
@@ -628,7 +628,7 @@ static inline void SetElem(TypedValue* base, TypedValue* key, Cell* value) {
       }
       // Compute how long the resulting string will be. Type needs
       // to agree with x.
-      int64 slen;
+      int64_t slen;
       if (x >= baseLen) {
         slen = x + 1;
       } else {
@@ -1143,14 +1143,14 @@ static inline void IncDecNewElem(TypedValue& tvScratch, TypedValue& tvRef,
   }
 }
 
-static inline ArrayData* UnsetElemArrayRawKey(ArrayData* a, int64 key,
+static inline ArrayData* UnsetElemArrayRawKey(ArrayData* a, int64_t key,
                                               bool copy) {
   return a->remove(key, copy);
 }
 
 static inline ArrayData* UnsetElemArrayRawKey(ArrayData* a, StringData* key,
                                               bool copy) {
-  int64 n;
+  int64_t n;
   if (!key->isStrictlyInteger(n)) {
     return a->remove(StrNR(key), copy);
   } else {
@@ -1361,7 +1361,7 @@ static inline bool IssetEmptyElem(TypedValue& tvScratch, TypedValue& tvRef,
     initScratchKey<keyType>(scratch, key);
     tvDup(key, &tv);
     tvCastToInt64InPlace(&tv);
-    int64 x = tv.m_data.num;
+    int64_t x = tv.m_data.num;
     if (x < 0 || x >= base->m_data.pstr->size()) {
       return useEmpty;
     }
diff --git a/hphp/runtime/vm/name_value_table_wrapper.cpp b/hphp/runtime/vm/name_value_table_wrapper.cpp
index b2a8ee68ded96..33a7654ad1247 100644
--- a/hphp/runtime/vm/name_value_table_wrapper.cpp
+++ b/hphp/runtime/vm/name_value_table_wrapper.cpp
@@ -56,7 +56,7 @@ bool NameValueTableWrapper::noCopyOnWrite() const {
   return true;
 }
 
-bool NameValueTableWrapper::exists(int64 k) const {
+bool NameValueTableWrapper::exists(int64_t k) const {
   return exists(String(k));
 }
 
@@ -68,7 +68,7 @@ bool NameValueTableWrapper::idxExists(ssize_t idx) const {
   return false;
 }
 
-CVarRef NameValueTableWrapper::get(int64 k, bool error) const {
+CVarRef NameValueTableWrapper::get(int64_t k, bool error) const {
   return get(String(k), error);
 }
 
@@ -89,11 +89,11 @@ TypedValue* NameValueTableWrapper::nvGet(const StringData* k) const {
   return m_tab->lookup(k);
 }
 
-TypedValue* NameValueTableWrapper::nvGet(int64 k) const {
+TypedValue* NameValueTableWrapper::nvGet(int64_t k) const {
   return m_tab->lookup(String(k).get());
 }
 
-ssize_t NameValueTableWrapper::getIndex(int64 k) const {
+ssize_t NameValueTableWrapper::getIndex(int64_t k) const {
   return getIndex(String(k));
 }
 
@@ -102,7 +102,7 @@ ssize_t NameValueTableWrapper::getIndex(const StringData* k) const {
   return iter.toInteger();
 }
 
-ArrayData* NameValueTableWrapper::lval(int64 k, Variant*& ret, bool copy,
+ArrayData* NameValueTableWrapper::lval(int64_t k, Variant*& ret, bool copy,
                                        bool checkExist) {
   return lval(String(k), ret, copy, checkExist);
 }
@@ -124,7 +124,7 @@ ArrayData* NameValueTableWrapper::lvalNew(Variant*& ret, bool copy) {
   return 0;
 }
 
-ArrayData* NameValueTableWrapper::set(int64 k, CVarRef v, bool copy) {
+ArrayData* NameValueTableWrapper::set(int64_t k, CVarRef v, bool copy) {
   return set(String(k), v, copy);
 }
 
@@ -134,7 +134,7 @@ ArrayData* NameValueTableWrapper::set(StringData* k, CVarRef v,
   return 0;
 }
 
-ArrayData* NameValueTableWrapper::setRef(int64 k, CVarRef v, bool copy) {
+ArrayData* NameValueTableWrapper::setRef(int64_t k, CVarRef v, bool copy) {
   return setRef(String(k), v, copy);
 }
 
@@ -143,7 +143,7 @@ ArrayData* NameValueTableWrapper::setRef(StringData* k, CVarRef v, bool copy) {
   return 0;
 }
 
-ArrayData* NameValueTableWrapper::remove(int64 k, bool copy) {
+ArrayData* NameValueTableWrapper::remove(int64_t k, bool copy) {
   return remove(String(k), copy);
 }
 
diff --git a/hphp/runtime/vm/name_value_table_wrapper.h b/hphp/runtime/vm/name_value_table_wrapper.h
index aa8c0d48622dd..8f22c1bb9d5ba 100644
--- a/hphp/runtime/vm/name_value_table_wrapper.h
+++ b/hphp/runtime/vm/name_value_table_wrapper.h
@@ -81,30 +81,30 @@ struct NameValueTableWrapper : public ArrayData {
   virtual CVarRef getValueRef(ssize_t pos) const;
   virtual bool noCopyOnWrite() const;
 
-  virtual bool exists(int64 k) const;
+  virtual bool exists(int64_t k) const;
   virtual bool exists(const StringData* k) const;
   virtual bool idxExists(ssize_t idx) const;
 
-  virtual CVarRef get(int64 k, bool error = false) const;
+  virtual CVarRef get(int64_t k, bool error = false) const;
   virtual CVarRef get(const StringData* k, bool error = false) const;
 
-  virtual TypedValue* nvGet(int64 k) const;
+  virtual TypedValue* nvGet(int64_t k) const;
   virtual TypedValue* nvGet(const StringData* k) const;
 
-  virtual ssize_t getIndex(int64 k) const;
+  virtual ssize_t getIndex(int64_t k) const;
   virtual ssize_t getIndex(const StringData* k) const;
 
-  virtual ArrayData* lval(int64 k, Variant*& ret, bool copy,
+  virtual ArrayData* lval(int64_t k, Variant*& ret, bool copy,
                           bool checkExist = false);
   virtual ArrayData* lval(StringData* k, Variant*& ret,
                           bool copy, bool checkExist = false);
   virtual ArrayData* lvalNew(Variant*& ret, bool copy);
 
-  virtual ArrayData* set(int64 k, CVarRef v, bool copy);
+  virtual ArrayData* set(int64_t k, CVarRef v, bool copy);
   virtual ArrayData* set(StringData* k, CVarRef v, bool copy);
-  virtual ArrayData* setRef(int64 k, CVarRef v, bool copy);
+  virtual ArrayData* setRef(int64_t k, CVarRef v, bool copy);
   virtual ArrayData* setRef(StringData* k, CVarRef v, bool copy);
-  virtual ArrayData* remove(int64 k, bool copy);
+  virtual ArrayData* remove(int64_t k, bool copy);
   virtual ArrayData* remove(const StringData* k, bool copy);
 
   virtual ArrayData* copy() const { return 0; }
diff --git a/hphp/runtime/vm/repo_helpers.cpp b/hphp/runtime/vm/repo_helpers.cpp
index 2afa2ea32ed44..f833eb132e968 100644
--- a/hphp/runtime/vm/repo_helpers.cpp
+++ b/hphp/runtime/vm/repo_helpers.cpp
@@ -228,7 +228,7 @@ void RepoQuery::bindBool(const char* paramName, bool b) {
   bindInt(paramName, int(b));
 }
 
-void RepoQuery::bindInt64(const char* paramName, int64 val) {
+void RepoQuery::bindInt64(const char* paramName, int64_t val) {
   sqlite3_stmt* stmt = m_stmt.get();
   int rc UNUSED =
     sqlite3_bind_int64(stmt,
@@ -280,7 +280,7 @@ void RepoQuery::exec() {
   reset();
 }
 
-int64 RepoQuery::getInsertedRowid() {
+int64_t RepoQuery::getInsertedRowid() {
   return sqlite3_last_insert_rowid(m_stmt.repo().dbc());
 }
 
@@ -427,7 +427,7 @@ void RepoQuery::getBool(int iCol, bool& b) {
   b = bool(val);
 }
 
-void RepoQuery::getInt64(int iCol, int64& val) {
+void RepoQuery::getInt64(int iCol, int64_t& val) {
   if (!isInt(iCol)) {
     throw RepoExc(
       "RepoQuery::%s(repo=%p) error: Column %d is not an integer in '%s'",
diff --git a/hphp/runtime/vm/repo_helpers.h b/hphp/runtime/vm/repo_helpers.h
index 972c7bdfd7a0a..3bb7f1943dd1a 100644
--- a/hphp/runtime/vm/repo_helpers.h
+++ b/hphp/runtime/vm/repo_helpers.h
@@ -105,7 +105,7 @@ class RepoQuery {
   void bindOffset(const char* paramName, Offset offset);
   void bindAttr(const char* paramName, Attr attrs);
   void bindBool(const char* paramName, bool b);
-  void bindInt64(const char* paramName, int64 val);
+  void bindInt64(const char* paramName, int64_t val);
   void bindNull(const char* paramName);
 
   void step();
@@ -116,7 +116,7 @@ class RepoQuery {
 
   // rowid() returns the row id associated with the most recent successful
   // insert.  Thus the rowid is irrelevant for non-insert queries.
-  int64 getInsertedRowid();
+  int64_t getInsertedRowid();
   bool isBlob(int iCol);
   bool isText(int iCol);
   bool isDouble(int iCol);
@@ -135,7 +135,7 @@ class RepoQuery {
   void getOffset(int iCol, Offset& offset);
   void getAttr(int iCol, Attr& attrs);
   void getBool(int iCol, bool& b);
-  void getInt64(int iCol, int64& val);
+  void getInt64(int iCol, int64_t& val);
 
  protected:
   RepoStmt& m_stmt;
diff --git a/hphp/runtime/vm/runtime.cpp b/hphp/runtime/vm/runtime.cpp
index 9ff49bdd05a39..3e3a0f4f79a37 100644
--- a/hphp/runtime/vm/runtime.cpp
+++ b/hphp/runtime/vm/runtime.cpp
@@ -50,7 +50,7 @@ void print_string(StringData* s) {
   decRefStr(s);
 }
 
-void print_int(int64 i) {
+void print_int(int64_t i) {
   char buf[256];
   snprintf(buf, 256, "%" PRId64, i);
   echo(buf);
@@ -145,7 +145,7 @@ concat_ss(StringData* v1, StringData* v2) {
  * incRef the output string
  */
 StringData*
-concat_is(int64 v1, StringData* v2) {
+concat_is(int64_t v1, StringData* v2) {
   int len1;
   char intbuf[21];
   char* intstart;
@@ -167,7 +167,7 @@ concat_is(int64 v1, StringData* v2) {
  * incRef the output string
  */
 StringData*
-concat_si(StringData* v1, int64 v2) {
+concat_si(StringData* v1, int64_t v2) {
   int len2;
   char intbuf[21];
   char* intstart;
@@ -189,7 +189,7 @@ concat_si(StringData* v1, int64 v2) {
  * incRef the output string
  */
 StringData*
-concat(DataType t1, uint64 v1, DataType t2, uint64 v2) {
+concat(DataType t1, uint64_t v1, DataType t2, uint64_t v2) {
   const char *s1, *s2;
   size_t s1len, s2len;
   bool free1, free2;
@@ -209,13 +209,13 @@ concat(DataType t1, uint64 v1, DataType t2, uint64 v2) {
   return retval;
 }
 
-int64 eq_null_str(StringData* v1) {
-  int64 retval = v1->empty();
+int64_t eq_null_str(StringData* v1) {
+  int64_t retval = v1->empty();
   decRefStr(v1);
   return retval;
 }
 
-int64 eq_bool_str(int64 v1, StringData* v2) {
+int64_t eq_bool_str(int64_t v1, StringData* v2) {
   // The truth table for v2->toBoolean() ? v1 : !v1
   //   looks like:
   //      \ v2:0 | v2:1
@@ -223,17 +223,17 @@ int64 eq_bool_str(int64 v1, StringData* v2) {
   // v1:1 |   0  |   1
   //
   // which is nothing but nxor.
-  int64 v2i = int64(v2->toBoolean());
+  int64_t v2i = int64_t(v2->toBoolean());
   assert(v2i == 0ll || v2i == 1ll);
   assert(v1  == 0ll || v1  == 1ll);
-  int64 retval = (v2i ^ v1) ^ 1;
+  int64_t retval = (v2i ^ v1) ^ 1;
   assert(retval == 0ll || retval == 1ll);
   decRefStr(v2);
   return retval;
 }
 
-int64 eq_int_str(int64 v1, StringData* v2) {
-  int64 lval; double dval;
+int64_t eq_int_str(int64_t v1, StringData* v2) {
+  int64_t lval; double dval;
   DataType ret = is_numeric_string(v2->data(), v2->size(), &lval, &dval, 1);
   decRefStr(v2);
   if (ret == KindOfInt64) {
@@ -245,38 +245,38 @@ int64 eq_int_str(int64 v1, StringData* v2) {
   }
 }
 
-int64 eq_str_str(StringData* v1, StringData* v2) {
-  int64 retval = v1->equal(v2);
+int64_t eq_str_str(StringData* v1, StringData* v2) {
+  int64_t retval = v1->equal(v2);
   decRefStr(v2);
   decRefStr(v1);
   return retval;
 }
 
-int64 same_str_str(StringData* v1, StringData* v2) {
-  int64 retval = v1 == v2 || v1->same(v2);
+int64_t same_str_str(StringData* v1, StringData* v2) {
+  int64_t retval = v1 == v2 || v1->same(v2);
   decRefStr(v2);
   decRefStr(v1);
   return retval;
 }
 
-int64 str0_to_bool(StringData* sd) {
-  int64 retval = sd->toBoolean();
+int64_t str0_to_bool(StringData* sd) {
+  int64_t retval = sd->toBoolean();
   return retval;
 }
 
-int64 str_to_bool(StringData* sd) {
-  int64 retval = str0_to_bool(sd);
+int64_t str_to_bool(StringData* sd) {
+  int64_t retval = str0_to_bool(sd);
   decRefStr(sd);
   return retval;
 }
 
-int64 arr0_to_bool(ArrayData* ad) {
+int64_t arr0_to_bool(ArrayData* ad) {
   return ad->size() != 0;
 }
 
-int64 arr_to_bool(ArrayData* ad) {
+int64_t arr_to_bool(ArrayData* ad) {
   assert(Transl::tx64->stateIsDirty());
-  int64 retval = arr0_to_bool(ad);
+  int64_t retval = arr0_to_bool(ad);
   decRefArr(ad);
   return retval;
 }
@@ -284,7 +284,7 @@ int64 arr_to_bool(ArrayData* ad) {
 /**
  * tv_to_bool will decrement tv's refcount if tv is a refcounted type
  */
-int64
+int64_t
 tv_to_bool(TypedValue* tv) {
   using std::string;
   bool retval;
@@ -300,7 +300,7 @@ tv_to_bool(TypedValue* tv) {
   TRACE(2, Trace::prettyNode("TvToBool", *tv) + string(" -> ") +
         string(retval ? "t" : "f") + string("\n"));
   tvRefcountedDecRef(tv);
-  return int64(retval);
+  return int64_t(retval);
 }
 
 Unit* compile_file(const char* s, size_t sz, const MD5& md5,
@@ -419,7 +419,7 @@ void collection_setm_wk1_v0(ObjectData* obj, TypedValue* value) {
   tvRefcountedDecRef(value);
 }
 
-void collection_setm_ik1_v0(ObjectData* obj, int64 key, TypedValue* value) {
+void collection_setm_ik1_v0(ObjectData* obj, int64_t key, TypedValue* value) {
   assert(obj);
   int ct = obj->getCollectionType();
   if (ct == Collection::VectorType) {
diff --git a/hphp/runtime/vm/runtime.h b/hphp/runtime/vm/runtime.h
index 710e30172b2f2..31cadeed94274 100644
--- a/hphp/runtime/vm/runtime.h
+++ b/hphp/runtime/vm/runtime.h
@@ -32,27 +32,27 @@ ObjectData* newVectorHelper(int nElems);
 ObjectData* newMapHelper(int nElems);
 ObjectData* newStableMapHelper(int nElems);
 
-StringData* concat_is(int64 v1, StringData* v2);
-StringData* concat_si(StringData* v1, int64 v2);
+StringData* concat_is(int64_t v1, StringData* v2);
+StringData* concat_si(StringData* v1, int64_t v2);
 StringData* concat_ss(StringData* v1, StringData* v2);
-StringData* concat(DataType t1, uint64 v1, DataType t2, uint64 v2);
+StringData* concat(DataType t1, uint64_t v1, DataType t2, uint64_t v2);
 
-int64 tv_to_bool(TypedValue* tv);
+int64_t tv_to_bool(TypedValue* tv);
 
-int64 eq_null_str(StringData* v1);
-int64 eq_bool_str(int64 v1, StringData* v2);
-int64 eq_int_str(int64 v1, StringData* v2);
-int64 eq_str_str(StringData* v1, StringData* v2);
+int64_t eq_null_str(StringData* v1);
+int64_t eq_bool_str(int64_t v1, StringData* v2);
+int64_t eq_int_str(int64_t v1, StringData* v2);
+int64_t eq_str_str(StringData* v1, StringData* v2);
 
-int64 same_str_str(StringData* v1, StringData* v2);
+int64_t same_str_str(StringData* v1, StringData* v2);
 
-int64 str0_to_bool(StringData* sd);
-int64 str_to_bool(StringData* sd);
-int64 arr0_to_bool(ArrayData* ad);
-int64 arr_to_bool(ArrayData* ad);
+int64_t str0_to_bool(StringData* sd);
+int64_t str_to_bool(StringData* sd);
+int64_t arr0_to_bool(ArrayData* ad);
+int64_t arr_to_bool(ArrayData* ad);
 
 void print_string(StringData* s);
-void print_int(int64 i);
+void print_int(int64_t i);
 void print_boolean(bool val);
 
 inline Iter*
@@ -271,7 +271,7 @@ extern BuildNativeFuncUnitFn g_hphp_build_native_func_unit;
 extern BuildNativeClassUnitFn g_hphp_build_native_class_unit;
 
 void collection_setm_wk1_v0(ObjectData* obj, TypedValue* value);
-void collection_setm_ik1_v0(ObjectData* obj, int64 key, TypedValue* value);
+void collection_setm_ik1_v0(ObjectData* obj, int64_t key, TypedValue* value);
 void collection_setm_sk1_v0(ObjectData* obj, StringData* key,
                             TypedValue* value);
 
diff --git a/hphp/runtime/vm/stats.cpp b/hphp/runtime/vm/stats.cpp
index d47590c942aaa..de004a999e294 100644
--- a/hphp/runtime/vm/stats.cpp
+++ b/hphp/runtime/vm/stats.cpp
@@ -72,7 +72,7 @@ void emitIncTranslOp(X64Assembler& a, Opcode opc, bool force) {
           Transl::CC_None, force);
 }
 
-static __thread int64 epoch;
+static __thread int64_t epoch;
 void dump() {
   if (!enabled()) return;
   TRACE(1, "STATS %ld %s\n", epoch, g_context->getRequestUrl(50).c_str());
diff --git a/hphp/runtime/vm/translator/fixup.h b/hphp/runtime/vm/translator/fixup.h
index ed397ec6f8cf6..54408675d338d 100644
--- a/hphp/runtime/vm/translator/fixup.h
+++ b/hphp/runtime/vm/translator/fixup.h
@@ -105,8 +105,8 @@ namespace VM { namespace Transl {
  */
 
 struct Fixup {
-  int32 m_pcOffset;
-  int32 m_spOffset;
+  int32_t m_pcOffset;
+  int32_t m_spOffset;
 
   Fixup(int32_t pcOff, int32_t spOff) : m_pcOffset(pcOff), m_spOffset(spOff)
   {
diff --git a/hphp/runtime/vm/translator/hopt/codegen.cpp b/hphp/runtime/vm/translator/hopt/codegen.cpp
index f61e6560b868c..7aeebdf266446 100644
--- a/hphp/runtime/vm/translator/hopt/codegen.cpp
+++ b/hphp/runtime/vm/translator/hopt/codegen.cpp
@@ -893,7 +893,7 @@ void CodeGenerator::cgBinaryIntOp(IRInstruction* inst,
   // Two immediates.
   if (src1Reg == InvalidReg && src2Reg == InvalidReg) {
     assert(src1->isConst() && src2->isConst());
-    int64 value = oper(src1->getValRawInt(),
+    int64_t value = oper(src1->getValRawInt(),
                        src2->getValRawInt());
     emitLoadImm(a, value, dstReg);
     return;
@@ -902,7 +902,7 @@ void CodeGenerator::cgBinaryIntOp(IRInstruction* inst,
   // One register, and one immediate.
 
   if (commutative) {
-    int64 immed = (src2Reg == InvalidReg
+    int64_t immed = (src2Reg == InvalidReg
                      ? src2 : src1)->getValRawInt();
     auto srcReg = src2Reg == InvalidReg ? src1Reg : src2Reg;
     if (srcReg == dstReg) {
@@ -999,7 +999,7 @@ void CodeGenerator::cgOpAdd(IRInstruction* inst) {
              &Asm::addq,
              &Asm::addq,
              &Asm::addsd_xmm_xmm,
-             std::plus<int64>(),
+             std::plus<int64_t>(),
              Commutative);
 }
 
@@ -1019,7 +1019,7 @@ void CodeGenerator::cgOpSub(IRInstruction* inst) {
              &Asm::subq,
              &Asm::subq,
              &Asm::subsd_xmm_xmm,
-             std::minus<int64>(),
+             std::minus<int64_t>(),
              NonCommutative);
 }
 
@@ -1027,7 +1027,7 @@ void CodeGenerator::cgOpAnd(IRInstruction* inst) {
   cgBinaryIntOp(inst,
                 &Asm::andq,
                 &Asm::andq,
-                [] (int64 a, int64 b) { return a & b; },
+                [] (int64_t a, int64_t b) { return a & b; },
                 Commutative);
 }
 
@@ -1035,7 +1035,7 @@ void CodeGenerator::cgOpOr(IRInstruction* inst) {
   cgBinaryIntOp(inst,
                 &Asm::orq,
                 &Asm::orq,
-                [] (int64 a, int64 b) { return a | b; },
+                [] (int64_t a, int64_t b) { return a | b; },
                 Commutative);
 }
 
@@ -1051,7 +1051,7 @@ void CodeGenerator::cgOpXor(IRInstruction* inst) {
   cgBinaryIntOp(inst,
                 &Asm::xorq,
                 &Asm::xorq,
-                [] (int64 a, int64 b) { return a ^ b; },
+                [] (int64_t a, int64_t b) { return a ^ b; },
                 Commutative);
 }
 
@@ -1060,17 +1060,17 @@ void CodeGenerator::cgOpMul(IRInstruction* inst) {
              &Asm::imul,
              &Asm::imul,
              &Asm::mulsd_xmm_xmm,
-             std::multiplies<int64>(),
+             std::multiplies<int64_t>(),
              Commutative);
 }
 
 // Runtime helpers
 
-HOT_FUNC_VM static int64 arrToBoolHelper(const ArrayData *a) {
+HOT_FUNC_VM static int64_t arrToBoolHelper(const ArrayData *a) {
   return a->size() != 0;
 }
 
-HOT_FUNC_VM static int64 cellToBoolHelper(TypedValue tv) {
+HOT_FUNC_VM static int64_t cellToBoolHelper(TypedValue tv) {
   if (IS_NULL_TYPE(tv.m_type)) {
     return 0;
   }
@@ -1097,17 +1097,17 @@ HOT_FUNC_VM static int64 cellToBoolHelper(TypedValue tv) {
 ///////////////////////////////////////////////////////////////////////////////
 
 #define DISPATCHER(name)                                                \
-  HOT_FUNC_VM int64 ccmp_ ## name (StringData* a1, StringData* a2)      \
+  HOT_FUNC_VM int64_t ccmp_ ## name (StringData* a1, StringData* a2)      \
   { return name(a1, a2); }                                              \
-  HOT_FUNC_VM int64 ccmp_ ## name (StringData* a1, int64 a2)            \
+  HOT_FUNC_VM int64_t ccmp_ ## name (StringData* a1, int64_t a2)            \
   { return name(a1, a2); }                                              \
-  HOT_FUNC_VM int64 ccmp_ ## name (StringData* a1, ObjectData* a2)      \
+  HOT_FUNC_VM int64_t ccmp_ ## name (StringData* a1, ObjectData* a2)      \
   { return name(a1, Object(a2)); }                                      \
-  HOT_FUNC_VM int64 ccmp_ ## name (ObjectData* a1, ObjectData* a2)      \
+  HOT_FUNC_VM int64_t ccmp_ ## name (ObjectData* a1, ObjectData* a2)      \
   { return name(Object(a1), Object(a2)); }                              \
-  HOT_FUNC_VM int64 ccmp_ ## name (ObjectData* a1, int64 a2)            \
+  HOT_FUNC_VM int64_t ccmp_ ## name (ObjectData* a1, int64_t a2)            \
   { return name(Object(a1), a2); }                                      \
-  HOT_FUNC_VM int64 ccmp_ ## name (ArrayData* a1, ArrayData* a2)        \
+  HOT_FUNC_VM int64_t ccmp_ ## name (ArrayData* a1, ArrayData* a2)        \
   { return name(Array(a1), Array(a2)); }
 
 DISPATCHER(same)
@@ -1118,16 +1118,16 @@ DISPATCHER(less)
 #undef DISPATCHER
 
 template <typename A, typename B>
-inline int64 ccmp_nsame(A a, B b) { return !ccmp_same(a, b); }
+inline int64_t ccmp_nsame(A a, B b) { return !ccmp_same(a, b); }
 
 template <typename A, typename B>
-inline int64 ccmp_nequal(A a, B b) { return !ccmp_equal(a, b); }
+inline int64_t ccmp_nequal(A a, B b) { return !ccmp_equal(a, b); }
 
 template <typename A, typename B>
-inline int64 ccmp_lte(A a, B b) { return !ccmp_more(a, b); }
+inline int64_t ccmp_lte(A a, B b) { return !ccmp_more(a, b); }
 
 template <typename A, typename B>
-inline int64 ccmp_gte(A a, B b) { return !ccmp_less(a, b); }
+inline int64_t ccmp_gte(A a, B b) { return !ccmp_less(a, b); }
 
 #define CG_OP_CMP(inst, setter, name)                                         \
   cgOpCmpHelper(inst, &Asm:: setter, ccmp_ ## name, ccmp_ ## name,            \
@@ -1145,12 +1145,12 @@ static bool typeIsSRON(Type t) {
 void CodeGenerator::cgOpCmpHelper(
           IRInstruction* inst,
           void (Asm::*setter)(Reg8),
-          int64 (*str_cmp_str)(StringData*, StringData*),
-          int64 (*str_cmp_int)(StringData*, int64),
-          int64 (*str_cmp_obj)(StringData*, ObjectData*),
-          int64 (*obj_cmp_obj)(ObjectData*, ObjectData*),
-          int64 (*obj_cmp_int)(ObjectData*, int64),
-          int64 (*arr_cmp_arr)( ArrayData*, ArrayData*)
+          int64_t (*str_cmp_str)(StringData*, StringData*),
+          int64_t (*str_cmp_int)(StringData*, int64_t),
+          int64_t (*str_cmp_obj)(StringData*, ObjectData*),
+          int64_t (*obj_cmp_obj)(ObjectData*, ObjectData*),
+          int64_t (*obj_cmp_int)(ObjectData*, int64_t),
+          int64_t (*arr_cmp_arr)( ArrayData*, ArrayData*)
         ) {
   SSATmp* dst   = inst->getDst();
   SSATmp* src1  = inst->getSrc(0);
@@ -1590,7 +1590,7 @@ void CodeGenerator::cgConv(IRInstruction* inst) {
     if (fromType == Type::Bool) {
       // Bool -> Int is just a move
       if (srcIsConst) {
-        int64 constVal = src->getValRawInt();
+        int64_t constVal = src->getValRawInt();
         if (constVal == 0) {
           m_as.xor_reg64_reg64(dstReg, dstReg);
         } else {
@@ -1623,7 +1623,7 @@ void CodeGenerator::cgConv(IRInstruction* inst) {
     } else if (fromType == Type::Bool) {
       // Bool -> Bool (nop!)
       if (srcIsConst) {
-        int64 constVal = src->getValRawInt();
+        int64_t constVal = src->getValRawInt();
         if (constVal == 0) {
           m_as.xor_reg64_reg64(dstReg, dstReg);
         } else {
@@ -1635,7 +1635,7 @@ void CodeGenerator::cgConv(IRInstruction* inst) {
     } else if (fromType == Type::Int) {
       // Int -> Bool
       if (src->isConst()) {
-        int64 constVal = src->getValInt();
+        int64_t constVal = src->getValInt();
         if (constVal == 0) {
           m_as.xor_reg64_reg64(dstReg, dstReg);
         } else {
@@ -1676,15 +1676,15 @@ void CodeGenerator::cgConv(IRInstruction* inst) {
       // Int -> Str
       ArgGroup args;
       args.ssa(src);
-      StringData*(*fPtr)(int64) = buildStringData;
+      StringData*(*fPtr)(int64_t) = buildStringData;
       cgCallHelper(m_as, (TCA)fPtr,
                    dst, kNoSyncPoint, args);
     } else if (fromType == Type::Bool) {
       // Bool -> Str
       m_as.testb(Reg8(int(srcReg)), Reg8(int(srcReg)));
-      m_as.mov_imm64_reg((uint64)StringData::GetStaticString(""),
+      m_as.mov_imm64_reg((uint64_t)StringData::GetStaticString(""),
                          dstReg);
-      m_as.mov_imm64_reg((uint64)StringData::GetStaticString("1"),
+      m_as.mov_imm64_reg((uint64_t)StringData::GetStaticString("1"),
                          rScratch);
       m_as.cmov_reg64_reg64(CC_NZ, rScratch, dstReg);
     } else {
@@ -1989,7 +1989,7 @@ void CodeGenerator::cgAllocSpill(IRInstruction* inst) {
   SSATmp* numSlots = inst->getSrc(0);
 
   assert(numSlots->isConst());
-  int64 n = numSlots->getValInt();
+  int64_t n = numSlots->getValInt();
   assert(n >= 0 && n % 2 == 0);
   if (n > 0) {
     m_as.sub_imm32_reg64(spillSlotsToSize(n), reg::rsp);
@@ -2000,7 +2000,7 @@ void CodeGenerator::cgFreeSpill(IRInstruction* inst) {
   SSATmp* numSlots = inst->getSrc(0);
 
   assert(numSlots->isConst());
-  int64 n = numSlots->getValInt();
+  int64_t n = numSlots->getValInt();
   assert(n >= 0 && n % 2 == 0);
   if (n > 0) {
     m_as.add_imm32_reg64(spillSlotsToSize(n), reg::rsp);
@@ -2023,7 +2023,7 @@ void CodeGenerator::cgSpill(IRInstruction* inst) {
       break;
     case SpillInfo::Memory:
       m_as.    store_reg64_disp_reg64(srcReg,
-                                      sizeof(uint64) * sinfo.mem(),
+                                      sizeof(uint64_t) * sinfo.mem(),
                                       reg::rsp);
       break;
     }
@@ -2045,7 +2045,7 @@ void CodeGenerator::cgReload(IRInstruction* inst) {
       break;
     case SpillInfo::Memory:
       m_as.    load_reg64_disp_reg64(reg::rsp,
-                                     sizeof(uint64) * sinfo.mem(),
+                                     sizeof(uint64_t) * sinfo.mem(),
                                      dstReg);
       break;
     }
@@ -2093,17 +2093,17 @@ void CodeGenerator::cgStRefNT(IRInstruction* inst) {
   cgStRefWork(inst, false);
 }
 
-static int64 getLocalOffset(int64 index) {
+static int64_t getLocalOffset(int64_t index) {
   return -cellsToBytes(index + 1);
 }
 
-static int64 getLocalOffset(SSATmp* index) {
+static int64_t getLocalOffset(SSATmp* index) {
   return getLocalOffset(index->getValInt());
 }
 
 int CodeGenerator::getIterOffset(SSATmp* tmp) {
   const Func* func = getCurFunc();
-  int64 index = tmp->getValInt();
+  int64_t index = tmp->getValInt();
   return -cellsToBytes(((index + 1) * kNumIterCells + func->numLocals()));
 }
 
@@ -2610,7 +2610,7 @@ Address CodeGenerator::cgCheckRefCountedType(PhysReg typeReg) {
 }
 
 Address CodeGenerator::cgCheckRefCountedType(PhysReg baseReg,
-                                             int64 offset) {
+                                             int64_t offset) {
 
   m_as.cmp_imm32_disp_reg32(KindOfRefCountThreshold,
                             offset + TVOFF(m_type),
@@ -2700,7 +2700,7 @@ void CodeGenerator::cgDecRefDynamicType(PhysReg typeReg,
 // scratch register.
 //
 void CodeGenerator::cgDecRefDynamicTypeMem(PhysReg baseReg,
-                                           int64 offset,
+                                           int64_t offset,
                                            Block* exit) {
   auto scratchReg = rScratch;
 
@@ -2764,7 +2764,7 @@ void CodeGenerator::cgDecRefDynamicTypeMem(PhysReg baseReg,
 //
 void CodeGenerator::cgDecRefMem(Type type,
                                 PhysReg baseReg,
-                                int64 offset,
+                                int64_t offset,
                                 Block* exit) {
   auto scratchReg = rScratch;
   assert(baseReg != scratchReg);
@@ -2889,7 +2889,7 @@ void CodeGenerator::emitSpillActRec(SSATmp* sp,
   } else if (func->isConst()) {
     // TODO: have register allocator materialize constants
     const Func* f = func->getValFunc();
-    m_as. mov_imm64_reg((uint64)f, rScratch);
+    m_as. mov_imm64_reg((uint64_t)f, rScratch);
     m_as.store_reg64_disp_reg64(rScratch,
                                 spOffset + AROFF(m_func),
                                 spReg);
@@ -2987,16 +2987,16 @@ void CodeGenerator::cgCall(IRInstruction* inst) {
   SSATmp* returnBcOffset = inst->getSrc(1);
   SSATmp* func           = inst->getSrc(2);
   SrcRange args          = inst->getSrcs().subpiece(3);
-  int32 numArgs          = args.size();
+  int32_t numArgs          = args.size();
 
   auto spReg = actRec->getReg();
   // put all outgoing arguments onto the VM stack
-  int64 adjustment = (-(int64)numArgs) * sizeof(Cell);
-  for (int32 i = 0; i < numArgs; i++) {
+  int64_t adjustment = (-(int64_t)numArgs) * sizeof(Cell);
+  for (int32_t i = 0; i < numArgs; i++) {
     cgStore(spReg, -(i + 1) * sizeof(Cell), args[i]);
   }
   // store the return bytecode offset into the outgoing actrec
-  uint64 returnBc = returnBcOffset->getValInt();
+  uint64_t returnBc = returnBcOffset->getValInt();
   m_as.store_imm32_disp_reg(returnBc, AROFF(m_soff), spReg);
   if (adjustment != 0) {
     m_as.add_imm32_reg64(adjustment, spReg);
@@ -3017,7 +3017,7 @@ void CodeGenerator::cgCastStk(IRInstruction *inst) {
   Type type      = inst->getTypeParam();
   SSATmp* sp     = inst->getSrc(0);
   SSATmp* off    = inst->getSrc(1);
-  uint32 offset  = off->getValInt();
+  uint32_t offset  = off->getValInt();
   PhysReg spReg  = sp->getReg();
 
   ArgGroup args;
@@ -3048,7 +3048,7 @@ void CodeGenerator::cgCastStk(IRInstruction *inst) {
 void CodeGenerator::cgCallBuiltin(IRInstruction* inst) {
   SSATmp* f             = inst->getSrc(0);
   auto args             = inst->getSrcs().subpiece(1);
-  int32 numArgs         = args.size();
+  int32_t numArgs         = args.size();
   SSATmp* dst           = inst->getDst();
   auto dstReg           = dst->getReg(0);
   auto dstType          = dst->getReg(1);
@@ -3114,9 +3114,9 @@ void CodeGenerator::cgSpillStack(IRInstruction* inst) {
   auto const spReg        = sp->getReg();
   auto const spillCells   = spillValueCells(inst);
 
-  int64 adjustment =
+  int64_t adjustment =
     (spAdjustment->getValInt() - spillCells) * sizeof(Cell);
-  for (uint32 i = 0, offset = 0; i < numSpillSrcs; ++i) {
+  for (uint32_t i = 0, offset = 0; i < numSpillSrcs; ++i) {
     if (spillVals[i]->getType() == Type::ActRec) {
       emitSpillActRec(sp, offset * sizeof(Cell) + adjustment, spillVals[i]);
       offset += kNumActRecCells;
@@ -3264,10 +3264,10 @@ void CodeGenerator::cgLdRaw(IRInstruction* inst) {
 
   if (offset->isConst()) {
     assert(offset->getType() == Type::Int);
-    int64 kind = offset->getValInt();
+    int64_t kind = offset->getValInt();
     RawMemSlot& slot = RawMemSlot::Get(RawMemSlot::Kind(kind));
     int ldSize = slot.getSize();
-    int64 off = slot.getOffset();
+    int64_t off = slot.getOffset();
     if (ldSize == sz::qword) {
       m_as.loadq (addrReg[off], destReg);
     } else if (ldSize == sz::dword) {
@@ -3291,12 +3291,12 @@ void CodeGenerator::cgLdRaw(IRInstruction* inst) {
 
 void CodeGenerator::cgStRaw(IRInstruction* inst) {
   auto baseReg = inst->getSrc(0)->getReg();
-  int64 kind = inst->getSrc(1)->getValInt();
+  int64_t kind = inst->getSrc(1)->getValInt();
   SSATmp* value = inst->getSrc(2);
 
   RawMemSlot& slot = RawMemSlot::Get(RawMemSlot::Kind(kind));
   int stSize = slot.getSize();
-  int64 off = slot.getOffset();
+  int64_t off = slot.getOffset();
 
   if (value->isConst()) {
     if (stSize == sz::qword) {
@@ -3409,7 +3409,7 @@ void CodeGenerator::cgStore(PhysReg base,
     return;
   }
   if (src->isConst()) {
-    int64 val = 0;
+    int64_t val = 0;
     if (type.subtypeOf(Type::Bool | Type::Int | Type::Dbl |
                        Type::Arr | Type::StaticStr | Type::Cls)) {
         val = src->getValBits();
@@ -3488,7 +3488,7 @@ void CodeGenerator::recordSyncPoint(Asm& as,
 
 void CodeGenerator::cgLdAddr(IRInstruction* inst) {
   auto base = inst->getSrc(0)->getReg();
-  int64 offset = inst->getSrc(1)->getValInt();
+  int64_t offset = inst->getSrc(1)->getValInt();
   m_as.lea (base[offset], inst->getDst()->getReg());
 }
 
@@ -3508,7 +3508,7 @@ void CodeGenerator::cgLdLocAddr(IRInstruction* inst) {
 
 void CodeGenerator::cgLdStackAddr(IRInstruction* inst) {
   auto base = inst->getSrc(0)->getReg();
-  int64 offset = cellsToBytes(inst->getSrc(1)->getValInt());
+  int64_t offset = cellsToBytes(inst->getSrc(1)->getValInt());
   m_as.lea (base[offset], inst->getDst()->getReg());
 }
 
@@ -3588,25 +3588,25 @@ void CodeGenerator::cgGuardRefs(IRInstruction* inst) {
   assert(bitsPtrReg != InvalidReg);
 
   assert(firstBitNumTmp->isConst() && firstBitNumTmp->getType() == Type::Int);
-  uint32 firstBitNum = (uint32)(firstBitNumTmp->getValInt());
+  uint32_t firstBitNum = (uint32_t)(firstBitNumTmp->getValInt());
 
   assert(mask64Tmp->getType() == Type::Int);
   assert(mask64Tmp->getInstruction()->getOpcode() == LdConst);
   auto mask64Reg = mask64Tmp->getReg();
   assert(mask64Reg != InvalidReg);
-  int64 mask64 = mask64Tmp->getValInt();
+  int64_t mask64 = mask64Tmp->getValInt();
 
   assert(vals64Tmp->getType() == Type::Int);
   assert(vals64Tmp->getInstruction()->getOpcode() == LdConst);
   auto vals64Reg = vals64Tmp->getReg();
   assert(vals64Reg != InvalidReg);
-  int64 vals64 = vals64Tmp->getValInt();
+  int64_t vals64 = vals64Tmp->getValInt();
 
   auto thenBody = [&] {
     auto bitsValReg = rScratch;
     //   Load the bit values in bitValReg:
     //     bitsValReg <- [bitsValPtr + (firstBitNum / 64)]
-    m_as.load_reg64_disp_reg64(bitsPtrReg, sizeof(uint64) * (firstBitNum / 64),
+    m_as.load_reg64_disp_reg64(bitsPtrReg, sizeof(uint64_t) * (firstBitNum / 64),
                                bitsValReg);
     //     bitsValReg <- bitsValReg & mask64
     m_as.and_reg64_reg64(mask64Reg, bitsValReg);
@@ -3650,7 +3650,7 @@ void CodeGenerator::cgLdPropAddr(IRInstruction* inst) {
   assert(objReg != InvalidReg);
   assert(dstReg != InvalidReg);
 
-  int64 offset = prop->getValInt();
+  int64_t offset = prop->getValInt();
   m_as.lea_reg64_disp_reg64(objReg, offset, dstReg);
 }
 
@@ -3661,13 +3661,13 @@ void CodeGenerator::cgLdClsMethod(IRInstruction* inst) {
 
   assert(cls->getType() == Type::Cls);
   assert(mSlot->isConst() && mSlot->getType() == Type::Int);
-  uint64 mSlotInt64 = mSlot->getValRawInt();
+  uint64_t mSlotInt64 = mSlot->getValRawInt();
   // We're going to multiply mSlotVal by sizeof(Func*) and use
   // it as a 32-bit offset (methOff) below.
   if (mSlotInt64 > (std::numeric_limits<uint32_t>::max() / sizeof(Func*))) {
     CG_PUNT(cgLdClsMethod_large_offset);
   }
-  int32 mSlotVal = (uint32) mSlotInt64;
+  int32_t mSlotVal = (uint32_t) mSlotInt64;
 
   Reg64 dstReg = dst->getReg();
   assert(dstReg != InvalidReg);
@@ -3678,7 +3678,7 @@ void CodeGenerator::cgLdClsMethod(IRInstruction* inst) {
   }
 
   Offset vecOff  = Class::getMethodsOffset() + Class::MethodMap::vecOff();
-  int32  methOff = mSlotVal * sizeof(Func*);
+  int32_t  methOff = mSlotVal * sizeof(Func*);
   m_as.loadq(clsReg[vecOff],  dstReg);
   m_as.loadq(dstReg[methOff], dstReg);
 }
@@ -4017,8 +4017,8 @@ void CodeGenerator::cgLookupClsCns(IRInstruction* inst) {
 }
 
 HOT_FUNC_VM
-static inline int64 ak_exist_string_helper(StringData* key, ArrayData* arr) {
-  int64 n;
+static inline int64_t ak_exist_string_helper(StringData* key, ArrayData* arr) {
+  int64_t n;
   if (key->isStrictlyInteger(n)) {
     return arr->exists(n);
   }
@@ -4026,26 +4026,26 @@ static inline int64 ak_exist_string_helper(StringData* key, ArrayData* arr) {
 }
 
 HOT_FUNC_VM
-static int64 ak_exist_string(StringData* key, ArrayData* arr) {
-  int64 res = ak_exist_string_helper(key, arr);
+static int64_t ak_exist_string(StringData* key, ArrayData* arr) {
+  int64_t res = ak_exist_string_helper(key, arr);
   return res;
 }
 
 HOT_FUNC_VM
-static int64 ak_exist_int(int64 key, ArrayData* arr) {
+static int64_t ak_exist_int(int64_t key, ArrayData* arr) {
   bool res = arr->exists(key);
   return res;
 }
 
 HOT_FUNC_VM
-static int64 ak_exist_string_obj(StringData* key, ObjectData* obj) {
+static int64_t ak_exist_string_obj(StringData* key, ObjectData* obj) {
   CArrRef arr = obj->o_toArray();
-  int64 res = ak_exist_string_helper(key, arr.get());
+  int64_t res = ak_exist_string_helper(key, arr.get());
   return res;
 }
 
 HOT_FUNC_VM
-static int64 ak_exist_int_obj(int64 key, ObjectData* obj) {
+static int64_t ak_exist_int_obj(int64_t key, ObjectData* obj) {
   CArrRef arr = obj->o_toArray();
   bool res = arr.get()->exists(key);
   return res;
@@ -4268,10 +4268,10 @@ void CodeGenerator::cgDefCns(IRInstruction* inst) {
   // the pointer to a stack slot
   if (RuntimeOption::RepoAuthoritative) {
     EMIT_CALL3(a, defCnsHelper<false>, IMM(ch), A(i.inputs[0]->location),
-               IMM((uint64)name));
+               IMM((uint64_t)name));
   } else {
     EMIT_CALL4(a, defCnsHelper<true>, IMM(ch), A(i.inputs[0]->location),
-               IMM((uint64)name), IMM(allocCnsBit(name)));
+               IMM((uint64_t)name), IMM(allocCnsBit(name)));
   }
 #endif
 
@@ -4329,7 +4329,7 @@ void CodeGenerator::cgDefCls(IRInstruction* inst) {
   */
   a.   lea_reg64_disp_reg64(rVmSp, -cellsToBytes(i.stackOff), rax);
 
-  EMIT_CALL2(a, m_tx64->m_defClsHelper, IMM((uint64)c), IMM((uint64)after));
+  EMIT_CALL2(a, m_tx64->m_defClsHelper, IMM((uint64_t)c), IMM((uint64_t)after));
 #endif
   CG_PUNT(DefCls);
 }
@@ -4347,7 +4347,7 @@ void CodeGenerator::cgInterpOne(IRInstruction* inst) {
   assert(fp->getType() == Type::StkPtr);
   assert(sp->getType() == Type::StkPtr);
 
-  int64 pcOff = pcOffTmp->getValInt();
+  int64_t pcOff = pcOffTmp->getValInt();
 
   void* interpOneHelper =
     interpOneEntryPoints[*(getCurFunc()->unit()->at(pcOff))];
@@ -4363,7 +4363,7 @@ void CodeGenerator::cgInterpOne(IRInstruction* inst) {
     // bytecode offset of the label
     Trace* targetTrace = label->getTrace();
     assert(targetTrace);
-    uint32 targetBcOff = targetTrace->getBcOff();
+    uint32_t targetBcOff = targetTrace->getBcOff();
     // compare the pc with the target bc offset
     m_as.cmp_imm64_disp_reg64(targetBcOff,
                               offsetof(VMExecutionContext, m_pc),
@@ -4372,8 +4372,8 @@ void CodeGenerator::cgInterpOne(IRInstruction* inst) {
   }
   auto newSpReg = inst->getDst()->getReg();
   DEBUG_ONLY auto spReg = sp->getReg();
-  int64 spAdjustment = spAdjustmentTmp->getValInt();
-  int64 adjustment =
+  int64_t spAdjustment = spAdjustmentTmp->getValInt();
+  int64_t adjustment =
     (spAdjustment - (resultType == Type::None ? 0 : 1)) * sizeof(Cell);
   assert(newSpReg == spReg);
   if (adjustment != 0) {
@@ -4391,7 +4391,7 @@ void CodeGenerator::cgDefFunc(IRInstruction* inst) {
 void CodeGenerator::cgFillContThis(IRInstruction* inst) {
   SSATmp* cont = inst->getSrc(0);
   auto baseReg = inst->getSrc(1)->getReg();
-  int64 offset = inst->getSrc(2)->getValInt();
+  int64_t offset = inst->getSrc(2)->getValInt();
   auto scratch = rScratch;
   auto contReg = cont->getReg();
 
@@ -4499,7 +4499,7 @@ void iterFreeHelper(Iter* iter) {
 
 void CodeGenerator::cgIterFree(IRInstruction* inst) {
   PhysReg fpReg = inst->getSrc(0)->getReg();
-  int64  offset = getIterOffset(inst->getSrc(1));
+  int64_t  offset = getIterOffset(inst->getSrc(1));
   cgCallHelper(m_as, (TCA)iterFreeHelper, InvalidReg, kSyncPoint,
                ArgGroup().addr(fpReg, offset));
 }
@@ -4510,8 +4510,8 @@ void CodeGenerator::cgIterInitK(IRInstruction* inst) {
 
 void CodeGenerator::cgIterInitCommon(IRInstruction* inst, bool isInitK) {
   PhysReg        fpReg = inst->getSrc(1)->getReg();
-  int64     iterOffset = getIterOffset(inst->getSrc(2));
-  int64 valLocalOffset = getLocalOffset(inst->getSrc(3));
+  int64_t     iterOffset = getIterOffset(inst->getSrc(2));
+  int64_t valLocalOffset = getLocalOffset(inst->getSrc(3));
   SSATmp*          src = inst->getSrc(0);
   ArgGroup args;
   args.addr(fpReg, iterOffset).ssa(src);
@@ -4551,7 +4551,7 @@ void CodeGenerator::cgDbgAssertRefCount(IRInstruction* inst) {
   emitAssertRefCount(m_as, inst->getSrc(0)->getReg());
 }
 
-void traceCallback(ActRec* fp, Cell* sp, int64 pcOff, void* rip) {
+void traceCallback(ActRec* fp, Cell* sp, int64_t pcOff, void* rip) {
 #if 0
   const Func* func = fp->m_func;
   std::cout << func->fullName()->data()
@@ -4562,7 +4562,7 @@ void traceCallback(ActRec* fp, Cell* sp, int64 pcOff, void* rip) {
   checkFrame(fp, sp, true);
 }
 
-void CodeGenerator::emitTraceCall(CodeGenerator::Asm& as, int64 pcOff,
+void CodeGenerator::emitTraceCall(CodeGenerator::Asm& as, int64_t pcOff,
                                   Transl::TranslatorX64* tx64) {
   // call to a trace function
   as.mov_imm64_reg((int64_t)as.code.frontier, reg::rcx);
diff --git a/hphp/runtime/vm/translator/hopt/codegen.h b/hphp/runtime/vm/translator/hopt/codegen.h
index eeadd028c84e3..19bd87d04b931 100644
--- a/hphp/runtime/vm/translator/hopt/codegen.h
+++ b/hphp/runtime/vm/translator/hopt/codegen.h
@@ -196,12 +196,12 @@ struct CodeGenerator {
   void cgOpCmpHelper(
             IRInstruction* inst,
             void (Asm::*setter)(Reg8),
-            int64 (*str_cmp_str)(StringData*, StringData*),
-            int64 (*str_cmp_int)(StringData*, int64),
-            int64 (*str_cmp_obj)(StringData*, ObjectData*),
-            int64 (*obj_cmp_obj)(ObjectData*, ObjectData*),
-            int64 (*obj_cmp_int)(ObjectData*, int64),
-            int64 (*arr_cmp_arr)(ArrayData*, ArrayData*));
+            int64_t (*str_cmp_str)(StringData*, StringData*),
+            int64_t (*str_cmp_int)(StringData*, int64_t),
+            int64_t (*str_cmp_obj)(StringData*, ObjectData*),
+            int64_t (*obj_cmp_obj)(ObjectData*, ObjectData*),
+            int64_t (*obj_cmp_int)(ObjectData*, int64_t),
+            int64_t (*arr_cmp_arr)(ArrayData*, ArrayData*));
   void cgJmpZeroHelper(IRInstruction* inst, ConditionCode cc);
   bool emitIncDecHelper(SSATmp* dst, SSATmp* src1, SSATmp* src2,
                         void(Asm::*emitFunc)(Reg64));
@@ -226,7 +226,7 @@ struct CodeGenerator {
                                     Block* exit);
   Address cgCheckRefCountedType(PhysReg typeReg);
   Address cgCheckRefCountedType(PhysReg baseReg,
-                                int64 offset);
+                                int64_t offset);
   void cgDecRefStaticType(Type type,
                           PhysReg dataReg,
                           Block* exit,
@@ -236,11 +236,11 @@ struct CodeGenerator {
                            Block* exit,
                            bool genZeroCheck);
   void cgDecRefDynamicTypeMem(PhysReg baseReg,
-                              int64 offset,
+                              int64_t offset,
                               Block* exit);
   void cgDecRefMem(Type type,
                    PhysReg baseReg,
-                   int64 offset,
+                   int64_t offset,
                    Block* exit);
   void emitSpillActRec(SSATmp* sp,
                        int64_t spOffset,
diff --git a/hphp/runtime/vm/translator/hopt/dce.cpp b/hphp/runtime/vm/translator/hopt/dce.cpp
index ebfca5553a18e..b80f64548e810 100644
--- a/hphp/runtime/vm/translator/hopt/dce.cpp
+++ b/hphp/runtime/vm/translator/hopt/dce.cpp
@@ -192,7 +192,7 @@ void sinkIncRefs(Trace* trace, IRFactory* irFactory, DceState& state) {
     }
     forEachInst(exit, [&](IRInstruction* inst) {
       // Replace the original tmps with the sunk tmps.
-      for (uint32 i = 0; i < inst->getNumSrcs(); ++i) {
+      for (uint32_t i = 0; i < inst->getNumSrcs(); ++i) {
         SSATmp* src = inst->getSrc(i);
         if (SSATmp* sunkTmp = sunkTmps[src->getId()]) {
           inst->setSrc(i, sunkTmp);
@@ -256,7 +256,7 @@ void eliminateDeadCode(Trace* trace, IRFactory* irFactory) {
   while (!wl.empty()) {
     IRInstruction* inst = wl.front();
     wl.pop_front();
-    for (uint32 i = 0; i < inst->getNumSrcs(); i++) {
+    for (uint32_t i = 0; i < inst->getNumSrcs(); i++) {
       SSATmp* src = inst->getSrc(i);
       if (src->getInstruction()->getOpcode() == DefConst) {
         continue;
diff --git a/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp b/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp
index c23951e0040f0..1fbb791ab35a7 100644
--- a/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp
+++ b/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp
@@ -95,7 +95,7 @@ void HhbcTranslator::refineType(SSATmp* tmp, Type type) {
 SSATmp* HhbcTranslator::pop(Type type) {
   SSATmp* opnd = m_evalStack.pop();
   if (opnd == nullptr) {
-    uint32 stackOff = m_stackDeficit;
+    uint32_t stackOff = m_stackDeficit;
     m_stackDeficit++;
     return m_tb->genLdStack(stackOff, type);
   }
@@ -120,7 +120,7 @@ void HhbcTranslator::popDecRef(Type type) {
     return;
   }
 
-  uint32 stackOff = m_stackDeficit;
+  uint32_t stackOff = m_stackDeficit;
   m_tb->genDecRefStack(type, stackOff);
   m_stackDeficit++;
 }
@@ -130,7 +130,7 @@ void HhbcTranslator::popDecRef(Type type) {
 // intermediate values.  If it ends up creating a new LdStack,
 // refineType during a later pop() or top() will fix up the type to
 // the known type.
-void HhbcTranslator::extendStack(uint32 index, Type type) {
+void HhbcTranslator::extendStack(uint32_t index, Type type) {
   if (index == 0) {
     push(pop(type));
     return;
@@ -141,7 +141,7 @@ void HhbcTranslator::extendStack(uint32 index, Type type) {
   push(tmp);
 }
 
-SSATmp* HhbcTranslator::top(Type type, uint32 index) {
+SSATmp* HhbcTranslator::top(Type type, uint32_t index) {
   SSATmp* tmp = m_evalStack.top(index);
   if (!tmp) {
     extendStack(index, type);
@@ -152,7 +152,7 @@ SSATmp* HhbcTranslator::top(Type type, uint32 index) {
   return tmp;
 }
 
-void HhbcTranslator::replace(uint32 index, SSATmp* tmp) {
+void HhbcTranslator::replace(uint32_t index, SSATmp* tmp) {
   m_evalStack.replace(index, tmp);
 }
 
@@ -186,7 +186,7 @@ void HhbcTranslator::emitPrint() {
     }
     // the print helpers decref their arg, so don't decref pop'ed value
     if (op != Nop) m_tb->gen(op, popC());
-    push(m_tb->genDefConst<int64>(1));
+    push(m_tb->genDefConst<int64_t>(1));
   } else {
     emitInterpOne(Type::Int, 1);
   }
@@ -327,11 +327,11 @@ void HhbcTranslator::emitColAddNewElemC() {
   emitInterpOneOrPunt(Type::Obj, 2);
 }
 
-void HhbcTranslator::emitCns(uint32 id) {
+void HhbcTranslator::emitCns(uint32_t id) {
   emitInterpOneOrPunt(Type::Cell);
 }
 
-void HhbcTranslator::emitDefCns(uint32 id) {
+void HhbcTranslator::emitDefCns(uint32_t id) {
   TRACE(3, "%u: DefCns %d\n", m_bcOff, id);
   StringData* name = lookupStringId(id);
   SSATmp* val = popC();
@@ -388,7 +388,7 @@ void HhbcTranslator::emitString(int strId) {
   push(m_tb->genDefConst(lookupStringId(strId)));
 }
 
-void HhbcTranslator::emitInt(int64 val) {
+void HhbcTranslator::emitInt(int64_t val) {
   TRACE(3, "%u: Int %" PRId64 "\n", m_bcOff, val);
   push(m_tb->genDefConst(val));
 }
@@ -418,12 +418,12 @@ void HhbcTranslator::emitFalse() {
   push(m_tb->genDefConst(false));
 }
 
-void HhbcTranslator::emitUninitLoc(uint32 id) {
+void HhbcTranslator::emitUninitLoc(uint32_t id) {
   TRACE(3, "%u: UninitLoc\n", m_bcOff);
   m_tb->genInitLoc(id, m_tb->genDefUninit());
 }
 
-void HhbcTranslator::emitInitThisLoc(int32 id) {
+void HhbcTranslator::emitInitThisLoc(int32_t id) {
   TRACE(3, "%u: InitThisLoc %d\n", m_bcOff, id);
   if (!getCurClass()) {
     // Do nothing if this is null
@@ -433,13 +433,13 @@ void HhbcTranslator::emitInitThisLoc(int32 id) {
   m_tb->genInitLoc(id, m_tb->genIncRef(tmpThis));
 }
 
-void HhbcTranslator::emitCGetL(int32 id) {
+void HhbcTranslator::emitCGetL(int32_t id) {
   TRACE(3, "%u: CGetL %d\n", m_bcOff, id);
   Trace* exitTrace = getExitTrace();
   pushIncRef(emitLdLocWarn(id, exitTrace));
 }
 
-void HhbcTranslator::emitCGetL2(int32 id) {
+void HhbcTranslator::emitCGetL2(int32_t id) {
   TRACE(3, "%u: CGetL2 %d\n", m_bcOff, id);
   Trace* exitTrace = getExitTrace();
   SSATmp* oldTop = pop(Type::Gen);
@@ -447,7 +447,7 @@ void HhbcTranslator::emitCGetL2(int32 id) {
   push(oldTop);
 }
 
-void HhbcTranslator::emitVGetL(int32 id) {
+void HhbcTranslator::emitVGetL(int32_t id) {
   TRACE(3, "%u: VGetL %d\n", m_bcOff, id);
   pushIncRef(m_tb->genBoxLoc(id));
 }
@@ -462,12 +462,12 @@ void HhbcTranslator::emitUnsetG(const StringData* gblName) {
   emitInterpOne(Type::None, 1);
 }
 
-void HhbcTranslator::emitUnsetL(int32 id) {
+void HhbcTranslator::emitUnsetL(int32_t id) {
   TRACE(3, "%u: UnsetL %d\n", m_bcOff, id);
   m_tb->genBindLoc(id, m_tb->genDefUninit());
 }
 
-void HhbcTranslator::emitBindL(int32 id) {
+void HhbcTranslator::emitBindL(int32_t id) {
   TRACE(3, "%u: BindL %d\n", m_bcOff, id);
   SSATmp* src = popV();
   if (m_curFunc->isPseudoMain()) {
@@ -483,7 +483,7 @@ void HhbcTranslator::emitBindL(int32 id) {
   }
 }
 
-void HhbcTranslator::emitSetL(int32 id) {
+void HhbcTranslator::emitSetL(int32_t id) {
   TRACE(3, "%u: SetL %d\n", m_bcOff, id);
   Trace* exitTrace = getExitTrace();
   SSATmp* src = popC();
@@ -494,7 +494,7 @@ void HhbcTranslator::emitSetL(int32 id) {
   push(m_tb->genStLoc(id, src, true, true, exitTrace));
 }
 
-void HhbcTranslator::emitIncDecL(bool pre, bool inc, uint32 id) {
+void HhbcTranslator::emitIncDecL(bool pre, bool inc, uint32_t id) {
   // Handle only integer inc/dec for now
   Trace* exitTrace = getExitSlowTrace();
   SSATmp* src = m_tb->genLdLocAsCell(id, exitTrace);
@@ -540,7 +540,7 @@ static bool isSupportedBinaryArith(Opcode opc,
   }
 }
 
-void HhbcTranslator::emitSetOpL(Opcode subOpc, uint32 id) {
+void HhbcTranslator::emitSetOpL(Opcode subOpc, uint32_t id) {
   TRACE(3, "%u: SetOpL %d\n", m_bcOff, id);
   Trace* exitTrace = getExitTrace();
   SSATmp* loc = emitLdLocWarn(id, exitTrace);
@@ -577,7 +577,7 @@ void HhbcTranslator::emitTraitExists(const StringData* traitName) {
   emitClassExists(traitName);
 }
 
-void HhbcTranslator::emitStaticLocInit(uint32 varId, uint32 listStrId) {
+void HhbcTranslator::emitStaticLocInit(uint32_t varId, uint32_t listStrId) {
   emitInterpOneOrPunt(Type::None, 1);
 }
 
@@ -612,39 +612,39 @@ SSATmp* HhbcTranslator::emitIterInitCommon(int offset, Lambda genFunc) {
   return emitJmpCondHelper(offset, true, res);
 }
 
-void HhbcTranslator::emitIterInit(uint32 iterId,
+void HhbcTranslator::emitIterInit(uint32_t iterId,
                                   int offset,
-                                  uint32 valLocalId) {
+                                  uint32_t valLocalId) {
   emitIterInitCommon(offset, [=] (SSATmp* src) {
     return m_tb->genIterInit(src, iterId, valLocalId);
   });
 }
 
-void HhbcTranslator::emitIterInitK(uint32 iterId,
+void HhbcTranslator::emitIterInitK(uint32_t iterId,
                                    int offset,
-                                   uint32 valLocalId,
-                                   uint32 keyLocalId) {
+                                   uint32_t valLocalId,
+                                   uint32_t keyLocalId) {
   emitIterInitCommon(offset, [=] (SSATmp* src) {
     return m_tb->genIterInitK(src, iterId, valLocalId, keyLocalId);
   });
 }
 
-void HhbcTranslator::emitIterNext(uint32 iterId,
+void HhbcTranslator::emitIterNext(uint32_t iterId,
                                   int offset,
-                                  uint32 valLocalId) {
+                                  uint32_t valLocalId) {
   SSATmp* res = m_tb->genIterNext(iterId, valLocalId);
   emitJmpCondHelper(offset, false, res);
 }
 
-void HhbcTranslator::emitIterNextK(uint32 iterId,
+void HhbcTranslator::emitIterNextK(uint32_t iterId,
                                    int offset,
-                                   uint32 valLocalId,
-                                   uint32 keyLocalId) {
+                                   uint32_t valLocalId,
+                                   uint32_t keyLocalId) {
   SSATmp* res = m_tb->genIterNextK(iterId, valLocalId, keyLocalId);
   emitJmpCondHelper(offset, false, res);
 }
 
-void HhbcTranslator::emitIterFree(uint32 iterId) {
+void HhbcTranslator::emitIterFree(uint32_t iterId) {
   m_tb->genIterFree(iterId);
 }
 
@@ -695,14 +695,14 @@ void HhbcTranslator::emitCreateCont(bool getArgs,
   push(cont);
 }
 
-void HhbcTranslator::emitContEnter(int32 returnBcOffset) {
+void HhbcTranslator::emitContEnter(int32_t returnBcOffset) {
   spillStack();
 
   assert(getCurClass());
   SSATmp* cont = m_tb->genLdThis(nullptr);
   SSATmp* contAR = m_tb->genLdRaw(cont, RawMemSlot::ContARPtr, Type::StkPtr);
 
-  SSATmp* func = m_tb->genLdARFuncPtr(contAR, m_tb->genDefConst<int64>(0));
+  SSATmp* func = m_tb->genLdARFuncPtr(contAR, m_tb->genDefConst<int64_t>(0));
   SSATmp* funcBody = m_tb->genLdRaw(func, RawMemSlot::FuncBody, Type::TCA);
 
   m_tb->genContEnter(contAR, funcBody, returnBcOffset);
@@ -737,7 +737,7 @@ void HhbcTranslator::emitUnpackCont() {
   push(m_tb->genLdRaw(cont, RawMemSlot::ContLabel, Type::Int));
 }
 
-void HhbcTranslator::emitPackCont(int64 labelId) {
+void HhbcTranslator::emitPackCont(int64_t labelId) {
   m_tb->genUnlinkContVarEnv();
   SSATmp* cont = m_tb->genLdAssertedLoc(0, Type::Obj);
   m_tb->genSetPropCell(cont, CONTOFF(m_value), popC());
@@ -748,7 +748,7 @@ void HhbcTranslator::emitPackCont(int64 labelId) {
 void HhbcTranslator::emitContReceive() {
   SSATmp* cont = m_tb->genLdAssertedLoc(0, Type::Obj);
   m_tb->genContRaiseCheck(cont, getExitSlowTrace());
-  SSATmp* valOffset = m_tb->genDefConst<int64>(CONTOFF(m_received));
+  SSATmp* valOffset = m_tb->genDefConst<int64_t>(CONTOFF(m_received));
   SSATmp* value = m_tb->genLdProp(cont, valOffset, Type::Cell, nullptr);
   value = m_tb->genIncRef(value);
   push(value);
@@ -810,7 +810,7 @@ void HhbcTranslator::emitContCurrent() {
   assert(getCurClass());
   SSATmp* cont = m_tb->genLdThis(nullptr);
   m_tb->genContStartedCheck(cont, getExitSlowTrace());
-  SSATmp* offset = m_tb->genDefConst<int64>(CONTOFF(m_value));
+  SSATmp* offset = m_tb->genDefConst<int64_t>(CONTOFF(m_value));
   SSATmp* value = m_tb->genLdProp(cont, offset, Type::Cell, nullptr);
   value = m_tb->genIncRef(value);
   push(value);
@@ -834,14 +834,14 @@ void HhbcTranslator::emitStrlen() {
     SSATmp* input = popC();
     if (input->isConst()) {
       // static string; fold its strlen operation
-      push(m_tb->genDefConst<int64>(input->getValStr()->size()));
+      push(m_tb->genDefConst<int64_t>(input->getValStr()->size()));
     } else {
       push(m_tb->genLdRaw(input, RawMemSlot::StrLen, Type::Int));
       m_tb->genDecRef(input);
     }
   } else if (inType.isNull()) {
     popC();
-    push(m_tb->genDefConst<int64>(0));
+    push(m_tb->genDefConst<int64_t>(0));
   } else if (inType == Type::Bool) {
     // strlen(true) == 1, strlen(false) == 0.
     push(m_tb->genConvToInt(popC()));
@@ -850,7 +850,7 @@ void HhbcTranslator::emitStrlen() {
   }
 }
 
-void HhbcTranslator::emitIncStat(int32 counter, int32 value, bool force) {
+void HhbcTranslator::emitIncStat(int32_t counter, int32_t value, bool force) {
   TRACE(3, "%u: IncStat %d %d\n", m_bcOff, counter, value);
   if (Stats::enabled() || force) {
     m_tb->genIncStat(counter, value, force);
@@ -935,7 +935,7 @@ void HhbcTranslator::emitIncDecProp(bool pre, bool inc, int offset,
   if (obj->getType() != Type::Obj) {
     PUNT(IncDecProp_nonobj);
   }
-  SSATmp* propOffset = m_tb->genDefConst<int64>(offset);
+  SSATmp* propOffset = m_tb->genDefConst<int64_t>(offset);
   SSATmp* src = m_tb->genLdProp(obj, propOffset, Type::Int, exitTrace);
   // do the add and store back
   SSATmp* res = emitIncDec(pre, inc, src);
@@ -956,7 +956,7 @@ void HhbcTranslator::emitSetProp(int offset, bool isPropOnStack) {
   if (obj->getType() != Type::Obj) {
     PUNT(SetProp_nonobj);
   }
-  SSATmp* propOffset = m_tb->genDefConst<int64>(offset);
+  SSATmp* propOffset = m_tb->genDefConst<int64_t>(offset);
   SSATmp* propPtr = m_tb->genUnboxPtr(m_tb->genLdPropAddr(obj, propOffset));
   SSATmp* prevValue = m_tb->genLdMem(propPtr, Type::Cell, exitTrace);
   m_tb->genStMem(propPtr, src, true);
@@ -994,7 +994,7 @@ void HhbcTranslator::emitCGetProp(LocationCode locCode,
       not_reached();
   }
   assert(obj->isA(Type::Obj));
-  SSATmp* propOffset = m_tb->genDefConst<int64>(offset);
+  SSATmp* propOffset = m_tb->genDefConst<int64_t>(offset);
   SSATmp* val;
 
   if (isInferedType) {
@@ -1025,7 +1025,7 @@ void HhbcTranslator::emitCGetProp(LocationCode locCode,
  * IssetH: return true if var is not uninit and !is_null(var)
  * Unboxes var if necessary when var is not uninit.
  */
-void HhbcTranslator::emitIssetL(int32 id) {
+void HhbcTranslator::emitIssetL(int32_t id) {
   TRACE(3, "%u: IssetL %d\n", m_bcOff, id);
 
   Type trackedType = m_tb->getLocalType(id);
@@ -1054,7 +1054,7 @@ void HhbcTranslator::emitIssetS(const StringData* propName) {
             &HPHP::VM::JIT::HhbcTranslator::emitLdClsPropAddrOrExit);
 }
 
-void HhbcTranslator::emitEmptyL(int32 id) {
+void HhbcTranslator::emitEmptyL(int32_t id) {
   TRACE(3, "%u: EmptyL %d\n", m_bcOff, id);
 
   Type trackedType = m_tb->getLocalType(id);
@@ -1130,12 +1130,12 @@ void HhbcTranslator::emitDup() {
   pushIncRef(topC());
 }
 
-void HhbcTranslator::emitJmp(int32 offset,
+void HhbcTranslator::emitJmp(int32_t offset,
                              bool  breakTracelet,
                              bool  noSurprise) {
   TRACE(3, "%u: Jmp %d\n", m_bcOff, offset);
   // If surprise flags are set, exit trace and handle surprise
-  bool backward = (offset - (int32)m_bcOff) < 0;
+  bool backward = (offset - (int32_t)m_bcOff) < 0;
   if (backward && !noSurprise) {
     m_tb->genExitWhenSurprised(getExitSlowTrace());
   }
@@ -1143,7 +1143,7 @@ void HhbcTranslator::emitJmp(int32 offset,
   m_tb->genJmp(getExitTrace(offset));
 }
 
-SSATmp* HhbcTranslator::emitJmpCondHelper(int32 offset,
+SSATmp* HhbcTranslator::emitJmpCondHelper(int32_t offset,
                                          bool negate,
                                          SSATmp* src) {
   Trace* target = nullptr;
@@ -1159,13 +1159,13 @@ SSATmp* HhbcTranslator::emitJmpCondHelper(int32 offset,
   return m_tb->genJmpCond(boolSrc, target, negate);
 }
 
-void HhbcTranslator::emitJmpZ(int32 offset) {
+void HhbcTranslator::emitJmpZ(int32_t offset) {
   TRACE(3, "%u: JmpZ %d\n", m_bcOff, offset);
   SSATmp* src = popC();
   emitJmpCondHelper(offset, true, src);
 }
 
-void HhbcTranslator::emitJmpNZ(int32 offset) {
+void HhbcTranslator::emitJmpNZ(int32_t offset) {
   TRACE(3, "%u: JmpNZ %d\n", m_bcOff, offset);
   SSATmp* src = popC();
   emitJmpCondHelper(offset, false, src);
@@ -1185,7 +1185,7 @@ void HhbcTranslator::emitCmp(Opcode opc) {
   m_tb->genDecRef(src1);
 }
 
-void HhbcTranslator::emitClsCnsD(int32 cnsNameStrId, int32 clsNameStrId) {
+void HhbcTranslator::emitClsCnsD(int32_t cnsNameStrId, int32_t clsNameStrId) {
   // This bytecode re-enters if there is no class with the given name
   // and can throw a fatal error.
   const StringData* cnsNameStr = lookupStringId(cnsNameStrId);
@@ -1269,7 +1269,7 @@ void HhbcTranslator::emitNativeImpl() {
   m_hasExit = true;
 }
 
-void HhbcTranslator::emitFPushCtor(int32 numParams) {
+void HhbcTranslator::emitFPushCtor(int32_t numParams) {
   TRACE(3, "%u: FPushFuncCtor %d\n", m_bcOff, numParams);
   SSATmp* cls = popA();
   spillStack();
@@ -1277,7 +1277,7 @@ void HhbcTranslator::emitFPushCtor(int32 numParams) {
   m_fpiStack.push(newObj);
 }
 
-void HhbcTranslator::emitFPushCtorD(int32 numParams, int32 classNameStrId) {
+void HhbcTranslator::emitFPushCtorD(int32_t numParams, int32_t classNameStrId) {
   const StringData* className = lookupStringId(classNameStrId);
   TRACE(3, "%u: FPushFuncCtorD %d %s\n", m_bcOff, numParams, className->data());
   spillStack();
@@ -1285,7 +1285,7 @@ void HhbcTranslator::emitFPushCtorD(int32 numParams, int32 classNameStrId) {
   m_fpiStack.push(newObj);
 }
 
-void HhbcTranslator::emitFPushFuncD(int32 numParams, int32 funcId) {
+void HhbcTranslator::emitFPushFuncD(int32_t numParams, int32_t funcId) {
   TRACE(3, "%u: FPushFuncD %d %d\n", m_bcOff, numParams, funcId);
   const NamedEntityPair& nep = lookupNamedEntityPairId(funcId);
   const StringData* name = nep.first;
@@ -1313,7 +1313,7 @@ void HhbcTranslator::emitFPushFuncD(int32 numParams, int32 funcId) {
   m_fpiStack.push(immutable ? actRec : ssaFunc);
 }
 
-void HhbcTranslator::emitFPushFunc(int32 numParams) {
+void HhbcTranslator::emitFPushFunc(int32_t numParams) {
   TRACE(3, "%u: FPushFuncD %d\n", m_bcOff, numParams);
   // input must be a string or an object implementing __invoke();
   // otherwise fatal
@@ -1332,8 +1332,8 @@ void HhbcTranslator::emitFPushFunc(int32 numParams) {
   spillStack(); // TODO(#2036900)
 }
 
-void HhbcTranslator::emitFPushObjMethodD(int32 numParams,
-                                         int32 methodNameStrId,
+void HhbcTranslator::emitFPushObjMethodD(int32_t numParams,
+                                         int32_t methodNameStrId,
                                          const Class* baseClass) {
   const StringData* methodName = lookupStringId(methodNameStrId);
   TRACE(3, "%u: FPushObjMethodD %s %d\n",
@@ -1416,9 +1416,9 @@ void HhbcTranslator::emitFPushObjMethodD(int32 numParams,
   }
 }
 
-void HhbcTranslator::emitFPushClsMethodD(int32 numParams,
-                                         int32 methodNameStrId,
-                                         int32 clssNamedEntityPairId) {
+void HhbcTranslator::emitFPushClsMethodD(int32_t numParams,
+                                         int32_t methodNameStrId,
+                                         int32_t clssNamedEntityPairId) {
 
   const StringData* methodName = lookupStringId(methodNameStrId);
   const NamedEntityPair& np = lookupNamedEntityPairId(clssNamedEntityPairId);
@@ -1481,7 +1481,7 @@ void HhbcTranslator::emitFPushClsMethodD(int32 numParams,
   m_fpiStack.push(actRec);
 }
 
-void HhbcTranslator::emitFPushClsMethodF(int32             numParams,
+void HhbcTranslator::emitFPushClsMethodF(int32_t             numParams,
                                          const Class*      cls,
                                          const StringData* methName) {
 
@@ -1536,7 +1536,7 @@ void HhbcTranslator::emitFCall(uint32_t numParams,
 
   // pop the incoming parameters to the call
   SSATmp* params[numParams];
-  for (uint32 i = 0; i < numParams; i++) {
+  for (uint32_t i = 0; i < numParams; i++) {
     params[numParams - i - 1] = popF();
   }
 
@@ -1566,8 +1566,8 @@ static bool isCppByRef(DataType t) {
   return t != KindOfBoolean && t != KindOfInt64 && t != KindOfNull;
 }
 
-void HhbcTranslator::emitFCallBuiltin(uint32 numArgs,
-                                      uint32 numNonDefault, int32 funcId) {
+void HhbcTranslator::emitFCallBuiltin(uint32_t numArgs,
+                                      uint32_t numNonDefault, int32_t funcId) {
   const NamedEntityPair& nep = lookupNamedEntityPairId(funcId);
   const StringData* name = nep.first;
   const Func* callee = Unit::lookupFunc(nep.second, name);
@@ -1755,20 +1755,20 @@ void HhbcTranslator::setThisAvailable() {
   m_tb->setThisAvailable();
 }
 
-void HhbcTranslator::guardTypeLocal(uint32 locId, Type type) {
+void HhbcTranslator::guardTypeLocal(uint32_t locId, Type type) {
   checkTypeLocal(locId, type);
   m_typeGuards.push_back(TypeGuard(TypeGuard::Local, locId, type));
 }
 
-void HhbcTranslator::checkTypeLocal(uint32 locId, Type type) {
+void HhbcTranslator::checkTypeLocal(uint32_t locId, Type type) {
   m_tb->genGuardLoc(locId, type, getExitTrace());
 }
 
-void HhbcTranslator::assertTypeLocal(uint32 localIndex, Type type) {
+void HhbcTranslator::assertTypeLocal(uint32_t localIndex, Type type) {
   m_tb->genAssertLoc(localIndex, type);
 }
 
-Trace* HhbcTranslator::guardTypeStack(uint32 stackIndex,
+Trace* HhbcTranslator::guardTypeStack(uint32_t stackIndex,
                                       Type type,
                                       Trace* nextTrace) {
   if (type.subtypeOf(Type::Cls)) {
@@ -1802,7 +1802,7 @@ void HhbcTranslator::checkTypeTopOfStack(Type type,
   }
 }
 
-void HhbcTranslator::assertTypeStack(uint32 stackIndex, Type type) {
+void HhbcTranslator::assertTypeStack(uint32_t stackIndex, Type type) {
   SSATmp* tmp = m_evalStack.top(stackIndex);
   if (!tmp) {
     m_tb->genAssertStk(stackIndex, type);
@@ -1832,7 +1832,7 @@ void HhbcTranslator::emitLoadDeps() {
   }
 }
 
-Trace* HhbcTranslator::guardRefs(int64               entryArDelta,
+Trace* HhbcTranslator::guardRefs(int64_t               entryArDelta,
                                  const vector<bool>& mask,
                                  const vector<bool>& vals,
                                  Trace*              exitTrace) {
@@ -1842,7 +1842,7 @@ Trace* HhbcTranslator::guardRefs(int64               entryArDelta,
 
   int32_t actRecOff = cellsToBytes(entryArDelta);
   SSATmp* funcPtr = m_tb->genLdARFuncPtr(m_tb->getSp(),
-                                         m_tb->genDefConst<int64>(actRecOff));
+                                         m_tb->genDefConst<int64_t>(actRecOff));
   SSATmp* nParams = m_tb->genLdRaw(funcPtr, RawMemSlot::FuncNumParams,
                                   Type::Int);
   SSATmp* bitsPtr = m_tb->genLdRaw(funcPtr, RawMemSlot::FuncRefBitVec,
@@ -1858,9 +1858,9 @@ Trace* HhbcTranslator::guardRefs(int64               entryArDelta,
 
     uint64_t vals64 = TranslatorX64::packBitVec(vals, i);
 
-    SSATmp* mask64Tmp   = m_tb->genLdConst<int64>(mask64);
-    SSATmp* vals64Tmp   = m_tb->genLdConst<int64>(vals64);
-    SSATmp* firstBitNum = m_tb->genDefConst<int64>(i);
+    SSATmp* mask64Tmp   = m_tb->genLdConst<int64_t>(mask64);
+    SSATmp* vals64Tmp   = m_tb->genLdConst<int64_t>(vals64);
+    SSATmp* firstBitNum = m_tb->genDefConst<int64_t>(i);
 
     m_tb->genGuardRefs(funcPtr, nParams, bitsPtr, firstBitNum,
                       mask64Tmp, vals64Tmp, exitTrace);
@@ -1869,7 +1869,7 @@ Trace* HhbcTranslator::guardRefs(int64               entryArDelta,
   return exitTrace;
 }
 
-void HhbcTranslator::emitVerifyParamType(int32 paramId,
+void HhbcTranslator::emitVerifyParamType(int32_t paramId,
                                          const StringData* constraintClsName) {
   /* It's currently better to interpOne all of these, since the slow path punts
    * for the entire tracelet */
@@ -2291,7 +2291,7 @@ void HhbcTranslator::emitBitNot() {
   Type srcType = topC()->getType();
   if (srcType == Type::Int) {
     SSATmp* src = popC();
-    SSATmp* ones = m_tb->genDefConst<int64>(~0);
+    SSATmp* ones = m_tb->genDefConst<int64_t>(~0);
     push(m_tb->genXor(src, ones));
   } else if (srcType.subtypeOf(Type::Null | Type::Bool | Type::Arr | Type::Obj)) {
     // raise fatal
@@ -2428,7 +2428,7 @@ Trace* HhbcTranslator::getExitTrace(Offset targetBcOff /* = -1 */) {
  * Generates a trace exit that can be the target of a conditional
  * control flow instruction at the current bytecode offset.
  */
-Trace* HhbcTranslator::getExitTrace(uint32 targetBcOff, uint32 notTakenBcOff) {
+Trace* HhbcTranslator::getExitTrace(uint32_t targetBcOff, uint32_t notTakenBcOff) {
   std::vector<SSATmp*> stackValues = getSpillValues();
   return m_tb->genExitTrace(targetBcOff,
                            m_stackDeficit,
@@ -2448,10 +2448,10 @@ SSATmp* HhbcTranslator::spillStack() {
   return sp;
 }
 
-SSATmp* HhbcTranslator::loadStackAddr(int32 offset) {
+SSATmp* HhbcTranslator::loadStackAddr(int32_t offset) {
   // You're almost certainly doing it wrong if you want to get the address of a
   // stack cell that's in m_evalStack.
-  assert(offset >= (int32)m_evalStack.numCells());
+  assert(offset >= (int32_t)m_evalStack.numCells());
   return m_tb->genLdStackAddr(
     offset + m_stackDeficit - m_evalStack.numCells());
 }
@@ -2460,7 +2460,7 @@ SSATmp* HhbcTranslator::loadStackAddr(int32 offset) {
 // This is a wrapper to TraceBuilder::genLdLoc() that also emits the
 // RaiseUninitWarning if the local is uninitialized
 //
-SSATmp* HhbcTranslator::emitLdLocWarn(uint32 id,
+SSATmp* HhbcTranslator::emitLdLocWarn(uint32_t id,
                                       Trace* target) {
   SSATmp* locVal = m_tb->genLdLocAsCell(id, target);
 
diff --git a/hphp/runtime/vm/translator/hopt/hhbctranslator.h b/hphp/runtime/vm/translator/hopt/hhbctranslator.h
index 08a9ed99c0992..eb15506a62d06 100644
--- a/hphp/runtime/vm/translator/hopt/hhbctranslator.h
+++ b/hphp/runtime/vm/translator/hopt/hhbctranslator.h
@@ -47,17 +47,17 @@ struct EvalStack {
     return tmp;
   }
 
-  SSATmp* top(uint32 offset=0) const {
+  SSATmp* top(uint32_t offset=0) const {
     if (offset >= m_vector.size()) {
       return nullptr;
     }
-    uint32 index = m_vector.size() - 1 - offset;
+    uint32_t index = m_vector.size() - 1 - offset;
     return m_vector[index];
   }
 
-  void replace(uint32 offset, SSATmp* tmp) {
+  void replace(uint32_t offset, SSATmp* tmp) {
     assert(offset < m_vector.size());
-    uint32 index = m_vector.size() - 1 - offset;
+    uint32_t index = m_vector.size() - 1 - offset;
     m_vector[index] = tmp;
   }
 
@@ -101,19 +101,19 @@ class TypeGuard {
     Iter
   };
 
-  TypeGuard(Kind kind, uint32 index, Type type)
+  TypeGuard(Kind kind, uint32_t index, Type type)
       : m_kind(kind)
       , m_index(index)
       , m_type(type) {
   }
 
   Kind      getKind()  const { return m_kind;  }
-  uint32    getIndex() const { return m_index; }
+  uint32_t    getIndex() const { return m_index; }
   Type getType()  const { return m_type;  }
 
  private:
   Kind      m_kind;
-  uint32    m_index;
+  uint32_t    m_index;
   Type m_type;
 };
 
@@ -142,14 +142,14 @@ struct HhbcTranslator {
 
   void setBcOff(Offset newOff, bool lastBcOff);
   void setBcOffNextTrace(Offset bcOff) { m_bcOffNextTrace = bcOff; }
-  uint32 getBcOffNextTrace() { return m_bcOffNextTrace; }
+  uint32_t getBcOffNextTrace() { return m_bcOffNextTrace; }
 
-  void emitUninitLoc(uint32 id);
+  void emitUninitLoc(uint32_t id);
   void emitPrint();
   void emitThis();
   void emitCheckThis();
   void emitBareThis(int notice);
-  void emitInitThisLoc(int32 id);
+  void emitInitThisLoc(int32_t id);
   void emitArray(int arrayId);
   void emitNewArray(int capacity);
   void emitNewTuple(int n);
@@ -160,8 +160,8 @@ struct HhbcTranslator {
   void emitNewCol(int type, int numElems);
   void emitColAddElemC();
   void emitColAddNewElemC();
-  void emitDefCns(uint32 id);
-  void emitCns(uint32 id);
+  void emitDefCns(uint32_t id);
+  void emitCns(uint32_t id);
   void emitConcat();
   void emitDefCls(int id, Offset after);
   void emitDefFunc(int id);
@@ -171,14 +171,14 @@ struct HhbcTranslator {
   void emitParent();
 
   void emitString(int strId);
-  void emitInt(int64 val);
+  void emitInt(int64_t val);
   void emitDouble(double val);
   void emitNullUninit();
   void emitNull();
   void emitTrue();
   void emitFalse();
-  void emitCGetL(int32 id);
-  void emitCGetL2(int32 id);
+  void emitCGetL(int32_t id);
+  void emitCGetL2(int32_t id);
   void emitCGetS(const StringData* propName,
                  Type resultType, bool isInferedType);
   void emitCGetG(const StringData* name, Type resultType,
@@ -189,41 +189,41 @@ struct HhbcTranslator {
                     bool isPropOnStack,
                     Type resultType,
                     bool isInferedType);
-  void emitVGetL(int32 id);
+  void emitVGetL(int32_t id);
   void emitVGetS(const StringData* propName);
   void emitVGetG(const StringData* name);
   void emitVGetM();
-  void emitSetL(int32 id);
+  void emitSetL(int32_t id);
   void emitSetS(const StringData* propName);
   void emitSetG(const StringData* gblName);
   void emitSetProp(int propOffset, bool isPropOnStack); // object + offset
-  void emitBindL(int32 id);
+  void emitBindL(int32_t id);
   void emitBindS(const StringData* propName);
   void emitBindG(const StringData* gblName);
   void emitBindM(const char* vectorDesc);
-  void emitUnsetL(int32 id);
+  void emitUnsetL(int32_t id);
   void emitUnsetN();
   void emitUnsetG(const StringData* gblName);
   void emitUnsetProp(int offset);
-  void emitIssetL(int32 id);
+  void emitIssetL(int32_t id);
   void emitIssetS(const StringData* propName);
   void emitIssetG(const StringData* gblName);
   void emitIssetM(const char* vectorDesc);
   void emitIssetProp(int offset);
-  void emitEmptyL(int32 id);
+  void emitEmptyL(int32_t id);
   void emitEmptyS(const StringData* propName);
   void emitEmptyG(const StringData* gblName);
   void emitEmptyM(const char* vectorDesc);
   void emitEmptyProp(int offset);
   // The subOpc param can be one of either
   // Add, Sub, Mul, Div, Mod, Shl, Shr, Concat, BitAnd, BitOr, BitXor
-  void emitSetOpL(Opcode subOpc, uint32 id);
+  void emitSetOpL(Opcode subOpc, uint32_t id);
   void emitSetOpS(Opcode subOpc);
   void emitSetOpM(Opcode subOpc, const char* vectorDesc);
   void emitSetOpProp(Opcode subOpc, int offset);
   // the pre & inc params encode the 4 possible sub opcodes:
   // PreInc, PostInc, PreDec, PostDec
-  void emitIncDecL(bool pre, bool inc, uint32 id);
+  void emitIncDecL(bool pre, bool inc, uint32_t id);
   void emitIncDecS(bool pre, bool inc);
   void emitIncDecProp(bool pre, bool inc, int offset, bool isPropOnStack);
   void emitPopC();
@@ -231,9 +231,9 @@ struct HhbcTranslator {
   void emitPopR();
   void emitDup();
   void emitUnboxR();
-  void emitJmpZ(int32 offset);
-  void emitJmpNZ(int32 offset);
-  void emitJmp(int32 offset, bool breakTracelet, bool noSurprise);
+  void emitJmpZ(int32_t offset);
+  void emitJmpNZ(int32_t offset);
+  void emitJmp(int32_t offset, bool breakTracelet, bool noSurprise);
   void emitGt()    { emitCmp(OpGt);    }
   void emitGte()   { emitCmp(OpGte);   }
   void emitLt()    { emitCmp(OpLt);    }
@@ -245,27 +245,27 @@ struct HhbcTranslator {
   void emitFPassCOp();
   void emitFPassR();
   void emitFPassV();
-  void emitFPushFuncD(int32 numParams, int32 funcId);
-  void emitFPushFunc(int32 numParams);
-  void emitFPushClsMethodD(int32 numParams,
-                           int32 methodNameStrId,
-                           int32 clssNamedEntityPairId);
-  void emitFPushObjMethodD(int32 numParams,
-                           int32 methodNameStrId,
+  void emitFPushFuncD(int32_t numParams, int32_t funcId);
+  void emitFPushFunc(int32_t numParams);
+  void emitFPushClsMethodD(int32_t numParams,
+                           int32_t methodNameStrId,
+                           int32_t clssNamedEntityPairId);
+  void emitFPushObjMethodD(int32_t numParams,
+                           int32_t methodNameStrId,
                            const Class* baseClass);
-  void emitFPushClsMethodF(int32             numParams,
+  void emitFPushClsMethodF(int32_t             numParams,
                            const Class*      cls,
                            const StringData* methName);
-  void emitFPushCtorD(int32 numParams, int32 classNameStrId);
-  void emitFPushCtor(int32 numParams);
+  void emitFPushCtorD(int32_t numParams, int32_t classNameStrId);
+  void emitFPushCtor(int32_t numParams);
   void emitFCallArray();
   void emitFCall(uint32_t numParams,
                   Offset returnBcOffset,
                   const Func* callee);
-  void emitFCallBuiltin(uint32 numArgs, uint32 numNonDefault,
-                        int32 funcId);
-  void emitClsCnsD(int32 cnsNameStrId, int32 clsNameStrId);
-  void emitClsCns(int32 cnsNameStrId);
+  void emitFCallBuiltin(uint32_t numArgs, uint32_t numNonDefault,
+                        int32_t funcId);
+  void emitClsCnsD(int32_t cnsNameStrId, int32_t clsNameStrId);
+  void emitClsCns(int32_t cnsNameStrId);
   void emitAKExists();
   void emitAGetC(const StringData* clsName);
   void emitAGetL(int localId, const StringData* clsName);
@@ -283,7 +283,7 @@ struct HhbcTranslator {
   void emitIsBoolC();
   void emitIsDoubleL(int id);
   void emitIsDoubleC();
-  void emitVerifyParamType(int32 paramId,
+  void emitVerifyParamType(int32_t paramId,
                            const StringData* constraintClsName);
   void emitInstanceOfD(int classNameStrId);
   void emitNop() {}
@@ -318,32 +318,32 @@ struct HhbcTranslator {
   void emitInterfaceExists(const StringData* ifaceName);
   void emitTraitExists(const StringData* traitName);
 
-  void emitStaticLocInit(uint32 varId, uint32 listStrId);
+  void emitStaticLocInit(uint32_t varId, uint32_t listStrId);
   void emitReqDoc(const StringData* name);
   void emitReqMod(const StringData* name);
   void emitReqSrc(const StringData* name);
 
   // iterators
-  void emitIterInit(uint32 iterId, int targetOffset, uint32 valLocalId);
-  void emitIterInitK(uint32 iterId,
+  void emitIterInit(uint32_t iterId, int targetOffset, uint32_t valLocalId);
+  void emitIterInitK(uint32_t iterId,
                      int targetOffset,
-                     uint32 valLocalId,
-                     uint32 keyLocalId);
-  void emitIterNext(uint32 iterId, int targetOffset, uint32 valLocalId);
-  void emitIterNextK(uint32 iterId,
+                     uint32_t valLocalId,
+                     uint32_t keyLocalId);
+  void emitIterNext(uint32_t iterId, int targetOffset, uint32_t valLocalId);
+  void emitIterNextK(uint32_t iterId,
                      int targetOffset,
-                     uint32 valLocalId,
-                     uint32 keyLocalId);
+                     uint32_t valLocalId,
+                     uint32_t keyLocalId);
 
-  void emitIterFree(uint32 iterId);
-  void emitVerifyParamType(uint32 paramId);
+  void emitIterFree(uint32_t iterId);
+  void emitVerifyParamType(uint32_t paramId);
 
   // continuations
   void emitCreateCont(bool getArgs, Id funNameStrId);
-  void emitContEnter(int32 returnBcOffset);
+  void emitContEnter(int32_t returnBcOffset);
   void emitContExit();
   void emitUnpackCont();
-  void emitPackCont(int64 labelId);
+  void emitPackCont(int64_t labelId);
   void emitContReceive();
   void emitContRaised();
   void emitContDone();
@@ -357,7 +357,7 @@ struct HhbcTranslator {
   void emitContHandle();
 
   void emitStrlen();
-  void emitIncStat(int32 counter, int32 value, bool force = false);
+  void emitIncStat(int32_t counter, int32_t value, bool force = false);
 
   template<typename T>
   SSATmp* cns(T val) {
@@ -365,19 +365,19 @@ struct HhbcTranslator {
   }
 
   // tracelet guards
-  Trace* guardTypeStack(uint32 stackIndex,
+  Trace* guardTypeStack(uint32_t stackIndex,
                         Type type,
                         Trace* nextTrace = nullptr);
-  void   guardTypeLocal(uint32 locId, Type type);
-  Trace* guardRefs(int64               entryArDelta,
+  void   guardTypeLocal(uint32_t locId, Type type);
+  Trace* guardRefs(int64_t               entryArDelta,
                    const vector<bool>& mask,
                    const vector<bool>& vals,
                    Trace*              exitTrace = nullptr);
 
   // Interface to irtranslator for predicted and inferred types.
-  void assertTypeLocal(uint32 localIndex, Type type);
-  void assertTypeStack(uint32 stackIndex, Type type);
-  void checkTypeLocal(uint32 localIndex, Type type);
+  void assertTypeLocal(uint32_t localIndex, Type type);
+  void assertTypeStack(uint32_t stackIndex, Type type);
+  void checkTypeLocal(uint32_t localIndex, Type type);
   void checkTypeTopOfStack(Type type, Offset nextByteCode);
   void setThisAvailable();
   void emitLoadDeps();
@@ -515,14 +515,14 @@ struct HhbcTranslator {
   void emitIsTypeC(Type t);
   void emitIsTypeL(Type t, int id);
   void emitCmp(Opcode opc);
-  SSATmp* emitJmpCondHelper(int32 offset, bool negate, SSATmp* src);
+  SSATmp* emitJmpCondHelper(int32_t offset, bool negate, SSATmp* src);
   SSATmp* emitIncDec(bool pre, bool inc, SSATmp* src);
   SSATmp* getMemberAddr(const char* vectorDesc, Trace* exitTrace);
   Trace* getExitTrace(Offset targetBcOff = -1);
-  Trace* getExitTrace(uint32 targetBcOff, uint32 notTakenBcOff);
+  Trace* getExitTrace(uint32_t targetBcOff, uint32_t notTakenBcOff);
   Trace* getExitSlowTrace();
   Trace* getGuardExit();
-  SSATmp* emitLdLocWarn(uint32 id, Trace* target);
+  SSATmp* emitLdLocWarn(uint32_t id, Trace* target);
   void emitInterpOne(Type type, int numDiscard = 0, Trace* target = nullptr);
   void emitInterpOneOrPunt(Type type,
                            int numDiscard = 0,
@@ -560,13 +560,13 @@ struct HhbcTranslator {
   SSATmp* popR() { return pop(Type::Gen);       }
   SSATmp* popA() { return pop(Type::Cls);       }
   SSATmp* popF() { return pop(Type::Gen);       }
-  SSATmp* topC(uint32 i = 0) { return top(Type::Cell, i); }
+  SSATmp* topC(uint32_t i = 0) { return top(Type::Cell, i); }
   std::vector<SSATmp*> getSpillValues() const;
   SSATmp* spillStack();
-  SSATmp* loadStackAddr(int32 offset);
-  SSATmp* top(Type type, uint32 index = 0);
-  void    extendStack(uint32 index, Type type);
-  void    replace(uint32 index, SSATmp* tmp);
+  SSATmp* loadStackAddr(int32_t offset);
+  SSATmp* top(Type type, uint32_t index = 0);
+  void    extendStack(uint32_t index, Type type);
+  void    replace(uint32_t index, SSATmp* tmp);
   void    refineType(SSATmp* tmp, Type type);
 
 private:
diff --git a/hphp/runtime/vm/translator/hopt/ir.cpp b/hphp/runtime/vm/translator/hopt/ir.cpp
index 6d0e4740df3a7..52c57b707d43e 100644
--- a/hphp/runtime/vm/translator/hopt/ir.cpp
+++ b/hphp/runtime/vm/translator/hopt/ir.cpp
@@ -525,12 +525,12 @@ IRInstruction* IRInstruction::clone(IRFactory* factory) const {
   return factory->cloneInstruction(this);
 }
 
-SSATmp* IRInstruction::getSrc(uint32 i) const {
+SSATmp* IRInstruction::getSrc(uint32_t i) const {
   if (i >= getNumSrcs()) return nullptr;
   return m_srcs[i];
 }
 
-void IRInstruction::setSrc(uint32 i, SSATmp* newSrc) {
+void IRInstruction::setSrc(uint32_t i, SSATmp* newSrc) {
   assert(i < getNumSrcs());
   m_srcs[i] = newSrc;
 }
@@ -575,7 +575,7 @@ bool IRInstruction::equals(IRInstruction* inst) const {
       m_numSrcs != inst->m_numSrcs) {
     return false;
   }
-  for (uint32 i = 0; i < getNumSrcs(); i++) {
+  for (uint32_t i = 0; i < getNumSrcs(); i++) {
     if (getSrc(i) != inst->getSrc(i)) {
       return false;
     }
@@ -625,7 +625,7 @@ void IRInstruction::printDst(std::ostream& ostream) const {
   }
 }
 
-void IRInstruction::printSrc(std::ostream& ostream, uint32 i) const {
+void IRInstruction::printSrc(std::ostream& ostream, uint32_t i) const {
   SSATmp* src = getSrc(i);
   if (src != nullptr) {
     if (m_id != 0 && !src->isConst() && src->getLastUseId() == m_id) {
@@ -644,7 +644,7 @@ void IRInstruction::printSrcs(std::ostream& ostream) const {
                ", " << getSrc(1)->getValInt();
     return;
   }
-  for (uint32 i = 0; i < m_numSrcs; i++) {
+  for (uint32_t i = 0; i < m_numSrcs; i++) {
     if (!first) {
       ostream << ", ";
     } else {
@@ -677,7 +677,7 @@ void IRInstruction::print(std::ostream& ostream) const {
     if (m_op == StRaw) {
       RawMemSlot& s =
         RawMemSlot::Get(RawMemSlot::Kind(offset->getValInt()));
-      int64 offset = s.getOffset();
+      int64_t offset = s.getOffset();
       if (offset) {
         ostream << " + " << offset;
       }
@@ -832,13 +832,13 @@ bool SSATmp::getValBool() const {
   return m_inst->getExtra<ConstData>()->as<bool>();
 }
 
-int64 SSATmp::getValInt() const {
+int64_t SSATmp::getValInt() const {
   assert(isConst());
   assert(m_inst->getTypeParam().equals(Type::Int));
   return m_inst->getExtra<ConstData>()->as<int64_t>();
 }
 
-int64 SSATmp::getValRawInt() const {
+int64_t SSATmp::getValRawInt() const {
   assert(isConst());
   return m_inst->getExtra<ConstData>()->as<int64_t>();
 }
@@ -959,7 +959,7 @@ void Trace::print(std::ostream& os, const AsmInfo* asmInfo) const {
           os << '\n';
           continue;
         }
-        uint32 bcOffset = marker->bcOff;
+        uint32_t bcOffset = marker->bcOff;
         if (const auto* func = marker->func) {
           func->unit()->prettyPrint(
             os, Unit::PrintOpts()
diff --git a/hphp/runtime/vm/translator/hopt/ir.h b/hphp/runtime/vm/translator/hopt/ir.h
index 74c70cb6c93e8..d465ff0275561 100644
--- a/hphp/runtime/vm/translator/hopt/ir.h
+++ b/hphp/runtime/vm/translator/hopt/ir.h
@@ -1114,13 +1114,13 @@ class RawMemSlot {
     }
   }
 
-  int64 getOffset()   const { return m_offset; }
-  int32 getSize()     const { return m_size; }
+  int64_t getOffset()   const { return m_offset; }
+  int32_t getSize()     const { return m_size; }
   Type getType() const { return m_type; }
   bool allowExtra()   const { return m_allowExtra; }
 
  private:
-  RawMemSlot(int64 offset, int32 size, Type type, bool allowExtra = false)
+  RawMemSlot(int64_t offset, int32_t size, Type type, bool allowExtra = false)
     : m_offset(offset), m_size(size), m_type(type), m_allowExtra(allowExtra) { }
 
   static RawMemSlot& GetContLabel() {
@@ -1164,8 +1164,8 @@ class RawMemSlot {
     return m;
   }
 
-  int64 m_offset;
-  int32 m_size;
+  int64_t m_offset;
+  int32_t m_size;
   Type m_type;
   bool m_allowExtra; // Used as a flag to ensure that extra offets are
                      // only used with RawMemSlots that support it
@@ -1313,8 +1313,8 @@ struct IRInstruction {
     assert(i <= m_numSrcs);
     m_numSrcs = i;
   }
-  SSATmp*    getSrc(uint32 i) const;
-  void       setSrc(uint32 i, SSATmp* newSrc);
+  SSATmp*    getSrc(uint32_t i) const;
+  void       setSrc(uint32_t i, SSATmp* newSrc);
   void       appendSrc(Arena&, SSATmp*);
   SrcRange   getSrcs() const {
     return SrcRange(m_srcs, m_numSrcs);
@@ -1345,13 +1345,13 @@ struct IRInstruction {
    * An instruction's 'id' has different meanings depending on the
    * compilation phase.
    */
-  uint32     getId()       const       { return m_id; }
-  void       setId(uint32 newId)       { m_id = newId; }
+  uint32_t     getId()       const       { return m_id; }
+  void       setId(uint32_t newId)       { m_id = newId; }
 
   /*
    * Instruction id (iid) is stable and useful as an array index.
    */
-  uint32     getIId()      const       {
+  uint32_t     getIId()      const       {
     assert(m_iid != kTransient);
     return m_iid;
   }
@@ -1403,7 +1403,7 @@ struct IRInstruction {
   bool isTerminal() const;
 
   void printDst(std::ostream& ostream) const;
-  void printSrc(std::ostream& ostream, uint32 srcIndex) const;
+  void printSrc(std::ostream& ostream, uint32_t srcIndex) const;
   void printOpcode(std::ostream& ostream) const;
   void printSrcs(std::ostream& ostream) const;
 
@@ -1413,10 +1413,10 @@ struct IRInstruction {
 private:
   Opcode            m_op;
   Type              m_typeParam;
-  uint16            m_numSrcs;
-  uint16            m_numDsts;
+  uint16_t            m_numSrcs;
+  uint16_t            m_numDsts;
   const IId         m_iid;
-  uint32            m_id;
+  uint32_t            m_id;
   SSATmp**          m_srcs;
   RegSet            m_liveOutRegs;
   SSATmp*           m_dst;     // if HasDest or NaryDest
@@ -1481,17 +1481,17 @@ inline std::ostream& operator<<(std::ostream& os, SpillInfo si) {
 
 class SSATmp {
 public:
-  uint32            getId() const { return m_id; }
+  uint32_t            getId() const { return m_id; }
   IRInstruction*    getInstruction() const { return m_inst; }
   void              setInstruction(IRInstruction* i) { m_inst = i; }
   Type              getType() const { return m_type; }
   void              setType(Type t) { m_type = t; }
-  uint32            getLastUseId() const { return m_lastUseId; }
-  void              setLastUseId(uint32 newId) { m_lastUseId = newId; }
-  uint32            getUseCount() const { return m_useCount; }
-  void              setUseCount(uint32 count) { m_useCount = count; }
+  uint32_t            getLastUseId() const { return m_lastUseId; }
+  void              setLastUseId(uint32_t newId) { m_lastUseId = newId; }
+  uint32_t            getUseCount() const { return m_useCount; }
+  void              setUseCount(uint32_t count) { m_useCount = count; }
   void              incUseCount() { m_useCount++; }
-  uint32            decUseCount() { return --m_useCount; }
+  uint32_t            decUseCount() { return --m_useCount; }
   bool              isBoxed() const { return getType().isBoxed(); }
   bool              isString() const { return isA(Type::Str); }
   bool              isArray() const { return isA(Type::Arr); }
@@ -1519,8 +1519,8 @@ class SSATmp {
    *    getInstruction()->getOpcode() == LdConst)
    */
   bool               getValBool() const;
-  int64              getValInt() const;
-  int64              getValRawInt() const;
+  int64_t              getValInt() const;
+  int64_t              getValRawInt() const;
   double             getValDbl() const;
   const StringData*  getValStr() const;
   const ArrayData*   getValArr() const;
@@ -1547,7 +1547,7 @@ class SSATmp {
    * Right now, we only spill both at the same time and only Spill and
    * Reload instructions need to deal with SSATmps that are spilled.
    */
-  bool hasReg(uint32 i = 0) const {
+  bool hasReg(uint32_t i = 0) const {
     return !m_isSpilled && m_regs[i] != InvalidReg;
   }
 
@@ -1571,8 +1571,8 @@ class SSATmp {
    * Returns InvalidReg for slots that aren't allocated.
    */
   PhysReg     getReg() const { assert(!m_isSpilled); return m_regs[0]; }
-  PhysReg     getReg(uint32 i) const { assert(!m_isSpilled); return m_regs[i]; }
-  void        setReg(PhysReg reg, uint32 i) { m_regs[i] = reg; }
+  PhysReg     getReg(uint32_t i) const { assert(!m_isSpilled); return m_regs[i]; }
+  void        setReg(PhysReg reg, uint32_t i) { m_regs[i] = reg; }
 
   /*
    * Returns information about how to spill/fill a SSATmp.
@@ -1606,7 +1606,7 @@ class SSATmp {
 
   // May only be created via IRFactory.  Note that this class is never
   // destructed, so don't add complex members.
-  SSATmp(uint32 opndId, IRInstruction* i)
+  SSATmp(uint32_t opndId, IRInstruction* i)
     : m_inst(i)
     , m_id(opndId)
     , m_type(outputType(i))
@@ -1621,10 +1621,10 @@ class SSATmp {
   SSATmp& operator=(const SSATmp&);
 
   IRInstruction*  m_inst;
-  const uint32    m_id;
+  const uint32_t    m_id;
   Type            m_type; // type when defined
-  uint32          m_lastUseId;
-  uint16          m_useCount;
+  uint32_t          m_lastUseId;
+  uint16_t          m_useCount;
   bool            m_isSpilled : 1;
   int32_t         m_spillSlot : 31;
 
@@ -1813,7 +1813,7 @@ inline Trace* IRInstruction::getTrace() const {
  */
 class Trace : boost::noncopyable {
 public:
-  explicit Trace(Block* first, uint32 bcOff, bool isMain) {
+  explicit Trace(Block* first, uint32_t bcOff, bool isMain) {
     push_back(first);
     m_bcOff = bcOff;
     m_isMain = isMain;
@@ -1834,7 +1834,7 @@ class Trace : boost::noncopyable {
     return b;
   }
 
-  uint32 getBcOff() { return m_bcOff; }
+  uint32_t getBcOff() { return m_bcOff; }
   Trace* addExitTrace(Trace* exit) {
     m_exitTraces.push_back(exit);
     return exit;
@@ -1850,7 +1850,7 @@ class Trace : boost::noncopyable {
 private:
   // offset of the first bytecode in this trace; 0 if this trace doesn't
   // represent a bytecode boundary.
-  uint32 m_bcOff;
+  uint32_t m_bcOff;
   std::list<Block*> m_blocks; // Blocks in main trace starting with entry block
   ExitList m_exitTraces;      // traces to which this trace exits
   bool m_isMain;
diff --git a/hphp/runtime/vm/translator/hopt/irtranslator.cpp b/hphp/runtime/vm/translator/hopt/irtranslator.cpp
index 50658da8f7d8d..45c732294f1c9 100644
--- a/hphp/runtime/vm/translator/hopt/irtranslator.cpp
+++ b/hphp/runtime/vm/translator/hopt/irtranslator.cpp
@@ -120,7 +120,7 @@ TranslatorX64::irCheckType(X64Assembler& a,
     // tx64LocPhysicalOffset returns:
     // negative offsets for locals accessed via rVmFp
     // positive offsets for stack values, relative to rVmSp
-    uint32 stackOffset = tx64LocPhysicalOffset(l);
+    uint32_t stackOffset = tx64LocPhysicalOffset(l);
     m_hhbcTrans->guardTypeStack(stackOffset, JIT::Type::fromRuntimeType(rtt));
   } else if (l.space == Location::Local){
     // Convert negative offset to a positive offset for convenience
@@ -604,7 +604,7 @@ void TranslatorX64::irTranslateContEnter(const Tracelet& t,
                                          const NormalizedInstruction& i) {
   int after = nextSrcKey(t, i).offset();
   const Func* srcFunc = curFunc();
-  int32 callOffsetInUnit = after - srcFunc->base();
+  int32_t callOffsetInUnit = after - srcFunc->base();
 
   HHIR_EMIT(ContEnter, callOffsetInUnit);
 }
@@ -1600,7 +1600,7 @@ void TranslatorX64::irAssertType(const Location& l,
     case Location::Stack: {
       // tx64LocPhysicalOffset returns positive offsets for stack values,
       // relative to rVmSp
-      uint32 stackOffset = tx64LocPhysicalOffset(l);
+      uint32_t stackOffset = tx64LocPhysicalOffset(l);
       m_hhbcTrans->assertTypeStack(stackOffset,
                                    JIT::Type::fromRuntimeType(rtt));
       break;
diff --git a/hphp/runtime/vm/translator/hopt/linearscan.cpp b/hphp/runtime/vm/translator/hopt/linearscan.cpp
index e003fcff0b0db..0a38adcd2212b 100644
--- a/hphp/runtime/vm/translator/hopt/linearscan.cpp
+++ b/hphp/runtime/vm/translator/hopt/linearscan.cpp
@@ -83,12 +83,12 @@ struct LinearScan : private boost::noncopyable {
   public:
     PreColoringHint() { clear(); }
     bool preColorsTmp(RegState* reg) const;
-    RegNumber getPreColoringReg(SSATmp* tmp, uint32 index) const;
+    RegNumber getPreColoringReg(SSATmp* tmp, uint32_t index) const;
     void clear();
-    void add(SSATmp* tmp, uint32 index, int argNum);
+    void add(SSATmp* tmp, uint32_t index, int argNum);
   private:
     // indexed by arg number
-    std::pair<SSATmp*, uint32> m_preColoredTmps[LinearScan::NumRegs];
+    std::pair<SSATmp*, uint32_t> m_preColoredTmps[LinearScan::NumRegs];
   };
 
 private:
@@ -103,20 +103,20 @@ struct LinearScan : private boost::noncopyable {
   void initFreeList();
   void coalesce(Trace* trace);
   void allocRegsToTrace();
-  uint32 createSpillSlot(SSATmp* tmp);
+  uint32_t createSpillSlot(SSATmp* tmp);
   static SSATmp* getSpilledTmp(SSATmp* tmp);
   static SSATmp* getOrigTmp(SSATmp* tmp);
-  void preAllocSpillLoc(uint32 numSpillLocs);
-  uint32 assignSpillLoc();
-  void insertAllocFreeSpill(Trace* trace, uint32 numExtraSpillLocs);
-  void insertAllocFreeSpillAux(Trace* trace, uint32 numExtraSpillLocs);
+  void preAllocSpillLoc(uint32_t numSpillLocs);
+  uint32_t assignSpillLoc();
+  void insertAllocFreeSpill(Trace* trace, uint32_t numExtraSpillLocs);
+  void insertAllocFreeSpillAux(Trace* trace, uint32_t numExtraSpillLocs);
   void rematerialize();
   void rematerializeAux();
   void removeUnusedSpills();
   void collectNatives();
   void computePreColoringHint();
   IRInstruction* getNextNative() const;
-  uint32 getNextNativeId() const;
+  uint32_t getNextNativeId() const;
 
   void pushFreeReg(RegState* reg);
   RegState* popFreeReg(std::list<RegState*>& freeList);
@@ -190,7 +190,7 @@ LinearScan::LinearScan(IRFactory* irFactory)
   m_regs[int(rVmTl)]   .m_reserved = true;
 
   // Reserve extra regs for testing purpose.
-  uint32 numFreeRegs = RuntimeOption::EvalHHIRNumFreeRegs;
+  uint32_t numFreeRegs = RuntimeOption::EvalHHIRNumFreeRegs;
   for (int i = kNumX64Regs - 1; i >= 0; i--) {
     if (!m_regs[i].m_reserved) {
       if (numFreeRegs == 0) {
@@ -203,7 +203,7 @@ LinearScan::LinearScan(IRFactory* irFactory)
 }
 
 RegSet LinearScan::computeLiveOutRegs(IRInstruction* inst, RegSet liveRegs) {
-  uint32 instId = inst->getId();
+  uint32_t instId = inst->getId();
   for (SSATmp* src : inst->getSrcs()) {
     if (src->getLastUseId() <= instId) {
       for (int locIndex = 0;
@@ -266,9 +266,9 @@ void LinearScan::allocRegToInstruction(InstructionList::iterator it) {
     m_regs[regNo].m_pinned = false;
   }
   std::vector<bool> needsReloading(inst->getNumSrcs(), true);
-  for (uint32 i = 0; i < inst->getNumSrcs(); ++i) {
+  for (uint32_t i = 0; i < inst->getNumSrcs(); ++i) {
     SSATmp* tmp = inst->getSrc(i);
-    int32 slotId = tmp->getSpillSlot();
+    int32_t slotId = tmp->getSpillSlot();
     if (slotId == -1) {
       needsReloading[i] = false;
     } else if ((tmp = m_slots[slotId].m_latestReload)) {
@@ -284,10 +284,10 @@ void LinearScan::allocRegToInstruction(InstructionList::iterator it) {
       }
     }
   }
-  for (uint32 i = 0; i < inst->getNumSrcs(); ++i) {
+  for (uint32_t i = 0; i < inst->getNumSrcs(); ++i) {
     if (needsReloading[i]) {
       SSATmp* tmp = inst->getSrc(i);
-      int32 slotId = tmp->getSpillSlot();
+      int32_t slotId = tmp->getSpillSlot();
       // <tmp> is spilled, and not reloaded.
       // Therefore, We need to reload the value into a new SSATmp.
 
@@ -454,9 +454,9 @@ void LinearScan::allocRegToTmp(RegState* reg, SSATmp* ssaTmp, uint32_t index) {
 }
 
 // Assign spill location numbers to Spill/Reload.
-uint32 LinearScan::assignSpillLoc() {
-  uint32 nextSpillLoc = 0;
-  uint32 nextMmxReg = 0;
+uint32_t LinearScan::assignSpillLoc() {
+  uint32_t nextSpillLoc = 0;
+  uint32_t nextMmxReg = 0;
 
   // visit blocks in reverse postorder and instructions in forward order,
   // assigning a spill slot id or mmx register number to each Spill.
@@ -486,7 +486,7 @@ uint32 LinearScan::assignSpillLoc() {
             // The live range of the spill slot doesn't span native calls,
             // and we still have free MMX registers.
             dst->getLastUseId() <= getNextNativeId() &&
-            nextMmxReg < (uint32)NumMmxRegs;
+            nextMmxReg < (uint32_t)NumMmxRegs;
 
           dst->setSpillInfo(locIndex,
             allowMmxSpill
@@ -517,7 +517,7 @@ uint32 LinearScan::assignSpillLoc() {
   return nextSpillLoc;
 }
 
-void LinearScan::insertAllocFreeSpill(Trace* trace, uint32 numExtraSpillLocs) {
+void LinearScan::insertAllocFreeSpill(Trace* trace, uint32_t numExtraSpillLocs) {
   insertAllocFreeSpillAux(trace, numExtraSpillLocs);
   for (Trace* exit : trace->getExitTraces()) {
     insertAllocFreeSpillAux(exit, numExtraSpillLocs);
@@ -525,7 +525,7 @@ void LinearScan::insertAllocFreeSpill(Trace* trace, uint32 numExtraSpillLocs) {
 }
 
 void LinearScan::insertAllocFreeSpillAux(Trace* trace,
-                                         uint32 numExtraSpillLocs) {
+                                         uint32_t numExtraSpillLocs) {
   ConstData numSpillConst(numExtraSpillLocs);
   SSATmp* tmp = m_irFactory->gen(DefConst, Type::Int,
     &numSpillConst)->getDst();
@@ -721,7 +721,7 @@ void LinearScan::initFreeList() {
 
 void LinearScan::coalesce(Trace* trace) {
   forEachTraceInst(trace, [](IRInstruction* inst) {
-    for (uint32 i = 0; i < inst->getNumSrcs(); ++i) {
+    for (uint32_t i = 0; i < inst->getNumSrcs(); ++i) {
       SSATmp* src = inst->getSrc(i);
       SSATmp* origSrc = canonicalize(src);
       if (origSrc != src) {
@@ -732,7 +732,7 @@ void LinearScan::coalesce(Trace* trace) {
   });
 }
 
-void LinearScan::preAllocSpillLoc(uint32 numSpillLocs) {
+void LinearScan::preAllocSpillLoc(uint32_t numSpillLocs) {
   for (Block* block : m_blocks) {
     for (IRInstruction& inst : *block) {
       if (inst.getOpcode() == Spill) {
@@ -740,7 +740,7 @@ void LinearScan::preAllocSpillLoc(uint32 numSpillLocs) {
         for (int index = 0; index < dst->numNeededRegs(); ++index) {
           assert(!dst->hasReg(index));
           if (dst->getSpillInfo(index).type() == SpillInfo::Memory) {
-            uint32 spillLoc = dst->getSpillInfo(index).mem();
+            uint32_t spillLoc = dst->getSpillInfo(index).mem();
             // Native stack layout:
             // |               |
             // +---------------+
@@ -819,14 +819,14 @@ void LinearScan::allocRegs(Trace* trace) {
   // can use MMX registers.
   collectNatives();
   // Make sure rsp is 16-aligned.
-  uint32 numSpillLocs = assignSpillLoc();
+  uint32_t numSpillLocs = assignSpillLoc();
   if (numSpillLocs % 2) {
     ++numSpillLocs;
   }
   assert(NumPreAllocatedSpillLocs % 2 == 0);
   if (numSpillLocs > 0) {
     preAllocSpillLoc(numSpillLocs);
-    if (numSpillLocs > (uint32)NumPreAllocatedSpillLocs) {
+    if (numSpillLocs > (uint32_t)NumPreAllocatedSpillLocs) {
       /*
        * We only insert AllocSpill and FreeSpill when the pre-allocated
        * spill locations are not enough.
@@ -1128,7 +1128,7 @@ void LinearScan::freeReg(RegState* reg) {
   pushFreeReg(reg);
   // The <tmp> shouldn't be reused any more.
   SSATmp* tmp = reg->m_ssaTmp;
-  int32 slotId = tmp->getSpillSlot();
+  int32_t slotId = tmp->getSpillSlot();
   if (slotId != -1) {
     m_slots[slotId].m_latestReload = nullptr;
   }
@@ -1186,7 +1186,7 @@ void LinearScan::spill(SSATmp* tmp) {
   if (tmp->getSpillSlot() == -1) {
     // <tmp> hasn't been spilled before.
     // We need to create a new spill slot for it.
-    uint32 slotId = createSpillSlot(tmp);
+    uint32_t slotId = createSpillSlot(tmp);
     // createSpillSlot sets the latest reloaded value of slotId to tmp.
     // Here, we need reset this value because tmp is spilled and no longer
     // synced with memory.
@@ -1195,8 +1195,8 @@ void LinearScan::spill(SSATmp* tmp) {
 }
 
 // Create a spill slot for <tmp>.
-uint32 LinearScan::createSpillSlot(SSATmp* tmp) {
-  uint32 slotId = m_slots.size();
+uint32_t LinearScan::createSpillSlot(SSATmp* tmp) {
+  uint32_t slotId = m_slots.size();
   tmp->setSpillSlot(slotId);
   IRInstruction* spillInst = m_irFactory->gen(Spill, tmp);
   SSATmp* spillTmp = spillInst->getDst();
@@ -1213,7 +1213,7 @@ IRInstruction* LinearScan::getNextNative() const {
   return m_natives.empty() ? nullptr : m_natives.front();
 }
 
-uint32 LinearScan::getNextNativeId() const {
+uint32_t LinearScan::getNextNativeId() const {
   IRInstruction* nextNative = getNextNative();
   return (nextNative ? nextNative->getId() : -1);
 }
@@ -1241,7 +1241,7 @@ bool LinearScan::PreColoringHint::preColorsTmp(RegState* reg) const {
 // A native call has at most six arguments, so the time complexity is
 // not a big problem.
 RegNumber LinearScan::PreColoringHint::getPreColoringReg(
-    SSATmp* tmp, uint32 index) const {
+    SSATmp* tmp, uint32_t index) const {
   for (int regNo = 0; regNo < kNumX64Regs; ++regNo) {
     if (m_preColoredTmps[regNo].first == tmp &&
         m_preColoredTmps[regNo].second == index) {
@@ -1260,7 +1260,7 @@ void LinearScan::PreColoringHint::clear() {
 
 // Provide a hint that (<tmp>, <index>) is used as the <argNum>-th arg
 // in next native.
-void LinearScan::PreColoringHint::add(SSATmp* tmp, uint32 index, int argNum) {
+void LinearScan::PreColoringHint::add(SSATmp* tmp, uint32_t index, int argNum) {
   int reg = int(argNumToRegName[argNum]);
   assert(reg >= 0 && reg < kNumX64Regs);
   m_preColoredTmps[reg].first = tmp;
diff --git a/hphp/runtime/vm/translator/hopt/simplifier.cpp b/hphp/runtime/vm/translator/hopt/simplifier.cpp
index 766a03ef2a103..73188ddd1f8d1 100644
--- a/hphp/runtime/vm/translator/hopt/simplifier.cpp
+++ b/hphp/runtime/vm/translator/hopt/simplifier.cpp
@@ -29,7 +29,7 @@ namespace JIT {
 TRACE_SET_MOD(hhir);
 
 void Simplifier::copyProp(IRInstruction* inst) {
-  for (uint32 i = 0; i < inst->getNumSrcs(); i++) {
+  for (uint32_t i = 0; i < inst->getNumSrcs(); i++) {
     IRInstruction* srcInst = inst->getSrc(i)->getInstruction();
     if (srcInst->getOpcode() == Mov) {
       inst->setSrc(i, srcInst->getSrc(0));
@@ -467,7 +467,7 @@ SSATmp* Simplifier::simplifyNot(SSATmp* src) {
     }                                                                         \
     if (src1->getType() == Type::StaticStr) {                                 \
       const StringData* str = src1->getValStr();                       \
-      int64 strInt = 0;                                                       \
+      int64_t strInt = 0;                                                       \
       if (str->isInteger()) {                                                 \
         strInt = str->toInt64();                                              \
       }                                                                       \
@@ -505,13 +505,13 @@ SSATmp* Simplifier::simplifyNot(SSATmp* src) {
   if (inst1->getOpcode() == Op##NAME && inst1->getSrc(1)->isConst()) {    \
     /* (X + C1) + C2 --> X + C3 */                                        \
     if (src2->isConst()) {                                                \
-      int64 right = inst1->getSrc(1)->getValInt();                 \
+      int64_t right = inst1->getSrc(1)->getValInt();                 \
       right OP##= src2->getValInt();                               \
       return m_tb->gen##NAME(inst1->getSrc(0), genDefInt(right));         \
     }                                                                     \
     /* (X + C1) + (Y + C2) --> X + Y + C3 */                              \
     if (inst2->getOpcode() == Op##NAME && inst2->getSrc(1)->isConst()) {  \
-      int64 right = inst1->getSrc(1)->getValInt();                 \
+      int64_t right = inst1->getSrc(1)->getValInt();                 \
       right OP##= inst2->getSrc(1)->getValInt();                   \
       SSATmp* left = m_tb->gen##NAME(inst1->getSrc(0), inst2->getSrc(0)); \
       return m_tb->gen##NAME(left, genDefInt(right));                     \
@@ -883,9 +883,9 @@ SSATmp* Simplifier::simplifyCmp(Opcode opName, SSATmp* src1, SSATmp* src2) {
       always_assert(opName == OpEq);
 
       if (src2->getValBool()) {
-        return m_tb->genCmp(OpNeq, src1, m_tb->genDefConst<int64>(0));
+        return m_tb->genCmp(OpNeq, src1, m_tb->genDefConst<int64_t>(0));
       } else {
-        return m_tb->genCmp(OpEq, src1, m_tb->genDefConst<int64>(0));
+        return m_tb->genCmp(OpEq, src1, m_tb->genDefConst<int64_t>(0));
       }
     }
 
@@ -917,7 +917,7 @@ SSATmp* Simplifier::simplifyCmp(Opcode opName, SSATmp* src1, SSATmp* src2) {
   if (src1->getType().isString() && src1->isConst() &&
       src2->getType() == Type::Int) {
     auto str = src1->getValStr();
-    int64 si; double sd;
+    int64_t si; double sd;
     auto st = str->isNumericWithVal(si, sd, true /* allow errors */);
     if (st == KindOfDouble) {
       return m_tb->genCmp(opName, m_tb->genDefConst<double>(sd), src2);
@@ -925,7 +925,7 @@ SSATmp* Simplifier::simplifyCmp(Opcode opName, SSATmp* src1, SSATmp* src2) {
     if (st == KindOfNull) {
       si = 0;
     }
-    return m_tb->genCmp(opName, m_tb->genDefConst<int64>(si), src2);
+    return m_tb->genCmp(opName, m_tb->genDefConst<int64_t>(si), src2);
   }
 
   // case 5: array cmp array. No juggling to do
@@ -1173,8 +1173,8 @@ SSATmp* Simplifier::simplifyIncRef(IRInstruction* inst) {
   return nullptr;
 }
 
-SSATmp* Simplifier::genDefInt(int64 val) {
-  return m_tb->genDefConst<int64>(val);
+SSATmp* Simplifier::genDefInt(int64_t val) {
+  return m_tb->genDefConst<int64_t>(val);
 }
 
 SSATmp* Simplifier::genDefBool(bool val) {
diff --git a/hphp/runtime/vm/translator/hopt/simplifier.h b/hphp/runtime/vm/translator/hopt/simplifier.h
index 72f33bbec4c83..b2e551dd0db67 100644
--- a/hphp/runtime/vm/translator/hopt/simplifier.h
+++ b/hphp/runtime/vm/translator/hopt/simplifier.h
@@ -77,7 +77,7 @@ struct Simplifier {
   SSATmp* simplifyGetCtxFwdCall(IRInstruction* inst);
 
 private:
-  SSATmp* genDefInt(int64 val);
+  SSATmp* genDefInt(int64_t val);
   SSATmp* genDefBool(bool val);
   SSATmp* simplifyCmp(Opcode opName, SSATmp* src1, SSATmp* src2);
   SSATmp* simplifyCondJmp(IRInstruction*);
diff --git a/hphp/runtime/vm/translator/hopt/tracebuilder.cpp b/hphp/runtime/vm/translator/hopt/tracebuilder.cpp
index 21be791c5187e..3877729b65e71 100644
--- a/hphp/runtime/vm/translator/hopt/tracebuilder.cpp
+++ b/hphp/runtime/vm/translator/hopt/tracebuilder.cpp
@@ -117,14 +117,14 @@ void TraceBuilder::genStMem(SSATmp* addr,
 }
 
 void TraceBuilder::genStMem(SSATmp* addr,
-                            int64 offset,
+                            int64_t offset,
                             SSATmp* src,
                             bool genStoreType) {
   Opcode opc = genStoreType ? StMem : StMemNT;
   gen(opc, addr, genDefConst(offset), src);
 }
 
-void TraceBuilder::genSetPropCell(SSATmp* base, int64 offset, SSATmp* value) {
+void TraceBuilder::genSetPropCell(SSATmp* base, int64_t offset, SSATmp* value) {
   SSATmp* oldVal = genLdProp(base, genDefConst(offset), Type::Cell, nullptr);
   genStProp(base, genDefConst(offset), value, true);
   genDecRef(oldVal);
@@ -207,7 +207,7 @@ void TraceBuilder::genDecRef(SSATmp* tmp) {
   gen(DecRef, tmp);
 }
 
-void TraceBuilder::genDecRefMem(SSATmp* base, int64 offset, Type type) {
+void TraceBuilder::genDecRefMem(SSATmp* base, int64_t offset, Type type) {
   gen(DecRefMem, type, base, genDefConst(offset));
 }
 
@@ -223,7 +223,7 @@ void TraceBuilder::genDecRefMem(SSATmp* base, int64 offset, Type type) {
  *     of a trace.
  */
 
-Trace* TraceBuilder::genExitGuardFailure(uint32 bcOff) {
+Trace* TraceBuilder::genExitGuardFailure(uint32_t bcOff) {
   Trace* trace = makeExitTrace(bcOff);
 
   MarkerData marker;
@@ -232,7 +232,7 @@ Trace* TraceBuilder::genExitGuardFailure(uint32 bcOff) {
   marker.func     = m_curFunc->getValFunc();
   gen(Marker, &marker); // goes on main trace
 
-  SSATmp* pc = genDefConst((int64)bcOff);
+  SSATmp* pc = genDefConst((int64_t)bcOff);
   // TODO change exit trace to a control flow instruction that
   // takes sp, fp, and a Marker as the target label instruction
   trace->back()->push_back(
@@ -247,9 +247,9 @@ Trace* TraceBuilder::genExitGuardFailure(uint32 bcOff) {
 /*
  * genExitSlow generates a target exit trace for TraceExitType::Slow branches.
  */
-Trace* TraceBuilder::getExitSlowTrace(uint32 bcOff,
-                                      int32 stackDeficit,
-                                      uint32 numOpnds,
+Trace* TraceBuilder::getExitSlowTrace(uint32_t bcOff,
+                                      int32_t stackDeficit,
+                                      uint32_t numOpnds,
                                       SSATmp** opnds) {
   // this is a newly created check with no label
   TraceExitType::ExitType exitType =
@@ -265,30 +265,30 @@ SSATmp* TraceBuilder::genLdRetAddr() {
 
 SSATmp* TraceBuilder::genLdRaw(SSATmp* base, RawMemSlot::Kind kind,
                                Type type) {
-  return gen(LdRaw, type, base, genDefConst(int64(kind)));
+  return gen(LdRaw, type, base, genDefConst(int64_t(kind)));
 }
 
 void TraceBuilder::genStRaw(SSATmp* base, RawMemSlot::Kind kind,
                             SSATmp* value) {
   assert(value->getType() == Type::Int || value->getType() == Type::Bool);
-  gen(StRaw, base, genDefConst(int64(kind)), value);
+  gen(StRaw, base, genDefConst(int64_t(kind)), value);
 }
 
-void TraceBuilder::genTraceEnd(uint32 nextPc,
+void TraceBuilder::genTraceEnd(uint32_t nextPc,
                                TraceExitType::ExitType exitType /* = Normal */) {
   gen(getExitOpcode(TraceExitType::Normal),
       m_curFunc,
-      genDefConst<int64>(nextPc),
+      genDefConst<int64_t>(nextPc),
       m_spValue,
       m_fpValue);
 }
 
-Trace* TraceBuilder::genExitTrace(uint32   bcOff,
-                                  int32    stackDeficit,
-                                  uint32   numOpnds,
+Trace* TraceBuilder::genExitTrace(uint32_t   bcOff,
+                                  int32_t    stackDeficit,
+                                  uint32_t   numOpnds,
                                   SSATmp** opnds,
                                   TraceExitType::ExitType exitType,
-                                  uint32   notTakenBcOff) {
+                                  uint32_t   notTakenBcOff) {
   Trace* exitTrace = makeExitTrace(bcOff);
 
   MarkerData marker;
@@ -301,14 +301,14 @@ Trace* TraceBuilder::genExitTrace(uint32   bcOff,
   if (numOpnds != 0 || stackDeficit != 0) {
     SSATmp* srcs[numOpnds + 2];
     srcs[0] = m_spValue;
-    srcs[1] = genDefConst<int64>(stackDeficit);
+    srcs[1] = genDefConst<int64_t>(stackDeficit);
     std::copy(opnds, opnds + numOpnds, srcs + 2);
 
     auto* spillInst = m_irFactory.gen(SpillStack, numOpnds + 2, srcs);
     sp = spillInst->getDst();
     exitTrace->back()->push_back(spillInst);
   }
-  SSATmp* pc = genDefConst<int64>(bcOff);
+  SSATmp* pc = genDefConst<int64_t>(bcOff);
   IRInstruction* instr = nullptr;
   if (exitType == TraceExitType::NormalCc) {
     assert(notTakenBcOff != 0);
@@ -358,7 +358,7 @@ SSATmp* TraceBuilder::genMul(SSATmp* src1, SSATmp* src2) {
 
 SSATmp* TraceBuilder::genNot(SSATmp* src) {
   assert(src->getType() == Type::Bool);
-  return genConvToBool(genXor(src, genDefConst<int64>(1)));
+  return genConvToBool(genXor(src, genDefConst<int64_t>(1)));
 }
 
 SSATmp* TraceBuilder::genDefUninit() {
@@ -437,7 +437,7 @@ void TraceBuilder::genReleaseVVOrExit(Trace* exit) {
   gen(ReleaseVVOrExit, getFirstBlock(exit), m_fpValue);
 }
 
-void TraceBuilder::genGuardLoc(uint32 id, Type type, Trace* exitTrace) {
+void TraceBuilder::genGuardLoc(uint32_t id, Type type, Trace* exitTrace) {
   SSATmp* prevValue = getLocalValue(id);
   if (prevValue) {
     genGuardType(prevValue, type, exitTrace);
@@ -453,7 +453,7 @@ void TraceBuilder::genGuardLoc(uint32 id, Type type, Trace* exitTrace) {
   }
 }
 
-void TraceBuilder::genAssertLoc(uint32 id, Type type) {
+void TraceBuilder::genAssertLoc(uint32_t id, Type type) {
   Type prevType = getLocalType(id);
   if (prevType == Type::None || type.strictSubtypeOf(prevType)) {
     LocalId local(id);
@@ -463,14 +463,14 @@ void TraceBuilder::genAssertLoc(uint32 id, Type type) {
   }
 }
 
-SSATmp* TraceBuilder::genLdAssertedLoc(uint32 id, Type type) {
+SSATmp* TraceBuilder::genLdAssertedLoc(uint32_t id, Type type) {
   genAssertLoc(id, type);
   return genLdLoc(id);
 }
 
-void TraceBuilder::genGuardStk(uint32 id, Type type, Trace* exitTrace) {
+void TraceBuilder::genGuardStk(uint32_t id, Type type, Trace* exitTrace) {
   gen(GuardStk, type, getFirstBlock(exitTrace), m_spValue,
-      genDefConst<int64>(id));
+      genDefConst<int64_t>(id));
 }
 
 SSATmp* TraceBuilder::genGuardType(SSATmp* src,
@@ -510,8 +510,8 @@ SSATmp* TraceBuilder::genLdPropAddr(SSATmp* obj, SSATmp* prop) {
   return gen(LdPropAddr, obj, prop);
 }
 
-SSATmp* TraceBuilder::genLdClsMethod(SSATmp* cls, uint32 methodSlot) {
-  return gen(LdClsMethod, cls, genDefConst<int64>(methodSlot));
+SSATmp* TraceBuilder::genLdClsMethod(SSATmp* cls, uint32_t methodSlot) {
+  return gen(LdClsMethod, cls, genDefConst<int64_t>(methodSlot));
 }
 
 SSATmp* TraceBuilder::genLdClsMethodCache(SSATmp* className,
@@ -525,7 +525,7 @@ SSATmp* TraceBuilder::genLdClsMethodCache(SSATmp* className,
 SSATmp* TraceBuilder::genLdObjMethod(const StringData* methodName,
                                      SSATmp* actRec) {
   return gen(LdObjMethod,
-             genDefConst<int64>(Transl::TargetCache::MethodCache::alloc()),
+             genDefConst<int64_t>(Transl::TargetCache::MethodCache::alloc()),
              genDefConst<const StringData*>(methodName), actRec);
 }
 
@@ -541,7 +541,7 @@ void TraceBuilder::genVerifyParamType(SSATmp* objClass,
   gen(JmpNSame, getFirstBlock(exitTrace), objClass, constraint);
 }
 
-SSATmp* TraceBuilder::genBoxLoc(uint32 id) {
+SSATmp* TraceBuilder::genBoxLoc(uint32_t id) {
   SSATmp* prevValue  = genLdLoc(id);
   Type prevType = prevValue->getType();
   // Don't box if local's value already boxed
@@ -557,13 +557,13 @@ SSATmp* TraceBuilder::genBoxLoc(uint32 id) {
   return newValue;
 }
 
-void TraceBuilder::genRaiseUninitWarning(uint32 id) {
+void TraceBuilder::genRaiseUninitWarning(uint32_t id) {
   gen(RaiseUninitWarning,
       genDefConst(m_curFunc->getValFunc()->localVarName(id)));
 }
 
-SSATmp* TraceBuilder::genLdAddr(SSATmp* base, int64 offset) {
-  return gen(LdAddr, base, genDefConst<int64>(offset));
+SSATmp* TraceBuilder::genLdAddr(SSATmp* base, int64_t offset) {
+  return gen(LdAddr, base, genDefConst<int64_t>(offset));
 }
 
 /**
@@ -573,7 +573,7 @@ SSATmp* TraceBuilder::genLdAddr(SSATmp* base, int64 offset) {
  * Note: the type of the local must be known already (due to type guards
  *       or assertions).
  */
-SSATmp* TraceBuilder::genLdLoc(uint32 id) {
+SSATmp* TraceBuilder::genLdLoc(uint32_t id) {
   SSATmp* tmp = getLocalValue(id);
   if (tmp) {
     return tmp;
@@ -591,7 +591,7 @@ SSATmp* TraceBuilder::genLdLoc(uint32 id) {
   return tmp;
 }
 
-SSATmp* TraceBuilder::genLdLocAsCell(uint32 id, Trace* exitTrace) {
+SSATmp* TraceBuilder::genLdLocAsCell(uint32_t id, Trace* exitTrace) {
   SSATmp*    tmp = genLdLoc(id);
   Type type = tmp->getType();
   if (!type.isBoxed()) {
@@ -601,12 +601,12 @@ SSATmp* TraceBuilder::genLdLocAsCell(uint32 id, Trace* exitTrace) {
   return genLdRef(tmp, type.innerType(), exitTrace);
 }
 
-SSATmp* TraceBuilder::genLdLocAddr(uint32 id) {
+SSATmp* TraceBuilder::genLdLocAddr(uint32_t id) {
   LocalId baseLocalId(id);
   return gen(LdLocAddr, getLocalType(id).ptr(), &baseLocalId, getFp());
 }
 
-void TraceBuilder::genStLocAux(uint32 id, SSATmp* newValue, bool storeType) {
+void TraceBuilder::genStLocAux(uint32_t id, SSATmp* newValue, bool storeType) {
   LocalId locId(id);
   gen(storeType ? StLoc : StLocNT,
       &locId,
@@ -617,7 +617,7 @@ void TraceBuilder::genStLocAux(uint32 id, SSATmp* newValue, bool storeType) {
 /*
  * Initializes a local to the provided state.
  */
-void TraceBuilder::genInitLoc(uint32 id, SSATmp* t0) {
+void TraceBuilder::genInitLoc(uint32_t id, SSATmp* t0) {
   genStLocAux(id, t0, true);
 }
 
@@ -648,7 +648,7 @@ void TraceBuilder::genDecRefLoc(int id) {
 /*
  * Stores a ref (boxed value) to a local. Also handles unsetting a local.
  */
-void TraceBuilder::genBindLoc(uint32 id,
+void TraceBuilder::genBindLoc(uint32_t id,
                               SSATmp* newValue,
                               bool doRefCount /* = true */) {
   LocalId locId(id);
@@ -688,7 +688,7 @@ void TraceBuilder::genBindLoc(uint32 id,
 /*
  * Store a cell value to a local that might be boxed.
  */
-SSATmp* TraceBuilder::genStLoc(uint32 id,
+SSATmp* TraceBuilder::genStLoc(uint32_t id,
                                SSATmp* newValue,
                                bool doRefCount,
                                bool genStoreType,
@@ -738,26 +738,26 @@ SSATmp* TraceBuilder::genStLoc(uint32 id,
   return retVal;
 }
 
-SSATmp* TraceBuilder::genNewObj(int32 numParams, SSATmp* cls) {
-  return gen(NewObj, genDefConst<int64>(numParams), cls, m_spValue, m_fpValue);
+SSATmp* TraceBuilder::genNewObj(int32_t numParams, SSATmp* cls) {
+  return gen(NewObj, genDefConst<int64_t>(numParams), cls, m_spValue, m_fpValue);
 }
 
-SSATmp* TraceBuilder::genNewObj(int32 numParams,
+SSATmp* TraceBuilder::genNewObj(int32_t numParams,
                                 const StringData* className) {
   return gen(NewObj,
-             genDefConst<int64>(numParams),
+             genDefConst<int64_t>(numParams),
              genDefConst<const StringData*>(className),
              m_spValue,
              m_fpValue);
 }
 
-SSATmp* TraceBuilder::genNewArray(int32 capacity) {
-  return gen(NewArray, genDefConst<int64>(capacity));
+SSATmp* TraceBuilder::genNewArray(int32_t capacity) {
+  return gen(NewArray, genDefConst<int64_t>(capacity));
 }
 
-SSATmp* TraceBuilder::genNewTuple(int32 numArgs, SSATmp* sp) {
+SSATmp* TraceBuilder::genNewTuple(int32_t numArgs, SSATmp* sp) {
   assert(numArgs >= 0);
-  return gen(NewTuple, genDefConst<int64>(numArgs), sp);
+  return gen(NewTuple, genDefConst<int64_t>(numArgs), sp);
 }
 
 SSATmp* TraceBuilder::genDefActRec(SSATmp* func,
@@ -768,7 +768,7 @@ SSATmp* TraceBuilder::genDefActRec(SSATmp* func,
              m_fpValue,
              func,
              objOrClass,
-             genDefConst<int64>(numArgs),
+             genDefConst<int64_t>(numArgs),
              invName ?
                genDefConst<const StringData*>(invName) : genDefInitNull());
 }
@@ -786,7 +786,7 @@ SSATmp* TraceBuilder::genFreeActRec() {
  * the value.
  */
 static SSATmp* getStackValue(SSATmp* sp,
-                             uint32 index,
+                             uint32_t index,
                              bool& spansCall,
                              Type& type) {
   IRInstruction* inst = sp->getInstruction();
@@ -863,9 +863,9 @@ static SSATmp* getStackValue(SSATmp* sp,
   case InterpOne: {
     // sp = InterpOne(fp, sp, bcOff, stackAdjustment, resultType)
     SSATmp* prevSp = inst->getSrc(1);
-    int64 numPopped = inst->getSrc(3)->getValInt();
+    int64_t numPopped = inst->getSrc(3)->getValInt();
     Type resultType = inst->getTypeParam();
-    int64 numPushed = resultType == Type::None ? 0 : 1;
+    int64_t numPushed = resultType == Type::None ? 0 : 1;
     if (index == 0 && numPushed == 1) {
       type = resultType;
       return nullptr;
@@ -904,7 +904,7 @@ void TraceBuilder::genAssertStk(uint32_t id, Type type) {
   UNUSED SSATmp* tmp = getStackValue(m_spValue, id, spansCall, knownType);
   assert(!tmp);
   if (knownType == Type::None || type.strictSubtypeOf(knownType)) {
-    gen(AssertStk, type, m_spValue, genDefConst<int64>(id));
+    gen(AssertStk, type, m_spValue, genDefConst<int64_t>(id));
   }
 }
 
@@ -925,11 +925,11 @@ SSATmp* TraceBuilder::genDefFP() {
   return gen(DefFP);
 }
 
-SSATmp* TraceBuilder::genDefSP(int32 spOffset) {
+SSATmp* TraceBuilder::genDefSP(int32_t spOffset) {
   return gen(DefSP, m_fpValue, genDefConst(spOffset));
 }
 
-SSATmp* TraceBuilder::genLdStackAddr(int64 index) {
+SSATmp* TraceBuilder::genLdStackAddr(int64_t index) {
   return gen(LdStackAddr, m_spValue, genDefConst(index));
 }
 
@@ -937,8 +937,8 @@ void TraceBuilder::genNativeImpl() {
   gen(NativeImpl, m_curFunc, m_fpValue);
 }
 
-SSATmp* TraceBuilder::genInterpOne(uint32 pcOff,
-                                   uint32 stackAdjustment,
+SSATmp* TraceBuilder::genInterpOne(uint32_t pcOff,
+                                   uint32_t stackAdjustment,
                                    Type resultType,
                                    Trace* target) {
   return gen(InterpOne,
@@ -946,18 +946,18 @@ SSATmp* TraceBuilder::genInterpOne(uint32 pcOff,
              getFirstBlock(target),
              m_fpValue,
              m_spValue,
-             genDefConst<int64>(pcOff),
-             genDefConst<int64>(stackAdjustment));
+             genDefConst<int64_t>(pcOff),
+             genDefConst<int64_t>(stackAdjustment));
 }
 
 SSATmp* TraceBuilder::genCall(SSATmp* actRec,
-                              uint32 returnBcOffset,
+                              uint32_t returnBcOffset,
                               SSATmp* func,
-                              uint32 numParams,
+                              uint32_t numParams,
                               SSATmp** params) {
   SSATmp* srcs[numParams + 3];
   srcs[0] = actRec;
-  srcs[1] = genDefConst<int64>(returnBcOffset);
+  srcs[1] = genDefConst<int64_t>(returnBcOffset);
   srcs[2] = func;
   std::copy(params, params + numParams, srcs + 3);
   return gen(Call, numParams + 3, srcs);
@@ -965,7 +965,7 @@ SSATmp* TraceBuilder::genCall(SSATmp* actRec,
 
 SSATmp* TraceBuilder::genCallBuiltin(SSATmp* func,
                                      Type type,
-                                     uint32 numArgs,
+                                     uint32_t numArgs,
                                      SSATmp** args) {
   SSATmp* srcs[numArgs + 1];
   srcs[0] = func;
@@ -985,7 +985,7 @@ void TraceBuilder::genRetCtrl(SSATmp* sp, SSATmp* fp, SSATmp* retVal) {
   gen(RetCtrl, sp, fp, retVal);
 }
 
-void TraceBuilder::genDecRefStack(Type type, uint32 stackOff) {
+void TraceBuilder::genDecRefStack(Type type, uint32_t stackOff) {
   bool spansCall = false;
   Type knownType = Type::None;
   SSATmp* tmp = getStackValue(m_spValue, stackOff, spansCall, knownType);
@@ -996,7 +996,7 @@ void TraceBuilder::genDecRefStack(Type type, uint32 stackOff) {
     if (knownType != Type::None) {
       type = Type::mostRefined(type, knownType);
     }
-    gen(DecRefStack, type, m_spValue, genDefConst<int64>(stackOff));
+    gen(DecRefStack, type, m_spValue, genDefConst<int64_t>(stackOff));
   } else {
     genDecRef(tmp);
   }
@@ -1013,13 +1013,13 @@ void TraceBuilder::genDecRefThis() {
 
 SSATmp* TraceBuilder::genGenericRetDecRefs(SSATmp* retVal, int numLocals) {
   return gen(GenericRetDecRefs, m_fpValue, retVal,
-             genDefConst<int64>(numLocals));
+             genDefConst<int64_t>(numLocals));
 }
 
-void TraceBuilder::genIncStat(int32 counter, int32 value, bool force) {
+void TraceBuilder::genIncStat(int32_t counter, int32_t value, bool force) {
   gen(IncStat,
-      genDefConst<int64>(counter),
-      genDefConst<int64>(value),
+      genDefConst<int64_t>(counter),
+      genDefConst<int64_t>(value),
       genDefConst<bool>(force));
 }
 
@@ -1027,8 +1027,8 @@ SSATmp* TraceBuilder::genIncRef(SSATmp* src) {
   return gen(IncRef, src);
 }
 
-SSATmp* TraceBuilder::genSpillStack(uint32 stackAdjustment,
-                                    uint32 numOpnds,
+SSATmp* TraceBuilder::genSpillStack(uint32_t stackAdjustment,
+                                    uint32_t numOpnds,
                                     SSATmp** spillOpnds) {
   if (stackAdjustment == 0 && numOpnds == 0) {
     return m_spValue;
@@ -1036,12 +1036,12 @@ SSATmp* TraceBuilder::genSpillStack(uint32 stackAdjustment,
 
   SSATmp* srcs[numOpnds + 2];
   srcs[0] = m_spValue;
-  srcs[1] = genDefConst<int64>(stackAdjustment);
+  srcs[1] = genDefConst<int64_t>(stackAdjustment);
   std::copy(spillOpnds, spillOpnds + numOpnds, srcs + 2);
   return gen(SpillStack, numOpnds + 2, srcs);
 }
 
-SSATmp* TraceBuilder::genLdStack(int32 stackOff, Type type) {
+SSATmp* TraceBuilder::genLdStack(int32_t stackOff, Type type) {
   bool spansCall = false;
   Type knownType = Type::None;
   SSATmp* tmp = getStackValue(m_spValue, stackOff, spansCall, knownType);
@@ -1055,13 +1055,13 @@ SSATmp* TraceBuilder::genLdStack(int32 stackOff, Type type) {
     return gen(LdStack,
                type,
                m_spValue,
-               genDefConst<int64>(stackOff));
+               genDefConst<int64_t>(stackOff));
   }
   return tmp;
 }
 
 void TraceBuilder::genContEnter(SSATmp* contAR, SSATmp* addr,
-                                int64 returnBcOffset) {
+                                int64_t returnBcOffset) {
   gen(ContEnter, contAR, addr, genDefConst(returnBcOffset));
 }
 
@@ -1091,55 +1091,55 @@ Trace* TraceBuilder::genContStartedCheck(SSATmp* cont, Trace* target) {
   return target;
 }
 
-SSATmp* TraceBuilder::genIterNext(uint32 iterId, uint32 localId) {
+SSATmp* TraceBuilder::genIterNext(uint32_t iterId, uint32_t localId) {
   // IterNext fpReg, iterId, localId
   return gen(IterNext,
              Type::Bool,
              m_fpValue,
-             genDefConst<int64>(iterId),
-             genDefConst<int64>(localId));
+             genDefConst<int64_t>(iterId),
+             genDefConst<int64_t>(localId));
 }
 
-SSATmp* TraceBuilder::genIterNextK(uint32 iterId,
-                                   uint32 valLocalId,
-                                   uint32 keyLocalId) {
+SSATmp* TraceBuilder::genIterNextK(uint32_t iterId,
+                                   uint32_t valLocalId,
+                                   uint32_t keyLocalId) {
   // IterNextK fpReg, iterId, valLocalId, keyLocalId
   return gen(IterNextK,
              Type::Bool,
              m_fpValue,
-             genDefConst<int64>(iterId),
-             genDefConst<int64>(valLocalId),
-             genDefConst<int64>(keyLocalId));
+             genDefConst<int64_t>(iterId),
+             genDefConst<int64_t>(valLocalId),
+             genDefConst<int64_t>(keyLocalId));
 }
 
 SSATmp* TraceBuilder::genIterInit(SSATmp* src,
-                                  uint32 iterId,
-                                  uint32 valLocalId) {
+                                  uint32_t iterId,
+                                  uint32_t valLocalId) {
   // IterInit src, fpReg, iterId, valLocalId
   return gen(IterInit,
              Type::Bool,
              src,
              m_fpValue,
-             genDefConst<int64>(iterId),
-             genDefConst<int64>(valLocalId));
+             genDefConst<int64_t>(iterId),
+             genDefConst<int64_t>(valLocalId));
 }
 
 SSATmp* TraceBuilder::genIterInitK(SSATmp* src,
-                                   uint32 iterId,
-                                   uint32 valLocalId,
-                                   uint32 keyLocalId) {
+                                   uint32_t iterId,
+                                   uint32_t valLocalId,
+                                   uint32_t keyLocalId) {
   // IterInitK src, fpReg, iterId, valLocalId, keyLocalId
   return gen(IterInitK,
              Type::Bool,
              src,
              m_fpValue,
-             genDefConst<int64>(iterId),
-             genDefConst<int64>(valLocalId),
-             genDefConst<int64>(keyLocalId));
+             genDefConst<int64_t>(iterId),
+             genDefConst<int64_t>(valLocalId),
+             genDefConst<int64_t>(keyLocalId));
 }
 
-SSATmp* TraceBuilder::genIterFree(uint32 iterId) {
-  return gen(IterFree, m_fpValue, genDefConst<int64>(iterId));
+SSATmp* TraceBuilder::genIterFree(uint32_t iterId) {
+  return gen(IterFree, m_fpValue, genDefConst<int64_t>(iterId));
 }
 
 void TraceBuilder::updateTrackedState(IRInstruction* inst) {
@@ -1179,7 +1179,7 @@ void TraceBuilder::updateTrackedState(IRInstruction* inst) {
     case SpillStack: {
       m_spValue = inst->getDst();
       // Push the spilled values but adjust for the popped values
-      int64 stackAdjustment = inst->getSrc(1)->getValInt();
+      int64_t stackAdjustment = inst->getSrc(1)->getValInt();
       m_spOffset -= stackAdjustment;
       m_spOffset += spillValueCells(inst);
       assert(m_spOffset >= 0);
@@ -1194,7 +1194,7 @@ void TraceBuilder::updateTrackedState(IRInstruction* inst) {
     }
     case InterpOne: {
       m_spValue = inst->getDst();
-      int64 stackAdjustment = inst->getSrc(3)->getValInt();
+      int64_t stackAdjustment = inst->getSrc(3)->getValInt();
       Type resultType = inst->getTypeParam();
       // push the return value if any and adjust for the popped values
       m_spOffset += ((resultType == Type::None ? 0 : 1) - stackAdjustment);
@@ -1360,10 +1360,10 @@ void TraceBuilder::useState(Block* block) {
 
 void TraceBuilder::clearTrackedState() {
   killCse(); // clears m_cseHash
-  for (uint32 i = 0; i < m_localValues.size(); i++) {
+  for (uint32_t i = 0; i < m_localValues.size(); i++) {
     m_localValues[i] = nullptr;
   }
-  for (uint32 i = 0; i < m_localTypes.size(); i++) {
+  for (uint32_t i = 0; i < m_localTypes.size(); i++) {
     m_localTypes[i] = Type::None;
   }
   m_spValue = m_fpValue = nullptr;
@@ -1626,7 +1626,7 @@ void TraceBuilder::updateLocalRefValues(SSATmp* oldRef, SSATmp* newRef) {
  * locals, however.
  */
 void TraceBuilder::killLocals() {
-   for (uint32 i = 0; i < m_localValues.size(); i++) {
+   for (uint32_t i = 0; i < m_localValues.size(); i++) {
     SSATmp* t = m_localValues[i];
     // should not kill DefConst, and LdConst should be replaced by DefConst
     if (!t || t->getInstruction()->getOpcode() == DefConst) {
diff --git a/hphp/runtime/vm/translator/hopt/tracebuilder.h b/hphp/runtime/vm/translator/hopt/tracebuilder.h
index 6694b54e2ad6c..4f8530a889308 100644
--- a/hphp/runtime/vm/translator/hopt/tracebuilder.h
+++ b/hphp/runtime/vm/translator/hopt/tracebuilder.h
@@ -42,7 +42,7 @@ class TraceBuilder {
   void setEnableCse(bool val)            { m_enableCse = val; }
   void setEnableSimplification(bool val) { m_enableSimplification = val; }
 
-  Trace* makeExitTrace(uint32 bcOff) {
+  Trace* makeExitTrace(uint32_t bcOff) {
     return m_trace->addExitTrace(makeTrace(m_curFunc->getValFunc(),
                                            bcOff, false));
   }
@@ -84,9 +84,9 @@ class TraceBuilder {
   SSATmp* genLdRaw(SSATmp* base, RawMemSlot::Kind kind, Type type);
   void    genStRaw(SSATmp* base, RawMemSlot::Kind kind, SSATmp* value);
 
-  SSATmp* genLdLoc(uint32 id);
-  SSATmp* genLdLocAddr(uint32 id);
-  void genRaiseUninitWarning(uint32 id);
+  SSATmp* genLdLoc(uint32_t id);
+  SSATmp* genLdLocAddr(uint32_t id);
+  void genRaiseUninitWarning(uint32_t id);
 
   /*
    * Returns an SSATmp containing the (inner) value of the given local.
@@ -97,15 +97,15 @@ class TraceBuilder {
    *       the tracked type for this local.  This check may be optimized away
    *       if we can determine that the inner type must match the tracked type.
    */
-  SSATmp* genLdLocAsCell(uint32 id, Trace* exitTrace);
+  SSATmp* genLdLocAsCell(uint32_t id, Trace* exitTrace);
 
   /*
    * Asserts that local 'id' has type 'type' and loads it into the
    * returned SSATmp.
    */
-  SSATmp* genLdAssertedLoc(uint32 id, Type type);
+  SSATmp* genLdAssertedLoc(uint32_t id, Type type);
 
-  SSATmp* genStLoc(uint32 id,
+  SSATmp* genStLoc(uint32_t id,
                    SSATmp* src,
                    bool doRefCount,
                    bool genStoreType,
@@ -114,28 +114,28 @@ class TraceBuilder {
   SSATmp* genLdMem(SSATmp* addr, int64_t offset,
                    Type type, Trace* target);
   void    genStMem(SSATmp* addr, SSATmp* src, bool genStoreType);
-  void    genStMem(SSATmp* addr, int64 offset, SSATmp* src, bool stType);
+  void    genStMem(SSATmp* addr, int64_t offset, SSATmp* src, bool stType);
   SSATmp* genLdProp(SSATmp* obj, SSATmp* prop, Type type, Trace* exit);
   void    genStProp(SSATmp* obj, SSATmp* prop, SSATmp* src, bool genStoreType);
-  void    genSetPropCell(SSATmp* base, int64 offset, SSATmp* value);
+  void    genSetPropCell(SSATmp* base, int64_t offset, SSATmp* value);
 
-  SSATmp* genBoxLoc(uint32 id);
-  void    genBindLoc(uint32 id, SSATmp* ref, bool doRefCount = true);
-  void    genInitLoc(uint32 id, SSATmp* t);
+  SSATmp* genBoxLoc(uint32_t id);
+  void    genBindLoc(uint32_t id, SSATmp* ref, bool doRefCount = true);
+  void    genInitLoc(uint32_t id, SSATmp* t);
 
   void    genCheckClsCnsDefined(SSATmp* cns, Trace* exitTrace);
   SSATmp* genLdCurFuncPtr();
   SSATmp* genLdARFuncPtr(SSATmp* baseAddr, SSATmp* offset);
   SSATmp* genLdFuncCls(SSATmp* func);
-  SSATmp* genNewObj(int32 numParams, const StringData* clsName);
-  SSATmp* genNewObj(int32 numParams, SSATmp* cls);
-  SSATmp* genNewArray(int32 capacity);
-  SSATmp* genNewTuple(int32 numArgs, SSATmp* sp);
+  SSATmp* genNewObj(int32_t numParams, const StringData* clsName);
+  SSATmp* genNewObj(int32_t numParams, SSATmp* cls);
+  SSATmp* genNewArray(int32_t capacity);
+  SSATmp* genNewTuple(int32_t numArgs, SSATmp* sp);
   SSATmp* genDefActRec(SSATmp* func, SSATmp* objOrClass, int32_t numArgs,
                        const StringData* invName);
   SSATmp* genFreeActRec();
-  void    genGuardLoc(uint32 id, Type type, Trace* exitTrace);
-  void    genGuardStk(uint32 id, Type type, Trace* exitTrace);
+  void    genGuardLoc(uint32_t id, Type type, Trace* exitTrace);
+  void    genGuardStk(uint32_t id, Type type, Trace* exitTrace);
   void    genAssertStk(uint32_t id, Type type);
   SSATmp* genGuardType(SSATmp* src, Type type, Trace* nextTrace);
   void    genGuardRefs(SSATmp* funcPtr,
@@ -145,12 +145,12 @@ class TraceBuilder {
                        SSATmp* mask64,
                        SSATmp* vals64,
                        Trace*  exitTrace);
-  void    genAssertLoc(uint32 id, Type type);
+  void    genAssertLoc(uint32_t id, Type type);
 
   SSATmp* genUnboxPtr(SSATmp* ptr);
   SSATmp* genLdRef(SSATmp* ref, Type type, Trace* exit);
   SSATmp* genAdd(SSATmp* src1, SSATmp* src2);
-  SSATmp* genLdAddr(SSATmp* base, int64 offset);
+  SSATmp* genLdAddr(SSATmp* base, int64_t offset);
 
   SSATmp* genSub(SSATmp* src1, SSATmp* src2);
   SSATmp* genMul(SSATmp* src1, SSATmp* src2);
@@ -180,38 +180,38 @@ class TraceBuilder {
   SSATmp* genConvToArr(SSATmp* src);
   SSATmp* genConvToObj(SSATmp* src);
   SSATmp* genLdPropAddr(SSATmp* obj, SSATmp* prop);
-  SSATmp* genLdClsMethod(SSATmp* cls, uint32 methodSlot);
+  SSATmp* genLdClsMethod(SSATmp* cls, uint32_t methodSlot);
   SSATmp* genLdClsMethodCache(SSATmp* className,
                               SSATmp* methodName,
                               SSATmp* baseClass,
                               Trace* slowPathExit);
   SSATmp* genLdObjMethod(const StringData* methodName, SSATmp* obj);
   SSATmp* genCall(SSATmp* actRec,
-                  uint32 returnBcOffset,
+                  uint32_t returnBcOffset,
                   SSATmp* func,
-                  uint32 numParams,
+                  uint32_t numParams,
                   SSATmp** params);
   SSATmp* genCallBuiltin(SSATmp* func, Type type,
-                         uint32 numArgs, SSATmp** args);
+                         uint32_t numArgs, SSATmp** args);
   void    genReleaseVVOrExit(Trace* exit);
   SSATmp* genGenericRetDecRefs(SSATmp* retVal, int numLocals);
   void    genRetVal(SSATmp* val);
   SSATmp* genRetAdjustStack();
   void    genRetCtrl(SSATmp* sp, SSATmp* fp, SSATmp* retAddr);
   void    genDecRef(SSATmp* tmp);
-  void    genDecRefMem(SSATmp* base, int64 offset, Type type);
-  void    genDecRefStack(Type type, uint32 stackOff);
+  void    genDecRefMem(SSATmp* base, int64_t offset, Type type);
+  void    genDecRefStack(Type type, uint32_t stackOff);
   void    genDecRefLoc(int id);
   void    genDecRefThis();
-  void    genIncStat(int32 counter, int32 value, bool force = false);
+  void    genIncStat(int32_t counter, int32_t value, bool force = false);
   SSATmp* genIncRef(SSATmp* src);
-  SSATmp* genSpillStack(uint32 stackAdjustment,
-                        uint32 numOpnds,
+  SSATmp* genSpillStack(uint32_t stackAdjustment,
+                        uint32_t numOpnds,
                         SSATmp** opnds);
-  SSATmp* genLdStack(int32 stackOff, Type type);
+  SSATmp* genLdStack(int32_t stackOff, Type type);
   SSATmp* genDefFP();
-  SSATmp* genDefSP(int32 spOffset);
-  SSATmp* genLdStackAddr(int64 offset);
+  SSATmp* genDefSP(int32_t spOffset);
+  SSATmp* genLdStackAddr(int64_t offset);
   void    genVerifyParamType(SSATmp* objClass, SSATmp* className,
                              const Class* constraint, Trace* exitTrace);
 
@@ -219,25 +219,25 @@ class TraceBuilder {
 
   void    genUnlinkContVarEnv();
   void    genLinkContVarEnv();
-  void    genContEnter(SSATmp* contAR, SSATmp* addr, int64 returnBcOffset);
+  void    genContEnter(SSATmp* contAR, SSATmp* addr, int64_t returnBcOffset);
   Trace*  genContRaiseCheck(SSATmp* cont, Trace* target);
   Trace*  genContPreNext(SSATmp* cont, Trace* target);
   Trace*  genContStartedCheck(SSATmp* cont, Trace* target);
 
-  SSATmp* genIterInit(SSATmp* src, uint32 iterId, uint32 valLocalId);
+  SSATmp* genIterInit(SSATmp* src, uint32_t iterId, uint32_t valLocalId);
   SSATmp* genIterInitK(SSATmp* src,
-                       uint32 iterId,
-                       uint32 valLocalId,
-                       uint32 keyLocalId);
-  SSATmp* genIterNext(uint32 iterId, uint32 valLocalId);
-  SSATmp* genIterNextK(uint32 iterId, uint32 valLocalId, uint32 keyLocalId);
-  SSATmp* genIterFree(uint32 iterId);
-
-  SSATmp* genInterpOne(uint32 pcOff, uint32 stackAdjustment,
+                       uint32_t iterId,
+                       uint32_t valLocalId,
+                       uint32_t keyLocalId);
+  SSATmp* genIterNext(uint32_t iterId, uint32_t valLocalId);
+  SSATmp* genIterNextK(uint32_t iterId, uint32_t valLocalId, uint32_t keyLocalId);
+  SSATmp* genIterFree(uint32_t iterId);
+
+  SSATmp* genInterpOne(uint32_t pcOff, uint32_t stackAdjustment,
                        Type resultType, Trace* target);
-  Trace* getExitSlowTrace(uint32 bcOff,
-                          int32 stackDeficit,
-                          uint32 numOpnds,
+  Trace* getExitSlowTrace(uint32_t bcOff,
+                          int32_t stackDeficit,
+                          uint32_t numOpnds,
                           SSATmp** opnds);
 
   /*
@@ -247,12 +247,12 @@ class TraceBuilder {
    * Lifetime of the returned pointer is managed by the trace this
    * TraceBuilder is generating.
    */
-  Trace* genExitTrace(uint32 bcOff,
-                      int32  stackDeficit,
-                      uint32 numOpnds,
+  Trace* genExitTrace(uint32_t bcOff,
+                      int32_t  stackDeficit,
+                      uint32_t numOpnds,
                       SSATmp** opnds,
                       TraceExitType::ExitType,
-                      uint32 notTakenBcOff = 0);
+                      uint32_t notTakenBcOff = 0);
 
   /*
    * Generates a target exit trace for GuardFailure exits.
@@ -260,10 +260,10 @@ class TraceBuilder {
    * Lifetime of the returned pointer is managed by the trace this
    * TraceBuilder is generating.
    */
-  Trace* genExitGuardFailure(uint32 off);
+  Trace* genExitGuardFailure(uint32_t off);
 
   // generates the ExitTrace instruction at the end of a trace
-  void genTraceEnd(uint32 nextPc,
+  void genTraceEnd(uint32_t nextPc,
                    TraceExitType::ExitType exitType = TraceExitType::Normal);
 
   template<typename T>
@@ -280,7 +280,7 @@ class TraceBuilder {
 
   Trace* getTrace() const { return m_trace.get(); }
   IRFactory* getIrFactory() { return &m_irFactory; }
-  int32 getSpOffset() { return m_spOffset; }
+  int32_t getSpOffset() { return m_spOffset; }
   SSATmp* getSp() const { return m_spValue; }
   SSATmp* getFp() const { return m_fpValue; }
 
@@ -342,10 +342,10 @@ class TraceBuilder {
   void      updateTrackedState(IRInstruction* inst);
   void      clearTrackedState();
 
-  Trace* makeTrace(const Func* func, uint32 bcOff, bool isMain) {
+  Trace* makeTrace(const Func* func, uint32_t bcOff, bool isMain) {
     return new Trace(m_irFactory.defBlock(func), bcOff, isMain);
   }
-  void genStLocAux(uint32 id, SSATmp* t0, bool genStoreType);
+  void genStLocAux(uint32_t id, SSATmp* t0, bool genStoreType);
 
   // saved state information associated with the start of a block
   struct State {
@@ -411,7 +411,7 @@ class TraceBuilder {
    */
   SSATmp*    m_spValue;      // current physical sp
   SSATmp*    m_fpValue;      // current physical fp
-  int32      m_spOffset;     // offset of physical sp from physical fp
+  int32_t      m_spOffset;     // offset of physical sp from physical fp
   SSATmp*    m_curFunc;      // current function context
   CSEHash    m_cseHash;
   bool       m_thisIsAvailable; // true only if current ActRec has non-null this
diff --git a/hphp/runtime/vm/translator/hopt/vectortranslator.cpp b/hphp/runtime/vm/translator/hopt/vectortranslator.cpp
index feac6116dd226..199034fd80abc 100644
--- a/hphp/runtime/vm/translator/hopt/vectortranslator.cpp
+++ b/hphp/runtime/vm/translator/hopt/vectortranslator.cpp
@@ -276,7 +276,7 @@ SSATmp* HhbcTranslator::VectorTranslator::getInput(unsigned i) {
       return m_tb.genDefConst<const StringData*>(m_ht.lookupStringId(l.offset));
 
     case Location::Litint:
-      return m_tb.genDefConst<int64>(l.offset);
+      return m_tb.genDefConst<int64_t>(l.offset);
 
     case Location::This:
       return m_tb.genLdThis(nullptr);
diff --git a/hphp/runtime/vm/translator/regalloc.cpp b/hphp/runtime/vm/translator/regalloc.cpp
index 43c088ec4fd67..af4f043bb44cd 100644
--- a/hphp/runtime/vm/translator/regalloc.cpp
+++ b/hphp/runtime/vm/translator/regalloc.cpp
@@ -74,7 +74,7 @@ RegAlloc::freeRegInfo(RegInfo *r) {
  */
 RegInfo*
 RegAlloc::alloc(const Location& loc, DataType type, RegInfo::State state,
-                bool needsFill, int64 immVal, PhysReg target) {
+                bool needsFill, int64_t immVal, PhysReg target) {
   RegInfo   *retval = nullptr;
   RegContent cont   = RegContent(loc, immVal);
 
@@ -180,7 +180,7 @@ RegAlloc::allocInputReg(const DynLocation& dl, PhysReg target) {
 
   const Location& loc = dl.location;
 
-  int64 litVal = 0;
+  int64_t litVal = 0;
   if (loc.isLiteral()) {
     litVal = rtt.valueGeneric();
   }
@@ -709,7 +709,7 @@ void RegAlloc::stateTransition(RegInfo* r, RegInfo::State to) {
 }
 
 PhysReg
-RegAlloc::getImmReg(int64 immVal, bool allowAllocate /* = true */) {
+RegAlloc::getImmReg(int64_t immVal, bool allowAllocate /* = true */) {
   DataType       type    = KindOfInt64;
   RegInfo::State state   = RegInfo::CLEAN;
   RegInfo       *freeReg = nullptr;
diff --git a/hphp/runtime/vm/translator/regalloc.h b/hphp/runtime/vm/translator/regalloc.h
index 80078195fcc3a..fc08e85007e18 100644
--- a/hphp/runtime/vm/translator/regalloc.h
+++ b/hphp/runtime/vm/translator/regalloc.h
@@ -48,13 +48,13 @@ struct RegContent {
     Loc,
     Int
   }        m_kind;
-  int64    m_int;
+  int64_t    m_int;
   Location m_loc;
 
-  RegContent(const Location &loc, int64 intval = 0)
+  RegContent(const Location &loc, int64_t intval = 0)
       : m_kind(Loc), m_int(intval), m_loc(loc) { }
 
-  RegContent(int64 _m_int) : m_kind(Int), m_int(_m_int), m_loc(Location()) { }
+  RegContent(int64_t _m_int) : m_kind(Int), m_int(_m_int), m_loc(Location()) { }
 
   RegContent() : m_kind(Invalid), m_int(0), m_loc(Location()) { }
 
@@ -132,7 +132,7 @@ struct RegInfo {
 #undef REGSTATE
   };
   RegContent m_cont;
-  uint64     m_epoch;
+  uint64_t     m_epoch;
   PhysReg    m_pReg;
   State      m_state;
   DataType   m_type;
@@ -145,7 +145,8 @@ struct RegInfo {
     };
     char buf[1024];
     sprintf(buf, "Reg:%02d:%s:%lld:Type:%d",
-            int(m_pReg), names[m_state], m_epoch, m_type);
+            int(m_pReg), names[m_state], static_cast<long long>(m_epoch),
+            m_type);
     return Trace::prettyNode(buf, m_cont);
   }
   RegInfo() : m_cont(), m_state(FREE) { }
@@ -165,7 +166,7 @@ class SpillFill {
                      bool writeType) = 0;
   virtual void fill(const Location& loc, PhysReg reg) = 0;
   virtual void fillByMov(PhysReg src, PhysReg dst) = 0;
-  virtual void loadImm(int64 immVal, PhysReg reg) = 0;
+  virtual void loadImm(int64_t immVal, PhysReg reg) = 0;
   virtual void poison(PhysReg reg) = 0;
 };
 
@@ -186,11 +187,11 @@ class RegAlloc {
   ContToRegMap    m_contToRegMap;     // Content -> PhysReg
   SpillFill*      m_spf;
   mutable int     m_freezeCount;      // support immutability
-  uint64          m_epoch;
+  uint64_t          m_epoch;
   bool            m_branchSynced;
 
   RegInfo* alloc(const Location& loc, DataType t, RegInfo::State state,
-                 bool needsFill, int64 immVal = 0, PhysReg target = InvalidReg);
+                 bool needsFill, int64_t immVal = 0, PhysReg target = InvalidReg);
   RegInfo* findFreeReg(const Location& loc);
   void assignRegInfo(RegInfo *regInfo, const RegContent &cont,
                      RegInfo::State state, DataType type);
@@ -309,7 +310,7 @@ class RegAlloc {
    *
    * Otherwise InvalidReg is returned.
    */
-  PhysReg getImmReg(int64 immVal, bool allowAllocate = true);
+  PhysReg getImmReg(int64_t immVal, bool allowAllocate = true);
 
   /*
    * Reset the register mapping to an empty state, epoch zero.
diff --git a/hphp/runtime/vm/translator/runtime-type.cpp b/hphp/runtime/vm/translator/runtime-type.cpp
index 075f4249fe113..d6ec1f6a733d9 100644
--- a/hphp/runtime/vm/translator/runtime-type.cpp
+++ b/hphp/runtime/vm/translator/runtime-type.cpp
@@ -72,7 +72,7 @@ RuntimeType::RuntimeType(bool value)
   consistencyCheck();
 }
 
-RuntimeType::RuntimeType(int64 value)
+RuntimeType::RuntimeType(int64_t value)
   : m_kind(VALUE) {
   m_value.outerType = KindOfInt64;
   m_value.innerType = KindOfInvalid;
@@ -180,7 +180,7 @@ RuntimeType::valueBoolean() const {
   return m_value.boolValid ? m_value.boolean : -1;
 }
 
-int64
+int64_t
 RuntimeType::valueInt() const {
   consistencyCheck();
   assert(m_kind == VALUE);
@@ -189,7 +189,7 @@ RuntimeType::valueInt() const {
 }
 
 // Get the value as a blob. Use with care.
-int64
+int64_t
 RuntimeType::valueGeneric() const {
   consistencyCheck();
   assert(m_kind == VALUE);
@@ -320,8 +320,8 @@ RuntimeType& RuntimeType::operator=(const RuntimeType& r) {
 
 size_t
 RuntimeType::operator()(const RuntimeType& r) const {
-  uint64 p1 = HPHP::hash_int64(m_kind);
-  uint64 p2 = 0;
+  uint64_t p1 = HPHP::hash_int64(m_kind);
+  uint64_t p2 = 0;
   // We can't just hash the whole blob of memory, because
   // C++ will leave padding uninitialized. The shifts are to
   // make the final hash order-dependent, so that
diff --git a/hphp/runtime/vm/translator/runtime-type.h b/hphp/runtime/vm/translator/runtime-type.h
index 097d0648db978..5e87cd88b6a3d 100644
--- a/hphp/runtime/vm/translator/runtime-type.h
+++ b/hphp/runtime/vm/translator/runtime-type.h
@@ -42,7 +42,7 @@ struct Location {
   , offset(0)
   { assert(spc == This); }
 
-  Location(Space spc, int64 off)
+  Location(Space spc, int64_t off)
     : space(spc)
     , offset(off)
   {}
@@ -121,7 +121,7 @@ struct Location {
 
 public:
   Space space;
-  int64 offset;
+  int64_t offset;
 };
 
 struct InputInfo {
@@ -195,7 +195,7 @@ class RuntimeType {
                                   // KindOfClass: An instance of the current
                                   //   instantiation of the preClass.  The
                                   //   exact class may differ across executions
-        int64 intval;             // KindOfInt64: A literal int
+        int64_t intval;             // KindOfInt64: A literal int
         struct {
           bool boolean;           // KindOfBoolean: A literal bool
                                   // from True or False.
@@ -234,7 +234,7 @@ class RuntimeType {
   RuntimeType(const ArrayData*);
   RuntimeType(const Class*);
   explicit RuntimeType(bool value);
-  explicit RuntimeType(int64 value);
+  explicit RuntimeType(int64_t value);
   RuntimeType(const RuntimeType& copy);
   RuntimeType();
   RuntimeType(const Iter* iter);
@@ -256,8 +256,8 @@ class RuntimeType {
   const StringData* valueStringOrNull() const;
   const ArrayData* valueArray() const;
   int valueBoolean() const;
-  int64 valueInt() const;
-  int64 valueGeneric() const;
+  int64_t valueInt() const;
+  int64_t valueGeneric() const;
 
   // Helpers for typechecking
   DataType typeCheckValue() const;
diff --git a/hphp/runtime/vm/translator/targetcache.cpp b/hphp/runtime/vm/translator/targetcache.cpp
index 6f5d6dc971152..50d741dd3b953 100644
--- a/hphp/runtime/vm/translator/targetcache.cpp
+++ b/hphp/runtime/vm/translator/targetcache.cpp
@@ -199,9 +199,9 @@ size_t allocCnsBit(const StringData* name) {
   return allocBitImpl(name, NSCnsBits);
 }
 
-Handle bitOffToHandleAndMask(size_t bit, uint8 &mask) {
+Handle bitOffToHandleAndMask(size_t bit, uint8_t &mask) {
   static_assert(!(8 % CHAR_BIT), "Unexpected size of char");
-  mask = (uint8)1 << (bit % 8);
+  mask = (uint8_t)1 << (bit % 8);
   size_t off = bit / CHAR_BIT;
   off -= off % (8 / CHAR_BIT);
   return off;
@@ -213,9 +213,9 @@ bool testBit(size_t bit) {
   return *(unsigned char*)handleToPtr(handle) & mask;
 }
 
-bool testBit(Handle handle, uint32 mask) {
+bool testBit(Handle handle, uint32_t mask) {
   assert(!(mask & (mask - 1)));
-  return *(uint32*)handleToPtr(handle) & mask;
+  return *(uint32_t*)handleToPtr(handle) & mask;
 }
 
 bool testAndSetBit(size_t bit) {
@@ -226,10 +226,10 @@ bool testAndSetBit(size_t bit) {
   return ret;
 }
 
-bool testAndSetBit(Handle handle, uint32 mask) {
+bool testAndSetBit(Handle handle, uint32_t mask) {
   assert(!(mask & (mask - 1)));
-  bool ret = *(uint32*)handleToPtr(handle) & mask;
-  *(uint32*)handleToPtr(handle) |= mask;
+  bool ret = *(uint32_t*)handleToPtr(handle) & mask;
+  *(uint32_t*)handleToPtr(handle) |= mask;
   return ret;
 }
 
diff --git a/hphp/runtime/vm/translator/targetcache.h b/hphp/runtime/vm/translator/targetcache.h
index da46f7648dc20..1629858d0ab1e 100644
--- a/hphp/runtime/vm/translator/targetcache.h
+++ b/hphp/runtime/vm/translator/targetcache.h
@@ -93,10 +93,10 @@ CacheHandle namedAlloc(const StringData* name, int numBytes, int align) {
 
 size_t allocBit();
 size_t allocCnsBit(const StringData* name);
-CacheHandle bitOffToHandleAndMask(size_t bit, uint8 &mask);
-bool testBit(CacheHandle handle, uint32 mask);
+CacheHandle bitOffToHandleAndMask(size_t bit, uint8_t &mask);
+bool testBit(CacheHandle handle, uint32_t mask);
 bool testBit(size_t bit);
-bool testAndSetBit(CacheHandle handle, uint32 mask);
+bool testAndSetBit(CacheHandle handle, uint32_t mask);
 bool testAndSetBit(size_t bit);
 bool isPersistentHandle(CacheHandle handle);
 
diff --git a/hphp/runtime/vm/translator/trans-data.h b/hphp/runtime/vm/translator/trans-data.h
index a9b871dfd008c..ee01fafdb4af0 100644
--- a/hphp/runtime/vm/translator/trans-data.h
+++ b/hphp/runtime/vm/translator/trans-data.h
@@ -35,11 +35,11 @@ class TransData {
 public:
   // Interface to be implemented by subclasses
   virtual ~TransData() {}
-  virtual uint32 getNumTrans() const = 0;
+  virtual uint32_t getNumTrans() const = 0;
 
   virtual const TransRec* getTransRec(TransID id) const = 0;
 
-  virtual uint64 getTransCounter(TransID id) const = 0;
+  virtual uint64_t getTransCounter(TransID id) const = 0;
 
   virtual const TransIDSet& getTransPreds(TransID transId) const = 0;
 
diff --git a/hphp/runtime/vm/translator/translator-runtime.cpp b/hphp/runtime/vm/translator/translator-runtime.cpp
index e631749f6b877..fa029629e5176 100644
--- a/hphp/runtime/vm/translator/translator-runtime.cpp
+++ b/hphp/runtime/vm/translator/translator-runtime.cpp
@@ -19,7 +19,7 @@
 namespace HPHP { namespace VM { namespace Transl {
 
 ArrayData* addElemIntKeyHelper(ArrayData* ad,
-                               int64 key,
+                               int64_t key,
                                TypedValue value) {
   // this does not re-enter
   return array_setm_ik1_v0(0, ad, key, &value);
diff --git a/hphp/runtime/vm/translator/translator-runtime.h b/hphp/runtime/vm/translator/translator-runtime.h
index 723230d6bbe8b..2e5ab584bc490 100644
--- a/hphp/runtime/vm/translator/translator-runtime.h
+++ b/hphp/runtime/vm/translator/translator-runtime.h
@@ -51,7 +51,7 @@ static_assert(sizeof(MInstrState) - sizeof(uintptr_t) // return address
 
 /* Helper functions for translated code */
 
-ArrayData* addElemIntKeyHelper(ArrayData* ad, int64 key, TypedValue val);
+ArrayData* addElemIntKeyHelper(ArrayData* ad, int64_t key, TypedValue val);
 ArrayData* addElemStringKeyHelper(ArrayData* ad, StringData* key, TypedValue val);
 RefData* box_value(TypedValue tv);
 
diff --git a/hphp/runtime/vm/translator/translator-x64-internal.h b/hphp/runtime/vm/translator/translator-x64-internal.h
index e3163a5a7443b..1289dccd44426 100644
--- a/hphp/runtime/vm/translator/translator-x64-internal.h
+++ b/hphp/runtime/vm/translator/translator-x64-internal.h
@@ -266,7 +266,7 @@ extern __thread JmpHitMap* tl_unlikelyHits;
 extern __thread JmpHitMap* tl_jccHits;
 
 template<Trace::Module mod>
-static void recordJmpProfile(litstr key, int64 take) {
+static void recordJmpProfile(litstr key, int64_t take) {
   JmpHitMap& map = mod == Trace::unlikely ? *tl_unlikelyHits : *tl_jccHits;
   JmpHitRate& r = map[key];
   r.key = key;
diff --git a/hphp/runtime/vm/translator/translator-x64-vector.cpp b/hphp/runtime/vm/translator/translator-x64-vector.cpp
index 0987035008ee9..5f879fc6b8234 100644
--- a/hphp/runtime/vm/translator/translator-x64-vector.cpp
+++ b/hphp/runtime/vm/translator/translator-x64-vector.cpp
@@ -2929,7 +2929,7 @@ void TranslatorX64::translateIssetMFast(const Tracelet& t,
     SKTRACE(1, ni.source, "loaded variant\n");
   }
 
-  typedef uint64 (*HelperFunc)(const void* arr, StringData* sd);
+  typedef uint64_t (*HelperFunc)(const void* arr, StringData* sd);
   HelperFunc helper = nullptr;
   if (key.isInt()) {
     helper = (HelperFunc)array_issetm_i;
diff --git a/hphp/runtime/vm/translator/translator-x64.cpp b/hphp/runtime/vm/translator/translator-x64.cpp
index 7fc566a37e76f..cfa38071a2f85 100644
--- a/hphp/runtime/vm/translator/translator-x64.cpp
+++ b/hphp/runtime/vm/translator/translator-x64.cpp
@@ -120,7 +120,7 @@ enum TransPerfCounter {
   tpc_num_counters
 };
 #undef TPC
-static __thread int64 s_perfCounters[tpc_num_counters];
+static __thread int64_t s_perfCounters[tpc_num_counters];
 #define INC_TPC(n) ++s_perfCounters[tpc_ ## n];
 
 #define NULLCASE() \
@@ -1591,7 +1591,7 @@ void
 TranslatorX64::emitTestSurpriseFlags(Asm& a) {
   static_assert(RequestInjectionData::LastFlag < (1 << 8),
                 "Translator assumes RequestInjectionFlags fit in one byte");
-  a.    testb((int8)0xff, rVmTl[TargetCache::kConditionFlagsOff]);
+  a.    testb((int8_t)0xff, rVmTl[TargetCache::kConditionFlagsOff]);
 }
 
 void
@@ -1694,7 +1694,7 @@ static void sync_regstate_to_caller(ActRec* preLive) {
   tl_regState = REGSTATE_CLEAN;
 }
 
-static uint64 run_intercept_helper(ActRec* ar, Variant* ihandler) {
+static uint64_t run_intercept_helper(ActRec* ar, Variant* ihandler) {
   sync_regstate_to_caller(ar);
   bool ret = run_intercept_handler<true>(ar, ihandler);
   /*
@@ -2173,13 +2173,13 @@ TranslatorX64::funcPrologue(Func* func, int nPassed) {
 TCA
 TranslatorX64::emitInterceptPrologue(Func* func) {
   TCA start = a.code.frontier;
-  emitImmReg(a, int64(&func->maybeIntercepted()), rax);
+  emitImmReg(a, int64_t(&func->maybeIntercepted()), rax);
   a.    cmpb (0, al);
   semiLikelyIfBlock(CC_NE, a, [&]{
     // Prologues are not really sites for function entry yet; we can get
     // here via an optimistic bindCall. Check that the func is as expected.
 
-    emitImmReg(a, int64(func), rax);
+    emitImmReg(a, int64_t(func), rax);
     a.  cmpq (rax, rStashedAR[AROFF(m_func)]);
     {
       JccBlock<CC_NZ> skip(a);
@@ -2389,7 +2389,7 @@ TranslatorX64::emitBindCall(SrcKey srcKey, const Func* funcd, int numArgs) {
     // rVmSp is already correctly adjusted, because there's no locals
     // other than the arguments passed.
     auto retval = emitNativeImpl(funcd, false /* don't jump to return */);
-    patchIP.patch(uint64(a.code.frontier));
+    patchIP.patch(uint64_t(a.code.frontier));
     return retval;
   }
   if (debug) {
@@ -2952,7 +2952,7 @@ TranslatorX64::checkRefs(X64Assembler& a,
         // Load the appropriate qword off of the top actRec's func*.
         SKTRACE(2, sk, "reffiness mask %" PRIx64 " value %" PRIx64 ", ar @%d\n",
                 mask, value, entryArDelta);
-        a.  load_reg64_disp_reg64(r(rBits), sizeof(uint64) * (i / 64),
+        a.  load_reg64_disp_reg64(r(rBits), sizeof(uint64_t) * (i / 64),
                                   r(rBitsValue));  // rBitsValue <- rBits[i / 64]
         a.  and_reg64_reg64(r(rMask), r(rBitsValue)); // rBitsValue &= rMask
         a.  cmp_reg64_reg64(r(rBitsValue), r(rExpectedBits));
@@ -2962,9 +2962,9 @@ TranslatorX64::checkRefs(X64Assembler& a,
 
         static_assert(AttrVariadicByRef == (1 << 15),
                       "AttrVariadicByRef assumed to be 1 << 15 in translator");
-        uint8 mask = (1u << (15 % CHAR_BIT));
+        uint8_t mask = (1u << (15 % CHAR_BIT));
         int offset = Func::attrsOff() + 15 / CHAR_BIT;
-        a.  testb((int8)mask, r(rFunc)[offset]);
+        a.  testb((int8_t)mask, r(rFunc)[offset]);
         {
           IfElseBlock<CC_NZ> ifNotWeirdBuiltin(a);
 
@@ -3354,7 +3354,7 @@ bool TranslatorX64::handleServiceRequest(TReqInfo& info,
     Offset offTaken = (Offset)args[1];
     Offset offNotTaken = (Offset)args[2];
     ConditionCode cc = ConditionCode(args[3]);
-    bool taken = int64(args[4]) & 1;
+    bool taken = int64_t(args[4]) & 1;
     start = bindJmpccFirst(toSmash, offTaken, offNotTaken,
                            taken, cc, smashed);
     // SrcKey: we basically need to emulate the fail
@@ -3693,7 +3693,7 @@ void TranslatorX64::fillByMov(PhysReg src, PhysReg dst) {
 }
 
 void
-TranslatorX64::loadImm(int64 immVal, PhysReg reg) {
+TranslatorX64::loadImm(int64_t immVal, PhysReg reg) {
   SpaceRecorder sr("_FillImm", *m_spillFillCode);
   TRACE(2, "loadImm: 0x%" PRIx64 " -> reg %d\n", immVal, int(reg));
   emitImmReg(*m_spillFillCode, immVal, reg);
@@ -4747,7 +4747,7 @@ TranslatorX64::translateBranchOp(const Tracelet& t,
     // Cast to a bool.
     if (false) {
       TypedValue *tv = nullptr;
-      int64 ret = tv_to_bool(tv);
+      int64_t ret = tv_to_bool(tv);
       if (ret) {
         printf("zoot");
       }
@@ -5298,7 +5298,7 @@ TranslatorX64::translateArray(const Tracelet& t,
     m_regMap.allocOutputRegs(i);
     ArrayData* ad = curUnit()->lookupArrayId(i.imm[0].u_AA);
     PhysReg r = getReg(i.outStack->location);
-    emitImmReg(a, uint64(ad), r);
+    emitImmReg(a, uint64_t(ad), r);
     // We are guaranteed that the array is static, so we do not need to
     // increment the refcount
     assert(ad->isStatic());
@@ -5315,7 +5315,7 @@ TranslatorX64::translateNewArray(const Tracelet& t,
   if (capacity == 0) {
     m_regMap.allocOutputRegs(i);
     PhysReg r = getReg(i.outStack->location);
-    emitImmReg(a, uint64(HphpArray::GetStaticEmptyArray()), r);
+    emitImmReg(a, uint64_t(HphpArray::GetStaticEmptyArray()), r);
     // We are guaranteed that the new array is static, so we do not need to
     // increment the refcount
     assert(HphpArray::GetStaticEmptyArray()->isStatic());
@@ -5646,13 +5646,13 @@ TranslatorX64::translateCns(const Tracelet& t,
     boost::scoped_ptr<DiamondReturn> astubsRet;
     if (checkDefined) {
       size_t bit = allocCnsBit(name);
-      uint8 mask;
+      uint8_t mask;
       CacheHandle ch = bitOffToHandleAndMask(bit, mask);
       // The 'test' instruction takes a signed immediate and the mask is
       // unsigned, but everything works out okay because the immediate is
       // the same size as the other operand. However, we have to sign-extend
       // the mask to 64 bits to make the assembler happy.
-      int64_t imm = (int64_t)(int8)mask;
+      int64_t imm = (int64_t)(int8_t)mask;
       a.testb(imm, rVmTl[ch]);
       if (!i.next) astubsRet.reset(new DiamondReturn);
       {
@@ -5767,11 +5767,11 @@ TranslatorX64::translateDefCns(const Tracelet& t,
   if (RuntimeOption::RepoAuthoritative) {
     EMIT_CALL(a, (defCnsHelper_func_t)defCnsHelper<false>,
                IMM(ch), A(i.inputs[0]->location),
-               IMM((uint64)name));
+               IMM((uint64_t)name));
   } else {
     EMIT_CALL(a, (defCnsHelper_func_t)defCnsHelper<true>,
                IMM(ch), A(i.inputs[0]->location),
-               IMM((uint64)name), IMM(allocCnsBit(name)));
+               IMM((uint64_t)name), IMM(allocCnsBit(name)));
   }
   recordReentrantCall(i);
   m_regMap.invalidate(i.outStack->location);
@@ -6048,13 +6048,13 @@ static void toStringError(StringData *cls) {
   raise_error("Method __toString() must return a string value");
 }
 
-static const StringData* stringDataFromInt(int64 n) {
+static const StringData* stringDataFromInt(int64_t n) {
   StringData* s = buildStringData(n);
   s->incRefCount();
   return s;
 }
 
-static const StringData* stringDataFromDouble(int64 n) {
+static const StringData* stringDataFromDouble(int64_t n) {
   StringData* s = buildStringData(*(double*)&n);
   s->incRefCount();
   return s;
@@ -6096,13 +6096,13 @@ TranslatorX64::translateCastString(const Tracelet& t,
   if (i.inputs[0]->isNull()) {
     m_regMap.allocOutputRegs(i);
     PhysReg dest = m_regMap.getReg(i.outStack->location);
-    a.   mov_imm64_reg((uint64)empty_string.get(), dest);
+    a.   mov_imm64_reg((uint64_t)empty_string.get(), dest);
   } else if (i.inputs[0]->isBoolean()) {
     static StringData* s_1 = StringData::GetStaticString("1");
     m_regMap.allocOutputRegs(i);
     PhysReg dest = m_regMap.getReg(i.outStack->location);
     a.   cmp_imm32_reg64(0, dest);
-    a.   mov_imm64_reg((uint64)empty_string.get(), dest);
+    a.   mov_imm64_reg((uint64_t)empty_string.get(), dest);
     ScratchReg scratch(m_regMap);
     a.   mov_imm64_reg((intptr_t)s_1, r(scratch));
     a.   cmov_reg64_reg64(CC_NZ, r(scratch), dest);
@@ -6121,7 +6121,7 @@ TranslatorX64::translateCastString(const Tracelet& t,
     m_regMap.allocOutputRegs(i);
     PhysReg dest = m_regMap.getReg(i.outStack->location);
     emitDecRef(i, dest, KindOfArray);
-    a.   mov_imm64_reg((uint64)s_array, dest);
+    a.   mov_imm64_reg((uint64_t)s_array, dest);
   } else if (i.inputs[0]->isObject()) {
     m_regMap.scrubStackEntries(i.stackOff - 1);
     m_regMap.cleanAll();
@@ -6284,11 +6284,11 @@ TranslatorX64::analyzeSwitch(Tracelet& t,
 }
 
 template <typename T>
-static int64 switchBoundsCheck(T v, int64 base, int64 nTargets) {
+static int64_t switchBoundsCheck(T v, int64_t base, int64_t nTargets) {
   // I'm relying on gcc to be smart enough to optimize away the next
   // two lines when T is int64.
-  if (int64(v) == v) {
-    int64 ival = v;
+  if (int64_t(v) == v) {
+    int64_t ival = v;
     if (ival >= base && ival < (base + nTargets)) {
       return ival - base;
     }
@@ -6296,17 +6296,17 @@ static int64 switchBoundsCheck(T v, int64 base, int64 nTargets) {
   return nTargets + 1;
 }
 
-static int64 switchDoubleHelper(int64 val, int64 base, int64 nTargets) {
+static int64_t switchDoubleHelper(int64_t val, int64_t base, int64_t nTargets) {
   union {
-    int64 intbits;
+    int64_t intbits;
     double dblval;
   } u;
   u.intbits = val;
   return switchBoundsCheck(u.dblval, base, nTargets);
 }
 
-static int64 switchStringHelper(StringData* s, int64 base, int64 nTargets) {
-  int64 ival;
+static int64_t switchStringHelper(StringData* s, int64_t base, int64_t nTargets) {
+  int64_t ival;
   double dval;
   switch (s->isNumericWithVal(ival, dval, 1)) {
     case KindOfNull:
@@ -6328,8 +6328,8 @@ static int64 switchStringHelper(StringData* s, int64 base, int64 nTargets) {
   return ival;
 }
 
-static int64 switchObjHelper(ObjectData* o, int64 base, int64 nTargets) {
-  int64 ival = o->o_toInt64();
+static int64_t switchObjHelper(ObjectData* o, int64_t base, int64_t nTargets) {
+  int64_t ival = o->o_toInt64();
   decRefObj(o);
   return switchBoundsCheck(ival, base, nTargets);
 }
@@ -6337,7 +6337,7 @@ static int64 switchObjHelper(ObjectData* o, int64 base, int64 nTargets) {
 void
 TranslatorX64::translateSwitch(const Tracelet& t,
                                const NormalizedInstruction& i) {
-  int64 base = i.imm[1].u_I64A;
+  int64_t base = i.imm[1].u_I64A;
   bool bounded = i.imm[2].u_IVA;
   const ImmVector& iv = i.immVec;
   int nTargets = bounded ? iv.size() - 2 : iv.size();
@@ -6495,7 +6495,7 @@ TranslatorX64::translateSSwitch(const Tracelet& t,
   auto bindAddr = [&](TCA& dest, Offset o) {
     SrcKey sk(curFunc(), ni.offset() + o);
     dest = emitServiceReq(SRFlags::SRNone, REQ_BIND_ADDR, 2ull,
-                          &dest, uint64(sk.offset()));
+                          &dest, uint64_t(sk.offset()));
   };
   if (fastPath) {
     Stats::emitInc(a, Stats::Tx64_StringSwitchFast);
@@ -6513,7 +6513,7 @@ TranslatorX64::translateSSwitch(const Tracelet& t,
 
     EMIT_RCALL(a, ni, sswitchHelperFast,
                input.isVariant() ? DEREF(inLoc) : V(inLoc),
-               IMM(int64(table)), IMM(int64(def)));
+               IMM(int64_t(table)), IMM(int64_t(def)));
   } else {
     Stats::emitInc(a, Stats::Tx64_StringSwitchSlow);
     const StringData** strtab = m_globalData.alloc<const StringData*>(
@@ -6528,7 +6528,7 @@ TranslatorX64::translateSSwitch(const Tracelet& t,
 
     m_regMap.cleanLoc(inLoc);
     EMIT_RCALL(a, ni, sswitchHelperSlow,
-               A(inLoc), IMM(int64(strtab)), IMM(cases), IMM(int64(jmptab)));
+               A(inLoc), IMM(int64_t(strtab)), IMM(cases), IMM(int64_t(jmptab)));
   }
   ScratchReg holdRax(m_regMap, rax);
   m_regMap.allocInputReg(ni, 0);
@@ -7693,8 +7693,8 @@ void TranslatorX64::translateStrlen(const Tracelet& t,
 
 void TranslatorX64::translateIncStat(const Tracelet& t,
                                      const NormalizedInstruction& i) {
-  int32 counter = i.imm[0].u_IVA;
-  int32 value = i.imm[1].u_IVA;
+  int32_t counter = i.imm[0].u_IVA;
+  int32_t value = i.imm[1].u_IVA;
   Stats::emitInc(a, Stats::StatCounter(counter), value);
 }
 
@@ -7724,7 +7724,7 @@ void TranslatorX64::analyzeTraitExists(Tracelet& t,
   analyzeClassExistsImpl(i);
 }
 
-static int64 classExistsSlow(const StringData* name, bool autoload,
+static int64_t classExistsSlow(const StringData* name, bool autoload,
                              Attr typeAttr) {
   bool ret = Unit::classExists(name, autoload, typeAttr);
   // XXX: do we need to decref this during an exception?
@@ -8268,36 +8268,36 @@ static void badKey() {
   raise_warning("Array key should be either a string or an integer");
 }
 
-static inline int64 ak_exist_string_helper(StringData* key, ArrayData* arr) {
-  int64 n;
+static inline int64_t ak_exist_string_helper(StringData* key, ArrayData* arr) {
+  int64_t n;
   if (key->isStrictlyInteger(n)) {
     return arr->exists(n);
   }
   return arr->exists(StrNR(key));
 }
 
-static int64 ak_exist_string(StringData* key, ArrayData* arr) {
-  int64 res = ak_exist_string_helper(key, arr);
+static int64_t ak_exist_string(StringData* key, ArrayData* arr) {
+  int64_t res = ak_exist_string_helper(key, arr);
   decRefArr(arr);
   decRefStr(key);
   return res;
 }
 
-static int64 ak_exist_int(int64 key, ArrayData* arr) {
+static int64_t ak_exist_int(int64_t key, ArrayData* arr) {
   bool res = arr->exists(key);
   decRefArr(arr);
   return res;
 }
 
-static int64 ak_exist_string_obj(StringData* key, ObjectData* obj) {
+static int64_t ak_exist_string_obj(StringData* key, ObjectData* obj) {
   CArrRef arr = obj->o_toArray();
-  int64 res = ak_exist_string_helper(key, arr.get());
+  int64_t res = ak_exist_string_helper(key, arr.get());
   decRefObj(obj);
   decRefStr(key);
   return res;
 }
 
-static int64 ak_exist_int_obj(int64 key, ObjectData* obj) {
+static int64_t ak_exist_int_obj(int64_t key, ObjectData* obj) {
   CArrRef arr = obj->o_toArray();
   bool res = arr.get()->exists(key);
   decRefObj(obj);
@@ -8731,7 +8731,7 @@ void TranslatorX64::translateDefCls(const Tracelet& t,
   ScratchReg offset(m_regMap, rax);
   emitLea(a, rVmSp, -cellsToBytes(i.stackOff), rax);
 
-  EMIT_CALL(a, m_defClsHelper, IMM((uint64)c), IMM((uint64)after));
+  EMIT_CALL(a, m_defClsHelper, IMM((uint64_t)c), IMM((uint64_t)after));
 }
 
 void TranslatorX64::analyzeDefFunc(Tracelet& t,
@@ -8748,7 +8748,7 @@ void TranslatorX64::translateDefFunc(const Tracelet& t,
   int fid = i.imm[0].u_IVA;
   Func* f = curFunc()->unit()->lookupFuncId(fid);
 
-  EMIT_CALL(a, defFuncHelper, IMM((uint64)f));
+  EMIT_CALL(a, defFuncHelper, IMM((uint64_t)f));
   recordReentrantCall(i);
 }
 
@@ -8846,9 +8846,9 @@ TranslatorX64::translateFPushClsMethodD(const Tracelet& t,
       EMIT_CALL(astubs,
                  StaticMethodCache::lookup,
                  IMM(ch),
-                 IMM(int64(np.second)),
-                 IMM(int64(cls)),
-                 IMM(int64(meth)));
+                 IMM(int64_t(np.second)),
+                 IMM(int64_t(cls)),
+                 IMM(int64_t(meth)));
       recordReentrantStubCall(i);
       emitMovRegReg(astubs, rax, r(rFunc));
       // NULL return means our work is done; see also
@@ -9242,7 +9242,7 @@ TranslatorX64::emitFPushCtorDFast(const NormalizedInstruction& i,
         UnlikelyIfBlock ifZero(CC_Z, a, astubs);
         Stats::emitInc(a, Stats::Tx64_NewInstancePropInit);
         EMIT_RCALL(astubs, i, getMethodPtr(&Class::initProps),
-                   IMM(int64(cls)));
+                   IMM(int64_t(cls)));
       }
     }
     if (sprops) {
@@ -9253,18 +9253,18 @@ TranslatorX64::emitFPushCtorDFast(const NormalizedInstruction& i,
         UnlikelyIfBlock ifZero(CC_Z, a, astubs);
         Stats::emitInc(a, Stats::Tx64_NewInstanceSPropInit);
         EMIT_RCALL(astubs, i, getMethodPtr(&Class::initSProps),
-                   IMM(int64(cls)));
+                   IMM(int64_t(cls)));
       }
     }
   }
 
   // Next, allocate the object
   if (cls->instanceCtor()) {
-    EMIT_RCALL(a, i, cls->instanceCtor(), IMM(int64(cls)));
+    EMIT_RCALL(a, i, cls->instanceCtor(), IMM(int64_t(cls)));
   } else {
     assert(allocator != -1);
     EMIT_RCALL(a, i, getMethodPtr(&Instance::newInstanceRaw),
-               IMM(int64(cls)), IMM(allocator));
+               IMM(int64_t(cls)), IMM(allocator));
   }
   ScratchReg holdRax(m_regMap, rax);
 
@@ -9290,7 +9290,7 @@ TranslatorX64::emitFPushCtorDFast(const NormalizedInstruction& i,
       // Fast case: copy from a known address in the Class
       EMIT_CALL(a, memcpy,
                 R(propVec),
-                IMM(int64(&cls->declPropInit()[0])),
+                IMM(int64_t(&cls->declPropInit()[0])),
                 IMM(cellsToBytes(nProps)));
     } else {
       // Slower case: we have to load the src address from the targetcache
@@ -9338,7 +9338,7 @@ TranslatorX64::emitFPushCtorDFast(const NormalizedInstruction& i,
     a.add_imm32_disp_reg32(2, TVOFF(_count), rax);
   }
   emitVStackStore(a, i, rVmFp, arOff + AROFF(m_savedRbp));
-  emitVStackStoreImm(a, i, int64(cls->getCtor()), arOff + AROFF(m_func));
+  emitVStackStoreImm(a, i, int64_t(cls->getCtor()), arOff + AROFF(m_func));
   emitVStackStoreImm(a, i, ActRec::encodeNumArgs(i.imm[0].u_IVA, true),
                      arOff + AROFF(m_numArgsAndCtorFlag), sz::dword);
   emitVStackStoreImm(a, i, 0, arOff + AROFF(m_varEnv));
@@ -9683,7 +9683,7 @@ TranslatorX64::setupActRecClsForStaticCall(const NormalizedInstruction &i,
 }
 
 template <bool warn>
-int64 checkClass(TargetCache::CacheHandle ch, StringData* clsName,
+int64_t checkClass(TargetCache::CacheHandle ch, StringData* clsName,
                  ActRec *ar) {
   VMRegAnchor _;
   AutoloadHandler::s_instance->invokeHandler(clsName->data());
@@ -9875,7 +9875,7 @@ TranslatorX64::translateFCall(const Tracelet& t,
 
   // The kooky offset here a) gets us to the current ActRec,
   // and b) accesses m_soff.
-  int32 callOffsetInUnit = srcFunc->unit()->offsetOf(after - srcFunc->base());
+  int32_t callOffsetInUnit = srcFunc->unit()->offsetOf(after - srcFunc->base());
   a.    storel  (callOffsetInUnit,
                  rVmSp[cellsToBytes(numArgs) + AROFF(m_soff)]);
 
@@ -10231,7 +10231,7 @@ emitClassToReg(X64Assembler& a, const StringData* name, PhysReg r) {
 
   Class* cls = Unit::lookupClass(name);
   if (classIsUniqueOrCtxParent(cls)) {
-    emitImmReg(a, int64(cls), r);
+    emitImmReg(a, int64_t(cls), r);
   } else {
     TargetCache::CacheHandle ch = TargetCache::allocKnownClass(name);
     a.  load_reg64_disp_reg64(rVmTl, ch, r);
@@ -10539,7 +10539,7 @@ TranslatorX64::emitInstanceCheck(const Tracelet& t,
   // burn its value into the translation, so it won't be in *cls and we use an
   // immediate.
   if (haveBit && classIsUniqueOrCtxParent(klass)) {
-    a.    cmp_imm64_reg64(int64(klass), r(inCls));
+    a.    cmp_imm64_reg64(int64_t(klass), r(inCls));
   } else {
     a.    cmp_reg64_reg64(r(inCls), r(cls));
   }
@@ -10565,12 +10565,12 @@ TranslatorX64::emitInstanceCheck(const Tracelet& t,
     }
 
     int offset;
-    uint8 mask;
+    uint8_t mask;
     if (Class::getInstanceBitMask(clsName, offset, mask)) {
       // We don't need to check that the parent class exists: if it doesn't
       // exist then it's impossible for this object to be an instance of it,
       // and the corresponding bit won't be set.
-      a.  testb((int8)mask, r(inCls)[offset]);
+      a.  testb((int8_t)mask, r(inCls)[offset]);
       if (verifying) {
         {
           UnlikelyIfBlock fail(CC_Z, a, astubs);
@@ -10653,7 +10653,7 @@ void TranslatorX64::translatorAssert(X64Assembler& a, ConditionCode cc,
   setup();
   TCA jmp = a.code.frontier;
   a.jcc8(cc, jmp);
-  emitImmReg(a, int64(msg), rdi);
+  emitImmReg(a, int64_t(msg), rdi);
   a.call((TCA)translatorAssertFail);
   recordCall(a, *m_curNI);
   a.patchJcc8(jmp, a.code.frontier);
@@ -10766,7 +10766,7 @@ TranslatorX64::translateBasicIterNext(const Tracelet& t,
     Iter* it = nullptr;
     TypedValue* val = nullptr;
     TypedValue* key = nullptr;
-    int64 ret = iter_next(it, val);
+    int64_t ret = iter_next(it, val);
     ret = iter_next_key(it, val, key);
     if (ret) printf("\n");
   }
@@ -11344,7 +11344,7 @@ TranslatorX64::translateTracelet(SrcKey sk, bool considerHHIR/*=true*/,
   TCA                     start = a.code.frontier;
   TCA                     stubStart = astubs.code.frontier;
   TCA                     counterStart = 0;
-  uint8                   counterLen = 0;
+  uint8_t                   counterLen = 0;
   SrcRec&                 srcRec = *getSrcRec(sk);
   vector<TransBCMapping>  bcMapping;
   TransKind               transKind = TransNormal;
@@ -12150,7 +12150,7 @@ bool TranslatorX64::addDbgGuards(const Unit* unit) {
   }
   s_writeLease.drop();
   gettime(CLOCK_MONOTONIC, &tsEnd);
-  int64 elapsed = gettime_diff_us(tsBegin, tsEnd);
+  int64_t elapsed = gettime_diff_us(tsBegin, tsEnd);
   if (Trace::moduleEnabledRelease(Trace::tx64, 5)) {
     Trace::traceRelease("addDbgGuards got lease for %" PRId64 " us\n", elapsed);
   }
@@ -12195,7 +12195,7 @@ void TranslatorX64::addDbgGuardImpl(SrcKey sk, SrcRec& srcRec) {
   static COff dbgOff = offsetof(ThreadInfo, m_reqInjectionData) +
                        offsetof(RequestInjectionData, debugger);
   a.   load_reg64_disp_reg32(rScratch, dbgOff, rScratch);
-  a.   testb((int8)0xff, rbyte(rScratch));
+  a.   testb((int8_t)0xff, rbyte(rScratch));
   // Branch to a special REQ_INTERPRET if attached
   {
     TCA fallback = emitServiceReq(REQ_INTERPRET, 2, uint64_t(sk.offset()), 0);
diff --git a/hphp/runtime/vm/translator/translator-x64.h b/hphp/runtime/vm/translator/translator-x64.h
index d8055283d38c9..714015e92b5aa 100644
--- a/hphp/runtime/vm/translator/translator-x64.h
+++ b/hphp/runtime/vm/translator/translator-x64.h
@@ -202,7 +202,7 @@ class TranslatorX64 : public Translator
   int m_curLine;
   litstr m_curFunc;
 private:
-  int64 m_createdTime;
+  int64_t m_createdTime;
 
   struct PendingFixup {
     TCA m_tca;
@@ -756,7 +756,7 @@ PSEUDOINSTRS
              bool writeType);
   void fill(const Location& loc, PhysReg reg);
   void fillByMov(PhysReg src, PhysReg dst);
-  void loadImm(int64 immVal, PhysReg reg);
+  void loadImm(int64_t immVal, PhysReg reg);
   void poison(PhysReg dest);
 
 public:
diff --git a/hphp/runtime/vm/translator/translator.cpp b/hphp/runtime/vm/translator/translator.cpp
index 0230219b775fb..371af2d0a8726 100644
--- a/hphp/runtime/vm/translator/translator.cpp
+++ b/hphp/runtime/vm/translator/translator.cpp
@@ -419,12 +419,12 @@ operator|(const Operands& l, const Operands& r) {
   return Operands(int(r) | int(l));
 }
 
-static int64 typeToMask(DataType t) {
+static int64_t typeToMask(DataType t) {
   return (t == KindOfInvalid) ? 1 : (1 << (1 + getDataTypeIndex(t)));
 }
 
 struct InferenceRule {
-  int64 mask;
+  int64_t mask;
   DataType result;
 };
 
@@ -454,14 +454,14 @@ static DataType inferType(const InferenceRule* rules,
  */
 
 #define TYPE_MASK(name) \
-  static const int64 name ## Mask = typeToMask(KindOf ## name);
+  static const int64_t name ## Mask = typeToMask(KindOf ## name);
 TYPE_MASK(Invalid);
 TYPE_MASK(Uninit);
 TYPE_MASK(Null);
 TYPE_MASK(Boolean);
-static const int64 IntMask = typeToMask(KindOfInt64);
+static const int64_t IntMask = typeToMask(KindOfInt64);
 TYPE_MASK(Double);
-static const int64 StringMask = typeToMask(KindOfString) |
+static const int64_t StringMask = typeToMask(KindOfString) |
                                 typeToMask(KindOfStaticString);
 TYPE_MASK(Array);
 TYPE_MASK(Object);
@@ -498,10 +498,10 @@ static RuntimeType bitOpType(DynLocation* a, DynLocation* b) {
   return inferType(BitOpRules, ins);
 }
 
-static uint32 m_w = 1;    /* must not be zero */
-static uint32 m_z = 1;    /* must not be zero */
+static uint32_t m_w = 1;    /* must not be zero */
+static uint32_t m_z = 1;    /* must not be zero */
 
-static uint32 get_random()
+static uint32_t get_random()
 {
     m_z = 36969 * (m_z & 65535) + (m_z >> 16);
     m_w = 18000 * (m_w & 65535) + (m_w >> 16);
@@ -1849,7 +1849,7 @@ static void addMVectorInputs(NormalizedInstruction& ni,
     if (mcode == MW) {
       // No stack and no locals.
     } else if (memberCodeHasImm(mcode)) {
-      int64 imm = decodeMemberCodeImm(&vec, mcode);
+      int64_t imm = decodeMemberCodeImm(&vec, mcode);
       if (memberCodeImmIsLoc(mcode)) {
         push_local(imm);
       } else if (memberCodeImmIsString(mcode)) {
@@ -2449,7 +2449,7 @@ Translator::findImmable(ImmStack &stack,
        * integer, we can call into array-access helper functions that
        * don't bother with the integer check.
        */
-      int64 lval;
+      int64_t lval;
       if (LIKELY(!str->isStrictlyInteger(lval))) {
         ni->hasConstImm = true;
         ni->constImm.u_SA = strId;
@@ -3346,15 +3346,15 @@ Translator::addDbgBLPC(PC pc) {
   return true;
 }
 
-uint64* Translator::getTransCounterAddr() {
+uint64_t* Translator::getTransCounterAddr() {
   if (!isTransDBEnabled()) return nullptr;
 
   TransID id = m_translations.size();
 
   // allocate a new chunk of counters if necessary
   if (id >= m_transCounters.size() * transCountersPerChunk) {
-    uint32   size = sizeof(uint64) * transCountersPerChunk;
-    uint64 *chunk = (uint64*)malloc(size);
+    uint32_t   size = sizeof(uint64_t) * transCountersPerChunk;
+    auto *chunk = (uint64_t*)malloc(size);
     bzero(chunk, size);
     m_transCounters.push_back(chunk);
   }
@@ -3364,11 +3364,11 @@ uint64* Translator::getTransCounterAddr() {
 }
 
 
-uint64 Translator::getTransCounter(TransID transId) const {
+uint64_t Translator::getTransCounter(TransID transId) const {
   if (!isTransDBEnabled()) return -1ul;
   assert(transId < m_translations.size());
 
-  uint64 counter;
+  uint64_t counter;
 
   if (transId / transCountersPerChunk >= m_transCounters.size()) {
     counter = 0;
@@ -3379,7 +3379,7 @@ uint64 Translator::getTransCounter(TransID transId) const {
   return counter;
 }
 
-void Translator::setTransCounter(TransID transId, uint64 value) {
+void Translator::setTransCounter(TransID transId, uint64_t value) {
   assert(transId < m_translations.size());
   assert(transId / transCountersPerChunk < m_transCounters.size());
 
@@ -3400,7 +3400,7 @@ const char *getTransKindName(TransKind kind) {
 }
 
 string
-TransRec::print(uint64 profCount) const {
+TransRec::print(uint64_t profCount) const {
   const size_t kBufSize = 1000;
   static char formatBuf[kBufSize];
 
@@ -3415,7 +3415,7 @@ TransRec::print(uint64 profCount) const {
            "  aLen = 0x%x\n"
            "  stubStart = %p\n"
            "  stubLen = 0x%x\n"
-           "  profCount = %llu\n"
+           "  profCount = %" PRIu64 "\n"
            "  bcMapping = %lu\n",
            id, md5.toString().c_str(), src.m_funcId, src.offset(),
            bcStopOffset, kind, getTransKindName(kind), aStart, aLen,
diff --git a/hphp/runtime/vm/translator/translator.h b/hphp/runtime/vm/translator/translator.h
index 24074902dd104..ec6b1760bf2e2 100644
--- a/hphp/runtime/vm/translator/translator.h
+++ b/hphp/runtime/vm/translator/translator.h
@@ -48,7 +48,7 @@ namespace Transl {
 
 static const bool trustSigSegv = false;
 
-static const uint32 transCountersPerChunk = 1024 * 1024 / 8;
+static const uint32_t transCountersPerChunk = 1024 * 1024 / 8;
 
 class TranslatorX64;
 extern TranslatorX64* volatile nextTx64;
@@ -107,7 +107,7 @@ struct SrcKey {
   }
   // Hash function for both hash_map and tbb conventions.
   static size_t hash(const SrcKey &sk) {
-    return HPHP::hash_int64_pair(sk.m_funcId, uint64(sk.m_offset));
+    return HPHP::hash_int64_pair(sk.m_funcId, uint64_t(sk.m_offset));
   }
   size_t operator()(const SrcKey& sk) const {
     return hash(sk);
@@ -167,8 +167,8 @@ struct DynLocation {
 
   // Hash function
   size_t operator()(const DynLocation &dl) const {
-    uint64 rtthash = rtt(rtt);
-    uint64 locHash = location(location);
+    uint64_t rtthash = rtt(rtt);
+    uint64_t locHash = location(location);
     return rtthash ^ locHash;
   }
 
@@ -531,7 +531,7 @@ struct RefDeps {
       return out.str();
     }
   };
-  typedef hphp_hash_map<int64, Record, int64_hash> ArMap;
+  typedef hphp_hash_map<int64_t, Record, int64_hash> ArMap;
   ArMap m_arMap;
 
   RefDeps() {}
@@ -730,14 +730,14 @@ struct TransRec {
   TransKind               kind;
   SrcKey                  src;
   MD5                     md5;
-  uint32                  bcStopOffset;
+  uint32_t                  bcStopOffset;
   vector<DynLocation>     dependencies;
   TCA                     aStart;
-  uint32                  aLen;
+  uint32_t                  aLen;
   TCA                     astubsStart;
-  uint32                  astubsLen;
+  uint32_t                  astubsLen;
   TCA                     counterStart;
-  uint8                   counterLen;
+  uint8_t                   counterLen;
   vector<TransBCMapping>  bcMapping;
 
   static const TransID InvalidID = -1LL;
@@ -748,9 +748,9 @@ struct TransRec {
            MD5       _md5,
            TransKind _kind,
            TCA       _aStart = 0,
-           uint32    _aLen = 0,
+           uint32_t    _aLen = 0,
            TCA       _astubsStart = 0,
-           uint32    _astubsLen = 0) :
+           uint32_t    _astubsLen = 0) :
       id(0), kind(_kind), src(s), md5(_md5), bcStopOffset(0),
       aStart(_aStart), aLen(_aLen),
       astubsStart(_astubsStart), astubsLen(_astubsLen),
@@ -761,11 +761,11 @@ struct TransRec {
            TransKind                _kind,
            const Tracelet&          t,
            TCA                      _aStart = 0,
-           uint32                   _aLen = 0,
+           uint32_t                   _aLen = 0,
            TCA                      _astubsStart = 0,
-           uint32                   _astubsLen = 0,
+           uint32_t                   _astubsLen = 0,
            TCA                      _counterStart = 0,
-           uint8                    _counterLen = 0,
+           uint8_t                    _counterLen = 0,
            vector<TransBCMapping>   _bcMapping = vector<TransBCMapping>()) :
       id(0), kind(_kind), src(s), md5(_md5),
       bcStopOffset(t.m_nextSk.offset()), aStart(_aStart), aLen(_aLen),
@@ -780,7 +780,7 @@ struct TransRec {
   }
 
   void setID(TransID newID) { id = newID; }
-  string print(uint64 profCount) const;
+  string print(uint64_t profCount) const;
 };
 
 /*
@@ -848,11 +848,11 @@ class Translator {
   typedef std::map<TCA, TransID> TransDB;
   TransDB            m_transDB;
   vector<TransRec>   m_translations;
-  vector<uint64*>    m_transCounters;
+  vector<uint64_t*>    m_transCounters;
 
   bool               m_useHHIR; // Is HHIR in effect for current trace?
 
-  int64              m_createdTime;
+  int64_t              m_createdTime;
 
   static Lease s_writeLease;
   static volatile bool s_replaceInFlight;
@@ -929,13 +929,13 @@ class Translator {
     return m_translations.size();
   }
 
-  uint64* getTransCounterAddr();
+  uint64_t* getTransCounterAddr();
 
-  uint64 getTransCounter(TransID transId) const;
+  uint64_t getTransCounter(TransID transId) const;
 
-  void setTransCounter(TransID transId, uint64 value);
+  void setTransCounter(TransID transId, uint64_t value);
 
-  uint32 addTranslation(const TransRec& transRec) {
+  uint32_t addTranslation(const TransRec& transRec) {
     if (Trace::moduleEnabledRelease(Trace::trans, 1)) {
       // Log the translation's size, creation time, SrcKey, and size
       Trace::traceRelease("New translation: %lld %s %u %u %d\n",
@@ -945,7 +945,7 @@ class Translator {
     }
 
     if (!isTransDBEnabled()) return -1u;
-    uint32 id = getCurrentTransID();
+    uint32_t id = getCurrentTransID();
     m_translations.push_back(transRec);
     m_translations[id].setID(id);
 
diff --git a/hphp/runtime/vm/translator/writelease.cpp b/hphp/runtime/vm/translator/writelease.cpp
index b62bbec2667b7..5faa95ae209a3 100644
--- a/hphp/runtime/vm/translator/writelease.cpp
+++ b/hphp/runtime/vm/translator/writelease.cpp
@@ -38,7 +38,7 @@ Lease::amOwner() const {
  * DEBUG-only, folks.
  */
 static inline pthread_t gremlinize_threadid(pthread_t tid) {
-  return (pthread_t)(~((int64)tid));
+  return (pthread_t)(~((int64_t)tid));
 }
 
 void Lease::gremlinLock() {
@@ -66,8 +66,8 @@ bool Lease::acquire(bool blocking /* = false */ ) {
   if (amOwner()) {
     return true;
   }
-  int64 expire = m_hintExpire;
-  int64 expireDiff = expire - Timer::GetCurrentTimeMicros();
+  int64_t expire = m_hintExpire;
+  int64_t expireDiff = expire - Timer::GetCurrentTimeMicros();
   if (!blocking && (m_held ||
                     (expireDiff > 0 && m_owner != pthread_self()))) {
     return false;
@@ -103,7 +103,7 @@ bool Lease::acquire(bool blocking /* = false */ ) {
   return false;
 }
 
-void Lease::drop(int64 hintExpireDelay) {
+void Lease::drop(int64_t hintExpireDelay) {
   assert(amOwner());
   TRACE(4, "thr%lx: dropping lease, called by %p,%p\n",
         pthread_self(), __builtin_return_address(0),
diff --git a/hphp/runtime/vm/translator/writelease.h b/hphp/runtime/vm/translator/writelease.h
index d9e12524995f9..09af0ccf45820 100644
--- a/hphp/runtime/vm/translator/writelease.h
+++ b/hphp/runtime/vm/translator/writelease.h
@@ -31,15 +31,15 @@ namespace HPHP { namespace VM { namespace Transl {
  */
 
 struct Lease {
-  static const int64 kStandardHintExpireInterval = 750;
+  static const int64_t kStandardHintExpireInterval = 750;
   pthread_t       m_owner;
   pthread_mutex_t m_lock;
   // m_held: since there's no portable, universally invalid pthread_t,
   // explicitly represent the held <-> unheld state machine.
   volatile bool   m_held;
-  int64           m_hintExpire;
-  int64           m_hintKept;
-  int64           m_hintGrabbed;
+  int64_t           m_hintExpire;
+  int64_t           m_hintKept;
+  int64_t           m_hintGrabbed;
 
   Lease() : m_held(false), m_hintExpire(0), m_hintKept(0), m_hintGrabbed(0) {
     pthread_mutex_init(&m_lock, nullptr);
@@ -54,7 +54,7 @@ struct Lease {
   bool amOwner() const;
   // acquire: also returns true if we are already the writer.
   bool acquire(bool blocking = false);
-  void drop(int64 hintExpireDelay = 0);
+  void drop(int64_t hintExpireDelay = 0);
 
   /*
    * A malevolent entity sometimes takes the write lease out from under us
diff --git a/hphp/runtime/vm/type_profile.cpp b/hphp/runtime/vm/type_profile.cpp
index 7fdbca6a742aa..5dc4ac6ae5c8b 100644
--- a/hphp/runtime/vm/type_profile.cpp
+++ b/hphp/runtime/vm/type_profile.cpp
@@ -157,7 +157,7 @@ profileInit() {
  * the EvalJitWarmupRequests'th req.
  */
 bool __thread profileOn = false;
-static int64 numRequests;
+static int64_t numRequests;
 
 static inline bool warmedUp() {
   return (numRequests >= RuntimeOption::EvalJitWarmupRequests) ||
diff --git a/hphp/runtime/vm/unit.cpp b/hphp/runtime/vm/unit.cpp
index e5797bfcfce74..19996bf72ce8f 100644
--- a/hphp/runtime/vm/unit.cpp
+++ b/hphp/runtime/vm/unit.cpp
@@ -265,7 +265,7 @@ bool Unit::MetaHandle::findMeta(const Unit* unit, Offset offset) {
 
 bool Unit::MetaHandle::nextArg(MetaInfo& info) {
   assert(index && cur && ptr);
-  uint8* end = (uint8*)index + index[*index + cur + 2];
+  uint8_t* end = (uint8_t*)index + index[*index + cur + 2];
   assert(ptr <= end);
   if (ptr == end) return false;
   info.m_kind = (Unit::MetaInfo::Kind)*ptr++;
@@ -1488,7 +1488,7 @@ Unit* UnitRepoProxy::load(const std::string& name, const MD5& md5) {
     }
   }
   if (repoId < 0) {
-    TRACE(3, "No repo contains '%s' (0x%016llx%016llx)\n",
+    TRACE(3, "No repo contains '%s' (0x%016" PRIx64  "%016" PRIx64 ")\n",
              name.c_str(), md5.q[0], md5.q[1]);
     return nullptr;
   }
@@ -1500,18 +1500,20 @@ Unit* UnitRepoProxy::load(const std::string& name, const MD5& md5) {
     getUnitMergeables(repoId).get(ue);
     m_repo.frp().getFuncs(repoId).get(ue);
   } catch (RepoExc& re) {
-    TRACE(0, "Repo error loading '%s' (0x%016llx%016llx) from '%s': %s\n",
-             name.c_str(), md5.q[0], md5.q[1], m_repo.repoName(repoId).c_str(),
-             re.msg().c_str());
+    TRACE(0,
+          "Repo error loading '%s' (0x%016" PRIx64 "%016"
+          PRIx64 ") from '%s': %s\n",
+          name.c_str(), md5.q[0], md5.q[1], m_repo.repoName(repoId).c_str(),
+          re.msg().c_str());
     return nullptr;
   }
-  TRACE(3, "Repo loaded '%s' (0x%016llx%016llx) from '%s'\n",
+  TRACE(3, "Repo loaded '%s' (0x%016" PRIx64 "%016" PRIx64 ") from '%s'\n",
            name.c_str(), md5.q[0], md5.q[1], m_repo.repoName(repoId).c_str());
   return ue.create();
 }
 
 void UnitRepoProxy::InsertUnitStmt
-                  ::insert(RepoTxn& txn, int64& unitSn, const MD5& md5,
+                  ::insert(RepoTxn& txn, int64_t& unitSn, const MD5& md5,
                            const uchar* bc, size_t bclen,
                            const uchar* bc_meta, size_t bc_meta_len,
                            const TypedValue* mainReturn, bool mergeOnly,
@@ -1555,7 +1557,7 @@ bool UnitRepoProxy::GetUnitStmt
     if (!query.row()) {
       return true;
     }
-    int64 unitSn;                            /**/ query.getInt64(0, unitSn);
+    int64_t unitSn;                            /**/ query.getInt64(0, unitSn);
     const void* bc; size_t bclen;            /**/ query.getBlob(1, bc, bclen);
     const void* bc_meta; size_t bc_meta_len; /**/ query.getBlob(2, bc_meta,
                                                                 bc_meta_len);
@@ -1581,7 +1583,7 @@ bool UnitRepoProxy::GetUnitStmt
 }
 
 void UnitRepoProxy::InsertUnitLitstrStmt
-                  ::insert(RepoTxn& txn, int64 unitSn, Id litstrId,
+                  ::insert(RepoTxn& txn, int64_t unitSn, Id litstrId,
                            const StringData* litstr) {
   if (!prepared()) {
     std::stringstream ssInsert;
@@ -1621,7 +1623,7 @@ void UnitRepoProxy::GetUnitLitstrsStmt
 }
 
 void UnitRepoProxy::InsertUnitArrayStmt
-                  ::insert(RepoTxn& txn, int64 unitSn, Id arrayId,
+                  ::insert(RepoTxn& txn, int64_t unitSn, Id arrayId,
                            const StringData* array) {
   if (!prepared()) {
     std::stringstream ssInsert;
@@ -1663,7 +1665,7 @@ void UnitRepoProxy::GetUnitArraysStmt
 }
 
 void UnitRepoProxy::InsertUnitPreConstStmt
-                  ::insert(RepoTxn& txn, int64 unitSn, const PreConst& pc,
+                  ::insert(RepoTxn& txn, int64_t unitSn, const PreConst& pc,
                            Id id) {
   if (!prepared()) {
     std::stringstream ssInsert;
@@ -1705,7 +1707,7 @@ void UnitRepoProxy::GetUnitPreConstsStmt
 }
 
 void UnitRepoProxy::InsertUnitMergeableStmt
-                  ::insert(RepoTxn& txn, int64 unitSn,
+                  ::insert(RepoTxn& txn, int64_t unitSn,
                            int ix, UnitMergeKind kind, Id id,
                            TypedValue* value) {
   if (!prepared()) {
@@ -1786,7 +1788,7 @@ void UnitRepoProxy::GetUnitMergeablesStmt
 }
 
 void UnitRepoProxy::InsertUnitSourceLocStmt
-                  ::insert(RepoTxn& txn, int64 unitSn, Offset pastOffset,
+                  ::insert(RepoTxn& txn, int64_t unitSn, Offset pastOffset,
                            int line0, int char0, int line1, int char1) {
   if (!prepared()) {
     std::stringstream ssInsert;
@@ -1806,7 +1808,7 @@ void UnitRepoProxy::InsertUnitSourceLocStmt
 }
 
 bool UnitRepoProxy::GetSourceLocStmt
-                  ::get(int64 unitSn, Offset pc, SourceLoc& sLoc) {
+                  ::get(int64_t unitSn, Offset pc, SourceLoc& sLoc) {
   try {
     RepoTxn txn(m_repo);
     if (!prepared()) {
@@ -1836,7 +1838,7 @@ bool UnitRepoProxy::GetSourceLocStmt
 }
 
 bool UnitRepoProxy::GetSourceLocPastOffsetsStmt
-                  ::get(int64 unitSn, int line, OffsetRangeVec& ranges) {
+                  ::get(int64_t unitSn, int line, OffsetRangeVec& ranges) {
   try {
     RepoTxn txn(m_repo);
     if (!prepared()) {
@@ -1865,7 +1867,7 @@ bool UnitRepoProxy::GetSourceLocPastOffsetsStmt
 }
 
 bool UnitRepoProxy::GetSourceLocBaseOffsetStmt
-                  ::get(int64 unitSn, OffsetRange& range) {
+                  ::get(int64_t unitSn, OffsetRange& range) {
   try {
     RepoTxn txn(m_repo);
     if (!prepared()) {
@@ -1894,7 +1896,7 @@ bool UnitRepoProxy::GetSourceLocBaseOffsetStmt
 }
 
 bool UnitRepoProxy::GetBaseOffsetAtPCLocStmt
-                  ::get(int64 unitSn, Offset pc, Offset& offset) {
+                  ::get(int64_t unitSn, Offset pc, Offset& offset) {
   try {
     RepoTxn txn(m_repo);
     if (!prepared()) {
@@ -1921,7 +1923,7 @@ bool UnitRepoProxy::GetBaseOffsetAtPCLocStmt
 }
 
 bool UnitRepoProxy::GetBaseOffsetAfterPCLocStmt
-                  ::get(int64 unitSn, Offset pc, Offset& offset) {
+                  ::get(int64_t unitSn, Offset pc, Offset& offset) {
   try {
     RepoTxn txn(m_repo);
     if (!prepared()) {
@@ -2221,7 +2223,7 @@ bool UnitEmitter::insert(UnitOrigin unitOrigin, RepoTxn& txn) {
                                     m_bc_meta, m_bc_meta_len,
                                     &m_mainReturn, m_mergeOnly, lines);
     }
-    int64 usn = m_sn;
+    int64_t usn = m_sn;
     for (unsigned i = 0; i < m_litstrs.size(); ++i) {
       urp.insertUnitLitstr(repoId).insert(txn, usn, i, m_litstrs[i]);
     }
@@ -2276,7 +2278,7 @@ bool UnitEmitter::insert(UnitOrigin unitOrigin, RepoTxn& txn) {
     }
     return false;
   } catch (RepoExc& re) {
-    TRACE(3, "Failed to commit '%s' (0x%016llx%016llx) to '%s': %s\n",
+    TRACE(3, "Failed to commit '%s' (0x%016" PRIx64 "%016" PRIx64 ") to '%s': %s\n",
              m_filepath->data(), m_md5.q[0], m_md5.q[1],
              repo.repoName(repoId).c_str(), re.msg().c_str());
     return true;
@@ -2294,7 +2296,7 @@ void UnitEmitter::commit(UnitOrigin unitOrigin) {
   } catch (RepoExc& re) {
     int repoId = repo.repoIdForNewUnit(unitOrigin);
     if (repoId != RepoIdInvalid) {
-      TRACE(3, "Failed to commit '%s' (0x%016llx%016llx) to '%s': %s\n",
+      TRACE(3, "Failed to commit '%s' (0x%016" PRIx64 "%016" PRIx64 ") to '%s': %s\n",
                m_filepath->data(), m_md5.q[0], m_md5.q[1],
                repo.repoName(repoId).c_str(), re.msg().c_str());
     }
diff --git a/hphp/runtime/vm/unit.h b/hphp/runtime/vm/unit.h
index 8a0c9b85a9f04..864144d030c46 100644
--- a/hphp/runtime/vm/unit.h
+++ b/hphp/runtime/vm/unit.h
@@ -373,7 +373,7 @@ struct Unit {
      * other stack arguments.)
      */
     Kind  m_kind;
-    uint8 m_arg;
+    uint8_t m_arg;
     Id    m_data;
   };
 
@@ -407,7 +407,7 @@ struct Unit {
    private:
     const Offset* index;
     unsigned cur;
-    const uint8 *ptr;
+    const uint8_t *ptr;
   };
 
   Unit();
@@ -416,7 +416,7 @@ struct Unit {
   void operator delete(void* p, size_t sz);
 
   int repoId() const { return m_repoId; }
-  int64 sn() const { return m_sn; }
+  int64_t sn() const { return m_sn; }
 
   PC entry() const { return m_bc; }
   Offset bclen() const { return m_bclen; }
@@ -653,7 +653,7 @@ struct Unit {
 private:
   // pseudoMain's return value, or KindOfUninit if its not known.
   TypedValue m_mainReturn;
-  int64 m_sn;
+  int64_t m_sn;
   uchar* m_bc;
   size_t m_bclen;
   uchar* m_bc_meta;
@@ -666,9 +666,9 @@ struct Unit {
   PreClassPtrVec m_preClasses;
   UnitMergeInfo* m_mergeInfo;
   unsigned m_cacheOffset;
-  int8 m_repoId;
-  uint8 m_mergeState;
-  uint8 m_cacheMask;
+  int8_t m_repoId;
+  uint8_t m_mergeState;
+  uint8_t m_cacheMask;
   bool m_mergeOnly;
   LineTable m_lineTable;
   FuncTable m_funcTable;
@@ -685,8 +685,8 @@ class UnitEmitter {
 
   int repoId() const { return m_repoId; }
   void setRepoId(int repoId) { m_repoId = repoId; }
-  int64 sn() const { return m_sn; }
-  void setSn(int64 sn) { m_sn = sn; }
+  int64_t sn() const { return m_sn; }
+  void setSn(int64_t sn) { m_sn = sn; }
   Offset bcPos() const { return (Offset)m_bclen; }
   void setBc(const uchar* bc, size_t bclen);
   void setBcMeta(const uchar* bc_meta, size_t bc_meta_len);
@@ -725,7 +725,7 @@ class UnitEmitter {
 
  private:
   template<class T>
-  void emitImpl(T n, int64 pos) {
+  void emitImpl(T n, int64_t pos) {
     uchar *c = (uchar*)&n;
     if (pos == -1) {
       // Make sure m_bc is large enough.
@@ -743,11 +743,11 @@ class UnitEmitter {
     }
   }
  public:
-  void emitOp(Op op, int64 pos = -1) {
+  void emitOp(Op op, int64_t pos = -1) {
     emitByte((uchar)op, pos);
   }
-  void emitByte(uchar n, int64 pos = -1) { emitImpl(n, pos); }
-  void emitInt32(int n, int64 pos = -1) { emitImpl(n, pos); }
+  void emitByte(uchar n, int64_t pos = -1) { emitImpl(n, pos); }
+  void emitInt32(int n, int64_t pos = -1) { emitImpl(n, pos); }
   template<typename T> void emitIVA(T n) {
     if (LIKELY((n & 0x7f) == n)) {
       emitByte((unsigned char)n << 1);
@@ -756,8 +756,8 @@ class UnitEmitter {
       emitInt32((n << 1) | 0x1);
     }
   }
-  void emitInt64(int64 n, int64 pos = -1) { emitImpl(n, pos); }
-  void emitDouble(double n, int64 pos = -1) { emitImpl(n, pos); }
+  void emitInt64(int64_t n, int64_t pos = -1) { emitImpl(n, pos); }
+  void emitDouble(double n, int64_t pos = -1) { emitImpl(n, pos); }
   bool insert(UnitOrigin unitOrigin, RepoTxn& txn);
   void commit(UnitOrigin unitOrigin);
   Func* newFunc(const FuncEmitter* fe, Unit& unit, Id id, int line1, int line2,
@@ -784,7 +784,7 @@ class UnitEmitter {
 
  private:
   int m_repoId;
-  int64 m_sn;
+  int64_t m_sn;
   static const size_t BCMaxInit = 4096; // Initial bytecode size.
   size_t m_bcmax;
   uchar* m_bc;
@@ -876,7 +876,7 @@ class UnitRepoProxy : public RepoProxy {
   class InsertUnitStmt : public RepoProxy::Stmt {
    public:
     InsertUnitStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
-    void insert(RepoTxn& txn, int64& unitSn, const MD5& md5, const uchar* bc,
+    void insert(RepoTxn& txn, int64_t& unitSn, const MD5& md5, const uchar* bc,
                 size_t bclen, const uchar* bc_meta, size_t bc_meta_len,
                 const TypedValue* mainReturn, bool mergeOnly,
                 const LineTable& lines);
@@ -889,7 +889,7 @@ class UnitRepoProxy : public RepoProxy {
   class InsertUnitLitstrStmt : public RepoProxy::Stmt {
    public:
     InsertUnitLitstrStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
-    void insert(RepoTxn& txn, int64 unitSn, Id litstrId,
+    void insert(RepoTxn& txn, int64_t unitSn, Id litstrId,
                 const StringData* litstr);
   };
   class GetUnitLitstrsStmt : public RepoProxy::Stmt {
@@ -900,7 +900,7 @@ class UnitRepoProxy : public RepoProxy {
   class InsertUnitArrayStmt : public RepoProxy::Stmt {
    public:
     InsertUnitArrayStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
-    void insert(RepoTxn& txn, int64 unitSn, Id arrayId,
+    void insert(RepoTxn& txn, int64_t unitSn, Id arrayId,
                 const StringData* array);
   };
   class GetUnitArraysStmt : public RepoProxy::Stmt {
@@ -911,7 +911,7 @@ class UnitRepoProxy : public RepoProxy {
   class InsertUnitPreConstStmt : public RepoProxy::Stmt {
   public:
     InsertUnitPreConstStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
-    void insert(RepoTxn& txn, int64 unitSn, const PreConst& pc,
+    void insert(RepoTxn& txn, int64_t unitSn, const PreConst& pc,
                 Id id);
   };
   class GetUnitPreConstsStmt : public RepoProxy::Stmt {
@@ -922,7 +922,7 @@ class UnitRepoProxy : public RepoProxy {
   class InsertUnitMergeableStmt : public RepoProxy::Stmt {
    public:
     InsertUnitMergeableStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
-    void insert(RepoTxn& txn, int64 unitSn,
+    void insert(RepoTxn& txn, int64_t unitSn,
                 int ix, UnitMergeKind kind,
                 Id id, TypedValue *value);
   };
@@ -934,33 +934,33 @@ class UnitRepoProxy : public RepoProxy {
   class InsertUnitSourceLocStmt : public RepoProxy::Stmt {
    public:
     InsertUnitSourceLocStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
-    void insert(RepoTxn& txn, int64 unitSn, Offset pastOffset, int line0,
+    void insert(RepoTxn& txn, int64_t unitSn, Offset pastOffset, int line0,
                 int char0, int line1, int char1);
   };
   class GetSourceLocStmt : public RepoProxy::Stmt {
    public:
     GetSourceLocStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
-    bool get(int64 unitSn, Offset pc, SourceLoc& sLoc);
+    bool get(int64_t unitSn, Offset pc, SourceLoc& sLoc);
   };
   class GetSourceLocPastOffsetsStmt : public RepoProxy::Stmt {
    public:
     GetSourceLocPastOffsetsStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
-    bool get(int64 unitSn, int line, OffsetRangeVec& ranges);
+    bool get(int64_t unitSn, int line, OffsetRangeVec& ranges);
   };
   class GetSourceLocBaseOffsetStmt : public RepoProxy::Stmt {
    public:
     GetSourceLocBaseOffsetStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
-    bool get(int64 unitSn, OffsetRange& range);
+    bool get(int64_t unitSn, OffsetRange& range);
   };
   class GetBaseOffsetAtPCLocStmt : public RepoProxy::Stmt {
    public:
     GetBaseOffsetAtPCLocStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
-    bool get(int64 unitSn, Offset pc, Offset& offset);
+    bool get(int64_t unitSn, Offset pc, Offset& offset);
   };
   class GetBaseOffsetAfterPCLocStmt : public RepoProxy::Stmt {
    public:
     GetBaseOffsetAfterPCLocStmt(Repo& repo, int repoId) : Stmt(repo, repoId) {}
-    bool get(int64 unitSn, Offset pc, Offset& offset);
+    bool get(int64_t unitSn, Offset pc, Offset& offset);
   };
 #define URP_OP(c, o) \
  public: \
diff --git a/hphp/runtime/vm/verifier/check_func.cpp b/hphp/runtime/vm/verifier/check_func.cpp
index 656aa20303601..247c805578ecb 100644
--- a/hphp/runtime/vm/verifier/check_func.cpp
+++ b/hphp/runtime/vm/verifier/check_func.cpp
@@ -242,9 +242,9 @@ bool FuncChecker::checkSection(bool is_main, const char* name, Offset base,
     if (isSwitch(*pc) ||
         instrJumpTarget(bc, offset(pc)) != InvalidAbsoluteOffset) {
       if (*pc == OpSwitch) {
-        int64 switchBase = getImm(pc, 1).u_I64A;
+        int64_t switchBase = getImm(pc, 1).u_I64A;
         int32_t len = getImmVector(pc).size();
-        int64 limit = base + len - 2;
+        int64_t limit = base + len - 2;
         if (limit < switchBase) {
           verify_error("Overflow in Switch bounds [%d:%d]\n",
                        base, past);
@@ -424,13 +424,13 @@ bool FuncChecker::checkImmediates(const char* name, const Opcode* instr) {
     }
     case HA: { // home address (id of local variable)
       PC ha_pc = pc;
-      int32 k = decodeVariableSizeImm(&ha_pc);
+      int32_t k = decodeVariableSizeImm(&ha_pc);
       ok &= checkLocal(pc, k);
       break;
     }
     case IA: { // iterator address (id of iterator variable)
       PC ia_pc = pc;
-      int32 k = decodeVariableSizeImm(&ia_pc);
+      int32_t k = decodeVariableSizeImm(&ia_pc);
       if (k >= numIters()) {
         verify_error("invalid iterator variable id %d at %d\n",
                k, offset((PC)instr));
@@ -440,7 +440,7 @@ bool FuncChecker::checkImmediates(const char* name, const Opcode* instr) {
     }
     case IVA: { // variable size int
       PC iva_pc = pc;
-      int32 k = decodeVariableSizeImm(&iva_pc);
+      int32_t k = decodeVariableSizeImm(&iva_pc);
       switch (*instr) {
       case OpStaticLoc:
       case OpStaticLocInit:
diff --git a/hphp/test/test_cpp_base.cpp b/hphp/test/test_cpp_base.cpp
index af0be7decfe2f..a1da47f09fd12 100644
--- a/hphp/test/test_cpp_base.cpp
+++ b/hphp/test/test_cpp_base.cpp
@@ -58,7 +58,7 @@ class Timer {
     gettimeofday(&m_start, 0);
   }
 
-  int64 getMicroSeconds() {
+  int64_t getMicroSeconds() {
     struct timeval end;
     gettimeofday(&end, 0);
     return (end.tv_sec - m_start.tv_sec) * 1000000 +
@@ -92,7 +92,7 @@ typedef SmartAllocator<SomeClass,
 
 bool TestCppBase::TestSmartAllocator() {
   int iMax = 1000000;
-  int64 time1, time2;
+  int64_t time1, time2;
   {
     static IMPLEMENT_THREAD_LOCAL(SomeClassAlloc, allocator);
 
diff --git a/hphp/test/test_ext_array.cpp b/hphp/test/test_ext_array.cpp
index 03b254ad39b77..af2908aeacbdf 100644
--- a/hphp/test/test_ext_array.cpp
+++ b/hphp/test/test_ext_array.cpp
@@ -519,7 +519,7 @@ bool TestExtArray::test_array_merge() {
        ")\n");
   }
   {
-    int64 id = 100000000000022LL;
+    int64_t id = 100000000000022LL;
     Array a = CREATE_MAP1(id, 1);
     Array b = CREATE_MAP1(id, 2);
     Array r = f_array_merge(2, a, CREATE_VECTOR1(b));
@@ -619,7 +619,7 @@ bool TestExtArray::test_array_replace() {
        ")\n");
   }
   {
-    int64 id = 100000000000022LL;
+    int64_t id = 100000000000022LL;
     Array a = CREATE_MAP1(id, 1);
     Array b = CREATE_MAP1(id, 2);
     Array r = f_array_replace(2, a, CREATE_VECTOR1(b));
diff --git a/hphp/test/test_ext_fb.cpp b/hphp/test/test_ext_fb.cpp
index 12c09a8f201dc..7048530274d89 100644
--- a/hphp/test/test_ext_fb.cpp
+++ b/hphp/test/test_ext_fb.cpp
@@ -94,12 +94,12 @@ bool TestExtFb::test_fb_compact_serialize() {
   fb_cs_test(CREATE_MAP3(0, "a", 2, "b", 3, "c"));
   fb_cs_test(CREATE_MAP1(3, "a"));
   // Test for overflow
-  fb_cs_test(CREATE_MAP1((int64)((1ULL << 63) - 1), "a"));
+  fb_cs_test(CREATE_MAP1((int64_t)((1ULL << 63) - 1), "a"));
 
   // Test each power of two, +/- 1 and the negatives of them
   // Test a single number and packed inside an array
   for (int i = 0; i < 64; ++i) {
-    int64 n = (1ULL << i);
+    int64_t n = (1ULL << i);
     fb_cs_test(n);    fb_cs_test(CREATE_VECTOR1(n));
     fb_cs_test(n-1);  fb_cs_test(CREATE_VECTOR1(n-1));
     fb_cs_test(n+1);  fb_cs_test(CREATE_VECTOR1(n+1));
diff --git a/hphp/test/test_ext_ipc.cpp b/hphp/test/test_ext_ipc.cpp
index f8becb78c7bf0..a4f3c7a71d4b4 100644
--- a/hphp/test/test_ext_ipc.cpp
+++ b/hphp/test/test_ext_ipc.cpp
@@ -56,7 +56,7 @@ bool TestExtIpc::test_message_queue() {
   strcpy(filename, "/tmp/XXXXXX");
   close(mkstemp(filename));
 
-  int64 token = f_ftok(filename, "a");
+  int64_t token = f_ftok(filename, "a");
   VERIFY(!f_msg_queue_exists(token));
   Object queue = f_msg_get_queue(token);
   VERIFY(queue.get());
@@ -144,7 +144,7 @@ bool TestExtIpc::test_sem_remove()  { return test_semaphore();}
 bool TestExtIpc::test_shared_memory() {
   Variant ret = f_shm_attach(0xDEADBEEF);
   VERIFY(!same(ret, false));
-  int64 index = ret.toInt64();
+  int64_t index = ret.toInt64();
   VERIFY(!f_shm_has_var(index, 1234));
   VERIFY(f_shm_put_var(index, 1234, "test"));
   VERIFY(f_shm_has_var(index, 1234));
diff --git a/hphp/test/test_ext_math.cpp b/hphp/test/test_ext_math.cpp
index 7e9023e5b60f7..c6944b1c74078 100644
--- a/hphp/test/test_ext_math.cpp
+++ b/hphp/test/test_ext_math.cpp
@@ -383,7 +383,7 @@ bool TestExtMath::test_rand() {
   VERIFY(f_rand(5, 15) >= 5);
   VERIFY(f_rand(5, 15) <= 15);
 
-  int64 n = f_rand(10000000000LL, 19999999999LL);
+  int64_t n = f_rand(10000000000LL, 19999999999LL);
   VERIFY(n >= 10000000000LL);
   VERIFY(n <= 19999999999LL);
 
diff --git a/hphp/test/test_ext_sqlite3.cpp b/hphp/test/test_ext_sqlite3.cpp
index 6251ef21daae5..1b8c532d3b991 100644
--- a/hphp/test/test_ext_sqlite3.cpp
+++ b/hphp/test/test_ext_sqlite3.cpp
@@ -117,8 +117,8 @@ bool TestExtSqlite3::test_sqlite3() {
 
   // Since minor version can change frequently, just test the major version
   VS(db->t_version()["versionString"][0], "3");
-  VERIFY((HPHP::int64)db->t_version()["versionNumber"] >
-         (HPHP::int64)3000000);
+  VERIFY((int64_t)db->t_version()["versionNumber"] >
+         (int64_t)3000000);
   f_unlink(":memory:test");
   return Count(true);
 }
diff --git a/hphp/test/test_ext_stream.cpp b/hphp/test/test_ext_stream.cpp
index ebe03734384b4..53dc0b756f1a2 100644
--- a/hphp/test/test_ext_stream.cpp
+++ b/hphp/test/test_ext_stream.cpp
@@ -306,7 +306,7 @@ bool TestExtStream::test_stream_wrapper_register() {
 }
 
 bool TestExtStream::test_stream_wrapper_restore() {
-  int64 count = f_count(f_stream_get_wrappers());
+  int64_t count = f_count(f_stream_get_wrappers());
 
   VS(f_stream_wrapper_unregister("http"), true);
   VS(f_count(f_stream_get_wrappers()), count - 1);
diff --git a/hphp/test/test_server.cpp b/hphp/test/test_server.cpp
index 1c9df3590bf15..d6d86c0325a2d 100644
--- a/hphp/test/test_server.cpp
+++ b/hphp/test/test_server.cpp
@@ -381,7 +381,7 @@ class TestTransport : public Transport {
   virtual const char *getUrl() { return "/string";}
   virtual const char *getRemoteHost() { return "remote";}
   virtual const void *getPostData(int &size) { size = 0; return nullptr;}
-  virtual uint16 getRemotePort() { return 0; }
+  virtual uint16_t getRemotePort() { return 0; }
   virtual Method getMethod() { return Transport::GET;}
   virtual std::string getHeader(const char *name) { return "";}
   virtual void getHeaders(HeaderMap &headers) {}
diff --git a/hphp/test/test_util.cpp b/hphp/test/test_util.cpp
index d49acf8be68b1..19237e13cea12 100644
--- a/hphp/test/test_util.cpp
+++ b/hphp/test/test_util.cpp
@@ -222,7 +222,7 @@ bool TestUtil::TestSharedString() {
     VERIFY(foo->getString() == "foo");
   }
   {
-    hphp_shared_string_map<int64> map;
+    hphp_shared_string_map<int64_t> map;
     for (int i = 0; i < 100; i++) {
       string k("key");
       k += i;
@@ -231,7 +231,7 @@ bool TestUtil::TestSharedString() {
     for (int i = 0; i < 100; i++) {
       string k("key");
       k += i;
-      hphp_shared_string_map<int64>::const_iterator it = map.find(k);
+      hphp_shared_string_map<int64_t>::const_iterator it = map.find(k);
       VERIFY(it != map.end());
       VERIFY(it->second == i);
     }
diff --git a/hphp/util/asm-x64.h b/hphp/util/asm-x64.h
index 1c81abcf640fd..53849412dbfb3 100644
--- a/hphp/util/asm-x64.h
+++ b/hphp/util/asm-x64.h
@@ -2068,7 +2068,7 @@ struct X64Assembler {
   }                                                                     \
   /* opq imm, disp(rdest, rindex, scale) */                             \
   inline void name ## _imm64_index_scale_disp_reg64(                    \
-    int64 imm, RegNumber rindex, int scale, int disp,             \
+    int64_t imm, RegNumber rindex, int scale, int disp,             \
     RegNumber rdest) {                                            \
     emitIM(instr_ ## name, rdest, rindex, scale, disp, imm);             \
   }
diff --git a/hphp/util/base.h b/hphp/util/base.h
index 80dca87aaeeb3..f6a21ba05ef72 100644
--- a/hphp/util/base.h
+++ b/hphp/util/base.h
@@ -167,14 +167,6 @@ static const bool hphpiCompat = true;
 #endif
 
 typedef unsigned char uchar;
-typedef signed char int8;
-typedef unsigned char uint8;
-typedef short int16;
-typedef unsigned short uint16;
-typedef int int32;
-typedef unsigned int uint32;
-typedef int64_t int64;
-typedef unsigned long long uint64;
 
 #ifndef ULLONG_MAX
 #define ULLONG_MAX 0xffffffffffffffffULL
@@ -230,13 +222,13 @@ template<class type, class T> struct hphp_string_hash_map :
 };
 
 struct int64_hash {
-  size_t operator() (const int64 v) const {
+  size_t operator() (const int64_t v) const {
     return (size_t)hash_int64(v);
   }
-  size_t hash(const int64 v) const {
+  size_t hash(const int64_t v) const {
     return operator()(v);
   }
-  bool equal(const int64 lhs, const int64 rhs) const {
+  bool equal(const int64_t lhs, const int64_t rhs) const {
     return lhs == rhs;
   }
 };
diff --git a/hphp/util/compatibility.cpp b/hphp/util/compatibility.cpp
index 6ccaa88398b66..ca68a476a8958 100644
--- a/hphp/util/compatibility.cpp
+++ b/hphp/util/compatibility.cpp
@@ -78,9 +78,9 @@ int gettime(clockid_t which_clock, struct timespec *tp) {
 #endif
 }
 
-int64 gettime_diff_us(const timespec &start, const timespec &end) {
-  int64 dsec = end.tv_sec - start.tv_sec;
-  int64 dnsec = end.tv_nsec - start.tv_nsec;
+int64_t gettime_diff_us(const timespec &start, const timespec &end) {
+  int64_t dsec = end.tv_sec - start.tv_sec;
+  int64_t dnsec = end.tv_nsec - start.tv_nsec;
   return dsec * 1000000 + dnsec / 1000;
 }
 
diff --git a/hphp/util/compatibility.h b/hphp/util/compatibility.h
index 05b78ccd7c87d..bc720454bc897 100644
--- a/hphp/util/compatibility.h
+++ b/hphp/util/compatibility.h
@@ -30,7 +30,7 @@ int dprintf(int fd, const char *format, ...);
 #endif
 
 int gettime(clockid_t which_clock, struct timespec *tp);
-int64 gettime_diff_us(const timespec &start, const timespec &end);
+int64_t gettime_diff_us(const timespec &start, const timespec &end);
 
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/util/disasm.cpp b/hphp/util/disasm.cpp
index c14113080f912..8ba0662aacd2f 100644
--- a/hphp/util/disasm.cpp
+++ b/hphp/util/disasm.cpp
@@ -153,10 +153,10 @@ void Disasm::disasm(std::ostream& out, uint8_t* codeStartAddr,
   char codeStr[MAX_INSTR_ASM_LEN];
   xed_uint8_t *frontier;
   xed_decoded_inst_t xedd;
-  uint64 ip;
+  uint64_t ip;
 
   // Decode and print each instruction
-  for (frontier = codeStartAddr, ip = (uint64)codeStartAddr;
+  for (frontier = codeStartAddr, ip = (uint64_t)codeStartAddr;
        frontier < codeEndAddr; ) {
     xed_decoded_inst_zero_set_mode(&xedd, &m_xedState);
     xed_decoded_inst_set_input_chip(&xedd, XED_CHIP_INVALID);
@@ -174,7 +174,7 @@ void Disasm::disasm(std::ostream& out, uint8_t* codeStartAddr,
     }
     out << folly::format("{:#10x}: ", ip);
 
-    uint32 instrLen = xed_decoded_inst_get_length(&xedd);
+    uint32_t instrLen = xed_decoded_inst_get_length(&xedd);
     if (m_printEncoding) {
       // print encoding, like in objdump
       unsigned posi = 0;
diff --git a/hphp/util/file_cache.cpp b/hphp/util/file_cache.cpp
index 4332edb7ffcda..4b4cbd129cc9c 100644
--- a/hphp/util/file_cache.cpp
+++ b/hphp/util/file_cache.cpp
@@ -463,7 +463,7 @@ char *FileCache::read(const char *name, int &len, bool &compressed) const {
   return nullptr;
 }
 
-int64 FileCache::fileSize(const char *name, bool isRelative) const {
+int64_t FileCache::fileSize(const char *name, bool isRelative) const {
   if (!name || !*name) return -1;
   if (isRelative) {
     FileMap::const_iterator iter = m_files.find(name);
diff --git a/hphp/util/file_cache.h b/hphp/util/file_cache.h
index 60d27581cf782..2ead847f67b6c 100644
--- a/hphp/util/file_cache.h
+++ b/hphp/util/file_cache.h
@@ -53,7 +53,7 @@ class FileCache {
   bool dirExists(const char *name, bool isRelative = true) const;
   bool exists(const char *name, bool isRelative = true) const;
   char *read(const char *name, int &len, bool &compressed) const;
-  int64 fileSize(const char *name, bool isRelative) const;
+  int64_t fileSize(const char *name, bool isRelative) const;
   void dump();
 
   static std::string GetRelativePath(const char *path);
diff --git a/hphp/util/hdf.cpp b/hphp/util/hdf.cpp
index 388f88458b172..f3dca348c5915 100644
--- a/hphp/util/hdf.cpp
+++ b/hphp/util/hdf.cpp
@@ -246,12 +246,12 @@ bool Hdf::getBool(bool defValue /* = false */) const {
     strcasecmp(v, "false") && strcasecmp(v, "no") && strcasecmp(v, "off");
 }
 
-int64 Hdf::getInt(int64 defValue, const char *type, int64 maxValue) const {
+int64_t Hdf::getInt(int64_t defValue, const char *type, int64_t maxValue) const {
   const char *v = get();
   if (v == nullptr) return defValue;
 
   char *endptr = nullptr;
-  int64 n = strtoll(v, &endptr, 0);
+  int64_t n = strtoll(v, &endptr, 0);
   if ((!endptr && !*endptr) ||
       (maxValue && (n > maxValue || n < (- maxValue - 1)))) {
     throw HdfDataTypeException(this, type, v);
@@ -264,25 +264,25 @@ char Hdf::getByte(char defValue /* = 0 */) const {
   return getInt(defValue, "byte", 0x7FL);
 }
 
-int16 Hdf::getInt16(int16 defValue /* = 0 */) const {
+int16_t Hdf::getInt16(int16_t defValue /* = 0 */) const {
   return getInt(defValue, "int16", 0x7FFFL);
 }
 
-int32 Hdf::getInt32(int32 defValue /* = 0 */) const {
+int32_t Hdf::getInt32(int32_t defValue /* = 0 */) const {
   return getInt(defValue, "int32", 0x7FFFFFFFL);
 }
 
-int64 Hdf::getInt64(int64 defValue /* = 0 */) const {
+int64_t Hdf::getInt64(int64_t defValue /* = 0 */) const {
   return getInt(defValue, "int64", 0);
 }
 
-uint64 Hdf::getUInt(uint64 defValue, const char *type, uint64 mask) const {
+uint64_t Hdf::getUInt(uint64_t defValue, const char *type, uint64_t mask) const {
   const char *v = get();
   if (v == nullptr) return defValue;
 
   char *endptr = nullptr;
-  int64 n = strtoull(v, &endptr, 0);
-  if ((!endptr && !*endptr) || (mask && ((uint64)n & mask))) {
+  int64_t n = strtoull(v, &endptr, 0);
+  if ((!endptr && !*endptr) || (mask && ((uint64_t)n & mask))) {
     throw HdfDataTypeException(this, type, v);
   }
 
@@ -293,15 +293,15 @@ uchar Hdf::getUByte(uchar defValue /* = 0 */) const {
   return getUInt(defValue, "unsigned byte", ~0xFFUL);
 }
 
-uint16 Hdf::getUInt16(uint16 defValue /* = 0 */) const {
+uint16_t Hdf::getUInt16(uint16_t defValue /* = 0 */) const {
   return getUInt(defValue, "unsigned int16", ~0xFFFFUL);
 }
 
-uint32 Hdf::getUInt32(uint32 defValue /* = 0 */) const {
+uint32_t Hdf::getUInt32(uint32_t defValue /* = 0 */) const {
   return getUInt(defValue, "unsigned int32", ~0xFFFFFFFFUL);
 }
 
-uint64 Hdf::getUInt64(uint64 defValue /* = 0 */) const {
+uint64_t Hdf::getUInt64(uint64_t defValue /* = 0 */) const {
   return getUInt(defValue, "unsigned int64", 0);
 }
 
@@ -378,38 +378,38 @@ int Hdf::compare(uchar v2) const {
   return v1 > v2 ? 1 : -1;
 }
 
-int Hdf::compare(int16 v2) const {
-  int16 v1 = getInt16();
+int Hdf::compare(int16_t v2) const {
+  int16_t v1 = getInt16();
   if (v1 == v2) return 0;
   return v1 > v2 ? 1 : -1;
 }
 
-int Hdf::compare(uint16 v2) const {
-  uint16 v1 = getUInt16();
+int Hdf::compare(uint16_t v2) const {
+  uint16_t v1 = getUInt16();
   if (v1 == v2) return 0;
   return v1 > v2 ? 1 : -1;
 }
 
-int Hdf::compare(int32 v2) const {
-  int32 v1 = getInt32();
+int Hdf::compare(int32_t v2) const {
+  int32_t v1 = getInt32();
   if (v1 == v2) return 0;
   return v1 > v2 ? 1 : -1;
 }
 
-int Hdf::compare(uint32 v2) const {
-  uint32 v1 = getUInt32();
+int Hdf::compare(uint32_t v2) const {
+  uint32_t v1 = getUInt32();
   if (v1 == v2) return 0;
   return v1 > v2 ? 1 : -1;
 }
 
-int Hdf::compare(int64 v2) const {
-  int64 v1 = getInt64();
+int Hdf::compare(int64_t v2) const {
+  int64_t v1 = getInt64();
   if (v1 == v2) return 0;
   return v1 > v2 ? 1 : -1;
 }
 
-int Hdf::compare(uint64 v2) const {
-  uint64 v1 = getUInt64();
+int Hdf::compare(uint64_t v2) const {
+  uint64_t v1 = getUInt64();
   if (v1 == v2) return 0;
   return v1 > v2 ? 1 : -1;
 }
@@ -451,13 +451,13 @@ void Hdf::set(const char *value) {
   CheckNeoError(hdf_set_value(getRaw(), nullptr, (char*)value));
 }
 
-void Hdf::set(int64 value) {
+void Hdf::set(int64_t value) {
   char buf[24];
   snprintf(buf, sizeof(buf), "%lld", (long long)value);
   set(buf);
 }
 
-void Hdf::set(uint64 value) {
+void Hdf::set(uint64_t value) {
   char buf[24];
   snprintf(buf, sizeof(buf), "%llu", (unsigned long long)value);
   set(buf);
diff --git a/hphp/util/hdf.h b/hphp/util/hdf.h
index 58aa9774621fe..137d595c74b05 100644
--- a/hphp/util/hdf.h
+++ b/hphp/util/hdf.h
@@ -121,12 +121,12 @@ class Hdf {
   std::string getString(const std::string &defValue = "") const;
   char   getByte  (char   defValue = 0) const;
   uchar  getUByte (uchar  defValue = 0) const;
-  int16  getInt16 (int16  defValue = 0) const;
-  uint16 getUInt16(uint16 defValue = 0) const;
-  int32  getInt32 (int32  defValue = 0) const;
-  uint32 getUInt32(uint32 defValue = 0) const;
-  int64  getInt64 (int64  defValue = 0) const;
-  uint64 getUInt64(uint64 defValue = 0) const;
+  int16_t  getInt16 (int16_t  defValue = 0) const;
+  uint16_t getUInt16(uint16_t defValue = 0) const;
+  int32_t  getInt32 (int32_t  defValue = 0) const;
+  uint32_t getUInt32(uint32_t defValue = 0) const;
+  int64_t  getInt64 (int64_t  defValue = 0) const;
+  uint64_t getUInt64(uint64_t defValue = 0) const;
   double getDouble(double defValue = 0) const;
 
   void get(std::vector<std::string> &values) const;
@@ -140,12 +140,12 @@ class Hdf {
   operator bool   () const { return getBool()  ;}
   operator char   () const { return getByte()  ;}
   operator uchar  () const { return getUByte() ;}
-  operator int16  () const { return getInt16() ;}
-  operator uint16 () const { return getUInt16();}
-  operator int32  () const { return getInt32() ;}
-  operator uint32 () const { return getUInt32();}
-  operator int64  () const { return getInt64() ;}
-  operator uint64 () const { return getUInt64();}
+  operator int16_t  () const { return getInt16() ;}
+  operator uint16_t () const { return getUInt16();}
+  operator int32_t  () const { return getInt32() ;}
+  operator uint32_t () const { return getUInt32();}
+  operator int64_t  () const { return getInt64() ;}
+  operator uint64_t () const { return getUInt64();}
   operator double () const { return getDouble();}
 
   /**
@@ -154,14 +154,14 @@ class Hdf {
   void set(const char *value);
   void set(const std::string &value) { set(value.c_str());}
   void set(bool   value) { set(value ? "1" : "0");}
-  void set(char   value) { set((int64)value);}
-  void set(uchar  value) { set((uint64)value);}
-  void set(int16  value) { set((int64)value);}
-  void set(uint16 value) { set((uint64)value);}
-  void set(int32  value) { set((int64)value);}
-  void set(uint32 value) { set((uint64)value);}
-  void set(int64  value);
-  void set(uint64 value);
+  void set(char   value) { set((int64_t)value);}
+  void set(uchar  value) { set((uint64_t)value);}
+  void set(int16_t  value) { set((int64_t)value);}
+  void set(uint16_t value) { set((uint64_t)value);}
+  void set(int32_t  value) { set((int64_t)value);}
+  void set(uint32_t value) { set((uint64_t)value);}
+  void set(int64_t  value);
+  void set(uint64_t value);
   void set(double value);
 
   Hdf &operator=(const char *value) { set(value); return *this;}
@@ -169,12 +169,12 @@ class Hdf {
   Hdf &operator=(bool   value) { set(value); return *this;}
   Hdf &operator=(char   value) { set(value); return *this;}
   Hdf &operator=(uchar  value) { set(value); return *this;}
-  Hdf &operator=(int16  value) { set(value); return *this;}
-  Hdf &operator=(uint16 value) { set(value); return *this;}
-  Hdf &operator=(int32  value) { set(value); return *this;}
-  Hdf &operator=(uint32 value) { set(value); return *this;}
-  Hdf &operator=(int64  value) { set(value); return *this;}
-  Hdf &operator=(uint64 value) { set(value); return *this;}
+  Hdf &operator=(int16_t  value) { set(value); return *this;}
+  Hdf &operator=(uint16_t value) { set(value); return *this;}
+  Hdf &operator=(int32_t  value) { set(value); return *this;}
+  Hdf &operator=(uint32_t value) { set(value); return *this;}
+  Hdf &operator=(int64_t  value) { set(value); return *this;}
+  Hdf &operator=(uint64_t value) { set(value); return *this;}
   Hdf &operator=(double value) { set(value); return *this;}
   Hdf &operator=(const Hdf &hdf);
 
@@ -240,12 +240,12 @@ class Hdf {
   int compare(const std::string &v) const;
   int compare(char   v) const;
   int compare(uchar  v) const;
-  int compare(int16  v) const;
-  int compare(uint16 v) const;
-  int compare(int32  v) const;
-  int compare(uint32 v) const;
-  int compare(int64  v) const;
-  int compare(uint64 v) const;
+  int compare(int16_t  v) const;
+  int compare(uint16_t v) const;
+  int compare(int32_t  v) const;
+  int compare(uint32_t v) const;
+  int compare(int64_t  v) const;
+  int compare(uint64_t v) const;
   int compare(double v) const;
 
   bool operator==(const char *v) const { return compare(v) == 0;}
@@ -276,47 +276,47 @@ class Hdf {
   bool operator> (uchar v) const { return compare(v) >  0;}
   bool operator< (uchar v) const { return compare(v) <  0;}
 
-  bool operator==(int16 v) const { return compare(v) == 0;}
-  bool operator!=(int16 v) const { return compare(v) != 0;}
-  bool operator>=(int16 v) const { return compare(v) >= 0;}
-  bool operator<=(int16 v) const { return compare(v) <= 0;}
-  bool operator> (int16 v) const { return compare(v) >  0;}
-  bool operator< (int16 v) const { return compare(v) <  0;}
-
-  bool operator==(uint16 v) const { return compare(v) == 0;}
-  bool operator!=(uint16 v) const { return compare(v) != 0;}
-  bool operator>=(uint16 v) const { return compare(v) >= 0;}
-  bool operator<=(uint16 v) const { return compare(v) <= 0;}
-  bool operator> (uint16 v) const { return compare(v) >  0;}
-  bool operator< (uint16 v) const { return compare(v) <  0;}
-
-  bool operator==(int32 v) const { return compare(v) == 0;}
-  bool operator!=(int32 v) const { return compare(v) != 0;}
-  bool operator>=(int32 v) const { return compare(v) >= 0;}
-  bool operator<=(int32 v) const { return compare(v) <= 0;}
-  bool operator> (int32 v) const { return compare(v) >  0;}
-  bool operator< (int32 v) const { return compare(v) <  0;}
-
-  bool operator==(uint32 v) const { return compare(v) == 0;}
-  bool operator!=(uint32 v) const { return compare(v) != 0;}
-  bool operator>=(uint32 v) const { return compare(v) >= 0;}
-  bool operator<=(uint32 v) const { return compare(v) <= 0;}
-  bool operator> (uint32 v) const { return compare(v) >  0;}
-  bool operator< (uint32 v) const { return compare(v) <  0;}
-
-  bool operator==(int64 v) const { return compare(v) == 0;}
-  bool operator!=(int64 v) const { return compare(v) != 0;}
-  bool operator>=(int64 v) const { return compare(v) >= 0;}
-  bool operator<=(int64 v) const { return compare(v) <= 0;}
-  bool operator> (int64 v) const { return compare(v) >  0;}
-  bool operator< (int64 v) const { return compare(v) <  0;}
-
-  bool operator==(uint64 v) const { return compare(v) == 0;}
-  bool operator!=(uint64 v) const { return compare(v) != 0;}
-  bool operator>=(uint64 v) const { return compare(v) >= 0;}
-  bool operator<=(uint64 v) const { return compare(v) <= 0;}
-  bool operator> (uint64 v) const { return compare(v) >  0;}
-  bool operator< (uint64 v) const { return compare(v) <  0;}
+  bool operator==(int16_t v) const { return compare(v) == 0;}
+  bool operator!=(int16_t v) const { return compare(v) != 0;}
+  bool operator>=(int16_t v) const { return compare(v) >= 0;}
+  bool operator<=(int16_t v) const { return compare(v) <= 0;}
+  bool operator> (int16_t v) const { return compare(v) >  0;}
+  bool operator< (int16_t v) const { return compare(v) <  0;}
+
+  bool operator==(uint16_t v) const { return compare(v) == 0;}
+  bool operator!=(uint16_t v) const { return compare(v) != 0;}
+  bool operator>=(uint16_t v) const { return compare(v) >= 0;}
+  bool operator<=(uint16_t v) const { return compare(v) <= 0;}
+  bool operator> (uint16_t v) const { return compare(v) >  0;}
+  bool operator< (uint16_t v) const { return compare(v) <  0;}
+
+  bool operator==(int32_t v) const { return compare(v) == 0;}
+  bool operator!=(int32_t v) const { return compare(v) != 0;}
+  bool operator>=(int32_t v) const { return compare(v) >= 0;}
+  bool operator<=(int32_t v) const { return compare(v) <= 0;}
+  bool operator> (int32_t v) const { return compare(v) >  0;}
+  bool operator< (int32_t v) const { return compare(v) <  0;}
+
+  bool operator==(uint32_t v) const { return compare(v) == 0;}
+  bool operator!=(uint32_t v) const { return compare(v) != 0;}
+  bool operator>=(uint32_t v) const { return compare(v) >= 0;}
+  bool operator<=(uint32_t v) const { return compare(v) <= 0;}
+  bool operator> (uint32_t v) const { return compare(v) >  0;}
+  bool operator< (uint32_t v) const { return compare(v) <  0;}
+
+  bool operator==(int64_t v) const { return compare(v) == 0;}
+  bool operator!=(int64_t v) const { return compare(v) != 0;}
+  bool operator>=(int64_t v) const { return compare(v) >= 0;}
+  bool operator<=(int64_t v) const { return compare(v) <= 0;}
+  bool operator> (int64_t v) const { return compare(v) >  0;}
+  bool operator< (int64_t v) const { return compare(v) <  0;}
+
+  bool operator==(uint64_t v) const { return compare(v) == 0;}
+  bool operator!=(uint64_t v) const { return compare(v) != 0;}
+  bool operator>=(uint64_t v) const { return compare(v) >= 0;}
+  bool operator<=(uint64_t v) const { return compare(v) <= 0;}
+  bool operator> (uint64_t v) const { return compare(v) >  0;}
+  bool operator< (uint64_t v) const { return compare(v) <  0;}
 
   bool operator==(double v) const { return compare(v) == 0;}
   bool operator!=(double v) const { return compare(v) != 0;}
@@ -350,14 +350,14 @@ class Hdf {
    * [-maxValue-1, maxValue]. If not, throw an HdfDataTypeException
    * with specified type string. If node is absent, return default value.
    */
-  int64 getInt(int64 defValue, const char *type, int64 maxValue) const;
+  int64_t getInt(int64_t defValue, const char *type, int64_t maxValue) const;
 
   /**
    * Parse value as a unsigned integer and check against mask to make sure
    * it's in the specified range. If not, throw an HdfDataTypeException
    * with specified type string. If node is absent, return default value.
    */
-  uint64 getUInt(uint64 defValue, const char *type, uint64 mask) const;
+  uint64_t getUInt(uint64_t defValue, const char *type, uint64_t mask) const;
 
   /**
    * Implementation of parent() calls.
diff --git a/hphp/util/lfu_table.h b/hphp/util/lfu_table.h
index 0a19a3d081a95..dc8eb7e2efbf8 100644
--- a/hphp/util/lfu_table.h
+++ b/hphp/util/lfu_table.h
@@ -70,7 +70,7 @@ class LFUTable {
     V val;
     Node *prev;
     Node *next;
-    std::atomic<uint64> hits;
+    std::atomic<uint64_t> hits;
     uint heapIndex;
     bool immortal;
 
diff --git a/hphp/util/light_process.cpp b/hphp/util/light_process.cpp
index 4cc0ca93025da..f10dc55a96b41 100644
--- a/hphp/util/light_process.cpp
+++ b/hphp/util/light_process.cpp
@@ -128,7 +128,7 @@ static void do_popen(FILE *fin, FILE *fout, int afdt_fd) {
     fprintf(fout, "error\n");
     fflush(fout);
   } else {
-    fprintf(fout, "success\n%" PRId64 "\n", (int64)f);
+    fprintf(fout, "success\n%" PRId64 "\n", (int64_t)f);
     fflush(fout);
     int fd = fileno(f);
     send_fd(afdt_fd, fd);
@@ -138,7 +138,7 @@ static void do_popen(FILE *fin, FILE *fout, int afdt_fd) {
 static void do_pclose(FILE *fin, FILE *fout) {
   char buf[BUFFER_SIZE];
 
-  int64 fptr = 0;
+  int64_t fptr = 0;
   read_buf(fin, buf);
   sscanf(buf, "%" PRId64, &fptr);
   FILE *f = (FILE *)fptr;
@@ -216,7 +216,7 @@ static void do_proc_open(FILE *fin, FILE *fout, int afdt_fd) {
     _exit(127);
   } else if (child > 0) {
     // successfully created the child process
-    fprintf(fout, "%" PRId64 "\n", (int64)child);
+    fprintf(fout, "%" PRId64 "\n", (int64_t)child);
     fflush(fout);
   } else {
     // failed creating the child process
@@ -238,7 +238,7 @@ static void kill_handler(int sig) {
 static void do_waitpid(FILE *fin, FILE *fout) {
   char buf[BUFFER_SIZE];
   read_buf(fin, buf);
-  int64 p = -1;
+  int64_t p = -1;
   int options = 0;
   int timeout = 0;
   sscanf(buf, "%" PRId64 " %d %d", &p, &options, &timeout);
@@ -252,7 +252,7 @@ static void do_waitpid(FILE *fin, FILE *fout) {
   pid_t ret = ::waitpid(pid, &stat, options);
   alarm(0); // cancel the previous alarm if not triggered yet
   waited = 0;
-  fprintf(fout, "%" PRId64 " %d\n", (int64)ret, stat);
+  fprintf(fout, "%" PRId64 " %d\n", (int64_t)ret, stat);
   if (ret < 0) {
     fprintf(fout, "%d\n", errno);
   }
@@ -527,7 +527,7 @@ FILE *LightProcess::LightPopenImpl(const char *cmd, const char *type,
     return nullptr;
   }
 
-  int64 fptr = 0;
+  int64_t fptr = 0;
   read_buf(g_procs[id].m_fin, buf);
   sscanf(buf, "%" PRId64, &fptr);
   if (!fptr) {
@@ -541,7 +541,7 @@ FILE *LightProcess::LightPopenImpl(const char *cmd, const char *type,
     return nullptr;
   }
   FILE *f = fdopen(fd, type);
-  g_procs[id].m_popenMap[(int64)f] = fptr;
+  g_procs[id].m_popenMap[(int64_t)f] = fptr;
 
   return f;
 }
@@ -554,14 +554,14 @@ int LightProcess::pclose(FILE *f) {
   int id = GetId();
   Lock lock(g_procs[id].m_procMutex);
 
-  std::map<int64, int64>::iterator it = g_procs[id].m_popenMap.find((int64)f);
+  std::map<int64_t, int64_t>::iterator it = g_procs[id].m_popenMap.find((int64_t)f);
   if (it == g_procs[id].m_popenMap.end()) {
     // try to close it with normal pclose
     return ::pclose(f);
   }
 
-  int64 f2 = it->second;
-  g_procs[id].m_popenMap.erase((int64)f);
+  int64_t f2 = it->second;
+  g_procs[id].m_popenMap.erase((int64_t)f);
   fclose(f);
   fprintf(g_procs[id].m_fout, "pclose\n%" PRId64 "\n", f2);
   fflush(g_procs[id].m_fout);
@@ -622,7 +622,7 @@ pid_t LightProcess::proc_open(const char *cmd, const vector<int> &created,
     }
     return -1;
   }
-  int64 pid = -1;
+  int64_t pid = -1;
   sscanf(buf, "%" PRId64, &pid);
   assert(pid);
   return (pid_t)pid;
@@ -638,14 +638,14 @@ pid_t LightProcess::waitpid(pid_t pid, int *stat_loc, int options,
   int id = GetId();
   Lock lock(g_procs[id].m_procMutex);
 
-  fprintf(g_procs[id].m_fout, "waitpid\n%" PRId64 " %d %d\n", (int64)pid, options,
+  fprintf(g_procs[id].m_fout, "waitpid\n%" PRId64 " %d %d\n", (int64_t)pid, options,
           timeout);
   fflush(g_procs[id].m_fout);
 
   char buf[BUFFER_SIZE];
   read_buf(g_procs[id].m_fin, buf);
   if (!buf[0]) return -1;
-  int64 ret;
+  int64_t ret;
   int stat;
   sscanf(buf, "%" PRId64 " %d", &ret, &stat);
   *stat_loc = stat;
diff --git a/hphp/util/light_process.h b/hphp/util/light_process.h
index b0c058a878313..4b49c1b01e86c 100644
--- a/hphp/util/light_process.h
+++ b/hphp/util/light_process.h
@@ -90,7 +90,7 @@ class LightProcess {
   std::string m_afdtFilename;
   int m_afdt_fd;
   int m_afdt_lfd;
-  std::map<int64, int64> m_popenMap;
+  std::map<int64_t, int64_t> m_popenMap;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/util/lock.cpp b/hphp/util/lock.cpp
index 189db97611718..b4687bd475f5e 100644
--- a/hphp/util/lock.cpp
+++ b/hphp/util/lock.cpp
@@ -45,7 +45,7 @@ LockProfiler::~LockProfiler() {
     gettimeofday(&unlockTime, nullptr);
     time_t dsec = unlockTime.tv_sec - m_lockTime.tv_sec;
     long dnsec = unlockTime.tv_usec - m_lockTime.tv_usec;
-    int64 dusec = dsec * 1000000 + dnsec;
+    int64_t dusec = dsec * 1000000 + dnsec;
 #else
     timespec unlockTime;
     unlockTime.tv_sec = 0;
@@ -53,7 +53,7 @@ LockProfiler::~LockProfiler() {
     clock_gettime(CLOCK_MONOTONIC, &unlockTime);
     time_t dsec = unlockTime.tv_sec - m_lockTime.tv_sec;
     long dnsec = unlockTime.tv_nsec - m_lockTime.tv_nsec;
-    int64 dusec = dsec * 1000000 + dnsec / 1000;
+    int64_t dusec = dsec * 1000000 + dnsec / 1000;
 #endif
 
     StackTrace st;
diff --git a/hphp/util/lock.h b/hphp/util/lock.h
index 961dbf2e75777..6ef3e2156dbd8 100644
--- a/hphp/util/lock.h
+++ b/hphp/util/lock.h
@@ -29,7 +29,7 @@ namespace HPHP {
  */
 class LockProfiler {
 public:
-  typedef void (*PFUNC_PROFILE)(const std::string &stack, int64 elapsed_us);
+  typedef void (*PFUNC_PROFILE)(const std::string &stack, int64_t elapsed_us);
   static PFUNC_PROFILE s_pfunc_profile;
   static bool s_profile;
   static int s_profile_sampling;
diff --git a/hphp/util/parser/parser.cpp b/hphp/util/parser/parser.cpp
index a81af012e58ca..cd4aa373ed36e 100644
--- a/hphp/util/parser/parser.cpp
+++ b/hphp/util/parser/parser.cpp
@@ -21,7 +21,7 @@ namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
 Mutex ParserBase::s_mutex;
-std::map<int64, int> ParserBase::s_closureIds;
+std::map<int64_t, int> ParserBase::s_closureIds;
 
 char ParserBase::GetAnonPrefix(AnonFuncKind kind) {
   static_assert(Closure == 0 && Continuation <= 9,
@@ -145,7 +145,7 @@ void ParserBase::popClass() {
 }
 
 std::string ParserBase::getAnonFuncName(AnonFuncKind kind) {
-  int64 h = hash_string_cs(m_fileName, strlen(m_fileName));
+  int64_t h = hash_string_cs(m_fileName, strlen(m_fileName));
   int closureId;
   {
     Lock lock(s_mutex);
diff --git a/hphp/util/parser/parser.h b/hphp/util/parser/parser.h
index d960c70edff5f..a686047cba9d7 100644
--- a/hphp/util/parser/parser.h
+++ b/hphp/util/parser/parser.h
@@ -241,7 +241,7 @@ class ParserBase {
 
   // for closure hidden name
   static Mutex s_mutex;
-  static std::map<int64, int> s_closureIds;
+  static std::map<int64_t, int> s_closureIds;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/util/stack_trace.cpp b/hphp/util/stack_trace.cpp
index 8489666381d7d..e38739a96938c 100644
--- a/hphp/util/stack_trace.cpp
+++ b/hphp/util/stack_trace.cpp
@@ -199,7 +199,7 @@ std::string StackTrace::hexEncode(int minLevel /* = 0 */,
   for (int i = minLevel; i < (int)m_bt_pointers.size() && i < maxLevel; i++) {
     if (i > minLevel) bts += ':';
     char buf[20];
-    snprintf(buf, sizeof(buf), "%" PRIx64, (int64)m_bt_pointers[i]);
+    snprintf(buf, sizeof(buf), "%" PRIx64, (int64_t)m_bt_pointers[i]);
     bts.append(buf);
   }
   return bts;
@@ -234,7 +234,7 @@ void StackTraceNoHeap::log(const char *errorType, const char *tracefn,
 
   dprintf(fd, "Host: %s\n",Process::GetHostName().c_str());
   dprintf(fd, "ProcessID: %s\n", pid);
-  dprintf(fd, "ThreadID: %" PRIx64"\n", (int64)Process::GetThreadId());
+  dprintf(fd, "ThreadID: %" PRIx64"\n", (int64_t)Process::GetThreadId());
   dprintf(fd, "ThreadPID: %u\n", Process::GetThreadPid());
   dprintf(fd, "Name: %s\n", Process::GetAppName().c_str());
   dprintf(fd, "Type: %s\n", errorType ? errorType : "(unknown error)");
diff --git a/hphp/util/timer.cpp b/hphp/util/timer.cpp
index ec3bf300db4f6..51a337be5bffb 100644
--- a/hphp/util/timer.cpp
+++ b/hphp/util/timer.cpp
@@ -50,28 +50,28 @@ Timer::~Timer() {
   }
 }
 
-int64 Timer::getMicroSeconds() const {
+int64_t Timer::getMicroSeconds() const {
   return measure() - m_start;
 }
 
 void Timer::report() const {
-  int64 ms = getMicroSeconds();
+  int64_t ms = getMicroSeconds();
   int seconds = ms / 1000000;
   PRINT_MSG("%s took %d'%02d\" (%" PRId64 " us) %s", m_name.c_str(),
             seconds / 60, seconds % 60, ms, getName());
 }
 
-static int64 to_usec(const timeval& tv) {
-  return (int64(tv.tv_sec) * 1000000) + tv.tv_usec;
+static int64_t to_usec(const timeval& tv) {
+  return (int64_t(tv.tv_sec) * 1000000) + tv.tv_usec;
 }
 
-int64 Timer::GetCurrentTimeMicros() {
+int64_t Timer::GetCurrentTimeMicros() {
   struct timeval tv;
   gettimeofday(&tv, 0);
   return to_usec(tv);
 }
 
-int64 Timer::measure() const {
+int64_t Timer::measure() const {
   if (m_type == WallTime) {
     return GetCurrentTimeMicros();
   }
@@ -102,21 +102,21 @@ const char *Timer::getName() const {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SlowTimer::SlowTimer(int64 msThreshold, const char *location, const char *info)
+SlowTimer::SlowTimer(int64_t msThreshold, const char *location, const char *info)
   : m_timer(Timer::WallTime), m_msThreshold(msThreshold) {
   if (location) m_location = location;
   if (info) m_info = info;
 }
 
 SlowTimer::~SlowTimer() {
-  int64 msec = getTime();
+  int64_t msec = getTime();
   if (msec >= m_msThreshold) {
     Logger::Error("SlowTimer [%dms] at %s: %s",
                   msec, m_location.c_str(), m_info.c_str());
   }
 }
 
-int64 SlowTimer::getTime() const {
+int64_t SlowTimer::getTime() const {
   return m_timer.getMicroSeconds() / 1000;
 }
 
diff --git a/hphp/util/timer.h b/hphp/util/timer.h
index 1f0c5000a0beb..55ae83da7b1cd 100644
--- a/hphp/util/timer.h
+++ b/hphp/util/timer.h
@@ -43,30 +43,30 @@ class Timer {
   Timer(Type type, const char *name = nullptr, ReportType r = Log);
   ~Timer();
 
-  static int64 GetCurrentTimeMicros();
+  static int64_t GetCurrentTimeMicros();
   const char *getName() const;
-  int64 getMicroSeconds() const;
+  int64_t getMicroSeconds() const;
   void report() const;
 
 private:
   Type m_type;
   ReportType m_report;
   std::string m_name;
-  int64 m_start;
+  int64_t m_start;
 
-  int64 measure() const;
+  int64_t measure() const;
 };
 
 class SlowTimer {
 public:
-  SlowTimer(int64 msThreshold, const char *location, const char *info);
+  SlowTimer(int64_t msThreshold, const char *location, const char *info);
   ~SlowTimer();
 
-  int64 getTime() const;
+  int64_t getTime() const;
 
 private:
   Timer m_timer;
-  int64 m_msThreshold;
+  int64_t m_msThreshold;
   std::string m_location;
   std::string m_info;
 };
diff --git a/hphp/util/vdso.cpp b/hphp/util/vdso.cpp
index 88ed700e581d2..290f2a1485863 100644
--- a/hphp/util/vdso.cpp
+++ b/hphp/util/vdso.cpp
@@ -32,7 +32,7 @@ Vdso::Vdso() : m_handle(nullptr), m_clock_gettime_ns(nullptr) {
   }
 
   m_clock_gettime_ns =
-    (int64 (*)(clockid_t))dlsym(m_handle, "__vdso_clock_gettime_ns");
+    (int64_t (*)(clockid_t))dlsym(m_handle, "__vdso_clock_gettime_ns");
   m_clock_gettime =
     (int (*)(clockid_t, timespec *))dlsym(m_handle, "__vdso_clock_gettime");
 }
@@ -43,7 +43,7 @@ Vdso::~Vdso() {
   }
 }
 
-int64 Vdso::ClockGetTimeNS(int clk_id) {
+int64_t Vdso::ClockGetTimeNS(int clk_id) {
   return s_vdso.clockGetTimeNS(clk_id);
 }
 
@@ -51,7 +51,7 @@ int Vdso::ClockGetTime(int clk_id, timespec *ts) {
   return s_vdso.clockGetTime(clk_id, ts);
 }
 
-inline ALWAYS_INLINE int64 Vdso::clockGetTimeNS(int clk_id) {
+inline ALWAYS_INLINE int64_t Vdso::clockGetTimeNS(int clk_id) {
   if (m_clock_gettime_ns)
     return m_clock_gettime_ns(clk_id);
   return -1;
diff --git a/hphp/util/vdso.h b/hphp/util/vdso.h
index 3382ed612cfe0..32a96a696769f 100644
--- a/hphp/util/vdso.h
+++ b/hphp/util/vdso.h
@@ -28,16 +28,16 @@ class Vdso {
   Vdso();
   ~Vdso();
   
-  static int64 ClockGetTimeNS(int clk_id);
+  static int64_t ClockGetTimeNS(int clk_id);
   static int ClockGetTime(int clk_id, timespec *ts);
 
   inline ALWAYS_INLINE int clockGetTime(int clk_id, timespec *ts);
-  inline ALWAYS_INLINE int64 clockGetTimeNS(int clk_id);
+  inline ALWAYS_INLINE int64_t clockGetTimeNS(int clk_id);
 
 private:
   void *m_handle;
   int (*m_clock_gettime)(clockid_t, timespec *ts);
-  int64 (*m_clock_gettime_ns)(clockid_t);
+  int64_t (*m_clock_gettime_ns)(clockid_t);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/util/zend/zend_html.h b/hphp/util/zend/zend_html.h
index e669aec72f06f..fe1e9d1d60534 100644
--- a/hphp/util/zend/zend_html.h
+++ b/hphp/util/zend/zend_html.h
@@ -46,7 +46,7 @@ namespace HPHP {
  */
 
 struct AsciiMap {
-  uint64 map[2];
+  uint64_t map[2];
 };
 
 enum StringHtmlEncoding {