diff --git a/include/boost/python/module_init.hpp b/include/boost/python/module_init.hpp
index 7770f531..aaf2a0f9 100644
--- a/include/boost/python/module_init.hpp
+++ b/include/boost/python/module_init.hpp
@@ -26,23 +26,7 @@ extern "C" __declspec(dllexport) void init##name()      \
 }                                                       \
 void init_module_##name()
 
-#  elif defined(_AIX) && !defined(BOOST_PYTHON_STATIC_MODULE)
-
-#   include <boost/python/detail/aix_init_module.hpp>
-#   define BOOST_PYTHON_MODULE_INIT(name)                               \
-void init_module_##name();                                              \
-extern "C"                                                              \
-{                                                                       \
-    extern PyObject* _PyImport_LoadDynamicModule(char*, char*, FILE *); \
-    void init##name()                                                   \
-    {                                                                   \
-        boost::python::detail::aix_init_module(                         \
-            _PyImport_LoadDynamicModule, #name, &init_module_##name);   \
-    }                                                                   \
-}                                                                       \
-void init_module_##name()
-
-# elif BOOST_PYTHON_USE_GCC_SYMBOL_VISIBILITY
+#  elif BOOST_PYTHON_USE_GCC_SYMBOL_VISIBILITY
 
 #   define BOOST_PYTHON_MODULE_INIT(name)                               \
 void init_module_##name();                                              \
@@ -52,7 +36,7 @@ extern "C" __attribute__ ((visibility("default"))) void init##name()    \
 }                                                                       \
 void init_module_##name()
 
-# else
+#  else
 
 #   define BOOST_PYTHON_MODULE_INIT(name)                               \
 void init_module_##name();                                              \
diff --git a/test/select_from_python_test.cpp b/test/select_from_python_test.cpp
index e8333902..bb60962a 100644
--- a/test/select_from_python_test.cpp
+++ b/test/select_from_python_test.cpp
@@ -5,9 +5,10 @@
 #include <boost/python/type_id.hpp>
 #include <iostream>
 
-// gcc 2.95.x and MIPSpro 7.3.1.3 linker seem to demand this definition
-#if ((defined(__GNUC__) && __GNUC__ < 3)) \
- || (defined(__sgi) && defined(__EDG_VERSION__) && (__EDG_VERSION__ == 238))
+// gcc 2.95.x, MIPSpro 7.3.1.3 and IBM XL for Linux linker seem to demand this definition
+#if (defined(__GNUC__) && (__GNUC__ < 3)) \
+ || (defined(__sgi) && defined(__EDG_VERSION__) && (__EDG_VERSION__ == 238)) \
+ || (defined(__IBMCPP__) && defined(__linux__))
 namespace boost { namespace python {
 BOOST_PYTHON_DECL bool handle_exception_impl(function0<void>)
 {