Move top-level headers to src/cpuinfo directory
diff --git a/src/arm/android/properties.c b/src/arm/android/properties.c
index 42dca9d..6e69647 100644
--- a/src/arm/android/properties.c
+++ b/src/arm/android/properties.c
@@ -9,7 +9,7 @@
#include <linux/api.h>
#include <arm/android/api.h>
#include <arm/linux/api.h>
-#include <log.h>
+#include <cpuinfo/log.h>
#if CPUINFO_MOCK
#include <cpuinfo-mock.h>
diff --git a/src/arm/cache.c b/src/arm/cache.c
index fc1914c..c972a2d 100644
--- a/src/arm/cache.c
+++ b/src/arm/cache.c
@@ -1,7 +1,7 @@
#include <stdint.h>
#include <cpuinfo.h>
-#include <log.h>
+#include <cpuinfo/log.h>
#include <arm/api.h>
#include <arm/midr.h>
diff --git a/src/arm/linux/aarch32-isa.c b/src/arm/linux/aarch32-isa.c
index 74f9ace..1a6d8a4 100644
--- a/src/arm/linux/aarch32-isa.c
+++ b/src/arm/linux/aarch32-isa.c
@@ -6,7 +6,7 @@
#include <arm/linux/api.h>
#include <arm/linux/cp.h>
#include <arm/midr.h>
-#include <log.h>
+#include <cpuinfo/log.h>
#if CPUINFO_MOCK
diff --git a/src/arm/linux/aarch64-isa.c b/src/arm/linux/aarch64-isa.c
index 783b8e8..697a047 100644
--- a/src/arm/linux/aarch64-isa.c
+++ b/src/arm/linux/aarch64-isa.c
@@ -1,7 +1,7 @@
#include <stdint.h>
#include <arm/linux/api.h>
-#include <log.h>
+#include <cpuinfo/log.h>
void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
diff --git a/src/arm/linux/chipset.c b/src/arm/linux/chipset.c
index ed19fb0..fa2bcd8 100644
--- a/src/arm/linux/chipset.c
+++ b/src/arm/linux/chipset.c
@@ -7,7 +7,7 @@
#ifdef __ANDROID__
#include <arm/android/api.h>
#endif
-#include <log.h>
+#include <cpuinfo/log.h>
#define CPUINFO_COUNT_OF(x) (sizeof(x) / sizeof(0[x]))
diff --git a/src/arm/linux/clusters.c b/src/arm/linux/clusters.c
index e3dcb79..d36c2df 100644
--- a/src/arm/linux/clusters.c
+++ b/src/arm/linux/clusters.c
@@ -11,8 +11,8 @@
#include <arm/api.h>
#include <arm/midr.h>
#include <linux/api.h>
-#include <api.h>
-#include <log.h>
+#include <cpuinfo/internal-api.h>
+#include <cpuinfo/log.h>
static inline bool bitmask_all(uint32_t bitfield, uint32_t mask) {
return (bitfield & mask) == mask;
diff --git a/src/arm/linux/cpuinfo.c b/src/arm/linux/cpuinfo.c
index 3873749..e9bdd4b 100644
--- a/src/arm/linux/cpuinfo.c
+++ b/src/arm/linux/cpuinfo.c
@@ -7,7 +7,7 @@
#include <linux/api.h>
#include <arm/linux/api.h>
#include <arm/midr.h>
-#include <log.h>
+#include <cpuinfo/log.h>
/*
* Size, in chars, of the on-stack buffer used for parsing lines of /proc/cpuinfo.
diff --git a/src/arm/linux/hwcap.c b/src/arm/linux/hwcap.c
index adf454e..36d0d91 100644
--- a/src/arm/linux/hwcap.c
+++ b/src/arm/linux/hwcap.c
@@ -13,7 +13,7 @@
#endif
#include <cpuinfo.h>
#include <arm/linux/api.h>
-#include <log.h>
+#include <cpuinfo/log.h>
#if CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_ARM && !defined(__ANDROID__)
#include <sys/auxv.h>
diff --git a/src/arm/linux/init.c b/src/arm/linux/init.c
index 95b78fb..262bb55 100644
--- a/src/arm/linux/init.c
+++ b/src/arm/linux/init.c
@@ -11,8 +11,8 @@
#include <arm/api.h>
#include <arm/midr.h>
#include <linux/api.h>
-#include <api.h>
-#include <log.h>
+#include <cpuinfo/internal-api.h>
+#include <cpuinfo/log.h>
struct cpuinfo_arm_isa cpuinfo_isa = { 0 };
diff --git a/src/arm/linux/midr.c b/src/arm/linux/midr.c
index db4e40f..8616df1 100644
--- a/src/arm/linux/midr.c
+++ b/src/arm/linux/midr.c
@@ -11,8 +11,8 @@
#include <arm/api.h>
#include <arm/midr.h>
#include <linux/api.h>
-#include <api.h>
-#include <log.h>
+#include <cpuinfo/internal-api.h>
+#include <cpuinfo/log.h>
#define CPUINFO_COUNT_OF(x) (sizeof(x) / sizeof(0[x]))
diff --git a/src/arm/mach/init.c b/src/arm/mach/init.c
index e5b43cd..64a0b37 100644
--- a/src/arm/mach/init.c
+++ b/src/arm/mach/init.c
@@ -11,8 +11,8 @@
#include <cpuinfo.h>
#include <mach/api.h>
-#include <api.h>
-#include <log.h>
+#include <cpuinfo/internal-api.h>
+#include <cpuinfo/log.h>
struct cpuinfo_arm_isa cpuinfo_isa = {
diff --git a/src/arm/uarch.c b/src/arm/uarch.c
index 1dcf048..6257a17 100644
--- a/src/arm/uarch.c
+++ b/src/arm/uarch.c
@@ -2,7 +2,7 @@
#include <arm/api.h>
#include <arm/midr.h>
-#include <log.h>
+#include <cpuinfo/log.h>
void cpuinfo_arm_decode_vendor_uarch(