diff --git a/src/hermes/HeadMMX.h b/src/hermes/HeadMMX.h
index 11cf6da5b..5d9850cca 100644
--- a/src/hermes/HeadMMX.h
+++ b/src/hermes/HeadMMX.h
@@ -46,7 +46,7 @@ void ConvertMMXp32_16RGB555();
 
 /* Fix the underscore business with ELF compilers */
 
-#if defined(__ELF__) && defined(__GNUC__)
+#if (defined(__ELF__) && defined(__GNUC__)) || defined(__SUNPRO_C)
   #ifdef __cplusplus 
   extern "C" {   
   #endif
diff --git a/src/hermes/HeadX86.h b/src/hermes/HeadX86.h
index 54e0cc9d7..fc6b6dddd 100644
--- a/src/hermes/HeadX86.h
+++ b/src/hermes/HeadX86.h
@@ -74,7 +74,7 @@ extern int ConvertX86p16_32BGRA888_LUT_X86[512];
 
 /* Now fix up the ELF underscore problem */
 
-#if defined(__ELF__) && defined(__GNUC__)
+#if (defined(__ELF__) && defined(__GNUC__)) || defined(__SUNPRO_C)
   #ifdef __cplusplus
   extern "C" {
   #endif