diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7bbc22bba66dfe6cf699b689e3342f91f0101858..485e806bd957d5cc8b8a314c3661e707c5ca6378 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Basic functionality to establish connection to a CaosDB server and
   retrieve its version (using the Extern C interface of caosdb-cpplib)
+* Support for Windows
 
 ### Changed
 
diff --git a/src/CaosDB.jl b/src/CaosDB.jl
index 31a500323bbac905109c0c2d1e06a3245ca7a6bc..f623188fe8beda0a997da4b7daaf0b2fdacd1d5e 100644
--- a/src/CaosDB.jl
+++ b/src/CaosDB.jl
@@ -52,7 +52,7 @@ end # Info
 
 module Utility
 
-using CaosDB
+using ..CaosDB
 
 """
     get_env_var(var[, default])
@@ -79,6 +79,8 @@ end # Utility
 
 module Authentication
 
+using ..CaosDB
+
 """
 Struct containing a pointer to the wrapped cpp authenticator
 class. Meant for internal use; call a