diff --git a/src/index.ts b/src/index.ts
index eea449a..a8fc944 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -17,30 +17,33 @@ import CONSTANTS from "./constants";
 export {
   // From event
   CloudEvent,
-  CloudEventV1,
-  CloudEventV1Attributes,
   Version,
   ValidationError,
+  Mode,
+  HTTP,
+  Kafka,
+  MQTT,
+  MQTTMessageFactory,
+  emitterFor,
+  Emitter,
+  // From Constants
+  CONSTANTS
+};
+
+export type {
+  CloudEventV1,
+  CloudEventV1Attributes,
   // From message
   Headers,
-  Mode,
   Binding,
   Message,
   Deserializer,
   Serializer,
-  HTTP,
-  Kafka,
   KafkaEvent,
   KafkaMessage,
-  MQTT,
   MQTTMessage,
-  MQTTMessageFactory,
   // From transport
   TransportFunction,
   EmitterFunction,
-  emitterFor,
-  Emitter,
-  Options,
-  // From Constants
-  CONSTANTS,
+  Options
 };
diff --git a/src/message/kafka/index.ts b/src/message/kafka/index.ts
index 13b15f4..85f3eec 100644
--- a/src/message/kafka/index.ts
+++ b/src/message/kafka/index.ts
@@ -10,7 +10,10 @@ import { sanitize } from "../http/headers";
 
 // Export the binding implementation and message interface
 export {
-  Kafka,
+  Kafka
+};
+
+export type {
   KafkaMessage,
   KafkaEvent
 };
diff --git a/src/message/mqtt/index.ts b/src/message/mqtt/index.ts
index 3943834..8f11b6b 100644
--- a/src/message/mqtt/index.ts
+++ b/src/message/mqtt/index.ts
@@ -6,10 +6,9 @@
 import { Binding, Deserializer, CloudEvent, CloudEventV1, CONSTANTS, Message, ValidationError, Headers } from "../..";
 
 export {
-  MQTT,
-  MQTTMessage,
-  MQTTMessageFactory
+  MQTT, MQTTMessageFactory
 };
+export type { MQTTMessage };
 
 /**
  * Extends the base {@linkcode Message} interface to include MQTT attributes, some of which
diff --git a/tsconfig.json b/tsconfig.json
index be34da2..a073e02 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,7 +11,8 @@
     "forceConsistentCasingInFileNames": true,  /* Disallow inconsistently-cased references to the same file. */
     "outDir": "./dist",
     "declaration": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "isolatedModules": true,
   },
   "compileOnSave": true,
   "include": [