6 files changed, 11 insertions, 11 deletions
diff --git a/zluda/src/impl/context.rs b/zluda/src/impl/context.rs
index 973febc..e812e85 100644
--- a/zluda/src/impl/context.rs
+++ b/zluda/src/impl/context.rs
@@ -1,5 +1,5 @@
 use super::{driver, FromCuda, ZludaObject};
-use cuda_types::*;
+use cuda_types::cuda::*;
 use hip_runtime_sys::*;
 use rustc_hash::FxHashSet;
 use std::{cell::RefCell, ptr, sync::Mutex};
diff --git a/zluda/src/impl/device.rs b/zluda/src/impl/device.rs
index 44725d9..13bce63 100644
--- a/zluda/src/impl/device.rs
+++ b/zluda/src/impl/device.rs
@@ -1,4 +1,4 @@
-use cuda_types::*;
+use cuda_types::cuda::*;
 use hip_runtime_sys::*;
 use std::{mem, ptr};
 
@@ -377,7 +377,7 @@ pub(crate) fn get_name(
     name: *mut ::core::ffi::c_char,
     len: ::core::ffi::c_int,
     dev: hipDevice_t,
-) -> cuda_types::CUresult {
+) -> CUresult {
     unsafe { hipDeviceGetName(name, len, dev) }?;
     let len = len as usize;
     let buffer = unsafe { std::slice::from_raw_parts(name, len) };
@@ -404,7 +404,7 @@ pub(crate) fn total_mem_v2(bytes: *mut usize, dev: hipDevice_t) -> hipError_t {
     unsafe { hipDeviceTotalMem(bytes, dev) }
 }
 
-pub(crate) fn get_properties(prop: &mut cuda_types::CUdevprop, dev: hipDevice_t) -> hipError_t {
+pub(crate) fn get_properties(prop: &mut CUdevprop, dev: hipDevice_t) -> hipError_t {
     let mut hip_props = unsafe { mem::zeroed() };
     unsafe { hipGetDevicePropertiesR0600(&mut hip_props, dev) }?;
     prop.maxThreadsPerBlock = hip_props.maxThreadsPerBlock;
diff --git a/zluda/src/impl/driver.rs b/zluda/src/impl/driver.rs
index 7ff2f54..5b15afb 100644
--- a/zluda/src/impl/driver.rs
+++ b/zluda/src/impl/driver.rs
@@ -1,4 +1,4 @@
-use cuda_types::*;
+use cuda_types::cuda::*;
 use hip_runtime_sys::*;
 use std::{
     ffi::{CStr, CString},
@@ -74,6 +74,6 @@ pub(crate) fn init(flags: ::core::ffi::c_uint) -> CUresult {
 }
 
 pub(crate) fn get_version(version: &mut ::core::ffi::c_int) -> CUresult {
-    *version = cuda_types::CUDA_VERSION as i32;
+    *version = cuda_types::cuda::CUDA_VERSION as i32;
     Ok(())
 }
diff --git a/zluda/src/impl/mod.rs b/zluda/src/impl/mod.rs
index 282f8d5..4d8bc83 100644
--- a/zluda/src/impl/mod.rs
+++ b/zluda/src/impl/mod.rs
@@ -1,4 +1,4 @@
-use cuda_types::*;
+use cuda_types::cuda::*;
 use hip_runtime_sys::*;
 use std::mem::{self, ManuallyDrop, MaybeUninit};
 
@@ -111,7 +111,7 @@ from_cuda_nop!(
     i32,
     u32,
     usize,
-    cuda_types::CUdevprop,
+    cuda_types::cuda::CUdevprop,
     CUdevice_attribute
 );
 from_cuda_transmute!(
@@ -137,7 +137,7 @@ impl<'a> FromCuda<'a, CUlimit> for hipLimit_t {
 
 pub(crate) trait ZludaObject: Sized + Send + Sync {
     const COOKIE: usize;
-    const LIVENESS_FAIL: CUerror = cuda_types::CUerror::INVALID_VALUE;
+    const LIVENESS_FAIL: CUerror = cuda_types::cuda::CUerror::INVALID_VALUE;
 
     type CudaHandle: Sized;
 
diff --git a/zluda/src/impl/module.rs b/zluda/src/impl/module.rs
index 8b19c1b..b469a89 100644
--- a/zluda/src/impl/module.rs
+++ b/zluda/src/impl/module.rs
@@ -1,5 +1,5 @@
 use super::ZludaObject;
-use cuda_types::*;
+use cuda_types::cuda::*;
 use hip_runtime_sys::*;
 use std::{ffi::CStr, mem};
 
diff --git a/zluda/src/impl/pointer.rs b/zluda/src/impl/pointer.rs
index 6b458a0..e620bab 100644
--- a/zluda/src/impl/pointer.rs
+++ b/zluda/src/impl/pointer.rs
@@ -1,4 +1,4 @@
-use cuda_types::*;
+use cuda_types::cuda::*;
 use hip_runtime_sys::*;
 use std::{ffi::c_void, ptr};