Removing alloy/core.h.

src/alloy/alloy-private.h

@@ -10,8 +10,6 @@
 #ifndef ALLOY_ALLOY_PRIVATE_H_
 #define ALLOY_ALLOY_PRIVATE_H_
 
-#include <alloy/core.h>
-
 #include <gflags/gflags.h>
 
 DECLARE_bool(debug);

src/alloy/alloy.h

@@ -10,8 +10,6 @@
 #ifndef ALLOY_ALLOY_H_
 #define ALLOY_ALLOY_H_
 
-#include <alloy/core.h>
-
 #include <alloy/runtime/function.h>
 #include <alloy/runtime/module.h>
 #include <alloy/runtime/runtime.h>

src/alloy/arena.h

@@ -10,7 +10,7 @@
 #ifndef ALLOY_ARENA_H_
 #define ALLOY_ARENA_H_
 
-#include <alloy/core.h>
+#include <cstdint>
 
 namespace alloy {
 

src/alloy/backend/assembler.h

@@ -12,8 +12,6 @@
 
 #include <memory>
 
-#include <alloy/core.h>
-
 namespace alloy {
 namespace hir {
 class HIRBuilder;

src/alloy/backend/backend.h

@@ -12,7 +12,6 @@
 
 #include <memory>
 
-#include <alloy/core.h>
 #include <alloy/backend/machine_info.h>
 
 namespace alloy {

src/alloy/backend/ivm/ivm_assembler.cc

@@ -16,6 +16,7 @@
 #include <alloy/hir/hir_builder.h>
 #include <alloy/hir/label.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace backend {

src/alloy/backend/ivm/ivm_assembler.h

@@ -10,8 +10,6 @@
 #ifndef ALLOY_BACKEND_IVM_IVM_ASSEMBLER_H_
 #define ALLOY_BACKEND_IVM_IVM_ASSEMBLER_H_
 
-#include <alloy/core.h>
-
 #include <alloy/arena.h>
 #include <alloy/backend/assembler.h>
 

src/alloy/backend/ivm/ivm_backend.h

@@ -10,8 +10,6 @@
 #ifndef ALLOY_BACKEND_IVM_IVM_BACKEND_H_
 #define ALLOY_BACKEND_IVM_IVM_BACKEND_H_
 
-#include <alloy/core.h>
-
 #include <alloy/backend/backend.h>
 
 namespace alloy {

src/alloy/backend/ivm/ivm_function.h

@@ -10,17 +10,14 @@
 #ifndef ALLOY_BACKEND_IVM_IVM_FUNCTION_H_
 #define ALLOY_BACKEND_IVM_IVM_FUNCTION_H_
 
-#include <alloy/core.h>
 #include <alloy/backend/ivm/ivm_intcode.h>
 #include <alloy/runtime/function.h>
 #include <alloy/runtime/symbol_info.h>
 
-
 namespace alloy {
 namespace backend {
 namespace ivm {
 
-
 class IVMFunction : public runtime::Function {
  public:
   IVMFunction(runtime::FunctionInfo* symbol_info);
@@ -47,10 +44,8 @@ private:
   SourceMapEntry* source_map_;
 };
 
-
 }  // namespace ivm
 }  // namespace backend
 }  // namespace alloy
 
-
 #endif  // ALLOY_BACKEND_IVM_IVM_FUNCTION_H_

src/alloy/backend/ivm/ivm_intcode.h

@@ -10,16 +10,14 @@
 #ifndef ALLOY_BACKEND_IVM_INTCODE_H_
 #define ALLOY_BACKEND_IVM_INTCODE_H_
 
-#include <alloy/core.h>
-
 #include <alloy/hir/instr.h>
 #include <alloy/hir/opcodes.h>
 
 namespace alloy {
 namespace runtime {
 class ThreadState;
-}
-}
+}  // namespace runtime
+}  // namespace alloy
 
 namespace alloy {
 namespace backend {

src/alloy/backend/ivm/ivm_stack.h

@@ -10,8 +10,6 @@
 #ifndef ALLOY_BACKEND_IVM_IVM_STACK_H_
 #define ALLOY_BACKEND_IVM_IVM_STACK_H_
 
-#include <alloy/core.h>
-
 #include <alloy/backend/ivm/ivm_intcode.h>
 
 namespace alloy {

src/alloy/backend/machine_info.h

@@ -10,7 +10,7 @@
 #ifndef ALLOY_BACKEND_MACHINE_INFO_H_
 #define ALLOY_BACKEND_MACHINE_INFO_H_
 
-#include <alloy/core.h>
+#include <cstdint>
 
 namespace alloy {
 namespace backend {

src/alloy/backend/x64/x64_assembler.cc

@@ -16,6 +16,7 @@
 #include <alloy/hir/hir_builder.h>
 #include <alloy/hir/label.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 namespace BE {
 #include <beaengine/BeaEngine.h>

src/alloy/backend/x64/x64_assembler.h

@@ -12,10 +12,8 @@
 
 #include <memory>
 
-#include <alloy/core.h>
-
-#include <alloy/string_buffer.h>
 #include <alloy/backend/assembler.h>
+#include <alloy/string_buffer.h>
 
 namespace alloy {
 namespace backend {

src/alloy/backend/x64/x64_backend.h

@@ -10,8 +10,6 @@
 #ifndef ALLOY_BACKEND_X64_X64_BACKEND_H_
 #define ALLOY_BACKEND_X64_X64_BACKEND_H_
 
-#include <alloy/core.h>
-
 #include <alloy/backend/backend.h>
 
 namespace alloy {

src/alloy/backend/x64/x64_code_cache.h

@@ -12,8 +12,6 @@
 
 #include <mutex>
 
-#include <alloy/core.h>
-
 namespace alloy {
 namespace backend {
 namespace x64 {

src/alloy/backend/x64/x64_code_cache_win.cc

@@ -10,6 +10,7 @@
 #include <alloy/backend/x64/x64_code_cache.h>
 
 #include <poly/poly.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace backend {

src/alloy/backend/x64/x64_emitter.cc

@@ -20,6 +20,7 @@
 #include <alloy/runtime/symbol_info.h>
 #include <alloy/runtime/thread_state.h>
 #include <xdb/protocol.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace backend {

src/alloy/backend/x64/x64_emitter.h

@@ -10,10 +10,7 @@
 #ifndef ALLOY_BACKEND_X64_X64_EMITTER_H_
 #define ALLOY_BACKEND_X64_X64_EMITTER_H_
 
-#include <alloy/core.h>
-
 #include <alloy/hir/value.h>
-
 #include <third_party/xbyak/xbyak/xbyak.h>
 
 namespace alloy {

src/alloy/backend/x64/x64_function.h

@@ -10,7 +10,6 @@
 #ifndef ALLOY_BACKEND_X64_X64_FUNCTION_H_
 #define ALLOY_BACKEND_X64_X64_FUNCTION_H_
 
-#include <alloy/core.h>
 #include <alloy/runtime/function.h>
 #include <alloy/runtime/symbol_info.h>
 

src/alloy/backend/x64/x64_sequences.h

@@ -10,8 +10,6 @@
 #ifndef ALLOY_BACKEND_X64_X64_SEQUENCES_H_
 #define ALLOY_BACKEND_X64_X64_SEQUENCES_H_
 
-#include <alloy/core.h>
-
 namespace alloy {
 namespace hir {
 class Instr;

src/alloy/backend/x64/x64_thunk_emitter.h

@@ -10,7 +10,6 @@
 #ifndef ALLOY_BACKEND_X64_X64_THUNK_EMITTER_H_
 #define ALLOY_BACKEND_X64_X64_THUNK_EMITTER_H_
 
-#include <alloy/core.h>
 #include <alloy/backend/x64/x64_backend.h>
 #include <alloy/backend/x64/x64_emitter.h>
 

src/alloy/backend/x64/x64_tracers.h

@@ -10,9 +10,8 @@
 #ifndef ALLOY_BACKEND_X64_X64_TRACERS_H_
 #define ALLOY_BACKEND_X64_X64_TRACERS_H_
 
-#include <alloy/core.h>
-
 #include <xmmintrin.h>
+#include <cstdint>
 
 namespace alloy {
 namespace backend {

src/alloy/compiler/compiler.cc

@@ -10,6 +10,7 @@
 #include <alloy/compiler/compiler.h>
 
 #include <alloy/compiler/compiler_pass.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace compiler {

src/alloy/compiler/compiler.h

@@ -13,7 +13,6 @@
 #include <memory>
 #include <vector>
 
-#include <alloy/core.h>
 #include <alloy/hir/hir_builder.h>
 
 namespace alloy {

src/alloy/compiler/compiler_pass.h

@@ -10,8 +10,6 @@
 #ifndef ALLOY_COMPILER_COMPILER_PASS_H_
 #define ALLOY_COMPILER_COMPILER_PASS_H_
 
-#include <alloy/core.h>
-
 #include <alloy/hir/hir_builder.h>
 
 namespace alloy {

src/alloy/compiler/passes/constant_propagation_pass.cc

@@ -11,6 +11,7 @@
 
 #include <alloy/runtime/function.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace compiler {

src/alloy/compiler/passes/context_promotion_pass.cc

@@ -13,6 +13,7 @@
 
 #include <alloy/compiler/compiler.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 DEFINE_bool(store_all_context_values, false,
             "Don't strip dead context stores to aid in debugging.");

src/alloy/compiler/passes/control_flow_analysis_pass.cc

@@ -12,6 +12,7 @@
 #include <alloy/backend/backend.h>
 #include <alloy/compiler/compiler.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace compiler {

src/alloy/compiler/passes/control_flow_simplification_pass.cc

@@ -12,6 +12,7 @@
 #include <alloy/backend/backend.h>
 #include <alloy/compiler/compiler.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace compiler {

src/alloy/compiler/passes/data_flow_analysis_pass.cc

@@ -12,6 +12,7 @@
 #include <alloy/backend/backend.h>
 #include <alloy/compiler/compiler.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 #if XE_COMPILER_MSVC
 #pragma warning(push)

src/alloy/compiler/passes/dead_code_elimination_pass.cc

@@ -9,6 +9,8 @@
 
 #include <alloy/compiler/passes/dead_code_elimination_pass.h>
 
+#include <xenia/profiling.h>
+
 namespace alloy {
 namespace compiler {
 namespace passes {

src/alloy/compiler/passes/finalization_pass.cc

@@ -12,6 +12,7 @@
 #include <alloy/backend/backend.h>
 #include <alloy/compiler/compiler.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace compiler {

src/alloy/compiler/passes/register_allocation_pass.cc

@@ -11,6 +11,8 @@
 
 #include <algorithm>
 
+#include <xenia/profiling.h>
+
 namespace alloy {
 namespace compiler {
 namespace passes {

src/alloy/compiler/passes/simplification_pass.cc

@@ -9,6 +9,8 @@
 
 #include <alloy/compiler/passes/simplification_pass.h>
 
+#include <xenia/profiling.h>
+
 namespace alloy {
 namespace compiler {
 namespace passes {

src/alloy/compiler/passes/validation_pass.cc

@@ -12,6 +12,7 @@
 #include <alloy/backend/backend.h>
 #include <alloy/compiler/compiler.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace compiler {

src/alloy/compiler/passes/value_reduction_pass.cc

@@ -12,6 +12,7 @@
 #include <alloy/backend/backend.h>
 #include <alloy/compiler/compiler.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 #if XE_COMPILER_MSVC
 #pragma warning(push)

src/alloy/core.h

@@ -1,16 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2013 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-#ifndef ALLOY_CORE_H_
-#define ALLOY_CORE_H_
-
-// TODO(benvanik): move the common stuff into here?
-#include <xenia/profiling.h>
-
-#endif  // ALLOY_CORE_H_

src/alloy/delegate.h

@@ -14,8 +14,6 @@
 #include <mutex>
 #include <vector>
 
-#include <alloy/core.h>
-
 namespace alloy {
 
 // TODO(benvanik): go lockfree, and don't hold the lock while emitting.

src/alloy/frontend/context_info.h

@@ -10,7 +10,7 @@
 #ifndef ALLOY_FRONTEND_CONTEXT_INFO_H_
 #define ALLOY_FRONTEND_CONTEXT_INFO_H_
 
-#include <alloy/core.h>
+#include <cstdint>
 
 namespace alloy {
 namespace frontend {

src/alloy/frontend/frontend.h

@@ -12,9 +12,8 @@
 
 #include <memory>
 
-#include <alloy/core.h>
-#include <alloy/memory.h>
 #include <alloy/frontend/context_info.h>
+#include <alloy/memory.h>
 #include <alloy/runtime/function.h>
 #include <alloy/runtime/symbol_info.h>
 

src/alloy/frontend/ppc/ppc_context.h

@@ -10,7 +10,6 @@
 #ifndef ALLOY_FRONTEND_PPC_PPC_CONTEXT_H_
 #define ALLOY_FRONTEND_PPC_PPC_CONTEXT_H_
 
-#include <alloy/core.h>
 #include <alloy/vec128.h>
 #include <poly/poly.h>
 

src/alloy/frontend/ppc/ppc_frontend.h

@@ -10,10 +10,8 @@
 #ifndef ALLOY_FRONTEND_PPC_PPC_FRONTEND_H_
 #define ALLOY_FRONTEND_PPC_PPC_FRONTEND_H_
 
-#include <alloy/core.h>
-#include <alloy/type_pool.h>
-
 #include <alloy/frontend/frontend.h>
+#include <alloy/type_pool.h>
 
 namespace alloy {
 namespace frontend {

src/alloy/frontend/ppc/ppc_hir_builder.cc

@@ -16,6 +16,7 @@
 #include <alloy/frontend/ppc/ppc_instr.h>
 #include <alloy/hir/label.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace frontend {

src/alloy/frontend/ppc/ppc_hir_builder.h

@@ -10,11 +10,10 @@
 #ifndef ALLOY_FRONTEND_PPC_PPC_HIR_BUILDER_H_
 #define ALLOY_FRONTEND_PPC_PPC_HIR_BUILDER_H_
 
-#include <alloy/core.h>
-#include <alloy/string_buffer.h>
 #include <alloy/hir/hir_builder.h>
 #include <alloy/runtime/function.h>
 #include <alloy/runtime/symbol_info.h>
+#include <alloy/string_buffer.h>
 
 namespace alloy {
 namespace frontend {

src/alloy/frontend/ppc/ppc_instr.h

@@ -10,11 +10,10 @@
 #ifndef ALLOY_FRONTEND_PPC_PPC_INSTR_H_
 #define ALLOY_FRONTEND_PPC_PPC_INSTR_H_
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
-#include <alloy/core.h>
-
 namespace alloy {
 class StringBuffer;
 }  // namespace alloy

src/alloy/frontend/ppc/ppc_scanner.cc

@@ -17,6 +17,7 @@
 #include <alloy/runtime/runtime.h>
 #include <poly/logging.h>
 #include <poly/memory.h>
+#include <xenia/profiling.h>
 
 #if 0
 #define LOGPPC(fmt, ...) PLOGCORE('p', fmt, ##__VA_ARGS__)

src/alloy/frontend/ppc/ppc_scanner.h

@@ -12,7 +12,6 @@
 
 #include <vector>
 
-#include <alloy/core.h>
 #include <alloy/runtime/symbol_info.h>
 
 namespace alloy {

src/alloy/frontend/ppc/ppc_translator.cc

@@ -18,6 +18,7 @@
 #include <alloy/frontend/ppc/ppc_instr.h>
 #include <alloy/frontend/ppc/ppc_scanner.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace frontend {

src/alloy/frontend/ppc/ppc_translator.h

@@ -12,11 +12,10 @@
 
 #include <memory>
 
-#include <alloy/core.h>
-#include <alloy/string_buffer.h>
 #include <alloy/backend/assembler.h>
 #include <alloy/compiler/compiler.h>
 #include <alloy/runtime/symbol_info.h>
+#include <alloy/string_buffer.h>
 
 namespace alloy {
 namespace frontend {

src/alloy/hir/block.h

@@ -11,7 +11,6 @@
 #define ALLOY_HIR_BLOCK_H_
 
 #include <alloy/arena.h>
-#include <alloy/core.h>
 
 namespace llvm {
 class BitVector;

src/alloy/hir/hir_builder.cc

@@ -9,11 +9,12 @@
 
 #include <alloy/hir/hir_builder.h>
 
-#include <alloy/string_buffer.h>
 #include <alloy/hir/block.h>
 #include <alloy/hir/instr.h>
 #include <alloy/hir/label.h>
 #include <alloy/runtime/symbol_info.h>
+#include <alloy/string_buffer.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace hir {

src/alloy/hir/hir_builder.h

@@ -12,7 +12,6 @@
 
 #include <vector>
 
-#include <alloy/core.h>
 #include <alloy/hir/block.h>
 #include <alloy/hir/instr.h>
 #include <alloy/hir/label.h>

src/alloy/hir/instr.h

@@ -10,7 +10,6 @@
 #ifndef ALLOY_HIR_INSTR_H_
 #define ALLOY_HIR_INSTR_H_
 
-#include <alloy/core.h>
 #include <alloy/hir/opcodes.h>
 #include <alloy/hir/value.h>
 

src/alloy/hir/label.h

@@ -10,8 +10,6 @@
 #ifndef ALLOY_HIR_LABEL_H_
 #define ALLOY_HIR_LABEL_H_
 
-#include <alloy/core.h>
-
 namespace alloy {
 namespace hir {
 

src/alloy/hir/opcodes.h

@@ -10,7 +10,7 @@
 #ifndef ALLOY_HIR_OPCODES_H_
 #define ALLOY_HIR_OPCODES_H_
 
-#include <alloy/core.h>
+#include <cstdint>
 
 namespace alloy {
 namespace hir {

src/alloy/hir/value.h

@@ -10,11 +10,10 @@
 #ifndef ALLOY_HIR_VALUE_H_
 #define ALLOY_HIR_VALUE_H_
 
-#include <alloy/core.h>
 #include <alloy/arena.h>
-#include <alloy/vec128.h>
 #include <alloy/backend/machine_info.h>
 #include <alloy/hir/opcodes.h>
+#include <alloy/vec128.h>
 #include <poly/poly.h>
 
 namespace alloy {

src/alloy/memory.h

@@ -10,7 +10,8 @@
 #ifndef ALLOY_MEMORY_H_
 #define ALLOY_MEMORY_H_
 
-#include <alloy/core.h>
+#include <cstdint>
+#include <vector>
 
 namespace alloy {
 

src/alloy/reset_scope.h

@@ -12,8 +12,6 @@
 
 #include <mutex>
 
-#include <alloy/core.h>
-
 namespace alloy {
 
 template <typename T>

src/alloy/runtime/debug_info.cc

@@ -9,6 +9,8 @@
 
 #include <alloy/runtime/debug_info.h>
 
+#include <memory>
+
 namespace alloy {
 namespace runtime {
 

src/alloy/runtime/debug_info.h

@@ -10,7 +10,7 @@
 #ifndef ALLOY_RUNTIME_DEBUG_INFO_H_
 #define ALLOY_RUNTIME_DEBUG_INFO_H_
 
-#include <alloy/core.h>
+#include <cstdint>
 
 namespace alloy {
 namespace runtime {

src/alloy/runtime/debugger.h

@@ -15,7 +15,6 @@
 #include <string>
 #include <unordered_map>
 
-#include <alloy/core.h>
 #include <alloy/delegate.h>
 
 namespace alloy {

src/alloy/runtime/entry_table.cc

@@ -10,6 +10,7 @@
 #include <alloy/runtime/entry_table.h>
 
 #include <poly/poly.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace runtime {

src/alloy/runtime/entry_table.h

@@ -14,8 +14,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include <alloy/core.h>
-
 namespace alloy {
 namespace runtime {
 

src/alloy/runtime/function.h

@@ -14,7 +14,6 @@
 #include <mutex>
 #include <vector>
 
-#include <alloy/core.h>
 #include <alloy/runtime/debug_info.h>
 
 namespace alloy {

src/alloy/runtime/instrument.h

@@ -10,7 +10,7 @@
 #ifndef ALLOY_RUNTIME_INSTRUMENT_H_
 #define ALLOY_RUNTIME_INSTRUMENT_H_
 
-#include <alloy/core.h>
+#include <cstdint>
 
 namespace alloy {
 class Memory;

src/alloy/runtime/module.cc

@@ -14,6 +14,7 @@
 
 #include <alloy/runtime/runtime.h>
 #include <poly/poly.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace runtime {

src/alloy/runtime/module.h

@@ -11,11 +11,11 @@
 #define ALLOY_RUNTIME_MODULE_H_
 
 #include <functional>
+#include <memory>
 #include <mutex>
 #include <unordered_map>
 #include <vector>
 
-#include <alloy/core.h>
 #include <alloy/memory.h>
 #include <alloy/runtime/symbol_info.h>
 

src/alloy/runtime/raw_module.cc

@@ -9,6 +9,8 @@
 
 #include <alloy/runtime/raw_module.h>
 
+#include <poly/platform.h>
+
 namespace alloy {
 namespace runtime {
 

src/alloy/runtime/runtime.cc

@@ -14,6 +14,7 @@
 #include <alloy/runtime/module.h>
 #include <poly/poly.h>
 #include <xdb/protocol.h>
+#include <xenia/profiling.h>
 
 // TODO(benvanik): based on compiler support
 #include <alloy/backend/ivm/ivm_backend.h>

src/alloy/runtime/runtime.h

@@ -14,10 +14,9 @@
 #include <mutex>
 #include <vector>
 
-#include <alloy/core.h>
-#include <alloy/memory.h>
 #include <alloy/backend/backend.h>
 #include <alloy/frontend/frontend.h>
+#include <alloy/memory.h>
 #include <alloy/runtime/debugger.h>
 #include <alloy/runtime/entry_table.h>
 #include <alloy/runtime/module.h>

src/alloy/runtime/symbol_info.h

@@ -10,10 +10,9 @@
 #ifndef ALLOY_RUNTIME_SYMBOL_INFO_H_
 #define ALLOY_RUNTIME_SYMBOL_INFO_H_
 
+#include <cstdint>
 #include <string>
 
-#include <alloy/core.h>
-
 namespace alloy {
 namespace runtime {
 

src/alloy/runtime/thread_state.h

@@ -12,8 +12,6 @@
 
 #include <string>
 
-#include <alloy/core.h>
-
 #include <alloy/memory.h>
 
 namespace alloy {

src/alloy/sources.gypi

@@ -6,7 +6,6 @@
     'alloy.h',
     'arena.cc',
     'arena.h',
-    'core.h',
     'delegate.h',
     'memory.cc',
     'memory.h',

src/alloy/string_buffer.cc

@@ -10,6 +10,7 @@
 #include <alloy/string_buffer.h>
 
 #include <algorithm>
+#include <cstdarg>
 
 namespace alloy {
 

src/alloy/string_buffer.h

@@ -10,11 +10,10 @@
 #ifndef ALLOY_STRING_BUFFER_H_
 #define ALLOY_STRING_BUFFER_H_
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
-#include <alloy/core.h>
-
 namespace alloy {
 
 class StringBuffer {

src/alloy/type_pool.h

@@ -13,8 +13,6 @@
 #include <mutex>
 #include <vector>
 
-#include <alloy/core.h>
-
 namespace alloy {
 
 template <class T, typename A>

src/alloy/vec128.h

@@ -10,7 +10,6 @@
 #ifndef ALLOY_VEC128_H_
 #define ALLOY_VEC128_H_
 
-#include <alloy/core.h>
 #include <poly/poly.h>
 
 namespace alloy {

xenia.gyp

@@ -45,6 +45,7 @@
       '__STDC_LIMIT_MACROS=1',
       '__STDC_CONSTANT_MACROS=1',
       '_ISOC99_SOURCE=1',
+      '_CRT_NONSTDC_NO_DEPRECATE=1',
     ],
 
     'conditions': [