diff --git a/lib/core.dart b/lib/core.dart
index 48a43407..a90c84b8 100644
--- a/lib/core.dart
+++ b/lib/core.dart
@@ -9,8 +9,6 @@
 /// runtime used for consuming, exposing, and discovering Things.
 library core;
 
-export "package:dcaf/dcaf.dart";
-
 export "src/core/definitions.dart";
 export "src/core/implementation.dart";
 export "src/core/scripting_api.dart";
diff --git a/lib/src/binding_coap/coap_client.dart b/lib/src/binding_coap/coap_client.dart
index c30d69ef..4d5e7ba5 100644
--- a/lib/src/binding_coap/coap_client.dart
+++ b/lib/src/binding_coap/coap_client.dart
@@ -9,6 +9,7 @@ import "dart:typed_data";
 
 import "package:coap/coap.dart" as coap;
 import "package:coap/config/coap_config_default.dart";
+import "package:dcaf/dcaf.dart";
 
 import "../../core.dart";
 
diff --git a/lib/src/binding_coap/coap_extensions.dart b/lib/src/binding_coap/coap_extensions.dart
index 4fcb3e6c..edb0a345 100644
--- a/lib/src/binding_coap/coap_extensions.dart
+++ b/lib/src/binding_coap/coap_extensions.dart
@@ -9,6 +9,7 @@ import "dart:typed_data";
 
 import "package:cbor/cbor.dart";
 import "package:coap/coap.dart";
+import "package:dcaf/dcaf.dart";
 
 import "../../core.dart" hide PskCredentials;
 
diff --git a/lib/src/core/definitions.dart b/lib/src/core/definitions.dart
index 5420984a..01cb828f 100644
--- a/lib/src/core/definitions.dart
+++ b/lib/src/core/definitions.dart
@@ -10,6 +10,8 @@
 /// [spec link]: https://www.w3.org/TR/wot-thing-description11/
 library definitions;
 
+export "package:dcaf/dcaf.dart" show AuthServerRequestCreationHint;
+
 export "definitions/additional_expected_response.dart";
 
 export "definitions/credentials/ace_credentials.dart";
diff --git a/lib/src/core/definitions/credentials/callbacks.dart b/lib/src/core/definitions/credentials/callbacks.dart
index 4cebe3b9..0169b2b9 100644
--- a/lib/src/core/definitions/credentials/callbacks.dart
+++ b/lib/src/core/definitions/credentials/callbacks.dart
@@ -6,7 +6,7 @@
 
 import "package:dcaf/dcaf.dart";
 
-import "../../implementation/augmented_form.dart";
+import "../../implementation.dart";
 import "../form.dart";
 import "ace_credentials.dart";
 import "credentials.dart";