diff --git a/include/boost/config/compiler/hp_acc.hpp b/include/boost/config/compiler/hp_acc.hpp
index 7028afe1..2ca5d30f 100644
--- a/include/boost/config/compiler/hp_acc.hpp
+++ b/include/boost/config/compiler/hp_acc.hpp
@@ -22,26 +22,21 @@
 #    define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
 #endif
 
-#if (__HP_aCC <= 33900)
+#if (__HP_aCC <= 33900) || !defined(BOOST_STRICT_CONFIG)
 #    define BOOST_NO_UNREACHABLE_RETURN_DETECTION
-#    define BOOST_MSVC6_MEMBER_TEMPLATES
-#    define BOOST_HAS_UNISTD_H
-#    define BOOST_HAS_SCHED_YIELD
-#    define BOOST_HAS_PTHREADS
-#    define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
-#    define BOOST_HAS_PARTIAL_STD_ALLOCATOR
-#    define BOOST_HAS_NL_TYPES_H
-#    define BOOST_HAS_NANOSLEEP
-#    define BOOST_HAS_LONG_LONG
-#    define BOOST_HAS_GETTIMEOFDAY
-#    define BOOST_HAS_DIRENT_H
-#    define BOOST_HAS_CLOCK_GETTIME
 #    define BOOST_NO_TEMPLATE_TEMPLATES
 #    define BOOST_NO_SWPRINTF
-#    define BOOST_NO_STD_ALLOCATOR
 #    define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
+//     std lib config should set this one already:
+//#    define BOOST_NO_STD_ALLOCATOR
 #endif 
 
+// optional features rather than defects:
+#if (__HP_aCC >= 33900)
+#    define BOOST_HAS_LONG_LONG
+#    define BOOST_HAS_PARTIAL_STD_ALLOCATOR
+#endif
+
 #define BOOST_COMPILER "HP aCC version " BOOST_STRINGIZE(__HP_aCC)
 
 //
@@ -58,3 +53,5 @@
 #  endif
 #endif
 
+
+
diff --git a/include/boost/config/platform/hpux.hpp b/include/boost/config/platform/hpux.hpp
index 4f2cf377..8ae5ba13 100644
--- a/include/boost/config/platform/hpux.hpp
+++ b/include/boost/config/platform/hpux.hpp
@@ -29,7 +29,29 @@
 # define BOOST_HAS_PTHREADS 
 #endif
 
+// the following are always available:
 #ifndef BOOST_HAS_GETTIMEOFDAY
-// gettimeofday is always available
-#define BOOST_HAS_GETTIMEOFDAY
+#  define BOOST_HAS_GETTIMEOFDAY
 #endif
+#ifndef BOOST_HAS_SCHED_YIELD
+#    define BOOST_HAS_SCHED_YIELD
+#endif
+#ifndef BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
+#    define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
+#endif
+#ifndef BOOST_HAS_NL_TYPES_H
+#    define BOOST_HAS_NL_TYPES_H
+#endif
+#ifndef BOOST_HAS_NANOSLEEP
+#    define BOOST_HAS_NANOSLEEP
+#endif
+#ifndef BOOST_HAS_GETTIMEOFDAY
+#    define BOOST_HAS_GETTIMEOFDAY
+#endif
+#ifndef BOOST_HAS_DIRENT_H
+#    define BOOST_HAS_DIRENT_H
+#endif
+#ifndef BOOST_HAS_CLOCK_GETTIME
+#    define BOOST_HAS_CLOCK_GETTIME
+#endif
+