diff --git a/include/boost/predef/hardware/simd/x86/avx.h b/include/boost/predef/hardware/simd/x86/avx.h
index bd5c328..b9d2ad4 100644
--- a/include/boost/predef/hardware/simd/x86/avx.h
+++ b/include/boost/predef/hardware/simd/x86/avx.h
@@ -25,13 +25,11 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_AVX BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_AVX BOOST_VERSION_NUMBER(5, 0, 0)
 
 #if defined(__AVX__)
-#   undef BOOST_HW_SIMD_X86_AVX
 #   if defined(BOOST_COMP_MSVC_AVAILABLE) && BOOST_COMP_MSVC > BOOST_VERSION_NUMBER(16, 0, 40219)\
        || !defined(BOOST_COMP_MSVC_AVAILABLE)
-#      define BOOST_HW_SIMD_X86_AVX BOOST_VERSION_NUMBER(5, 0, 0)
 #      define BOOST_HW_SIMD_X86_AVX_AVAILABLE
 #   endif
 #endif
diff --git a/include/boost/predef/hardware/simd/x86/avx2.h b/include/boost/predef/hardware/simd/x86/avx2.h
index 5b79a23..f2774a4 100644
--- a/include/boost/predef/hardware/simd/x86/avx2.h
+++ b/include/boost/predef/hardware/simd/x86/avx2.h
@@ -25,13 +25,11 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_AVX2 BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_AVX2 BOOST_VERSION_NUMBER(5, 3, 0)
 
 #if defined(__AVX2__)
-#   undef BOOST_HW_SIMD_X86_AVX2
 #   if defined(BOOST_COMP_MSVC_AVAILABLE) && BOOST_COMP_MSVC > BOOST_VERSION_NUMBER(17, 0, 0)\
        || !defined(BOOST_COMP_MSVC_AVAILABLE)
-#      define BOOST_HW_SIMD_X86_AVX2 BOOST_VERSION_NUMBER(5, 3, 0)
 #      define BOOST_HW_SIMD_X86_AVX2_AVAILABLE
 #   endif
 #endif
diff --git a/include/boost/predef/hardware/simd/x86/fma3.h b/include/boost/predef/hardware/simd/x86/fma3.h
index e27678f..112102a 100644
--- a/include/boost/predef/hardware/simd/x86/fma3.h
+++ b/include/boost/predef/hardware/simd/x86/fma3.h
@@ -25,13 +25,11 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_FMA3 BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_FMA3 BOOST_VERSION_NUMBER(5, 2, 0)
 
 #if defined(__FMA__)
-#   undef BOOST_HW_SIMD_X86_FMA3
 #   if defined(BOOST_COMP_MSVC_AVAILABLE) && BOOST_COMP_MSVC < BOOST_VERSION_NUMBER(17, 0, 0)\
        || !defined(BOOST_COMP_MSVC_AVAILABLE)
-#      define BOOST_HW_SIMD_X86_FMA3 BOOST_VERSION_NUMBER(5, 2, 0)
 #      define BOOST_HW_SIMD_X86_FMA3_AVAILABLE
 #   endif
 #endif
diff --git a/include/boost/predef/hardware/simd/x86/fma4.h b/include/boost/predef/hardware/simd/x86/fma4.h
index 5c2e926..8e09d17 100644
--- a/include/boost/predef/hardware/simd/x86/fma4.h
+++ b/include/boost/predef/hardware/simd/x86/fma4.h
@@ -24,11 +24,9 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_FMA4 BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_FMA4 BOOST_VERSION_NUMBER(5, 1, 0)
 
 #if defined(__FMA4__)
-#   undef BOOST_HW_SIMD_X86_FMA4
-#   define BOOST_HW_SIMD_X86_FMA4 BOOST_VERSION_NUMBER(5, 1, 0)
 #   define BOOST_HW_SIMD_X86_FMA4_AVAILABLE
 #endif
 
