diff --git a/include/boost/config/select_platform_config.hpp b/include/boost/config/select_platform_config.hpp
index 5699b2a2..60bfa509 100644
--- a/include/boost/config/select_platform_config.hpp
+++ b/include/boost/config/select_platform_config.hpp
@@ -49,7 +49,7 @@
 // MacOS
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/macos.hpp"
 
-#elif defined(__IBMCPP__)
+#elif defined(__IBMCPP__) || defined(_AIX)
 // IBM
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/aix.hpp"
 
diff --git a/include/boost/detail/limits.hpp b/include/boost/detail/limits.hpp
index 02bf2633..cd5ac0dc 100644
--- a/include/boost/detail/limits.hpp
+++ b/include/boost/detail/limits.hpp
@@ -49,9 +49,14 @@
 
 // The macros are not named appropriately.  We don't care about integer
 // bit layout, but about floating-point NaN (etc.) bit patterns.
-#if defined(__sparc) || defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__)
+#if defined(__sparc) || defined(__sparc__) \
+   || defined(_POWER) || defined(__powerpc__) \
+   || defined(__ppc__) || defined(__hppa) \
+   || defined(_MIPSEB) || defined(_POWER) \
+   || defined(__s390__)
 #define BOOST_BIG_ENDIAN
-#elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__)
+#elif defined(__i386__) || defined(__alpha__) \
+   || defined(__ia64)  || defined(__ia64__)
 #define BOOST_LITTLE_ENDIAN
 #else
 #error The file boost/detail/limits.hpp needs to be set up for your CPU type.