diff --git a/src/lib.zig b/src/lib.zig
index 6db82d90d7b790543ad80858df025c49eace2acc..f295833e44ec375ec91023ea2894945ee0f9540e 100644
--- a/src/lib.zig
+++ b/src/lib.zig
@@ -4,73 +4,73 @@ const extras = @import("./lib.zig");
 const assert = std.debug.assert;
 const builtin = @import("builtin");
 
-pub usingnamespace @import("./reduceNumber.zig");
-pub usingnamespace @import("./fmtByteCountIEC.zig");
-pub usingnamespace @import("./randomSlice.zig");
-pub usingnamespace @import("./trimPrefix.zig");
-pub usingnamespace @import("./trimPrefixEnsure.zig");
-pub usingnamespace @import("./trimSuffix.zig");
-pub usingnamespace @import("./trimSuffixEnsure.zig");
-pub usingnamespace @import("./base64EncodeAlloc.zig");
-pub usingnamespace @import("./base64DecodeAlloc.zig");
-pub usingnamespace @import("./asciiUpper.zig");
-pub usingnamespace @import("./doesFileExist.zig");
-pub usingnamespace @import("./doesFolderExist.zig");
-pub usingnamespace @import("./sliceToInt.zig");
-pub usingnamespace @import("./fileList.zig");
-pub usingnamespace @import("./fileSize.zig");
-pub usingnamespace @import("./dirSize.zig");
-pub usingnamespace @import("./hashFile.zig");
-pub usingnamespace @import("./pipe.zig");
-pub usingnamespace @import("./countScalar.zig");
-pub usingnamespace @import("./sortBy.zig");
-pub usingnamespace @import("./sortBySlice.zig");
-pub usingnamespace @import("./lessThanSlice.zig");
-pub usingnamespace @import("./containsString.zig");
-pub usingnamespace @import("./ensureFieldSubset.zig");
-pub usingnamespace @import("./fmtReplacer.zig");
-pub usingnamespace @import("./randomBytes.zig");
-pub usingnamespace @import("./readExpected.zig");
-pub usingnamespace @import("./readBytes.zig");
-pub usingnamespace @import("./FixedMaxBuffer.zig");
-pub usingnamespace @import("./hashBytes.zig");
-pub usingnamespace @import("./readType.zig");
-pub usingnamespace @import("./indexBufferT.zig");
-pub usingnamespace @import("./BufIndexer.zig");
-pub usingnamespace @import("./skipToBoundary.zig");
-pub usingnamespace @import("./is.zig");
-pub usingnamespace @import("./safeAdd.zig");
-pub usingnamespace @import("./safeAddWrap.zig");
-pub usingnamespace @import("./readBytesAlloc.zig");
-pub usingnamespace @import("./nullifyS.zig");
-pub usingnamespace @import("./sliceTo.zig");
-pub usingnamespace @import("./matchesAll.zig");
-pub usingnamespace @import("./matchesAny.zig");
-pub usingnamespace @import("./opslice.zig");
+pub const reduceNumber = @import("./reduceNumber.zig").reduceNumber;
+pub const fmtByteCountIEC = @import("./fmtByteCountIEC.zig").fmtByteCountIEC;
+pub const randomSlice = @import("./randomSlice.zig").randomSlice;
+pub const trimPrefix = @import("./trimPrefix.zig").trimPrefix;
+pub const trimPrefixEnsure = @import("./trimPrefixEnsure.zig").trimPrefixEnsure;
+pub const trimSuffix = @import("./trimSuffix.zig").trimSuffix;
+pub const trimSuffixEnsure = @import("./trimSuffixEnsure.zig").trimSuffixEnsure;
+pub const base64EncodeAlloc = @import("./base64EncodeAlloc.zig").base64EncodeAlloc;
+pub const base64DecodeAlloc = @import("./base64DecodeAlloc.zig").base64DecodeAlloc;
+pub const asciiUpper = @import("./asciiUpper.zig").asciiUpper;
+pub const doesFileExist = @import("./doesFileExist.zig").doesFileExist;
+pub const doesFolderExist = @import("./doesFolderExist.zig").doesFolderExist;
+pub const sliceToInt = @import("./sliceToInt.zig").sliceToInt;
+pub const fileList = @import("./fileList.zig").fileList;
+pub const fileSize = @import("./fileSize.zig").fileSize;
+pub const dirSize = @import("./dirSize.zig").dirSize;
+pub const hashFile = @import("./hashFile.zig").hashFile;
+pub const pipe = @import("./pipe.zig").pipe;
+pub const countScalar = @import("./countScalar.zig").countScalar;
+pub const sortBy = @import("./sortBy.zig").sortBy;
+pub const sortBySlice = @import("./sortBySlice.zig").sortBySlice;
+pub const lessThanSlice = @import("./lessThanSlice.zig").lessThanSlice;
+pub const containsString = @import("./containsString.zig").containsString;
+pub const ensureFieldSubset = @import("./ensureFieldSubset.zig").ensureFieldSubset;
+pub const fmtReplacer = @import("./fmtReplacer.zig").fmtReplacer;
+pub const randomBytes = @import("./randomBytes.zig").randomBytes;
+pub const readExpected = @import("./readExpected.zig").readExpected;
+pub const readBytes = @import("./readBytes.zig").readBytes;
+pub const FixedMaxBuffer = @import("./FixedMaxBuffer.zig").FixedMaxBuffer;
+pub const hashBytes = @import("./hashBytes.zig").hashBytes;
+pub const readType = @import("./readType.zig").readType;
+pub const indexBufferT = @import("./indexBufferT.zig").indexBufferT;
+pub const BufIndexer = @import("./BufIndexer.zig").BufIndexer;
+pub const skipToBoundary = @import("./skipToBoundary.zig").skipToBoundary;
+pub const is = @import("./is.zig").is;
+pub const safeAdd = @import("./safeAdd.zig").safeAdd;
+pub const safeAddWrap = @import("./safeAddWrap.zig").safeAddWrap;
+pub const readBytesAlloc = @import("./readBytesAlloc.zig").readBytesAlloc;
+pub const nullifyS = @import("./nullifyS.zig").nullifyS;
+pub const sliceTo = @import("./sliceTo.zig").sliceTo;
+pub const matchesAll = @import("./matchesAll.zig").matchesAll;
+pub const matchesAny = @import("./matchesAny.zig").matchesAny;
+pub const opslice = @import("./opslice.zig").opslice;
 
 pub fn assertLog(ok: bool, comptime message: string, args: anytype) void {
     if (!ok) std.log.err("assertion failure: " ++ message, args);
     if (!ok) unreachable; // assertion failure
 }
 
