diff --git a/Classes/TLSLog.h b/Classes/TLSLog.h
index 8f37a18..c3d81b0 100644
--- a/Classes/TLSLog.h
+++ b/Classes/TLSLog.h
@@ -20,7 +20,11 @@
 #ifndef __TLSLOG_H__
 #define __TLSLOG_H__
 
+#ifdef __cplusplus
+#import <Foundation/Foundation.h>
+#else
 @import Foundation;
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Classes/TLS_Project.h b/Classes/TLS_Project.h
index f073924..8fa95cc 100644
--- a/Classes/TLS_Project.h
+++ b/Classes/TLS_Project.h
@@ -19,7 +19,11 @@
 
 /* This header is private to Twitter Logging Service */
 
+#ifdef __cplusplus
+#import <Foundation/Foundation.h>
+#else
 @import Foundation;
+#endif
 
 /*
  Static Asserts (asserts that trigger at compile time)
diff --git a/Classes/TwitterLoggingService.h b/Classes/TwitterLoggingService.h
index 443f327..db6cece 100644
--- a/Classes/TwitterLoggingService.h
+++ b/Classes/TwitterLoggingService.h
@@ -17,7 +17,11 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 
+#ifdef __cplusplus
+#import <Foundation/Foundation.h>
+#else
 @import Foundation;
+#endif
 
 #pragma mark Primary Header
 
diff --git a/TwitterLoggingService.podspec b/TwitterLoggingService.podspec
index c815cc8..d5285d6 100644
--- a/TwitterLoggingService.podspec
+++ b/TwitterLoggingService.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'TwitterLoggingService'
-  s.version          = '2.2.0'
+  s.version          = '2.2.1'
   s.summary          = 'Twitter Logging Service is a robust and performant logging framework for iOS clients'
   s.description      = <<-DESC
 Twitter created a framework for logging in order to fulfill the following requirements:
@@ -18,6 +18,15 @@ Twitter created a framework for logging in order to fulfill the following requir
   s.author           = { 'Twitter' => 'opensource@twitter.com' }
   s.source           = { :git => 'https://github.com/twitter/ios-twitter-logging-service.git', :tag => s.version.to_s }
   s.ios.deployment_target = '8.0'
-  s.source_files = 'Classes/*'
-  s.public_header_files = 'Classes/*.h'
+  s.public_header_files = 'Classes/**/*.h'
+
+  s.subspec 'Default' do |sp|
+    sp.source_files = 'Classes/**/*'
+  end
+
+  s.subspec 'ObjC' do |sp|
+    sp.source_files = 'Classes/**/*.{h,m,c,cpp,mm}'
+  end
+
+  s.default_subspec = 'Default'
 end