diff --git a/include/boost/predef/hardware/simd/x86/mic.h b/include/boost/predef/hardware/simd/x86/mic.h
index 87de8ed..6604063 100644
--- a/include/boost/predef/hardware/simd/x86/mic.h
+++ b/include/boost/predef/hardware/simd/x86/mic.h
@@ -24,11 +24,9 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_MIC BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_MIC BOOST_VERSION_NUMBER(6, 0, 0)
 
 #if defined(__MIC__)
-#   undef BOOST_HW_SIMD_X86_MIC
-#   define BOOST_HW_SIMD_X86_MIC BOOST_VERSION_NUMBER(6, 0, 0)
 #   define BOOST_HW_SIMD_X86_MIC_AVAILABLE
 #endif
 
diff --git a/include/boost/predef/hardware/simd/x86/mmx.h b/include/boost/predef/hardware/simd/x86/mmx.h
index f0476bb..6eac54a 100644
--- a/include/boost/predef/hardware/simd/x86/mmx.h
+++ b/include/boost/predef/hardware/simd/x86/mmx.h
@@ -24,11 +24,9 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_MMX BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_MMX BOOST_VERSION_NUMBER(0, 99, 0)
 
 #if defined(__MMX__)
-#   undef BOOST_HW_SIMD_X86_MMX
-#   define BOOST_HW_SIMD_X86_MMX BOOST_VERSION_NUMBER(0, 99, 0)
 #   define BOOST_HW_SIMD_X86_MMX_AVAILABLE
 #endif
 
diff --git a/include/boost/predef/hardware/simd/x86/sse.h b/include/boost/predef/hardware/simd/x86/sse.h
index 5459f27..55d3edb 100644
--- a/include/boost/predef/hardware/simd/x86/sse.h
+++ b/include/boost/predef/hardware/simd/x86/sse.h
@@ -26,11 +26,9 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_SSE BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_SSE BOOST_VERSION_NUMBER(1, 0, 0)
 
 #if defined(__SSE__) || defined(_M_X64) || _M_IX86_FP >= 1
-#   undef BOOST_HW_SIMD_X86_SSE
-#   define BOOST_HW_SIMD_X86_SSE BOOST_VERSION_NUMBER(1, 0, 0)
 #   define BOOST_HW_SIMD_X86_SSE_AVAILABLE
 #endif
 
diff --git a/include/boost/predef/hardware/simd/x86/sse2.h b/include/boost/predef/hardware/simd/x86/sse2.h
index 178f594..a9f0614 100644
--- a/include/boost/predef/hardware/simd/x86/sse2.h
+++ b/include/boost/predef/hardware/simd/x86/sse2.h
@@ -26,11 +26,9 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_SSE2 BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_SSE2 BOOST_VERSION_NUMBER(2, 0, 0)
 
 #if defined(__SSE2__) || defined(_M_X64) || _M_IX86_FP >= 2
-#   undef BOOST_HW_SIMD_X86_SSE2
-#   define BOOST_HW_SIMD_X86_SSE2 BOOST_VERSION_NUMBER(2, 0, 0)
 #   define BOOST_HW_SIMD_X86_SSE2_AVAILABLE
 #endif
 
diff --git a/include/boost/predef/hardware/simd/x86/sse3.h b/include/boost/predef/hardware/simd/x86/sse3.h
index c827292..86d0bfd 100644
--- a/include/boost/predef/hardware/simd/x86/sse3.h
+++ b/include/boost/predef/hardware/simd/x86/sse3.h
@@ -24,11 +24,9 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_SSE3 BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_SSE3 BOOST_VERSION_NUMBER(3, 0, 0)
 
 #if defined(__SSE3__)
-#   undef BOOST_HW_SIMD_X86_SSE3
-#   define BOOST_HW_SIMD_X86_SSE3 BOOST_VERSION_NUMBER(3, 0, 0)
 #   define BOOST_HW_SIMD_X86_SSE3_AVAILABLE
 #endif
 
