always import str16 from winapi crate root

win32/src/lib.rs

@@ -21,4 +21,3 @@ mod machine_unicorn;
 
 pub use host::*;
 pub use machine::{Machine, Status};
-pub use memory::str16;

win32/src/winapi/kernel32/command_line.rs

@@ -1,7 +1,10 @@
 //! Process command line.
 
 use super::UNICODE_STRING;
-use crate::{str16::String16, winapi::alloc::Arena, Machine};
+use crate::{
+    winapi::{alloc::Arena, String16},
+    Machine,
+};
 use memory::{ExtensionsMut, Mem};
 
 /// Process command line, as exposed in GetCommandLine() and also TEB.

win32/src/winapi/kernel32/console.rs

@@ -1,7 +1,7 @@
 use crate::{
-    str16::Str16,
     winapi::{
-        calling_convention::ArrayWithSize, handle::HANDLE, kernel32::WriteFile, DWORD, HFILE, WORD,
+        calling_convention::ArrayWithSize, handle::HANDLE, kernel32::WriteFile, Str16, DWORD,
+        HFILE, WORD,
     },
     Machine,
 };

win32/src/winapi/kernel32/env.rs

@@ -1,4 +1,7 @@
-use crate::{str16::Str16, winapi::calling_convention::ArrayWithSize, Machine};
+use crate::{
+    winapi::{calling_convention::ArrayWithSize, Str16},
+    Machine,
+};
 
 #[win32_derive::dllexport]
 pub fn GetEnvironmentStrings(machine: &mut Machine) -> u32 {

win32/src/winapi/kernel32/file.rs

@@ -1,11 +1,10 @@
 use super::{FILETIME, SECURITY_ATTRIBUTES};
 use crate::{
     machine::Machine,
-    str16::String16,
     winapi::{
         calling_convention::{ABIReturn, ArrayWithSize, ArrayWithSizeMut},
         kernel32::set_last_error,
-        Str16, DWORD, ERROR, HFILE, HFIND, MAX_PATH,
+        Str16, String16, DWORD, ERROR, HFILE, HFIND, MAX_PATH,
     },
     FileOptions, ReadDir, ReadDirEntry, Stat, StatKind,
 };

win32/src/winapi/kernel32/nls.rs

@@ -1,6 +1,9 @@
 //! "National Language Support", e.g. code page conversions.
 
-use crate::{str16::Str16, winapi::calling_convention::ArrayWithSizeMut, Machine};
+use crate::{
+    winapi::{calling_convention::ArrayWithSizeMut, Str16},
+    Machine,
+};
 use bitflags::bitflags;
 use memory::Extensions;
 

win32/src/winapi/kernel32/process.rs

@@ -1,5 +1,8 @@
 use super::STARTUPINFOA;
-use crate::{str16::Str16, winapi::HANDLE, Machine};
+use crate::{
+    winapi::{Str16, HANDLE},
+    Machine,
+};
 
 pub type HPROCESS = HANDLE<()>;
 

win32/src/winapi/mod.rs

@@ -28,8 +28,8 @@ mod version;
 mod wininet;
 mod winmm;
 
-pub use crate::str16::{Str16, String16};
 pub use error::ERROR;
+pub use memory::str16::{Str16, String16};
 pub use types::*;
 
 pub struct State {

win32/src/winapi/user32/misc.rs

@@ -1,6 +1,5 @@
 use crate::{
-    str16::Str16,
-    winapi::{calling_convention::VarArgs, HWND, POINT, RECT},
+    winapi::{calling_convention::VarArgs, Str16, HWND, POINT, RECT},
     Machine,
 };
 use memory::{Extensions, ExtensionsMut};

win32/src/winapi/user32/paint.rs

@@ -1,12 +1,11 @@
 use super::{WindowType, HBRUSH, HDC};
 use crate::{
-    str16::Str16,
     winapi::{
         calling_convention::FromArg,
         gdi32::{
             COLORREF, HGDIOBJ, {self},
         },
-        HWND, RECT,
+        Str16, HWND, RECT,
     },
     Machine,
 };

win32/src/winapi/user32/wndclass.rs

@@ -1,7 +1,6 @@
 use super::{BrushOrColor, HBRUSH, HCURSOR, HICON, HINSTANCE};
 use crate::{
-    str16::Str16,
-    winapi::{calling_convention::FromArg, HWND},
+    winapi::{calling_convention::FromArg, Str16, HWND},
     Machine,
 };
 use bitflags::bitflags;

win32/src/winapi/winmm/misc.rs

@@ -1,5 +1,5 @@
 pub use crate::winapi::kernel32::HMODULE;
-use crate::{str16::Str16, Machine};
+use crate::{winapi::Str16, Machine};
 
 #[win32_derive::dllexport]
 pub fn PlaySoundW(