diff --git a/cpuid/x86.cpp b/cpuid/x86.cpp
index bff3da01..9aa02bf9 100644
--- a/cpuid/x86.cpp
+++ b/cpuid/x86.cpp
@@ -8,13 +8,13 @@
 
 #include "x86.hpp"
 
-#include "endian.hpp"
-#include "view.hpp"
-#include "bitwise.hpp"
+#include "../std.hpp"
+#include "../endian.hpp"
+#include "../view.hpp"
+#include "../bitwise.hpp"
 
 #include <fmt/ostream.h>
 
-#include <cstdint>
 #include <ostream>
 
 using cruft::cpu::x86;
@@ -23,15 +23,16 @@ using cruft::cpu::x86;
 ///////////////////////////////////////////////////////////////////////////////
 namespace {
     struct cpuid_t {
-        uint32_t a, b, c, d;
+        u32 a, b, c, d;
     };
 }
 
 
 //-----------------------------------------------------------------------------
-cpuid_t cpuid (u32 query, u32 param = 0)
+static cpuid_t
+cpuid (u32 query, u32 param = 0)
 {
-    cpuid_t res;
+    ::cpuid_t res;
 
     asm (
         "cpuid"