From fa528f474179995e05490bfcbd0a88ccdd9b50fc Mon Sep 17 00:00:00 2001
From: kobalicekp <kobalicek.petr@gmail.com>
Date: Tue, 1 Apr 2014 21:16:31 +0200
Subject: [PATCH] Added gcc visibility push/pop to ApiBegin/ApiEnd.
 ApiBegin/ApiEnd moved from asmjit/base to asmjit.

---
 CMakeLists.txt                    | 6 +++---
 src/asmjit/{base => }/apibegin.h  | 7 ++++++-
 src/asmjit/{base => }/apiend.h    | 5 +++++
 src/asmjit/base/assembler.cpp     | 4 ++--
 src/asmjit/base/assembler.h       | 4 ++--
 src/asmjit/base/codegen.cpp       | 4 ++--
 src/asmjit/base/codegen.h         | 4 ++--
 src/asmjit/base/compiler.cpp      | 4 ++--
 src/asmjit/base/compiler.h        | 4 ++--
 src/asmjit/base/context.cpp       | 4 ++--
 src/asmjit/base/context_p.h       | 4 ++--
 src/asmjit/base/cpuinfo.cpp       | 4 ++--
 src/asmjit/base/cpuinfo.h         | 4 ++--
 src/asmjit/base/cputicks.cpp      | 4 ++--
 src/asmjit/base/cputicks.h        | 4 ++--
 src/asmjit/base/defs.cpp          | 4 ++--
 src/asmjit/base/defs.h            | 4 ++--
 src/asmjit/base/error.cpp         | 4 ++--
 src/asmjit/base/error.h           | 4 ++--
 src/asmjit/base/func.cpp          | 4 ++--
 src/asmjit/base/func.h            | 4 ++--
 src/asmjit/base/globals.cpp       | 4 ++--
 src/asmjit/base/globals.h         | 4 ++--
 src/asmjit/base/intutil.h         | 4 ++--
 src/asmjit/base/lock.h            | 4 ++--
 src/asmjit/base/logger.cpp        | 4 ++--
 src/asmjit/base/logger.h          | 4 ++--
 src/asmjit/base/memorymanager.cpp | 4 ++--
 src/asmjit/base/memorymanager.h   | 4 ++--
 src/asmjit/base/podlist.h         | 4 ++--
 src/asmjit/base/podvector.cpp     | 4 ++--
 src/asmjit/base/podvector.h       | 4 ++--
 src/asmjit/base/runtime.cpp       | 4 ++--
 src/asmjit/base/runtime.h         | 4 ++--
 src/asmjit/base/string.cpp        | 4 ++--
 src/asmjit/base/string.h          | 4 ++--
 src/asmjit/base/vectypes.h        | 4 ++--
 src/asmjit/base/vmem.cpp          | 4 ++--
 src/asmjit/base/vmem.h            | 4 ++--
 src/asmjit/base/zone.cpp          | 4 ++--
 src/asmjit/base/zone.h            | 4 ++--
 src/asmjit/x86/x86assembler.cpp   | 4 ++--
 src/asmjit/x86/x86assembler.h     | 4 ++--
 src/asmjit/x86/x86compiler.cpp    | 4 ++--
 src/asmjit/x86/x86compiler.h      | 4 ++--
 src/asmjit/x86/x86context.cpp     | 4 ++--
 src/asmjit/x86/x86context_p.h     | 4 ++--
 src/asmjit/x86/x86cpuinfo.cpp     | 4 ++--
 src/asmjit/x86/x86cpuinfo.h       | 4 ++--
 src/asmjit/x86/x86defs.cpp        | 4 ++--
 src/asmjit/x86/x86defs.h          | 4 ++--
 src/asmjit/x86/x86func.cpp        | 4 ++--
 src/asmjit/x86/x86func.h          | 4 ++--
 53 files changed, 114 insertions(+), 104 deletions(-)
 rename src/asmjit/{base => }/apibegin.h (95%)
 rename src/asmjit/{base => }/apiend.h (92%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f789c6..de86f0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,6 +184,9 @@ EndMacro()
 Set(ASMJIT_SRC "")
 
 AsmJit_AddSource(ASMJIT_SRC asmjit
+  apibegin.h
+  apiend.h
+
   asmjit.h
   base.h
   build.h
@@ -194,9 +197,6 @@ AsmJit_AddSource(ASMJIT_SRC asmjit
 )
 
 AsmJit_AddSource(ASMJIT_SRC asmjit/base
-  apibegin.h
-  apiend.h
-
   assembler.cpp
   assembler.h
   codegen.cpp
diff --git a/src/asmjit/base/apibegin.h b/src/asmjit/apibegin.h
similarity index 95%
rename from src/asmjit/base/apibegin.h
rename to src/asmjit/apibegin.h
index 9447cbb..b705d97 100644
--- a/src/asmjit/base/apibegin.h
+++ b/src/asmjit/apibegin.h
@@ -5,7 +5,7 @@
 // Zlib - See LICENSE.md file in the package.
 
 #if !defined(_ASMJIT_BUILD_H)
-#include "../build.h"
+#include "build.h"
 #endif // !_ASMJIT_BUILD_H
 
 // ============================================================================
@@ -51,4 +51,9 @@
 // # if (__GNUC__ * 10000  + __GNUC_MINOR__ * 100  + __GNUC_PATCHLEVEL__) >= 402001
 // #  pragma GCC diagnostic ignored "-w"
 // # endif
+
+#if __GNUC__ >= 4
+# pragma GCC visibility push(hidden)
+#endif __GNUC__ >= 4
+
 #endif // __GNUC__
diff --git a/src/asmjit/base/apiend.h b/src/asmjit/apiend.h
similarity index 92%
rename from src/asmjit/base/apiend.h
rename to src/asmjit/apiend.h
index 3732478..e44a82a 100644
--- a/src/asmjit/base/apiend.h
+++ b/src/asmjit/apiend.h
@@ -31,4 +31,9 @@
 // ============================================================================
 
 #if defined(__GNUC__)
+
+#if __GNUC__ >= 4
+# pragma GCC visibility pop
+#endif // __GNUC__ >= 4
+
 #endif // __GNUC__
diff --git a/src/asmjit/base/assembler.cpp b/src/asmjit/base/assembler.cpp
index bea4df1..5f31b4e 100644
--- a/src/asmjit/base/assembler.cpp
+++ b/src/asmjit/base/assembler.cpp
@@ -16,7 +16,7 @@
 #include <stdarg.h>
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -283,4 +283,4 @@ Error BaseAssembler::emit(uint32_t code, const Operand& o0, const Operand& o1, c
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/assembler.h b/src/asmjit/base/assembler.h
index 9648d12..febcee2 100644
--- a/src/asmjit/base/assembler.h
+++ b/src/asmjit/base/assembler.h
@@ -19,7 +19,7 @@
 #include "../base/zone.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -470,7 +470,7 @@ ASMJIT_INLINE Label::Label(BaseAssembler& a) : Operand(NoInit) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_ASSEMBLER_H
diff --git a/src/asmjit/base/codegen.cpp b/src/asmjit/base/codegen.cpp
index 0b5f053..6a85985 100644
--- a/src/asmjit/base/codegen.cpp
+++ b/src/asmjit/base/codegen.cpp
@@ -12,7 +12,7 @@
 #include "../base/intutil.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -115,4 +115,4 @@ Error CodeGen::setFeature(uint32_t feature, bool value) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/codegen.h b/src/asmjit/base/codegen.h
index 4397e12..6135474 100644
--- a/src/asmjit/base/codegen.h
+++ b/src/asmjit/base/codegen.h
@@ -16,7 +16,7 @@
 #include "../base/zone.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -198,7 +198,7 @@ struct CodeGen {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_CODEGEN_H
diff --git a/src/asmjit/base/compiler.cpp b/src/asmjit/base/compiler.cpp
index 62c747f..b2e4e5a 100644
--- a/src/asmjit/base/compiler.cpp
+++ b/src/asmjit/base/compiler.cpp
@@ -19,7 +19,7 @@
 #include <stdarg.h>
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -574,4 +574,4 @@ void BaseCompiler::rename(BaseVar& var, const char* name) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/compiler.h b/src/asmjit/base/compiler.h
index ce0f5ab..d867718 100644
--- a/src/asmjit/base/compiler.h
+++ b/src/asmjit/base/compiler.h
@@ -20,7 +20,7 @@
 #include "../base/runtime.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -1976,7 +1976,7 @@ ASMJIT_INLINE BaseNode::BaseNode(BaseCompiler* compiler, uint32_t type) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_COMPILER_H
diff --git a/src/asmjit/base/context.cpp b/src/asmjit/base/context.cpp
index fc2a42e..b2f7845 100644
--- a/src/asmjit/base/context.cpp
+++ b/src/asmjit/base/context.cpp
@@ -12,7 +12,7 @@
 #include "../base/intutil.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -345,4 +345,4 @@ Error BaseContext::compile(FuncNode* func) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/context_p.h b/src/asmjit/base/context_p.h
index 33b5fcc..d5334c7 100644
--- a/src/asmjit/base/context_p.h
+++ b/src/asmjit/base/context_p.h
@@ -13,7 +13,7 @@
 #include "../base/zone.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -272,7 +272,7 @@ struct BaseContext {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_CONTEXT_P_H
diff --git a/src/asmjit/base/cpuinfo.cpp b/src/asmjit/base/cpuinfo.cpp
index ad42121..2272980 100644
--- a/src/asmjit/base/cpuinfo.cpp
+++ b/src/asmjit/base/cpuinfo.cpp
@@ -30,7 +30,7 @@
 #endif // ASMJIT_OS_POSIX
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -81,4 +81,4 @@ const BaseCpuInfo* BaseCpuInfo::getHost() {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/cpuinfo.h b/src/asmjit/base/cpuinfo.h
index 94593b3..cecf68a 100644
--- a/src/asmjit/base/cpuinfo.h
+++ b/src/asmjit/base/cpuinfo.h
@@ -12,7 +12,7 @@
 #include "../base/globals.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -137,7 +137,7 @@ struct BaseCpuInfo {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_CPUINFO_H
diff --git a/src/asmjit/base/cputicks.cpp b/src/asmjit/base/cputicks.cpp
index 7effbfc..ea2c518 100644
--- a/src/asmjit/base/cputicks.cpp
+++ b/src/asmjit/base/cputicks.cpp
@@ -22,7 +22,7 @@
 #endif // ASMJIT_OS_MAC
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -117,4 +117,4 @@ uint32_t CpuTicks::now() {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/cputicks.h b/src/asmjit/base/cputicks.h
index 3c69b20..0c23df8 100644
--- a/src/asmjit/base/cputicks.h
+++ b/src/asmjit/base/cputicks.h
@@ -12,7 +12,7 @@
 #include "../base/globals.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -32,7 +32,7 @@ struct CpuTicks {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_CPUTICKS_H
diff --git a/src/asmjit/base/defs.cpp b/src/asmjit/base/defs.cpp
index 957dd72..922204b 100644
--- a/src/asmjit/base/defs.cpp
+++ b/src/asmjit/base/defs.cpp
@@ -11,7 +11,7 @@
 #include "../base/defs.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -24,4 +24,4 @@ const Operand noOperand;
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/defs.h b/src/asmjit/base/defs.h
index 60068e3..b400754 100644
--- a/src/asmjit/base/defs.h
+++ b/src/asmjit/base/defs.h
@@ -12,7 +12,7 @@
 #include "../base/intutil.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -1151,7 +1151,7 @@ struct Label : public Operand {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_DEFS_H
diff --git a/src/asmjit/base/error.cpp b/src/asmjit/base/error.cpp
index 3388e1f..99cdf0d 100644
--- a/src/asmjit/base/error.cpp
+++ b/src/asmjit/base/error.cpp
@@ -12,7 +12,7 @@
 #include "../base/intutil.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -66,4 +66,4 @@ const char* ErrorUtil::asString(Error e) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/error.h b/src/asmjit/base/error.h
index adba3f7..9a30808 100644
--- a/src/asmjit/base/error.h
+++ b/src/asmjit/base/error.h
@@ -9,7 +9,7 @@
 #define _ASMJIT_BASE_ERROR_H
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -190,7 +190,7 @@ struct ErrorUtil {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_ERROR_H
diff --git a/src/asmjit/base/func.cpp b/src/asmjit/base/func.cpp
index c0423ac..3d63b96 100644
--- a/src/asmjit/base/func.cpp
+++ b/src/asmjit/base/func.cpp
@@ -11,10 +11,10 @@
 #include "../base/func.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/func.h b/src/asmjit/base/func.h
index 5dded3a..602e46f 100644
--- a/src/asmjit/base/func.h
+++ b/src/asmjit/base/func.h
@@ -13,7 +13,7 @@
 #include "../base/globals.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -626,7 +626,7 @@ struct FuncBuilder10 : public FuncPrototype {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_FUNC_H
diff --git a/src/asmjit/base/globals.cpp b/src/asmjit/base/globals.cpp
index 55e06bf..2971e00 100644
--- a/src/asmjit/base/globals.cpp
+++ b/src/asmjit/base/globals.cpp
@@ -11,7 +11,7 @@
 #include "../base/globals.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -27,4 +27,4 @@ void assertionFailed(const char* exp, const char* file, int line) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/globals.h b/src/asmjit/base/globals.h
index c6e92bb..0e3d40b 100644
--- a/src/asmjit/base/globals.h
+++ b/src/asmjit/base/globals.h
@@ -12,7 +12,7 @@
 #include "../build.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -139,7 +139,7 @@ template<typename T, typename Z>
 static ASMJIT_INLINE T asmjit_cast(Z* p) { return (T)p; }
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_GLOBALS_H
diff --git a/src/asmjit/base/intutil.h b/src/asmjit/base/intutil.h
index c8ae89a..3df824c 100644
--- a/src/asmjit/base/intutil.h
+++ b/src/asmjit/base/intutil.h
@@ -16,7 +16,7 @@
 #endif // ASMJIT_OS_WINDOWS
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -694,7 +694,7 @@ union UInt64 {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_INTUTIL_H
diff --git a/src/asmjit/base/lock.h b/src/asmjit/base/lock.h
index 3b18eb3..c909a8b 100644
--- a/src/asmjit/base/lock.h
+++ b/src/asmjit/base/lock.h
@@ -22,7 +22,7 @@
 #endif // ASMJIT_OS_POSIX
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -126,7 +126,7 @@ struct AutoLock {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_LOCK_H
diff --git a/src/asmjit/base/logger.cpp b/src/asmjit/base/logger.cpp
index 421c31b..ac918e6 100644
--- a/src/asmjit/base/logger.cpp
+++ b/src/asmjit/base/logger.cpp
@@ -16,7 +16,7 @@
 #include <stdarg.h>
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -157,4 +157,4 @@ void StringLogger::logString(uint32_t style, const char* buf, size_t len) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/logger.h b/src/asmjit/base/logger.h
index 95286a4..c58e981 100644
--- a/src/asmjit/base/logger.h
+++ b/src/asmjit/base/logger.h
@@ -16,7 +16,7 @@
 #include <stdarg.h>
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -232,7 +232,7 @@ struct StringLogger : public BaseLogger {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_LOGGER_H
diff --git a/src/asmjit/base/memorymanager.cpp b/src/asmjit/base/memorymanager.cpp
index 1eedb93..20e7549 100644
--- a/src/asmjit/base/memorymanager.cpp
+++ b/src/asmjit/base/memorymanager.cpp
@@ -15,7 +15,7 @@
 #include "../base/vmem.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 // This file contains implementation of virtual memory management for AsmJit
 // library. The initial concept is to keep this implementation simple but
@@ -1044,4 +1044,4 @@ void VirtualMemoryManager::setKeepVirtualMemory(bool keepVirtualMemory) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/memorymanager.h b/src/asmjit/base/memorymanager.h
index 803f400..d6756e7 100644
--- a/src/asmjit/base/memorymanager.h
+++ b/src/asmjit/base/memorymanager.h
@@ -13,7 +13,7 @@
 #include "../base/error.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -163,7 +163,7 @@ struct VirtualMemoryManager : public MemoryManager {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_MEMORYMANAGER_H
diff --git a/src/asmjit/base/podlist.h b/src/asmjit/base/podlist.h
index 93f59d6..628a406 100644
--- a/src/asmjit/base/podlist.h
+++ b/src/asmjit/base/podlist.h
@@ -13,7 +13,7 @@
 #include "../base/globals.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -111,7 +111,7 @@ struct PodList {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_PODLIST_H
diff --git a/src/asmjit/base/podvector.cpp b/src/asmjit/base/podvector.cpp
index 3fccd51..02f3c2c 100644
--- a/src/asmjit/base/podvector.cpp
+++ b/src/asmjit/base/podvector.cpp
@@ -12,7 +12,7 @@
 #include "../base/podvector.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -93,4 +93,4 @@ Error PodVectorBase::_reserve(size_t n, size_t sizeOfT) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/podvector.h b/src/asmjit/base/podvector.h
index 2223ceb..00645ef 100644
--- a/src/asmjit/base/podvector.h
+++ b/src/asmjit/base/podvector.h
@@ -14,7 +14,7 @@
 #include "../base/globals.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -257,7 +257,7 @@ struct PodVector : PodVectorBase {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_PODVECTOR_H
diff --git a/src/asmjit/base/runtime.cpp b/src/asmjit/base/runtime.cpp
index 09ca322..f322ca4 100644
--- a/src/asmjit/base/runtime.cpp
+++ b/src/asmjit/base/runtime.cpp
@@ -16,7 +16,7 @@
 #include "../base/runtime.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -110,4 +110,4 @@ Error JitRuntime::release(void* p) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/runtime.h b/src/asmjit/base/runtime.h
index 4faa901..1133bb7 100644
--- a/src/asmjit/base/runtime.h
+++ b/src/asmjit/base/runtime.h
@@ -12,7 +12,7 @@
 #include "../base/error.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -127,7 +127,7 @@ struct JitRuntime : public BaseRuntime {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_RUNTIME_H
diff --git a/src/asmjit/base/string.cpp b/src/asmjit/base/string.cpp
index 910e8c9..3d3ab3e 100644
--- a/src/asmjit/base/string.cpp
+++ b/src/asmjit/base/string.cpp
@@ -13,7 +13,7 @@
 #include "../base/string.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -372,4 +372,4 @@ bool StringBuilder::eq(const char* str, size_t len) const {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/string.h b/src/asmjit/base/string.h
index ef15622..eb10ecb 100644
--- a/src/asmjit/base/string.h
+++ b/src/asmjit/base/string.h
@@ -16,7 +16,7 @@
 #include <stdarg.h>
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -345,7 +345,7 @@ struct StringBuilderT : public StringBuilder {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_STRING_H
diff --git a/src/asmjit/base/vectypes.h b/src/asmjit/base/vectypes.h
index 41f73c1..e9f8ecc 100644
--- a/src/asmjit/base/vectypes.h
+++ b/src/asmjit/base/vectypes.h
@@ -12,7 +12,7 @@
 #include "../base/defs.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -1242,7 +1242,7 @@ union Vec256Data {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_VECTYPES_H
diff --git a/src/asmjit/base/vmem.cpp b/src/asmjit/base/vmem.cpp
index 89ba80c..07648f8 100644
--- a/src/asmjit/base/vmem.cpp
+++ b/src/asmjit/base/vmem.cpp
@@ -24,7 +24,7 @@
 #endif // ASMJIT_OS_POSIX
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -142,4 +142,4 @@ size_t VMem::getPageSize() {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/vmem.h b/src/asmjit/base/vmem.h
index 5e95237..dc413f8 100644
--- a/src/asmjit/base/vmem.h
+++ b/src/asmjit/base/vmem.h
@@ -9,7 +9,7 @@
 #define _ASMJIT_BASE_VMEM_H
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -70,7 +70,7 @@ struct VMem {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_VMEM_H
diff --git a/src/asmjit/base/zone.cpp b/src/asmjit/base/zone.cpp
index eb43c7f..7d30dc5 100644
--- a/src/asmjit/base/zone.cpp
+++ b/src/asmjit/base/zone.cpp
@@ -16,7 +16,7 @@
 #include <stdarg.h>
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -171,4 +171,4 @@ char* Zone::sformat(const char* fmt, ...) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
diff --git a/src/asmjit/base/zone.h b/src/asmjit/base/zone.h
index 6075dfd..b85f586 100644
--- a/src/asmjit/base/zone.h
+++ b/src/asmjit/base/zone.h
@@ -9,7 +9,7 @@
 #define _ASMJIT_BASE_ZONE_H
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 
@@ -184,7 +184,7 @@ struct Zone {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_BASE_ZONE_H
diff --git a/src/asmjit/x86/x86assembler.cpp b/src/asmjit/x86/x86assembler.cpp
index 4a26e39..8ed8229 100644
--- a/src/asmjit/x86/x86assembler.cpp
+++ b/src/asmjit/x86/x86assembler.cpp
@@ -22,7 +22,7 @@
 #include "../x86/x86defs.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 namespace x86x64 {
@@ -3754,7 +3754,7 @@ Error Assembler::_emit(uint32_t code, const Operand& o0, const Operand& o1, cons
 #endif // ASMJIT_BUILD_X64
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // ASMJIT_BUILD_X86 || ASMJIT_BUILD_X64
diff --git a/src/asmjit/x86/x86assembler.h b/src/asmjit/x86/x86assembler.h
index 16ba531..39fa01c 100644
--- a/src/asmjit/x86/x86assembler.h
+++ b/src/asmjit/x86/x86assembler.h
@@ -13,7 +13,7 @@
 #include "../x86/x86defs.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 namespace x86x64 {
@@ -5387,7 +5387,7 @@ struct Assembler : public X86X64Assembler {
 #undef INST_3i_
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_X86_X86ASSEMBLER_H
diff --git a/src/asmjit/x86/x86compiler.cpp b/src/asmjit/x86/x86compiler.cpp
index c5f26cc..d272fd1 100644
--- a/src/asmjit/x86/x86compiler.cpp
+++ b/src/asmjit/x86/x86compiler.cpp
@@ -19,7 +19,7 @@
 #include "../x86/x86context_p.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 namespace x86x64 {
@@ -652,7 +652,7 @@ Compiler::~Compiler() {}
 #endif // ASMJIT_BUILD_X64
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // ASMJIT_BUILD_X86 || ASMJIT_BUILD_X64
diff --git a/src/asmjit/x86/x86compiler.h b/src/asmjit/x86/x86compiler.h
index 0648dcc..fc4274f 100644
--- a/src/asmjit/x86/x86compiler.h
+++ b/src/asmjit/x86/x86compiler.h
@@ -15,7 +15,7 @@
 #include "../x86/x86func.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 namespace x86x64 {
@@ -4232,7 +4232,7 @@ struct Compiler : public X86X64Compiler {
 #undef INST_3i_
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_X86_X86COMPILER_H
diff --git a/src/asmjit/x86/x86context.cpp b/src/asmjit/x86/x86context.cpp
index a863ce0..8932704 100644
--- a/src/asmjit/x86/x86context.cpp
+++ b/src/asmjit/x86/x86context.cpp
@@ -21,7 +21,7 @@
 #include "../x86/x86func.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 namespace x86x64 {
@@ -5545,7 +5545,7 @@ Error X86X64Context::serialize(BaseAssembler* assembler, BaseNode* start, BaseNo
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // ASMJIT_BUILD_X86 || ASMJIT_BUILD_X64
diff --git a/src/asmjit/x86/x86context_p.h b/src/asmjit/x86/x86context_p.h
index b8796f8..9168ad6 100644
--- a/src/asmjit/x86/x86context_p.h
+++ b/src/asmjit/x86/x86context_p.h
@@ -17,7 +17,7 @@
 #include "../x86/x86defs.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 namespace x86x64 {
@@ -513,7 +513,7 @@ struct X86X64Context : public BaseContext {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_X86_X86CONTEXT_P_H
diff --git a/src/asmjit/x86/x86cpuinfo.cpp b/src/asmjit/x86/x86cpuinfo.cpp
index 0df9a66..f1c78d0 100644
--- a/src/asmjit/x86/x86cpuinfo.cpp
+++ b/src/asmjit/x86/x86cpuinfo.cpp
@@ -22,7 +22,7 @@
 #endif // _MSC_VER >= 1400
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 namespace x86x64 {
@@ -300,7 +300,7 @@ void hostCpuDetect(CpuInfo* cpuInfo) {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // ASMJIT_BUILD_X86 || ASMJIT_BUILD_X64
diff --git a/src/asmjit/x86/x86cpuinfo.h b/src/asmjit/x86/x86cpuinfo.h
index 5294443..2d1fd63 100644
--- a/src/asmjit/x86/x86cpuinfo.h
+++ b/src/asmjit/x86/x86cpuinfo.h
@@ -13,7 +13,7 @@
 #include "../base/defs.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 namespace x86x64 {
@@ -217,7 +217,7 @@ ASMJIT_API void hostCpuDetect(CpuInfo* cpuInfo);
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_X86_X86CPUINFO_H
diff --git a/src/asmjit/x86/x86defs.cpp b/src/asmjit/x86/x86defs.cpp
index 6ebf270..001a7c6 100644
--- a/src/asmjit/x86/x86defs.cpp
+++ b/src/asmjit/x86/x86defs.cpp
@@ -15,7 +15,7 @@
 #include "../x86/x86defs.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 namespace x86x64 {
@@ -3333,7 +3333,7 @@ const YmmReg ymm15(kRegTypeYmm, kRegIndexYmm15, 32);
 
 #endif // ASMJIT_BUILD_X64
 
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // ASMJIT_BUILD_X86 || ASMJIT_BUILD_X64
diff --git a/src/asmjit/x86/x86defs.h b/src/asmjit/x86/x86defs.h
index 07c5477..9f2629c 100644
--- a/src/asmjit/x86/x86defs.h
+++ b/src/asmjit/x86/x86defs.h
@@ -17,7 +17,7 @@
 #include "../base/vectypes.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 namespace x86x64 {
@@ -4196,7 +4196,7 @@ static ASMJIT_INLINE Mem intptr_ptr(const GpVar& base, const GpVar& index, uint3
 #endif // ASMJIT_BUILD_X64
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_X86_X86DEFS_H
diff --git a/src/asmjit/x86/x86func.cpp b/src/asmjit/x86/x86func.cpp
index 9b99ae5..f8a46af 100644
--- a/src/asmjit/x86/x86func.cpp
+++ b/src/asmjit/x86/x86func.cpp
@@ -19,7 +19,7 @@
 #include "../x86/x86func.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 namespace x86x64 {
@@ -536,7 +536,7 @@ void X86X64FuncDecl::reset() {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // ASMJIT_BUILD_X86 || ASMJIT_BUILD_X64
diff --git a/src/asmjit/x86/x86func.h b/src/asmjit/x86/x86func.h
index c6a37e1..2ce3a57 100644
--- a/src/asmjit/x86/x86func.h
+++ b/src/asmjit/x86/x86func.h
@@ -14,7 +14,7 @@
 #include "../x86/x86defs.h"
 
 // [Api-Begin]
-#include "../base/apibegin.h"
+#include "../apibegin.h"
 
 namespace asmjit {
 namespace x86x64 {
@@ -487,7 +487,7 @@ struct X86X64FuncDecl : public FuncDecl {
 } // asmjit namespace
 
 // [Api-End]
-#include "../base/apiend.h"
+#include "../apiend.h"
 
 // [Guard]
 #endif // _ASMJIT_X86_X86FUNC_H