diff --git a/Example/ParticleSDK/ParticleSDK.xcodeproj/project.pbxproj b/Example/ParticleSDK/ParticleSDK.xcodeproj/project.pbxproj
index 60dd151..0c9ed47 100644
--- a/Example/ParticleSDK/ParticleSDK.xcodeproj/project.pbxproj
+++ b/Example/ParticleSDK/ParticleSDK.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		5014ED5E1CB73A2400A1063E /* SparkEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F650A11C8542B30065F02F /* SparkEvent.h */; };
+		5014ED5E1CB73A2400A1063E /* SparkEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F650A11C8542B30065F02F /* SparkEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5038C5AD1CA220C50084D255 /* SparkSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 5038C5AB1CA220C50084D255 /* SparkSession.m */; };
 		5038C5AE1CA220C50084D255 /* SparkSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 5038C5AC1CA220C50084D255 /* SparkSession.h */; };
 		50F6507F1C85423D0065F02F /* ParticleSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F6507E1C85423D0065F02F /* ParticleSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
diff --git a/Example/ParticleSDK/ParticleSDK/ParticleSDK.h b/Example/ParticleSDK/ParticleSDK/ParticleSDK.h
index cb0e4c6..40784f3 100644
--- a/Example/ParticleSDK/ParticleSDK/ParticleSDK.h
+++ b/Example/ParticleSDK/ParticleSDK/ParticleSDK.h
@@ -16,5 +16,6 @@ FOUNDATION_EXPORT const unsigned char ParticleSDKVersionString[];
 // In this header, you should import all the public headers of your framework using statements like #import <ParticleSDK/PublicHeader.h>
 #import <ParticleSDK/SparkCloud.h>
 #import <ParticleSDK/SparkDevice.h>
+#import <ParticleSDK/SparkEvent.h>
 
 
diff --git a/Pod/Classes/SDK/SparkCloud.h b/Pod/Classes/SDK/SparkCloud.h
index 0ff0c27..480aeee 100644
--- a/Pod/Classes/SDK/SparkCloud.h
+++ b/Pod/Classes/SDK/SparkCloud.h
@@ -19,6 +19,8 @@
 
 #import <Foundation/Foundation.h>
 #import "SparkDevice.h"
+#import "SparkEvent.h"
+
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Pod/Classes/SDK/SparkDevice.h b/Pod/Classes/SDK/SparkDevice.h
index d170ee9..ee17670 100644
--- a/Pod/Classes/SDK/SparkDevice.h
+++ b/Pod/Classes/SDK/SparkDevice.h
@@ -18,6 +18,7 @@
 //  limitations under the License.
 
 #import <Foundation/Foundation.h>
+#import "SparkEvent.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -27,9 +28,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 typedef void (^SparkCompletionBlock)(NSError * _Nullable error);
 
-@class SparkEvent;
-typedef void (^SparkEventHandler)(SparkEvent * _Nullable event, NSError * _Nullable error);
-
 typedef NS_ENUM(NSInteger, SparkDeviceType) {
     SparkDeviceTypeCore=0,
     SparkDeviceTypePhoton=6,