diff --git a/Source/GTMAppAuthFetcherAuthorization.m b/Source/GTMAppAuthFetcherAuthorization.m
index 7c302e67..fcff0aab 100644
--- a/Source/GTMAppAuthFetcherAuthorization.m
+++ b/Source/GTMAppAuthFetcherAuthorization.m
@@ -18,7 +18,11 @@
 
 #import "GTMAppAuthFetcherAuthorization.h"
 
+#ifndef GTMAPPAUTH_USER_IMPORTS
+#import <AppAuth/AppAuth.h>
+#else // GTMAPPAUTH_USER_IMPORTS
 #import "AppAuth.h"
+#endif // GTMAPPAUTH_USER_IMPORTS
 
 #define GTMOAuth2AssertValidSelector GTMBridgeAssertValidSelector
 
diff --git a/Source/GTMOAuth2KeychainCompatibility/GTMOAuth2KeychainCompatibility.m b/Source/GTMOAuth2KeychainCompatibility/GTMOAuth2KeychainCompatibility.m
index 5f8e2828..52f0ef54 100644
--- a/Source/GTMOAuth2KeychainCompatibility/GTMOAuth2KeychainCompatibility.m
+++ b/Source/GTMOAuth2KeychainCompatibility/GTMOAuth2KeychainCompatibility.m
@@ -18,7 +18,12 @@
 
 #import "GTMOAuth2KeychainCompatibility.h"
 
+#ifndef GTMAPPAUTH_USER_IMPORTS
+#import <AppAuth/AppAuth.h>
+#else // GTMAPPAUTH_USER_IMPORTS
 #import "AppAuth.h"
+#endif // GTMAPPAUTH_USER_IMPORTS
+
 #import "GTMKeychain.h"
 
 // standard OAuth keys