diff --git a/include/my_compiler.h b/include/my_compiler.h
index 0a83c6587a5..1cd46ff4260 100644
--- a/include/my_compiler.h
+++ b/include/my_compiler.h
@@ -42,7 +42,7 @@
 
 /* Oracle Solaris Studio */
 #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-# if (__SUNPRO_C >= 0x590) || (__SUNPRO_CC >= 0x590)
+# if __SUNPRO_C >= 0x590
 #   define MY_ALIGN_EXT
 # endif
 
@@ -124,4 +124,6 @@ struct my_aligned_storage
 
 #endif /* __cplusplus */
 
+#include <my_attribute.h>
+
 #endif /* MY_COMPILER_INCLUDED */
diff --git a/include/my_global.h b/include/my_global.h
index 6723267ae50..ec22a57329b 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -623,7 +623,7 @@ typedef unsigned short ushort;
 #define my_const_cast(A) (A)
 #endif
 
-#include <my_attribute.h>
+#include <my_compiler.h>
 
 /*
   Wen using the embedded library, users might run into link problems,
diff --git a/sql/spatial.h b/sql/spatial.h
index 67edc077e04..f778acd6c34 100644
--- a/sql/spatial.h
+++ b/sql/spatial.h
@@ -16,8 +16,6 @@
 #ifndef _spatial_h
 #define _spatial_h
 
-#include <my_compiler.h>
-
 #ifdef HAVE_SPATIAL
 
 const uint SRID_SIZE= 4;