diff --git a/src/impl/base.h b/src/impl/base.h
index 60e54e2..aa197e0 100644
--- a/src/impl/base.h
+++ b/src/impl/base.h
@@ -26,6 +26,7 @@
 #include <vector>
 #include <set>
 #include <filesystem>
+#include <utility>
 
 #if defined(_DEBUG)
 #define XLANG_DEBUG
diff --git a/src/impl/winmd_reader/database.h b/src/impl/winmd_reader/database.h
index c65de70..9a6b505 100644
--- a/src/impl/winmd_reader/database.h
+++ b/src/impl/winmd_reader/database.h
@@ -119,44 +119,44 @@ namespace winmd::reader
             initialize();
         }
 
-        table<TypeRef> TypeRef{ this };
-        table<GenericParamConstraint> GenericParamConstraint{ this };
-        table<TypeSpec> TypeSpec{ this };
-        table<TypeDef> TypeDef{ this };
-        table<CustomAttribute> CustomAttribute{ this };
-        table<MethodDef> MethodDef{ this };
-        table<MemberRef> MemberRef{ this };
-        table<Module> Module{ this };
-        table<Param> Param{ this };
-        table<InterfaceImpl> InterfaceImpl{ this };
-        table<Constant> Constant{ this };
-        table<Field> Field{ this };
-        table<FieldMarshal> FieldMarshal{ this };
-        table<DeclSecurity> DeclSecurity{ this };
-        table<ClassLayout> ClassLayout{ this };
-        table<FieldLayout> FieldLayout{ this };
-        table<StandAloneSig> StandAloneSig{ this };
-        table<EventMap> EventMap{ this };
-        table<Event> Event{ this };
-        table<PropertyMap> PropertyMap{ this };
-        table<Property> Property{ this };
-        table<MethodSemantics> MethodSemantics{ this };
-        table<MethodImpl> MethodImpl{ this };
-        table<ModuleRef> ModuleRef{ this };
-        table<ImplMap> ImplMap{ this };
-        table<FieldRVA> FieldRVA{ this };
-        table<Assembly> Assembly{ this };
-        table<AssemblyProcessor> AssemblyProcessor{ this };
-        table<AssemblyOS> AssemblyOS{ this };
-        table<AssemblyRef> AssemblyRef{ this };
-        table<AssemblyRefProcessor> AssemblyRefProcessor{ this };
-        table<AssemblyRefOS> AssemblyRefOS{ this };
-        table<File> File{ this };
-        table<ExportedType> ExportedType{ this };
-        table<ManifestResource> ManifestResource{ this };
-        table<NestedClass> NestedClass{ this };
-        table<GenericParam> GenericParam{ this };
-        table<MethodSpec> MethodSpec{ this };
+        table<reader::TypeRef> TypeRef{ this };
+        table<reader::GenericParamConstraint> GenericParamConstraint{ this };
+        table<reader::TypeSpec> TypeSpec{ this };
+        table<reader::TypeDef> TypeDef{ this };
+        table<reader::CustomAttribute> CustomAttribute{ this };
+        table<reader::MethodDef> MethodDef{ this };
+        table<reader::MemberRef> MemberRef{ this };
+        table<reader::Module> Module{ this };
+        table<reader::Param> Param{ this };
+        table<reader::InterfaceImpl> InterfaceImpl{ this };
+        table<reader::Constant> Constant{ this };
+        table<reader::Field> Field{ this };
+        table<reader::FieldMarshal> FieldMarshal{ this };
+        table<reader::DeclSecurity> DeclSecurity{ this };
+        table<reader::ClassLayout> ClassLayout{ this };
+        table<reader::FieldLayout> FieldLayout{ this };
+        table<reader::StandAloneSig> StandAloneSig{ this };
+        table<reader::EventMap> EventMap{ this };
+        table<reader::Event> Event{ this };
+        table<reader::PropertyMap> PropertyMap{ this };
+        table<reader::Property> Property{ this };
+        table<reader::MethodSemantics> MethodSemantics{ this };
+        table<reader::MethodImpl> MethodImpl{ this };
+        table<reader::ModuleRef> ModuleRef{ this };
+        table<reader::ImplMap> ImplMap{ this };
+        table<reader::FieldRVA> FieldRVA{ this };
+        table<reader::Assembly> Assembly{ this };
+        table<reader::AssemblyProcessor> AssemblyProcessor{ this };
+        table<reader::AssemblyOS> AssemblyOS{ this };
+        table<reader::AssemblyRef> AssemblyRef{ this };
+        table<reader::AssemblyRefProcessor> AssemblyRefProcessor{ this };
+        table<reader::AssemblyRefOS> AssemblyRefOS{ this };
+        table<reader::File> File{ this };
+        table<reader::ExportedType> ExportedType{ this };
+        table<reader::ManifestResource> ManifestResource{ this };
+        table<reader::NestedClass> NestedClass{ this };
+        table<reader::GenericParam> GenericParam{ this };
+        table<reader::MethodSpec> MethodSpec{ this };
 
         template <typename T>
         table<T> const& get_table() const noexcept;
diff --git a/src/impl/winmd_reader/flags.h b/src/impl/winmd_reader/flags.h
index 62dee7f..6ae8ebf 100644
--- a/src/impl/winmd_reader/flags.h
+++ b/src/impl/winmd_reader/flags.h
@@ -303,7 +303,7 @@ namespace winmd::reader
 
     struct MethodImplAttributes : impl::AttributesBase<uint16_t>
     {
-        constexpr CodeType CodeType() const noexcept
+        constexpr reader::CodeType CodeType() const noexcept
         {
             return get_enum<reader::CodeType>(CodeType_mask);
         }
@@ -311,7 +311,7 @@ namespace winmd::reader
         {
             set_enum(arg, CodeType_mask);
         }
-        constexpr Managed Managed() const noexcept
+        constexpr reader::Managed Managed() const noexcept
         {
             return get_enum<reader::Managed>(Managed_mask);
         }
@@ -600,7 +600,7 @@ namespace winmd::reader
         {
             set_bit(arg, WindowsRuntime_bit);
         }
-        constexpr StringFormat StringFormat() const noexcept
+        constexpr reader::StringFormat StringFormat() const noexcept
         {
             return get_enum<reader::StringFormat>(StringFormat_mask);
         }
diff --git a/src/impl/winmd_reader/index.h b/src/impl/winmd_reader/index.h
index 6a7fc22..26de81f 100644
--- a/src/impl/winmd_reader/index.h
+++ b/src/impl/winmd_reader/index.h
@@ -48,9 +48,9 @@ namespace winmd::reader
     {
         using index_base<TypeDefOrRef>::index_base;
 
-        TypeDef TypeDef() const;
-        TypeRef TypeRef() const;
-        TypeSpec TypeSpec() const;
+        reader::TypeDef TypeDef() const;
+        reader::TypeRef TypeRef() const;
+        reader::TypeSpec TypeSpec() const;
         auto CustomAttribute() const;
     };
 }