diff --git a/src/libsodium/include/sodium/export.h b/src/libsodium/include/sodium/export.h
index b786c77b..f6aa242d 100644
--- a/src/libsodium/include/sodium/export.h
+++ b/src/libsodium/include/sodium/export.h
@@ -2,7 +2,7 @@
 #ifndef sodium_export_H
 #define sodium_export_H
 
-#if !defined(__clang__) && !defined(__GNUC__)
+#if !defined(__clang__) && !defined(__GNUC__) && !defined(__SUNPRO_C)
 # ifdef __attribute__
 #  undef __attribute__
 # endif
diff --git a/src/libsodium/include/sodium/private/common.h b/src/libsodium/include/sodium/private/common.h
index 632fc8a7..4863cc65 100644
--- a/src/libsodium/include/sodium/private/common.h
+++ b/src/libsodium/include/sodium/private/common.h
@@ -196,7 +196,7 @@ xor_buf(unsigned char *out, const unsigned char *in, size_t n)
     }
 }
 
-#if !defined(__clang__) && !defined(__GNUC__)
+#if !defined(__clang__) && !defined(__GNUC__) && !defined(__SUNPRO_C)
 # ifdef __attribute__
 #  undef __attribute__
 # endif