-pub usingnamespace @import("./parse_json.zig");
-pub usingnamespace @import("./isArrayOf.zig");
-pub usingnamespace @import("./parse_int.zig");
-pub usingnamespace @import("./parse_bool.zig");
-pub usingnamespace @import("./to_hex.zig");
-pub usingnamespace @import("./FieldUnion.zig");
-pub usingnamespace @import("./LoggingReader.zig");
-pub usingnamespace @import("./LoggingWriter.zig");
-pub usingnamespace @import("./Partial.zig");
-pub usingnamespace @import("./coalescePartial.zig");
-pub usingnamespace @import("./joinPartial.zig");
-pub usingnamespace @import("./OneBiggerInt.zig");
-pub usingnamespace @import("./ReverseFields.zig");
-pub usingnamespace @import("./stringToEnum.zig");
-pub usingnamespace @import("./containsAggregate.zig");
-pub usingnamespace @import("./AnyReader.zig");
-pub usingnamespace @import("./sum.zig");
-pub usingnamespace @import("./RingBuffer.zig");
+pub const parse_json = @import("./parse_json.zig").parse_json;
+pub const isArrayOf = @import("./isArrayOf.zig").isArrayOf;
+pub const parse_int = @import("./parse_int.zig").parse_int;
+pub const parse_bool = @import("./parse_bool.zig").parse_bool;
+pub const to_hex = @import("./to_hex.zig").to_hex;
+pub const FieldUnion = @import("./FieldUnion.zig").FieldUnion;
+pub const LoggingReader = @import("./LoggingReader.zig").LoggingReader;
+pub const LoggingWriter = @import("./LoggingWriter.zig").LoggingWriter;
+pub const Partial = @import("./Partial.zig").Partial;
+pub const coalescePartial = @import("./coalescePartial.zig").coalescePartial;
+pub const joinPartial = @import("./joinPartial.zig").joinPartial;
+pub const OneBiggerInt = @import("./OneBiggerInt.zig").OneBiggerInt;
+pub const ReverseFields = @import("./ReverseFields.zig").ReverseFields;
+pub const stringToEnum = @import("./stringToEnum.zig").stringToEnum;
+pub const containsAggregate = @import("./containsAggregate.zig").containsAggregate;
+pub const AnyReader = @import("./AnyReader.zig").AnyReader;
+pub const sum = @import("./sum.zig").sum;
+pub const RingBuffer = @import("./RingBuffer.zig").RingBuffer;
 
 pub fn fd_realpath(fd: std.posix.fd_t) ![std.fs.max_path_bytes:0]u8 {
     switch (builtin.os.tag) {
@@ -89,34 +89,131 @@ test {
     _ = &fd_realpath;
 }
 
-pub usingnamespace @import("./rawInt.zig");
-pub usingnamespace @import("./expectSimilarType.zig");
-pub usingnamespace @import("./rawIntBytes.zig");
-pub usingnamespace @import("./globalOption.zig");
-pub usingnamespace @import("./OneSmallerInt.zig");
-pub usingnamespace @import("./FlippedInt.zig");
-pub usingnamespace @import("./isZigString.zig");
-pub usingnamespace @import("./isIndexable.zig");
-pub usingnamespace @import("./isSlice.zig");
-pub usingnamespace @import("./matchesNone.zig");
-pub usingnamespace @import("./indexOfSlice.zig");
-pub usingnamespace @import("./mapBy.zig");
-pub usingnamespace @import("./lessThanBy.zig");
-pub usingnamespace @import("./isContainer.zig");
-pub usingnamespace @import("./hasFn.zig");
-pub usingnamespace @import("./hasFields.zig");
-pub usingnamespace @import("./StructOfSlices.zig");
-pub usingnamespace @import("./StructOfArrays.zig");
-pub usingnamespace @import("./StaticMultiList.zig");
-pub usingnamespace @import("./join.zig");
-pub usingnamespace @import("./omit.zig");
-pub usingnamespace @import("./swapMany.zig");
-pub usingnamespace @import("./ManyArrayList.zig");
-pub usingnamespace @import("./compareFnBasic.zig");
-pub usingnamespace @import("./compareFnField.zig");
-pub usingnamespace @import("./compareFnRange.zig");
-pub usingnamespace @import("./asciiLower.zig");
-pub usingnamespace @import("./parseDigits.zig");
-pub usingnamespace @import("./from_hex.zig");
-pub usingnamespace @import("./Pointee.zig");
-pub usingnamespace @import("./compareFnSlice.zig");
+pub const rawInt = @import("./rawInt.zig").rawInt;
+pub const expectSimilarType = @import("./expectSimilarType.zig").expectSimilarType;
+pub const rawIntBytes = @import("./rawIntBytes.zig").rawIntBytes;
+pub const globalOption = @import("./globalOption.zig").globalOption;
+pub const OneSmallerInt = @import("./OneSmallerInt.zig").OneSmallerInt;
+pub const FlippedInt = @import("./FlippedInt.zig").FlippedInt;
+pub const isZigString = @import("./isZigString.zig").isZigString;
+pub const isIndexable = @import("./isIndexable.zig").isIndexable;
+pub const isSlice = @import("./isSlice.zig").isSlice;
+pub const matchesNone = @import("./matchesNone.zig").matchesNone;
+pub const indexOfSlice = @import("./indexOfSlice.zig").indexOfSlice;
+pub const mapBy = @import("./mapBy.zig").mapBy;
+pub const lessThanBy = @import("./lessThanBy.zig").lessThanBy;
+pub const isContainer = @import("./isContainer.zig").isContainer;
+pub const hasFn = @import("./hasFn.zig").hasFn;
+pub const hasFields = @import("./hasFields.zig").hasFields;
+pub const StructOfSlices = @import("./StructOfSlices.zig").StructOfSlices;
+pub const StructOfArrays = @import("./StructOfArrays.zig").StructOfArrays;
+pub const StaticMultiList = @import("./StaticMultiList.zig").StaticMultiList;
+pub const join = @import("./join.zig").join;
+pub const omit = @import("./omit.zig").omit;
+pub const swapMany = @import("./swapMany.zig").swapMany;
+pub const swapManyLR = @import("./swapMany.zig").swapManyLR;
+pub const ManyArrayList = @import("./ManyArrayList.zig").ManyArrayList;
+pub const compareFnBasic = @import("./compareFnBasic.zig").compareFnBasic;
+pub const compareFnField = @import("./compareFnField.zig").compareFnField;
+pub const compareFnRange = @import("./compareFnRange.zig").compareFnRange;
+pub const asciiLower = @import("./asciiLower.zig").asciiLower;
+pub const asciiLowerComptime = @import("./asciiLower.zig").asciiLowerComptime;
+pub const parseDigits = @import("./parseDigits.zig").parseDigits;
+pub const from_hex = @import("./from_hex.zig").from_hex;
+pub const Pointee = @import("./Pointee.zig").Pointee;
+pub const compareFnSlice = @import("./compareFnSlice.zig").compareFnSlice;
+
+test {
+    _ = @import("reduceNumber.zig");
+    _ = @import("fmtByteCountIEC.zig");
+    _ = @import("randomSlice.zig");
+    _ = @import("trimPrefix.zig");
+    _ = @import("trimPrefixEnsure.zig");
+    _ = @import("trimSuffix.zig");
+    _ = @import("trimSuffixEnsure.zig");
+    _ = @import("base64EncodeAlloc.zig");
+    _ = @import("base64DecodeAlloc.zig");
+    _ = @import("asciiUpper.zig");
+    _ = @import("doesFileExist.zig");
+    _ = @import("doesFolderExist.zig");
+    _ = @import("sliceToInt.zig");
+    _ = @import("fileList.zig");
+    _ = @import("fileSize.zig");
+    _ = @import("dirSize.zig");
+    _ = @import("hashFile.zig");
+    _ = @import("pipe.zig");
+    _ = @import("countScalar.zig");
+    _ = @import("sortBy.zig");
+    _ = @import("sortBySlice.zig");
+    _ = @import("lessThanSlice.zig");
+    _ = @import("containsString.zig");
+    _ = @import("ensureFieldSubset.zig");
+    _ = @import("fmtReplacer.zig");
+    _ = @import("randomBytes.zig");
+    _ = @import("readExpected.zig");
+    _ = @import("readBytes.zig");
+    _ = @import("FixedMaxBuffer.zig");
+    _ = @import("hashBytes.zig");
+    _ = @import("readType.zig");
+    _ = @import("indexBufferT.zig");
+    _ = @import("BufIndexer.zig");
+    _ = @import("skipToBoundary.zig");
+    _ = @import("is.zig");
+    _ = @import("safeAdd.zig");
+    _ = @import("safeAddWrap.zig");
+    _ = @import("readBytesAlloc.zig");
+    _ = @import("nullifyS.zig");
+    _ = @import("sliceTo.zig");
+    _ = @import("matchesAll.zig");
+    _ = @import("matchesAny.zig");
+    _ = @import("opslice.zig");
+    _ = @import("parse_json.zig");
+    _ = @import("isArrayOf.zig");
+    _ = @import("parse_int.zig");
+    _ = @import("parse_bool.zig");
+    _ = @import("to_hex.zig");
+    _ = @import("FieldUnion.zig");
+    _ = @import("LoggingReader.zig");
+    _ = @import("LoggingWriter.zig");
+    _ = @import("Partial.zig");
+    _ = @import("coalescePartial.zig");
+    _ = @import("joinPartial.zig");
+    _ = @import("OneBiggerInt.zig");
+    _ = @import("ReverseFields.zig");
+    _ = @import("stringToEnum.zig");
+    _ = @import("containsAggregate.zig");
+    _ = @import("AnyReader.zig");
+    _ = @import("sum.zig");
+    _ = @import("RingBuffer.zig");
+    _ = @import("rawInt.zig");
+    _ = @import("expectSimilarType.zig");
+    _ = @import("rawIntBytes.zig");
+    _ = @import("globalOption.zig");
+    _ = @import("OneSmallerInt.zig");
+    _ = @import("FlippedInt.zig");
+    _ = @import("isZigString.zig");
+    _ = @import("isIndexable.zig");
+    _ = @import("isSlice.zig");
+    _ = @import("matchesNone.zig");
+    _ = @import("indexOfSlice.zig");
+    _ = @import("mapBy.zig");
+    _ = @import("lessThanBy.zig");
+    _ = @import("isContainer.zig");
+    _ = @import("hasFn.zig");
+    _ = @import("hasFields.zig");
+    _ = @import("StructOfSlices.zig");
+    _ = @import("StructOfArrays.zig");
+    _ = @import("StaticMultiList.zig");
+    _ = @import("join.zig");
+    _ = @import("omit.zig");
+    _ = @import("swapMany.zig");
+    _ = @import("ManyArrayList.zig");
+    _ = @import("compareFnBasic.zig");
+    _ = @import("compareFnField.zig");
+    _ = @import("compareFnRange.zig");
+    _ = @import("asciiLower.zig");
+    _ = @import("parseDigits.zig");
+    _ = @import("from_hex.zig");
+    _ = @import("Pointee.zig");
+    _ = @import("compareFnSlice.zig");
+}