git » sdk » commit 799f170

diff --git a/snikket/Chat.hx b/snikket/Chat.hx
index 1276cdf..803a554 100644
--- a/snikket/Chat.hx
+++ b/snikket/Chat.hx
@@ -13,6 +13,10 @@ import snikket.queries.DiscoInfoGet;
 import snikket.queries.MAMQuery;
 using Lambda;
 
+#if cpp
+import HaxeCBridge;
+#end
+
 enum UiState {
 	Pinned;
 	Open; // or Unspecified
@@ -20,7 +24,6 @@ enum UiState {
 }
 
 #if cpp
-import HaxeCBridge;
 @:build(HaxeCBridge.expose())
 #end
 abstract class Chat {
diff --git a/snikket/ChatMessage.hx b/snikket/ChatMessage.hx
index ffed9fa..fbea4dd 100644
--- a/snikket/ChatMessage.hx
+++ b/snikket/ChatMessage.hx
@@ -6,6 +6,10 @@ import haxe.io.BytesData;
 import haxe.Exception;
 using Lambda;
 
+#if cpp
+import HaxeCBridge;
+#end
+
 import snikket.JID;
 import snikket.Identicon;
 import snikket.StringUtil;
@@ -32,7 +36,6 @@ class ChatAttachment {
 @:expose
 @:nullSafety(Strict)
 #if cpp
-import HaxeCBridge;
 @:build(HaxeCBridge.expose())
 #end
 class ChatMessage {
diff --git a/snikket/Client.hx b/snikket/Client.hx
index 609096b..a92e579 100644
--- a/snikket/Client.hx
+++ b/snikket/Client.hx
@@ -28,9 +28,12 @@ import snikket.queries.RosterGet;
 import snikket.queries.VcardTempGet;
 using Lambda;
 
-@:expose
 #if cpp
 import HaxeCBridge;
+#end
+
+@:expose
+#if cpp
 @:build(HaxeCBridge.expose())
 #end
 class Client extends EventEmitter {