diff --git a/include/boost/predef/hardware/simd/x86/sse4_1.h b/include/boost/predef/hardware/simd/x86/sse4_1.h
index 8713d09..8e7e804 100644
--- a/include/boost/predef/hardware/simd/x86/sse4_1.h
+++ b/include/boost/predef/hardware/simd/x86/sse4_1.h
@@ -24,11 +24,9 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_SSE4_1 BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_SSE4_1 BOOST_VERSION_NUMBER(4, 1, 0)
 
 #if defined(__SSE4_1__)
-#   undef BOOST_HW_SIMD_X86_SSE4_1
-#   define BOOST_HW_SIMD_X86_SSE4_1 BOOST_VERSION_NUMBER(4, 1, 0)
 #   define BOOST_HW_SIMD_X86_SSE4_1_AVAILABLE
 #endif
 
diff --git a/include/boost/predef/hardware/simd/x86/sse4_2.h b/include/boost/predef/hardware/simd/x86/sse4_2.h
index c56eae4..57717d6 100644
--- a/include/boost/predef/hardware/simd/x86/sse4_2.h
+++ b/include/boost/predef/hardware/simd/x86/sse4_2.h
@@ -24,11 +24,9 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_SSE4_2 BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_SSE4_2 BOOST_VERSION_NUMBER(4, 2, 0)
 
 #if defined(__SSE4_2__)
-#   undef BOOST_HW_SIMD_X86_SSE4_2
-#   define BOOST_HW_SIMD_X86_SSE4_2 BOOST_VERSION_NUMBER(4, 2, 0)
 #   define BOOST_HW_SIMD_X86_SSE4_2_AVAILABLE
 #endif
 
diff --git a/include/boost/predef/hardware/simd/x86/sse4a.h b/include/boost/predef/hardware/simd/x86/sse4a.h
index 59aaf58..fced0b7 100644
--- a/include/boost/predef/hardware/simd/x86/sse4a.h
+++ b/include/boost/predef/hardware/simd/x86/sse4a.h
@@ -24,11 +24,9 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_SSE4A BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_SSE4A BOOST_VERSION_NUMBER(4, 0, 0)
 
 #if defined(__SSE4A__)
-#   undef BOOST_HW_SIMD_X86_SSE4A
-#   define BOOST_HW_SIMD_X86_SSE4A BOOST_VERSION_NUMBER(4, 0, 0)
 #   define BOOST_HW_SIMD_X86_SSE4A_AVAILABLE
 #endif
 
diff --git a/include/boost/predef/hardware/simd/x86/ssse3.h b/include/boost/predef/hardware/simd/x86/ssse3.h
index 08856c4..fa35b53 100644
--- a/include/boost/predef/hardware/simd/x86/ssse3.h
+++ b/include/boost/predef/hardware/simd/x86/ssse3.h
@@ -24,11 +24,9 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_SSSE3 BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_SSSE3 BOOST_VERSION_NUMBER(3, 1, 0)
 
 #if defined(__SSSE3__)
-#   undef BOOST_HW_SIMD_X86_SSSE3
-#   define BOOST_HW_SIMD_X86_SSSE3 BOOST_VERSION_NUMBER(3, 1, 0)
 #   define BOOST_HW_SIMD_X86_SSSE3_AVAILABLE
 #endif
 
diff --git a/include/boost/predef/hardware/simd/x86/xop.h b/include/boost/predef/hardware/simd/x86/xop.h
index d4482be..e91ef7b 100644
--- a/include/boost/predef/hardware/simd/x86/xop.h
+++ b/include/boost/predef/hardware/simd/x86/xop.h
@@ -24,11 +24,9 @@ http://www.boost.org/LICENSE_1_0.txt)
      ]
  */
 
-#define BOOST_HW_SIMD_X86_XOP BOOST_VERSION_NUMBER_NOT_AVAILABLE
+#define BOOST_HW_SIMD_X86_XOP BOOST_VERSION_NUMBER(5, 1, 1)
 
 #if defined(__XOP__)
-#   undef BOOST_HW_SIMD_X86_XOP
-#   define BOOST_HW_SIMD_X86_XOP BOOST_VERSION_NUMBER(5, 1, 1)
 #   define BOOST_HW_SIMD_X86_XOP_AVAILABLE
 #endif