diff --git a/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h b/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h
index 243c1a3f..286354c8 100644
--- a/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h
+++ b/AFOAuth2Manager/AFHTTPRequestSerializer+OAuth2.h
@@ -20,7 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import <AFNetworking/AFURLRequestSerialization.h>
+#if __has_feature(modules)
+	@import AFNetworking;
+#else
+	#import <AFNetworking/AFURLRequestSerialization.h>
+#endif
 
 @class AFOAuthCredential;
 
diff --git a/AFOAuth2Manager/AFOAuth2Manager.h b/AFOAuth2Manager/AFOAuth2Manager.h
index f6927dd7..1c8749fa 100644
--- a/AFOAuth2Manager/AFOAuth2Manager.h
+++ b/AFOAuth2Manager/AFOAuth2Manager.h
@@ -20,10 +20,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE
 
-#import <Foundation/Foundation.h>
+#if __has_feature(modules)
+	@import Foundation;
+	@import AFNetworking;
+#else
+	#import <Foundation/Foundation.h>
+	#import <AFNetworking/AFHTTPSessionManager.h>
+#endif
 #import "AFOAuthCredential.h"
 #import "AFHTTPRequestSerializer+OAuth2.h"
-#import <AFNetworking/AFHTTPSessionManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/AFOAuth2Manager/AFOAuthCredential.h b/AFOAuth2Manager/AFOAuthCredential.h
index be97d5f4..c3fd3f44 100644
--- a/AFOAuth2Manager/AFOAuthCredential.h
+++ b/AFOAuth2Manager/AFOAuthCredential.h
@@ -20,7 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import <Foundation/Foundation.h>
+#if __has_feature(modules)
+	@import Foundation;
+#else
+	#import <Foundation/Foundation.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN