diff --git a/aws-cpp-sdk-core/include/aws/core/utils/base64/Base64.h b/aws-cpp-sdk-core/include/aws/core/utils/base64/Base64.h
index 994167ce743..62713faddc4 100644
--- a/aws-cpp-sdk-core/include/aws/core/utils/base64/Base64.h
+++ b/aws-cpp-sdk-core/include/aws/core/utils/base64/Base64.h
@@ -17,7 +17,13 @@
 
 #ifdef __APPLE__
 
+#ifdef __clang__
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif // __clang__
+
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif // __GNUC__
 
 #endif // __APPLE__
 
diff --git a/aws-cpp-sdk-core/include/aws/core/utils/crypto/MD5.h b/aws-cpp-sdk-core/include/aws/core/utils/crypto/MD5.h
index b06c1fe1a59..2b513ccb79b 100644
--- a/aws-cpp-sdk-core/include/aws/core/utils/crypto/MD5.h
+++ b/aws-cpp-sdk-core/include/aws/core/utils/crypto/MD5.h
@@ -20,7 +20,13 @@
 
 #ifdef __APPLE__
 
+#ifdef __clang__
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif // __clang__
+
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif // __GNUC__
 
 #endif // __APPLE__
 
diff --git a/aws-cpp-sdk-core/include/aws/core/utils/crypto/Sha256.h b/aws-cpp-sdk-core/include/aws/core/utils/crypto/Sha256.h
index 5e34dbc86ec..5db6a9ca0fb 100644
--- a/aws-cpp-sdk-core/include/aws/core/utils/crypto/Sha256.h
+++ b/aws-cpp-sdk-core/include/aws/core/utils/crypto/Sha256.h
@@ -20,7 +20,13 @@
 
 #ifdef __APPLE__
 
+#ifdef __clang__
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif // __clang__
+
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif // __GNUC__
 
 #endif // __APPLE__
 
diff --git a/aws-cpp-sdk-core/include/aws/core/utils/crypto/Sha256HMAC.h b/aws-cpp-sdk-core/include/aws/core/utils/crypto/Sha256HMAC.h
index 8f6f28e98d3..a2d4c1d7034 100644
--- a/aws-cpp-sdk-core/include/aws/core/utils/crypto/Sha256HMAC.h
+++ b/aws-cpp-sdk-core/include/aws/core/utils/crypto/Sha256HMAC.h
@@ -20,7 +20,13 @@
 
 #ifdef __APPLE__
 
+#ifdef __clang__
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif // __clang__
+
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif // __GNUC__
 
 #endif // __APPLE__
 
diff --git a/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp b/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp
index d2b93129312..2ee8faeb15f 100644
--- a/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp
+++ b/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp
@@ -25,10 +25,19 @@
 //to be different than the posix defined function.
 //turn it off because we need it for this test and this isn't production code
 //anyways.
+#ifdef __APPLE__
+
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
+#endif // __clang__
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif // __GNUC__
+
+#endif // __APPLE__
 
 #ifdef _MSC_VER
 #pragma warning(disable: 4996) // _CRT_SECURE_NO_WARNINGS
@@ -176,7 +185,14 @@ TEST(PersistentCognitoIdentityProvider_JsonImpl_Test, TestPersistance)
     ASSERT_EQ(loginAccessTokens.longTermTokenExpiry, ourIdentityPool.GetObject("Logins").GetAllObjects().begin()->second.GetInt64("Expiry"));
 }
 
+#ifdef __APPLE__
+
 #ifdef __clang__
 #pragma clang diagnostic pop
-#endif
+#endif // __clang__
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif // __GNUC__
 
+#endif // __APPLE__