diff --git a/+hdf5nc/h5save.m b/+hdf5nc/h5save.m
index f8d3091..80e26c5 100644
--- a/+hdf5nc/h5save.m
+++ b/+hdf5nc/h5save.m
@@ -10,7 +10,7 @@ function h5save(filename, varname, A, opts)
   opts.type string = string.empty
 end
 
-import hdf5nc.*
+import hdf5nc.h5exists
 
 if isnumeric(A)
   mustBeReal(A)
@@ -67,7 +67,7 @@ function exist_file(filename, varname, A, sizeA)
 
 
 function new_file(filename, varname, A, sizeA)
-import hdf5nc.auto_chunk_size
+
 folder = fileparts(filename);
 assert(isfolder(folder), '%s is not a folder, cannot create %s', folder, filename)
 
diff --git a/+hdf5nc/h5size.m b/+hdf5nc/h5size.m
index a6ee073..fb0a876 100644
--- a/+hdf5nc/h5size.m
+++ b/+hdf5nc/h5size.m
@@ -10,8 +10,6 @@
   variable (1,1) string
 end
 
-import hdf5nc.expanduser
-
 finf = h5info(expanduser(filename), variable);
 fsize = finf.Dataspace.Size;
 
diff --git a/+hdf5nc/h5variables.m b/+hdf5nc/h5variables.m
index 0d5ce1f..f395b3f 100644
--- a/+hdf5nc/h5variables.m
+++ b/+hdf5nc/h5variables.m
@@ -5,8 +5,6 @@
   group string = string.empty
 end
 
-import hdf5nc.expanduser
-
 names = string.empty;
 groups = string.empty;
 
diff --git a/+hdf5nc/ncsave.m b/+hdf5nc/ncsave.m
index 1939b9f..7f7b80f 100644
--- a/+hdf5nc/ncsave.m
+++ b/+hdf5nc/ncsave.m
@@ -10,7 +10,7 @@ function ncsave(filename, varname, A, opts)
   opts.type string = string.empty
 end
 
-import hdf5nc.*
+import hdf5nc.ncexists
 
 filename = expanduser(filename);
 
@@ -67,7 +67,7 @@ function exist_file(filename, varname, A, sizeA)
 
 
 function new_file(filename, varname, A, sizeA, ncdims)
-import hdf5nc.auto_chunk_size
+
 folder = fileparts(filename);
 assert(isfolder(folder), '%s is not a folder, cannot create %s', folder, filename)
 
diff --git a/+hdf5nc/ncsize.m b/+hdf5nc/ncsize.m
index e3b004f..973a086 100644
--- a/+hdf5nc/ncsize.m
+++ b/+hdf5nc/ncsize.m
@@ -10,8 +10,6 @@
   varname (1,1) string
 end
 
-import hdf5nc.expanduser
-
 vinf = ncinfo(expanduser(filename), varname);
 fsize = vinf.Size;
 
diff --git a/+hdf5nc/ncvariables.m b/+hdf5nc/ncvariables.m
index 0ee07c4..6c7795b 100644
--- a/+hdf5nc/ncvariables.m
+++ b/+hdf5nc/ncvariables.m
@@ -4,8 +4,6 @@
   filename (1,1) string
 end
 
-import hdf5nc.expanduser
-
 finf = ncinfo(expanduser(filename));
 ds = finf.Variables(:);
 names = string({ds(:).Name});
diff --git a/+hdf5nc/auto_chunk_size.m b/+hdf5nc/private/auto_chunk_size.m
similarity index 100%
rename from +hdf5nc/auto_chunk_size.m
rename to +hdf5nc/private/auto_chunk_size.m
diff --git a/+hdf5nc/coerce_ds.m b/+hdf5nc/private/coerce_ds.m
similarity index 100%
rename from +hdf5nc/coerce_ds.m
rename to +hdf5nc/private/coerce_ds.m
diff --git a/+hdf5nc/expanduser.m b/+hdf5nc/private/expanduser.m
similarity index 100%
rename from +hdf5nc/expanduser.m
rename to +hdf5nc/private/expanduser.m
diff --git a/+hdf5nc/test_hdf5.m b/+hdf5nc/test_hdf5.m
index 4fe05c4..256b4a7 100644
--- a/+hdf5nc/test_hdf5.m
+++ b/+hdf5nc/test_hdf5.m
@@ -34,7 +34,6 @@ function teardownOnce(tc)
 
 
 function test_auto_chunk_size(tc)
-import hdf5nc.auto_chunk_size
 tc.assertEqual(auto_chunk_size([1500,2500,1000,500,100]), [12,20,8,8,2], '5D chunk fail')
 tc.assertEqual(auto_chunk_size([15,250,100]), [2,32,25], '3D chunk fail')
 tc.assertEqual(auto_chunk_size([15,250]), [15,250], '2D small chunk fail')