diff --git a/include/boost/preprocessor/arithmetic/add.hpp b/include/boost/preprocessor/arithmetic/add.hpp
index 29976e9..2e56b52 100644
--- a/include/boost/preprocessor/arithmetic/add.hpp
+++ b/include/boost/preprocessor/arithmetic/add.hpp
@@ -35,7 +35,6 @@ single token).</p>
 */
 #define BOOST_PP_ADD(X,Y) BOOST_PP_ADD_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_ADD_D(D,X,Y) BOOST_PP_TUPLE_ELEM(2,0,BOOST_PP_WHILE##D(BOOST_PP_ADD_C,BOOST_PP_ADD_F,(X,Y)))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_ADD_C(D,P) BOOST_PP_TUPLE_ELEM(2,1,P)
@@ -44,7 +43,6 @@ single token).</p>
 #  define BOOST_PP_ADD_C(D,P) BOOST_PP_TUPLE2_ELEM1 P
 #  define BOOST_PP_ADD_F(D,P) (BOOST_PP_INC(BOOST_PP_TUPLE2_ELEM0 P),BOOST_PP_DEC(BOOST_PP_TUPLE2_ELEM1 P))
 #endif
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_ADD().</p> */
 #define BOOST_PREPROCESSOR_ADD(X,Y) BOOST_PP_ADD(X,Y)
diff --git a/include/boost/preprocessor/arithmetic/div.hpp b/include/boost/preprocessor/arithmetic/div.hpp
index 3dafffe..5affd77 100644
--- a/include/boost/preprocessor/arithmetic/div.hpp
+++ b/include/boost/preprocessor/arithmetic/div.hpp
@@ -33,7 +33,6 @@ single token).</p>
 */
 #define BOOST_PP_DIV(X,Y) BOOST_PP_DIV_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_DIV_D(D,X,Y) BOOST_PP_TUPLE_ELEM(3,0,BOOST_PP_WHILE##D(BOOST_PP_DIV_C,BOOST_PP_DIV_F,(0,X,Y)))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_DIV_C(D,P) BOOST_PP_LESS_EQUAL_D(D,BOOST_PP_TUPLE_ELEM(3,2,P),BOOST_PP_TUPLE_ELEM(3,1,P))
@@ -42,7 +41,6 @@ single token).</p>
 #  define BOOST_PP_DIV_C(D,P) BOOST_PP_LESS_EQUAL_D(D,BOOST_PP_TUPLE3_ELEM2 P,BOOST_PP_TUPLE3_ELEM1 P)
 #  define BOOST_PP_DIV_F(D,P) (BOOST_PP_INC(BOOST_PP_TUPLE3_ELEM0 P),BOOST_PP_SUB_D(D,BOOST_PP_TUPLE3_ELEM1 P,BOOST_PP_TUPLE3_ELEM2 P),BOOST_PP_TUPLE3_ELEM2 P)
 #endif
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_DIV().</p> */
 #define BOOST_PREPROCESSOR_DIV(X,Y) BOOST_PP_DIV(X,Y)
diff --git a/include/boost/preprocessor/arithmetic/mod.hpp b/include/boost/preprocessor/arithmetic/mod.hpp
index 6033d23..cdaba17 100644
--- a/include/boost/preprocessor/arithmetic/mod.hpp
+++ b/include/boost/preprocessor/arithmetic/mod.hpp
@@ -32,11 +32,9 @@ single token).</p>
 */
 #define BOOST_PP_MOD(X,Y) BOOST_PP_MOD_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_MOD_D(D,X,Y) BOOST_PP_TUPLE_ELEM(2,0,BOOST_PP_WHILE##D(BOOST_PP_MOD_C,BOOST_PP_MOD_F,(X,Y)))
 #define BOOST_PP_MOD_C(D,P) BOOST_PP_LESS_EQUAL_D(D,BOOST_PP_TUPLE2_ELEM1 P,BOOST_PP_TUPLE2_ELEM0 P)
 #define BOOST_PP_MOD_F(D,P) (BOOST_PP_SUB_D(D,BOOST_PP_TUPLE2_ELEM0 P,BOOST_PP_TUPLE2_ELEM1 P),BOOST_PP_TUPLE2_ELEM1 P)
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_MOD().</p> */
 #define BOOST_PREPROCESSOR_MOD(X,Y) BOOST_PP_MOD(X,Y)
diff --git a/include/boost/preprocessor/arithmetic/mul.hpp b/include/boost/preprocessor/arithmetic/mul.hpp
index cc8fce6..36a6023 100644
--- a/include/boost/preprocessor/arithmetic/mul.hpp
+++ b/include/boost/preprocessor/arithmetic/mul.hpp
@@ -32,7 +32,6 @@ single token).</p>
 */
 #define BOOST_PP_MUL(X,Y) BOOST_PP_MUL_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_MUL_D(D,X,Y) BOOST_PP_TUPLE_ELEM(3,0,BOOST_PP_WHILE##D(BOOST_PP_MUL_C,BOOST_PP_MUL_F,(0,X,Y)))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_MUL_C(D,P) BOOST_PP_TUPLE_ELEM(3,2,P)
@@ -41,7 +40,6 @@ single token).</p>
 #  define BOOST_PP_MUL_C(D,P) BOOST_PP_TUPLE3_ELEM2 P
 #  define BOOST_PP_MUL_F(D,P) (BOOST_PP_ADD_D(D,BOOST_PP_TUPLE3_ELEM0 P,BOOST_PP_TUPLE3_ELEM1 P),BOOST_PP_TUPLE3_ELEM1 P,BOOST_PP_DEC(BOOST_PP_TUPLE3_ELEM2 P))
 #endif
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_MUL().</p> */
 #define BOOST_PREPROCESSOR_MUL(X,Y) BOOST_PP_MUL(X,Y)
diff --git a/include/boost/preprocessor/arithmetic/sub.hpp b/include/boost/preprocessor/arithmetic/sub.hpp
index 87a90de..cdc5b72 100644
--- a/include/boost/preprocessor/arithmetic/sub.hpp
+++ b/include/boost/preprocessor/arithmetic/sub.hpp
@@ -34,7 +34,6 @@ single token).</p>
 */
 #define BOOST_PP_SUB(X,Y) BOOST_PP_SUB_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_SUB_D(D,X,Y) BOOST_PP_TUPLE_ELEM(2,0,BOOST_PP_WHILE##D(BOOST_PP_SUB_C,BOOST_PP_SUB_F,(X,Y)))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_SUB_C(D,P) BOOST_PP_TUPLE_ELEM(2,1,P)
@@ -43,7 +42,6 @@ single token).</p>
 #  define BOOST_PP_SUB_C(D,P) BOOST_PP_TUPLE2_ELEM1 P
 #  define BOOST_PP_SUB_F(D,P) (BOOST_PP_DEC(BOOST_PP_TUPLE2_ELEM0 P),BOOST_PP_DEC(BOOST_PP_TUPLE2_ELEM1 P))
 #endif
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_SUB(X,Y).</p> */
 #define BOOST_PREPROCESSOR_SUB(X,Y) BOOST_PP_SUB(X,Y)
diff --git a/include/boost/preprocessor/cat.hpp b/include/boost/preprocessor/cat.hpp
index d1bbb5c..b778f9f 100644
--- a/include/boost/preprocessor/cat.hpp
+++ b/include/boost/preprocessor/cat.hpp
@@ -28,10 +28,8 @@ expanded.</p>
 */
 #define BOOST_PP_CAT(X,Y) BOOST_PP_CAT_DELAY(X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_CAT_DELAY(X,Y) BOOST_PP_DO_CAT(X,Y)
 #define BOOST_PP_DO_CAT(X,Y) X##Y
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_CAT().</p> */
 #define BOOST_PREPROCESSOR_CAT(X,Y) BOOST_PP_CAT(X,Y)
diff --git a/include/boost/preprocessor/comparison/equal.hpp b/include/boost/preprocessor/comparison/equal.hpp
index 11071b3..b2077e8 100644
--- a/include/boost/preprocessor/comparison/equal.hpp
+++ b/include/boost/preprocessor/comparison/equal.hpp
@@ -31,9 +31,7 @@ otherwise.</p>
 */
 #define BOOST_PP_EQUAL(X,Y) BOOST_PP_EQUAL_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_EQUAL_D(D,X,Y) BOOST_PP_NOT(BOOST_PP_NOT_EQUAL_D(D,X,Y))
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_EQUAL().</p> */
 #define BOOST_PREPROCESSOR_EQUAL(X,Y) BOOST_PP_EQUAL(X,Y)
diff --git a/include/boost/preprocessor/comparison/greater.hpp b/include/boost/preprocessor/comparison/greater.hpp
index 4ac5650..741b7f1 100644
--- a/include/boost/preprocessor/comparison/greater.hpp
+++ b/include/boost/preprocessor/comparison/greater.hpp
@@ -30,9 +30,7 @@ otherwise.</p>
 */
 #define BOOST_PP_GREATER(X,Y) BOOST_PP_GREATER_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_GREATER_D(D,X,Y) BOOST_PP_LESS_D(D,Y,X)
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_GREATER().</p> */
 #define BOOST_PREPROCESSOR_GREATER(X,Y) BOOST_PP_GREATER(X,Y)
diff --git a/include/boost/preprocessor/comparison/greater_equal.hpp b/include/boost/preprocessor/comparison/greater_equal.hpp
index f675c58..3e07f42 100644
--- a/include/boost/preprocessor/comparison/greater_equal.hpp
+++ b/include/boost/preprocessor/comparison/greater_equal.hpp
@@ -30,9 +30,7 @@ otherwise.</p>
 */
 #define BOOST_PP_GREATER_EQUAL(X,Y) BOOST_PP_GREATER_EQUAL_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_GREATER_EQUAL_D(D,X,Y) BOOST_PP_LESS_EQUAL_D(D,Y,X)
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_GREATER_EQUAL().</p> */
 #define BOOST_PREPROCESSOR_GREATER_EQUAL(X,Y) BOOST_PP_GREATER_EQUAL(X,Y)
diff --git a/include/boost/preprocessor/comparison/less.hpp b/include/boost/preprocessor/comparison/less.hpp
index a8b6d0b..5f43f7b 100644
--- a/include/boost/preprocessor/comparison/less.hpp
+++ b/include/boost/preprocessor/comparison/less.hpp
@@ -32,9 +32,7 @@ otherwise.</p>
 */
 #define BOOST_PP_LESS(X,Y) BOOST_PP_LESS_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LESS_D(D,X,Y) BOOST_PP_AND(BOOST_PP_NOT_EQUAL_D(D,X,Y),BOOST_PP_LESS_EQUAL_D(D,X,Y))
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_LESS().</p> */
 #define BOOST_PREPROCESSOR_LESS(X,Y) BOOST_PP_LESS(X,Y)
diff --git a/include/boost/preprocessor/comparison/less_equal.hpp b/include/boost/preprocessor/comparison/less_equal.hpp
index 5a69e0e..a98e52c 100644
--- a/include/boost/preprocessor/comparison/less_equal.hpp
+++ b/include/boost/preprocessor/comparison/less_equal.hpp
@@ -31,9 +31,7 @@ otherwise.</p>
 */
 #define BOOST_PP_LESS_EQUAL(X,Y) BOOST_PP_LESS_EQUAL_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LESS_EQUAL_D(D,X,Y) BOOST_PP_NOT(BOOST_PP_SUB_D(D,X,Y))
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_LESS_EQUAL().</p> */
 #define BOOST_PREPROCESSOR_LESS_EQUAL(X,Y) BOOST_PP_LESS_EQUAL(X,Y)
diff --git a/include/boost/preprocessor/comparison/not_equal.hpp b/include/boost/preprocessor/comparison/not_equal.hpp
index a352c99..00cc58f 100644
--- a/include/boost/preprocessor/comparison/not_equal.hpp
+++ b/include/boost/preprocessor/comparison/not_equal.hpp
@@ -32,9 +32,7 @@ otherwise.</p>
 */
 #define BOOST_PP_NOT_EQUAL(X,Y) BOOST_PP_NOT_EQUAL_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_NOT_EQUAL_D(D,X,Y) BOOST_PP_BOOL(BOOST_PP_ADD_D(D,BOOST_PP_SUB_D(D,X,Y),BOOST_PP_SUB_D(D,Y,X)))
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_NOT_EQUAL().</p> */
 #define BOOST_PREPROCESSOR_NOT_EQUAL(X,Y) BOOST_PP_NOT_EQUAL(X,Y)
diff --git a/include/boost/preprocessor/dec.hpp b/include/boost/preprocessor/dec.hpp
index 18b2e73..a8392d7 100644
--- a/include/boost/preprocessor/dec.hpp
+++ b/include/boost/preprocessor/dec.hpp
@@ -25,7 +25,6 @@ supported.</p>
 */
 #define BOOST_PP_DEC(X) BOOST_PP_DEC_DELAY(X)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_DEC_DELAY(X) BOOST_PP_DEC##X
 #define BOOST_PP_DEC0 0
 #define BOOST_PP_DEC1 0
@@ -156,7 +155,6 @@ supported.</p>
 #define BOOST_PP_DEC126 125
 #define BOOST_PP_DEC127 126
 #define BOOST_PP_DEC128 127
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_DEC().</p> */
 #define BOOST_PREPROCESSOR_DEC(X) BOOST_PP_DEC(X)
diff --git a/include/boost/preprocessor/enum.hpp b/include/boost/preprocessor/enum.hpp
index 3b70e2d..3e4b238 100644
--- a/include/boost/preprocessor/enum.hpp
+++ b/include/boost/preprocessor/enum.hpp
@@ -37,11 +37,9 @@
 */
 #define BOOST_PP_ENUM(N,F,P) BOOST_PP_REPEAT(N,BOOST_PP_ENUM_F,(F,P))
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_ENUM_F(I,FP) BOOST_PP_COMMA_IF(I) BOOST_PP_TUPLE_ELEM(2,0,FP)(I,BOOST_PP_TUPLE_ELEM(2,1,FP))
 #else
 #  define BOOST_PP_ENUM_F(I,FP) BOOST_PP_COMMA_IF(I) BOOST_PP_TUPLE2_ELEM0 FP(I,BOOST_PP_TUPLE2_ELEM1 FP)
 #endif
 #endif
-#endif
diff --git a/include/boost/preprocessor/enum_params.hpp b/include/boost/preprocessor/enum_params.hpp
index 4582764..2ea06be 100644
--- a/include/boost/preprocessor/enum_params.hpp
+++ b/include/boost/preprocessor/enum_params.hpp
@@ -36,9 +36,7 @@
 */
 #define BOOST_PP_ENUM_PARAMS(N,P) BOOST_PP_ENUM(N,BOOST_PP_ENUM_PARAMS_F,P)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_ENUM_PARAMS_F(I,P) BOOST_PP_CAT(P,I)
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_ENUM_PARAMS().</p> */
 #define BOOST_PREPROCESSOR_ENUM_PARAMS(N,P) BOOST_PP_ENUM_PARAMS(N,P)
diff --git a/include/boost/preprocessor/enum_params_with_a_default.hpp b/include/boost/preprocessor/enum_params_with_a_default.hpp
index a3c5c99..4d99a41 100644
--- a/include/boost/preprocessor/enum_params_with_a_default.hpp
+++ b/include/boost/preprocessor/enum_params_with_a_default.hpp
@@ -36,13 +36,11 @@
 */
 #define BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(N,P,D) BOOST_PP_ENUM(N,BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT_F,(P,D))
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT_F(I,PD) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2,0,PD),I)=BOOST_PP_TUPLE_ELEM(2,1,PD)
 #else
 #  define BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT_F(I,PD) BOOST_PP_CAT(BOOST_PP_TUPLE2_ELEM0 PD,I)=BOOST_PP_TUPLE2_ELEM1 PD
 #endif
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT().</p> */
 #define BOOST_PREPROCESSOR_ENUM_PARAMS_WITH_A_DEFAULT(N,P,D) BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(N,P,D)
diff --git a/include/boost/preprocessor/enum_params_with_defaults.hpp b/include/boost/preprocessor/enum_params_with_defaults.hpp
index 89b90ae..bfd5c8c 100644
--- a/include/boost/preprocessor/enum_params_with_defaults.hpp
+++ b/include/boost/preprocessor/enum_params_with_defaults.hpp
@@ -39,13 +39,11 @@
 */
 #define BOOST_PP_ENUM_PARAMS_WITH_DEFAULTS(N,P,D) BOOST_PP_ENUM(N,BOOST_PP_ENUM_PARAMS_WITH_DEFAULTS_F,(P,D))
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_ENUM_PARAMS_WITH_DEFAULTS_F(I,PD) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2,0,PD),I)=BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2,1,PD),I)
 #else
 #  define BOOST_PP_ENUM_PARAMS_WITH_DEFAULTS_F(I,PD) BOOST_PP_CAT(BOOST_PP_TUPLE2_ELEM0 PD,I)=BOOST_PP_CAT(BOOST_PP_TUPLE2_ELEM1 PD,I)
 #endif
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_ENUM_PARAMS_WITH_DEFAULTS().</p> */
 #define BOOST_PREPROCESSOR_ENUM_PARAMS_WITH_DEFAULTS(N,P,D) BOOST_PP_ENUM_PARAMS_WITH_DEFAULTS(N,P,D)
diff --git a/include/boost/preprocessor/enum_shifted.hpp b/include/boost/preprocessor/enum_shifted.hpp
index 3b519fc..43b95de 100644
--- a/include/boost/preprocessor/enum_shifted.hpp
+++ b/include/boost/preprocessor/enum_shifted.hpp
@@ -32,11 +32,9 @@
 */
 #define BOOST_PP_ENUM_SHIFTED(N,F,P) BOOST_PP_ENUM(BOOST_PP_DEC(N),BOOST_PP_ENUM_SHIFTED_F,(F,P))
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_ENUM_SHIFTED_F(I,FP) BOOST_PP_TUPLE_ELEM(2,0,FP)(BOOST_PP_INC(I),BOOST_PP_TUPLE_ELEM(2,1,FP))
 #else
 #  define BOOST_PP_ENUM_SHIFTED_F(I,FP) BOOST_PP_TUPLE2_ELEM0 FP(BOOST_PP_INC(I),BOOST_PP_TUPLE2_ELEM1 FP)
 #endif
 #endif
-#endif
diff --git a/include/boost/preprocessor/enum_shifted_params.hpp b/include/boost/preprocessor/enum_shifted_params.hpp
index a67db58..40792b8 100644
--- a/include/boost/preprocessor/enum_shifted_params.hpp
+++ b/include/boost/preprocessor/enum_shifted_params.hpp
@@ -42,9 +42,7 @@
 */
 #define BOOST_PP_ENUM_SHIFTED_PARAMS(N,P) BOOST_PP_ENUM_SHIFTED(N,BOOST_PP_ENUM_SHIFTED_PARAMS_F,P)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_ENUM_SHIFTED_PARAMS_F(I,P) BOOST_PP_CAT(P,I)
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_ENUM_SHIFTED_PARAMS().</p> */
 #define BOOST_PREPROCESSOR_ENUM_SHIFTED_PARAMS(N,P) BOOST_PP_ENUM_SHIFTED_PARAMS(N,P)
diff --git a/include/boost/preprocessor/for.hpp b/include/boost/preprocessor/for.hpp
index 72d252a..a03748f 100644
--- a/include/boost/preprocessor/for.hpp
+++ b/include/boost/preprocessor/for.hpp
@@ -63,7 +63,6 @@ invoking BOOST_PP_FOR##R() directly.</p>
 */
 #define BOOST_PP_FOR(X,C,F,I) BOOST_PP_FOR0(X,C,F,I)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_FOR_C0(C,R,X,I) BOOST_PP_IF(C(R,X),I,BOOST_PP_TUPLE2_EAT)
 #define BOOST_PP_FOR_C1(C,R,X) BOOST_PP_IF(C(R,X),BOOST_PP_FOR##R,BOOST_PP_TUPLE4_EAT)
 #define BOOST_PP_FOR0(X,C,F,I) BOOST_PP_FOR_C0(C,1,X,I)(1,X) BOOST_PP_FOR_C1(C,1,X)(F(1,X),C,F,I)
@@ -197,4 +196,3 @@ invoking BOOST_PP_FOR##R() directly.</p>
 #define BOOST_PP_FOR128(X,C,F,I) BOOST_PP_FOR_C0(C,129,X,I)(129,X) BOOST_PP_FOR_C1(C,129,X)(F(129,X),C,F,I)
 #define BOOST_PP_FOR129(C,F,I,X) RECURSION DEPTH EXCEEDED!
 #endif
-#endif
diff --git a/include/boost/preprocessor/if.hpp b/include/boost/preprocessor/if.hpp
index 3bbaadc..8fd2915 100644
--- a/include/boost/preprocessor/if.hpp
+++ b/include/boost/preprocessor/if.hpp
@@ -29,10 +29,8 @@ BOOST_PP_REPEAT().</p>
 */
 #define BOOST_PP_IF(C,T,E) BOOST_PP_IF_BOOL(BOOST_PP_BOOL(C))(E,T)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_IF_BOOL(C) BOOST_PP_IF_BOOL_DELAY(C)
 #define BOOST_PP_IF_BOOL_DELAY(C) BOOST_PP_TUPLE2_ELEM##C
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_IF().</p> */
 #define BOOST_PREPROCESSOR_IF(C,T,E) BOOST_PP_IF(C,T,E)
diff --git a/include/boost/preprocessor/inc.hpp b/include/boost/preprocessor/inc.hpp
index 964b7ee..5c6c9cd 100644
--- a/include/boost/preprocessor/inc.hpp
+++ b/include/boost/preprocessor/inc.hpp
@@ -26,7 +26,6 @@ supported.</p>
 */
 #define BOOST_PP_INC(X) BOOST_PP_INC_DELAY(X)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_INC_DELAY(X) BOOST_PP_INC##X
 #define BOOST_PP_INC0 1
 #define BOOST_PP_INC1 2
@@ -157,7 +156,6 @@ supported.</p>
 #define BOOST_PP_INC126 127
 #define BOOST_PP_INC127 128
 #define BOOST_PP_INC128 128
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_INC().</p> */
 #define BOOST_PREPROCESSOR_INC(X) BOOST_PP_INC(X)
diff --git a/include/boost/preprocessor/list/append.hpp b/include/boost/preprocessor/list/append.hpp
index 15fe216..3b4cbfe 100644
--- a/include/boost/preprocessor/list/append.hpp
+++ b/include/boost/preprocessor/list/append.hpp
@@ -44,8 +44,6 @@
 */
 #define BOOST_PP_LIST_APPEND(L,P) BOOST_PP_LIST_APPEND_D(0,L,P)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_APPEND_D(D,L,P) BOOST_PP_LIST_FOLD_RIGHT_D(D,BOOST_PP_LIST_APPEND_F,L,P)
 #define BOOST_PP_LIST_APPEND_F(D,H,P) (H,P,1)
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/at.hpp b/include/boost/preprocessor/list/at.hpp
index 050dad2..eb77ac0 100644
--- a/include/boost/preprocessor/list/at.hpp
+++ b/include/boost/preprocessor/list/at.hpp
@@ -38,7 +38,5 @@ first element is at index <code>0</code>.</p>
 */
 #define BOOST_PP_LIST_AT(L,I) BOOST_PP_LIST_AT_D(0,L,I)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_AT_D(D,L,I) BOOST_PP_LIST_FIRST(BOOST_PP_LIST_REST_N_D(D,I,L))
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/cat.hpp b/include/boost/preprocessor/list/cat.hpp
index 974368a..7b9ac01 100644
--- a/include/boost/preprocessor/list/cat.hpp
+++ b/include/boost/preprocessor/list/cat.hpp
@@ -42,8 +42,6 @@
 */
 #define BOOST_PP_LIST_CAT(L) BOOST_PP_LIST_CAT_D(0,L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_CAT_D(D,L) BOOST_PP_LIST_FOLD_LEFT_D(D,BOOST_PP_LIST_CAT_F,BOOST_PP_TUPLE3_ELEM0 L,BOOST_PP_TUPLE3_ELEM1 L)
 #define BOOST_PP_LIST_CAT_F(D,P,H) BOOST_PP_CAT(P,H)
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/enum.hpp b/include/boost/preprocessor/list/enum.hpp
index d0f9a01..92cd860 100644
--- a/include/boost/preprocessor/list/enum.hpp
+++ b/include/boost/preprocessor/list/enum.hpp
@@ -39,10 +39,8 @@
 */
 #define BOOST_PP_LIST_ENUM(L) BOOST_PP_LIST_ENUM_R(0,L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_ENUM_R(R,L) BOOST_PP_FOR##R((L,BOOST_PP_EMPTY),BOOST_PP_LIST_ENUM_C,BOOST_PP_LIST_ENUM_F,BOOST_PP_LIST_ENUM_I)
 #define BOOST_PP_LIST_ENUM_C(R,P) BOOST_PP_TUPLE_ELEM(3,2,BOOST_PP_TUPLE_ELEM(2,0,P))
 #define BOOST_PP_LIST_ENUM_F(R,P) (BOOST_PP_TUPLE_ELEM(3,1,BOOST_PP_TUPLE_ELEM(2,0,P)),BOOST_PP_COMMA)
 #define BOOST_PP_LIST_ENUM_I(R,P) BOOST_PP_TUPLE_ELEM(2,1,P)() BOOST_PP_TUPLE_ELEM(3,0,BOOST_PP_TUPLE_ELEM(2,0,P))
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/filter.hpp b/include/boost/preprocessor/list/filter.hpp
index 8ac8ba4..b9d0525 100644
--- a/include/boost/preprocessor/list/filter.hpp
+++ b/include/boost/preprocessor/list/filter.hpp
@@ -42,7 +42,6 @@ for which <code>F(D,P,X)</code> is true.</p>
 */
 #define BOOST_PP_LIST_FILTER(F,P,L) BOOST_PP_LIST_FILTER_D(0,F,P,L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_FILTER_D(D,F,P,L) BOOST_PP_TUPLE_ELEM(3,2,BOOST_PP_LIST_FOLD_RIGHT_D(D,BOOST_PP_LIST_FILTER_F,L,(F,P,(_,_,0))))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_LIST_FILTER_F(D,H,P) (BOOST_PP_TUPLE_ELEM(3,0,P),BOOST_PP_TUPLE_ELEM(3,1,P),BOOST_PP_IF(BOOST_PP_TUPLE_ELEM(3,0,P)(D,BOOST_PP_TUPLE3_ELEM1 P,H),BOOST_PP_LIST_CONS,BOOST_PP_TUPLE2_ELEM1)(H,BOOST_PP_TUPLE_ELEM(3,2,P)))
@@ -52,4 +51,3 @@ for which <code>F(D,P,X)</code> is true.</p>
 #  define BOOST_PP_LIST_FILTER_F(D,H,P) (BOOST_PP_TUPLE3_ELEM0 P,BOOST_PP_TUPLE3_ELEM1 P,BOOST_PP_IF(BOOST_PP_TUPLE3_ELEM0 P(D,BOOST_PP_TUPLE3_ELEM1 P,H),BOOST_PP_LIST_CONS,BOOST_PP_TUPLE2_ELEM1)(H,BOOST_PP_TUPLE3_ELEM2 P))
 #endif
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/first_n.hpp b/include/boost/preprocessor/list/first_n.hpp
index b70e7e0..7955a9a 100644
--- a/include/boost/preprocessor/list/first_n.hpp
+++ b/include/boost/preprocessor/list/first_n.hpp
@@ -49,7 +49,6 @@
 */
 #define BOOST_PP_LIST_FIRST_N(N,L) BOOST_PP_LIST_FIRST_N_D(0,N,L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_FIRST_N_D(D,N,L) BOOST_PP_LIST_REVERSE_D(D,BOOST_PP_TUPLE_ELEM(3,0,BOOST_PP_WHILE##D(BOOST_PP_LIST_FIRST_N_C,BOOST_PP_LIST_FIRST_N_F,((_,_,0),L,N))))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_LIST_FIRST_N_C(D,X) BOOST_PP_TUPLE_ELEM(3,2,X)
@@ -59,4 +58,3 @@
 #  define BOOST_PP_LIST_FIRST_N_F(D,X) ((BOOST_PP_TUPLE3_ELEM0 BOOST_PP_TUPLE3_ELEM1 X,BOOST_PP_TUPLE3_ELEM0 X,1),BOOST_PP_TUPLE3_ELEM1 BOOST_PP_TUPLE3_ELEM1 X,BOOST_PP_DEC(BOOST_PP_TUPLE3_ELEM2 X))
 #endif
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/fold_left.hpp b/include/boost/preprocessor/list/fold_left.hpp
index de22685..6ef5a79 100644
--- a/include/boost/preprocessor/list/fold_left.hpp
+++ b/include/boost/preprocessor/list/fold_left.hpp
@@ -52,7 +52,6 @@ list <code>L</code> (from the left or the start of the list).</p>
 */
 #define BOOST_PP_LIST_FOLD_LEFT(F,P,L) BOOST_PP_LIST_FOLD_LEFT_D(0,F,P,L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_FOLD_LEFT_D(D,F,P,L) BOOST_PP_TUPLE_ELEM(3,1,BOOST_PP_WHILE##D(BOOST_PP_LIST_FOLD_LEFT_C,BOOST_PP_LIST_FOLD_LEFT_F,(F,P,L)))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_LIST_FOLD_LEFT_C(D,X) BOOST_PP_TUPLE_ELEM(3,2,BOOST_PP_TUPLE_ELEM(3,2,X))
@@ -65,4 +64,3 @@ list <code>L</code> (from the left or the start of the list).</p>
 #  define BOOST_PP_LIST_FOLD_LEFT_F(D,X) (BOOST_PP_TUPLE3_ELEM0 X,BOOST_PP_TUPLE3_ELEM0 X(D,BOOST_PP_TUPLE3_ELEM1 X,BOOST_PP_TUPLE3_ELEM0 BOOST_PP_TUPLE3_ELEM2 X),BOOST_PP_TUPLE3_ELEM1 BOOST_PP_TUPLE3_ELEM2 X)
 #endif
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/fold_left_2nd.hpp b/include/boost/preprocessor/list/fold_left_2nd.hpp
index d7d6f49..92c3022 100644
--- a/include/boost/preprocessor/list/fold_left_2nd.hpp
+++ b/include/boost/preprocessor/list/fold_left_2nd.hpp
@@ -19,7 +19,6 @@
 /** <p>Same as BOOST_PP_FOLD_LEFT(), but is implemented independently.</p> */
 #define BOOST_PP_LIST_FOLD_LEFT_2ND(F,P,L) BOOST_PP_LIST_FOLD_LEFT_2ND_D(0,F,P,L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_FOLD_LEFT_2ND_D(D,F,P,L) BOOST_PP_TUPLE_ELEM(3,1,BOOST_PP_WHILE##D(BOOST_PP_LIST_FOLD_LEFT_2ND_C,BOOST_PP_LIST_FOLD_LEFT_2ND_F,(F,P,L)))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_LIST_FOLD_LEFT_2ND_C(D,X) BOOST_PP_TUPLE_ELEM(3,2,BOOST_PP_TUPLE_ELEM(3,2,X))
@@ -32,4 +31,3 @@
 #  define BOOST_PP_LIST_FOLD_LEFT_2ND_F(D,X) (BOOST_PP_TUPLE3_ELEM0 X,BOOST_PP_TUPLE3_ELEM0 X(D,BOOST_PP_TUPLE3_ELEM1 X,BOOST_PP_TUPLE3_ELEM0 BOOST_PP_TUPLE3_ELEM2 X),BOOST_PP_TUPLE3_ELEM1 BOOST_PP_TUPLE3_ELEM2 X)
 #endif
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/fold_right.hpp b/include/boost/preprocessor/list/fold_right.hpp
index 0c7630e..5363c11 100644
--- a/include/boost/preprocessor/list/fold_right.hpp
+++ b/include/boost/preprocessor/list/fold_right.hpp
@@ -48,7 +48,6 @@ list <code>L</code> (from the right or the end of the list).</p>
 */
 #define BOOST_PP_LIST_FOLD_RIGHT(F,L,P) BOOST_PP_LIST_FOLD_RIGHT_D(0,F,L,P)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_FOLD_RIGHT_D(D,F,L,P) BOOST_PP_TUPLE_ELEM(2,1,BOOST_PP_LIST_FOLD_LEFT_D(D,BOOST_PP_LIST_FOLD_RIGHT_F,(F,P),BOOST_PP_LIST_REVERSE_D(D,L)))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_LIST_FOLD_RIGHT_F(D,P,H) (BOOST_PP_TUPLE_ELEM(2,0,P),BOOST_PP_TUPLE_ELEM(2,0,P)(D,H,BOOST_PP_TUPLE_ELEM(2,1,P)))
@@ -58,4 +57,3 @@ list <code>L</code> (from the right or the end of the list).</p>
 #  define BOOST_PP_LIST_FOLD_RIGHT_F(D,P,H) (BOOST_PP_TUPLE2_ELEM0 P,BOOST_PP_TUPLE2_ELEM0 P(D,H,BOOST_PP_TUPLE2_ELEM1 P))
 #endif
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/fold_right_2nd.hpp b/include/boost/preprocessor/list/fold_right_2nd.hpp
index f7b055f..0ef6da2 100644
--- a/include/boost/preprocessor/list/fold_right_2nd.hpp
+++ b/include/boost/preprocessor/list/fold_right_2nd.hpp
@@ -19,7 +19,6 @@
 /** <p>Same as BOOST_PP_LIST_FOLD_RIGHT(), but is implemented independently.</p> */
 #define BOOST_PP_LIST_FOLD_RIGHT_2ND(F,L,P) BOOST_PP_LIST_FOLD_RIGHT_2ND_D(0,F,L,P)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_FOLD_RIGHT_2ND_D(D,F,L,P) BOOST_PP_TUPLE_ELEM(2,1,BOOST_PP_LIST_FOLD_LEFT_2ND_D(D,BOOST_PP_LIST_FOLD_RIGHT_2ND_F,(F,P),BOOST_PP_LIST_FOLD_LEFT_2ND_D(D,BOOST_PP_LIST_REVERSE_F,(_,_,0),L)))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_LIST_FOLD_RIGHT_2ND_F(D,P,H) (BOOST_PP_TUPLE_ELEM(2,0,P),BOOST_PP_TUPLE_ELEM(2,0,P)(D,H,BOOST_PP_TUPLE_ELEM(2,1,P)))
@@ -29,4 +28,3 @@
 #  define BOOST_PP_LIST_FOLD_RIGHT_2ND_F(D,P,H) (BOOST_PP_TUPLE2_ELEM0 P,BOOST_PP_TUPLE2_ELEM0 P(D,H,BOOST_PP_TUPLE2_ELEM1 P))
 #endif
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/for_each.hpp b/include/boost/preprocessor/list/for_each.hpp
index f8b3fc7..e0b1e9c 100644
--- a/include/boost/preprocessor/list/for_each.hpp
+++ b/include/boost/preprocessor/list/for_each.hpp
@@ -45,10 +45,8 @@ BOOST_PP_LIST_SIZE(L)[.</p>
 */
 #define BOOST_PP_LIST_FOR_EACH(F,P,L) BOOST_PP_LIST_FOR_EACH_R(0,F,P,L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_FOR_EACH_R(R,F,P,L) BOOST_PP_FOR##R((F,P,L),BOOST_PP_LIST_FOR_EACH_C,BOOST_PP_LIST_FOR_EACH_F,BOOST_PP_LIST_FOR_EACH_I)
 #define BOOST_PP_LIST_FOR_EACH_C(R,FPL) BOOST_PP_TUPLE_ELEM(3,2,BOOST_PP_TUPLE_ELEM(3,2,FPL))
 #define BOOST_PP_LIST_FOR_EACH_F(R,FPL) (BOOST_PP_TUPLE_ELEM(3,0,FPL),BOOST_PP_TUPLE_ELEM(3,1,FPL),BOOST_PP_TUPLE_ELEM(3,1,BOOST_PP_TUPLE_ELEM(3,2,FPL)))
 #define BOOST_PP_LIST_FOR_EACH_I(R,FPL) BOOST_PP_TUPLE_ELEM(3,0,FPL)(R,BOOST_PP_TUPLE_ELEM(3,1,FPL),BOOST_PP_TUPLE_ELEM(3,0,BOOST_PP_TUPLE_ELEM(3,2,FPL)))
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/for_each_product.hpp b/include/boost/preprocessor/list/for_each_product.hpp
index c7280c0..386d034 100644
--- a/include/boost/preprocessor/list/for_each_product.hpp
+++ b/include/boost/preprocessor/list/for_each_product.hpp
@@ -43,7 +43,6 @@ explosion.</p>
 */
 #define BOOST_PP_LIST_FOR_EACH_PRODUCT(F,N,T_OF_L) BOOST_PP_LIST_FOR_EACH_PRODUCT_R(0,F,N,T_OF_L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_FOR_EACH_PRODUCT_R(R,F,N,T_OF_L) BOOST_PP_LIST_FOR_EACH_PRODUCT_R2(0,F,BOOST_PP_TUPLE_TO_LIST(N,BOOST_PP_TUPLE_REVERSE(N,T_OF_L)))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406 ||\
   !defined(BOOST_NO_COMPILER_CONFIG) && defined(_MSC_VER)
@@ -96,4 +95,3 @@ explosion.</p>
 #define BOOST_PP_LIST_FOR_EACH_PRODUCT_I15_C(R,P) BOOST_PP_FOR##R(BOOST_PP_LIST_FOR_EACH_PRODUCT_I_H(P),BOOST_PP_LIST_FOR_EACH_PRODUCT_C,BOOST_PP_LIST_FOR_EACH_PRODUCT_F,BOOST_PP_LIST_FOR_EACH_PRODUCT_I16)
 #define BOOST_PP_LIST_FOR_EACH_PRODUCT_I15(R,P) BOOST_PP_LIST_FOR_EACH_PRODUCT_I_C(P,15)(R,P)
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/rest_n.hpp b/include/boost/preprocessor/list/rest_n.hpp
index 6c1eee8..dbaffd6 100644
--- a/include/boost/preprocessor/list/rest_n.hpp
+++ b/include/boost/preprocessor/list/rest_n.hpp
@@ -49,7 +49,6 @@ list <code>L</code>.</p>
 */
 #define BOOST_PP_LIST_REST_N(N,L) BOOST_PP_LIST_REST_N_D(0,N,L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_REST_N_D(D,N,L) BOOST_PP_TUPLE_ELEM(2,0,BOOST_PP_WHILE##D(BOOST_PP_LIST_REST_N_C,BOOST_PP_LIST_REST_N_F,(L,N)))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_LIST_REST_N_C(D,X) BOOST_PP_TUPLE_ELEM(2,1,X)
@@ -59,4 +58,3 @@ list <code>L</code>.</p>
 #  define BOOST_PP_LIST_REST_N_F(D,X) (BOOST_PP_TUPLE3_ELEM1 BOOST_PP_TUPLE2_ELEM0 X,BOOST_PP_DEC(BOOST_PP_TUPLE2_ELEM1 X))
 #endif
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/reverse.hpp b/include/boost/preprocessor/list/reverse.hpp
index 54790a1..9cb752c 100644
--- a/include/boost/preprocessor/list/reverse.hpp
+++ b/include/boost/preprocessor/list/reverse.hpp
@@ -41,8 +41,6 @@
 */
 #define BOOST_PP_LIST_REVERSE(L) BOOST_PP_LIST_REVERSE_D(0,L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_REVERSE_D(D,L) BOOST_PP_LIST_FOLD_LEFT_D(D,BOOST_PP_LIST_REVERSE_F,(_,_,0),L)
 #define BOOST_PP_LIST_REVERSE_F(D,P,H) (H,P,1)
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/size.hpp b/include/boost/preprocessor/list/size.hpp
index 1273499..8c23df7 100644
--- a/include/boost/preprocessor/list/size.hpp
+++ b/include/boost/preprocessor/list/size.hpp
@@ -38,8 +38,6 @@
 */
 #define BOOST_PP_LIST_SIZE(L) BOOST_PP_LIST_SIZE_D(0,L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_SIZE_D(D,L) BOOST_PP_LIST_FOLD_LEFT_D(D,BOOST_PP_LIST_SIZE_F,0,L)
 #define BOOST_PP_LIST_SIZE_F(D,P,H) BOOST_PP_INC(P)
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/to_tuple.hpp b/include/boost/preprocessor/list/to_tuple.hpp
index 297e352..5b2ebb0 100644
--- a/include/boost/preprocessor/list/to_tuple.hpp
+++ b/include/boost/preprocessor/list/to_tuple.hpp
@@ -43,7 +43,5 @@
 */
 #define BOOST_PP_LIST_TO_TUPLE(L) BOOST_PP_LIST_TO_TUPLE_R(0,L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_TO_TUPLE_R(D,L) (BOOST_PP_LIST_ENUM_R(D,L))
 #endif
-#endif
diff --git a/include/boost/preprocessor/list/transform.hpp b/include/boost/preprocessor/list/transform.hpp
index e5a0fc5..74bef5c 100644
--- a/include/boost/preprocessor/list/transform.hpp
+++ b/include/boost/preprocessor/list/transform.hpp
@@ -52,7 +52,6 @@ of the list producing a new list.</p>
 */
 #define BOOST_PP_LIST_TRANSFORM(F,P,L) BOOST_PP_LIST_TRANSFORM_D(0,F,P,L)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_LIST_TRANSFORM_D(D,F,P,L) BOOST_PP_TUPLE_ELEM(3,2,BOOST_PP_LIST_FOLD_RIGHT_D(D,BOOST_PP_LIST_TRANSFORM_F,L,(F,P,(_,_,0))))
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 #  define BOOST_PP_LIST_TRANSFORM_F(D,H,P) (BOOST_PP_TUPLE_ELEM(3,0,P),BOOST_PP_TUPLE_ELEM(3,1,P),(BOOST_PP_TUPLE_ELEM(3,0,P)(D,BOOST_PP_TUPLE_ELEM(3,1,P),H),BOOST_PP_TUPLE_ELEM(3,2,P),1))
@@ -62,4 +61,3 @@ of the list producing a new list.</p>
 #  define BOOST_PP_LIST_TRANSFORM_F(D,H,P) (BOOST_PP_TUPLE3_ELEM0 P,BOOST_PP_TUPLE3_ELEM1 P,(BOOST_PP_TUPLE3_ELEM0 P(D,BOOST_PP_TUPLE3_ELEM1 P,H),BOOST_PP_TUPLE3_ELEM2 P,1))
 #endif
 #endif
-#endif
diff --git a/include/boost/preprocessor/logical/bool.hpp b/include/boost/preprocessor/logical/bool.hpp
index e3ceeeb..ef4a004 100644
--- a/include/boost/preprocessor/logical/bool.hpp
+++ b/include/boost/preprocessor/logical/bool.hpp
@@ -17,7 +17,6 @@
 */
 #define BOOST_PP_BOOL(X) BOOST_PP_BOOL_DELAY(X)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 /* BOOL can be implemented in O(1) tokens using saturated ADD & SUB.
  * Unfortunately, it would result in significantly slower preprocessing.
  */
@@ -151,7 +150,6 @@
 #define BOOST_PP_BOOL126 1
 #define BOOST_PP_BOOL127 1
 #define BOOST_PP_BOOL128 1
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_BOOL().</p> */
 #define BOOST_PREPROCESSOR_BOOL(X) BOOST_PP_BOOL(X)
diff --git a/include/boost/preprocessor/logical/nor.hpp b/include/boost/preprocessor/logical/nor.hpp
index 1fa1fed..172a551 100644
--- a/include/boost/preprocessor/logical/nor.hpp
+++ b/include/boost/preprocessor/logical/nor.hpp
@@ -26,14 +26,12 @@
 */
 #define BOOST_PP_NOR(X,Y) BOOST_PP_NOR_BOOL(BOOST_PP_BOOL(X),BOOST_PP_BOOL(Y))
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_NOR_BOOL(X,Y) BOOST_PP_NOR_BOOL_DELAY(X,Y)
 #define BOOST_PP_NOR_BOOL_DELAY(X,Y) BOOST_PP_NOR_BOOL##X##Y
 #define BOOST_PP_NOR_BOOL00 1
 #define BOOST_PP_NOR_BOOL01 0
 #define BOOST_PP_NOR_BOOL10 0
 #define BOOST_PP_NOR_BOOL11 0
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_NOR().</p> */
 #define BOOST_PREPROCESSOR_NOR(X,Y) BOOST_PP_NOR(X,Y)
diff --git a/include/boost/preprocessor/max.hpp b/include/boost/preprocessor/max.hpp
index 7025dfa..1fc1ab9 100644
--- a/include/boost/preprocessor/max.hpp
+++ b/include/boost/preprocessor/max.hpp
@@ -33,9 +33,7 @@ single token).</p>
 */
 #define BOOST_PP_MAX(X,Y) BOOST_PP_MAX_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_MAX_D(D,X,Y) BOOST_PP_IF(BOOST_PP_LESS_EQUAL_D(D,X,Y),Y,X)
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_MAX().</p> */
 #define BOOST_PREPROCESSOR_MAX(X,Y) BOOST_PP_MAX(X,Y)
diff --git a/include/boost/preprocessor/min.hpp b/include/boost/preprocessor/min.hpp
index 1e86d6a..eb5339f 100644
--- a/include/boost/preprocessor/min.hpp
+++ b/include/boost/preprocessor/min.hpp
@@ -33,9 +33,7 @@ single token).</p>
 */
 #define BOOST_PP_MIN(X,Y) BOOST_PP_MIN_D(0,X,Y)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_MIN_D(D,X,Y) BOOST_PP_IF(BOOST_PP_LESS_EQUAL_D(D,Y,X),Y,X)
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_MIN().</p> */
 #define BOOST_PREPROCESSOR_MIN(X,Y) BOOST_PP_MIN(X,Y)
diff --git a/include/boost/preprocessor/repeat.hpp b/include/boost/preprocessor/repeat.hpp
index e034cc6..7e23544 100644
--- a/include/boost/preprocessor/repeat.hpp
+++ b/include/boost/preprocessor/repeat.hpp
@@ -39,7 +39,6 @@ BOOST_PP_REPEAT_3RD() macros.</p>
 */
 #define BOOST_PP_REPEAT(N,M,P) BOOST_PP_REPEAT_DELAY(N,M,P)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_REPEAT_DELAY(N,M,P) BOOST_PP_REPEAT##N(M,P)
 #define BOOST_PP_REPEAT0(M,P)
 #define BOOST_PP_REPEAT1(M,P) M(0,P)
@@ -170,7 +169,6 @@ BOOST_PP_REPEAT_3RD() macros.</p>
 #define BOOST_PP_REPEAT126(M,P) BOOST_PP_REPEAT125(M,P) M(125,P)
 #define BOOST_PP_REPEAT127(M,P) BOOST_PP_REPEAT126(M,P) M(126,P)
 #define BOOST_PP_REPEAT128(M,P) BOOST_PP_REPEAT127(M,P) M(127,P)
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_REPEAT().</p> */
 #define BOOST_PREPROCESSOR_REPEAT(N,M,P) BOOST_PP_REPEAT(N,M,P)
diff --git a/include/boost/preprocessor/repeat_2nd.hpp b/include/boost/preprocessor/repeat_2nd.hpp
index 130a30c..77658d6 100644
--- a/include/boost/preprocessor/repeat_2nd.hpp
+++ b/include/boost/preprocessor/repeat_2nd.hpp
@@ -22,7 +22,6 @@
 */
 #define BOOST_PP_REPEAT_2ND(N,M,P) BOOST_PP_REPEAT_2ND_DELAY(N,M,P)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_REPEAT_2ND_DELAY(N,M,P) BOOST_PP_REPEAT_2ND##N(M,P)
 #define BOOST_PP_REPEAT_2ND0(M,P)
 #define BOOST_PP_REPEAT_2ND1(M,P) M(0,P)
@@ -153,7 +152,6 @@
 #define BOOST_PP_REPEAT_2ND126(M,P) BOOST_PP_REPEAT_2ND125(M,P) M(125,P)
 #define BOOST_PP_REPEAT_2ND127(M,P) BOOST_PP_REPEAT_2ND126(M,P) M(126,P)
 #define BOOST_PP_REPEAT_2ND128(M,P) BOOST_PP_REPEAT_2ND127(M,P) M(127,P)
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_REPEAT_2ND().</p> */
 #define BOOST_PREPROCESSOR_REPEAT_2ND(N,M,P) BOOST_PP_REPEAT_2ND(N,M,P)
diff --git a/include/boost/preprocessor/repeat_3rd.hpp b/include/boost/preprocessor/repeat_3rd.hpp
index 29e7116..d88175e 100644
--- a/include/boost/preprocessor/repeat_3rd.hpp
+++ b/include/boost/preprocessor/repeat_3rd.hpp
@@ -16,7 +16,6 @@
 /** <p>Same as BOOST_PP_REPEAT(), but implemented independently.</p> */
 #define BOOST_PP_REPEAT_3RD(N,M,P) BOOST_PP_REPEAT_3RD_DELAY(N,M,P)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_REPEAT_3RD_DELAY(N,M,P) BOOST_PP_REPEAT_3RD##N(M,P)
 #define BOOST_PP_REPEAT_3RD0(M,P)
 #define BOOST_PP_REPEAT_3RD1(M,P) M(0,P)
@@ -147,7 +146,6 @@
 #define BOOST_PP_REPEAT_3RD126(M,P) BOOST_PP_REPEAT_3RD125(M,P) M(125,P)
 #define BOOST_PP_REPEAT_3RD127(M,P) BOOST_PP_REPEAT_3RD126(M,P) M(126,P)
 #define BOOST_PP_REPEAT_3RD128(M,P) BOOST_PP_REPEAT_3RD127(M,P) M(127,P)
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_REPEAT_3RD().</p> */
 #define BOOST_PREPROCESSOR_REPEAT_3RD(N,M,P) BOOST_PP_REPEAT_3RD(N,M,P)
diff --git a/include/boost/preprocessor/stringize.hpp b/include/boost/preprocessor/stringize.hpp
index 5aca8c3..dfaaf68 100644
--- a/include/boost/preprocessor/stringize.hpp
+++ b/include/boost/preprocessor/stringize.hpp
@@ -27,10 +27,8 @@
 */
 #define BOOST_PP_STRINGIZE(X) BOOST_PP_STRINGIZE_DELAY(X)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_STRINGIZE_DELAY(X) BOOST_PP_DO_STRINGIZE(X)
 #define BOOST_PP_DO_STRINGIZE(X) #X
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_STRINGIZE().</p> */
 #define BOOST_PREPROCESSOR_STRINGIZE(E) BOOST_PP_STRINGIZE(E)
diff --git a/include/boost/preprocessor/tuple/eat.hpp b/include/boost/preprocessor/tuple/eat.hpp
index f5cbb7c..3a65bda 100644
--- a/include/boost/preprocessor/tuple/eat.hpp
+++ b/include/boost/preprocessor/tuple/eat.hpp
@@ -28,7 +28,6 @@ BOOST_PP_EMPTY().</p>
 */
 #define BOOST_PP_TUPLE_EAT(N) BOOST_PP_TUPLE_EAT_DELAY(N)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_TUPLE_EAT_DELAY(N) BOOST_PP_TUPLE##N##_EAT
 #define BOOST_PP_TUPLE0_EAT()
 #define BOOST_PP_TUPLE1_EAT(A)
@@ -48,4 +47,3 @@ BOOST_PP_EMPTY().</p>
 #define BOOST_PP_TUPLE15_EAT(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O)
 #define BOOST_PP_TUPLE16_EAT(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P)
 #endif
-#endif
diff --git a/include/boost/preprocessor/tuple/elem.hpp b/include/boost/preprocessor/tuple/elem.hpp
index 8e25e53..d55d131 100644
--- a/include/boost/preprocessor/tuple/elem.hpp
+++ b/include/boost/preprocessor/tuple/elem.hpp
@@ -40,7 +40,6 @@
 */
 #define BOOST_PP_TUPLE_ELEM(N,I,T) BOOST_PP_TUPLE_ELEM_DELAY(N,I,T)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 /* This is a workaround for a CodeWarrior PP bug. Strictly speaking
  * this workaround invokes undefined behavior, but it works as desired.
@@ -210,7 +209,6 @@
 #define BOOST_PP_TUPLE16_ELEM13(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P) N
 #define BOOST_PP_TUPLE16_ELEM14(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P) O
 #define BOOST_PP_TUPLE16_ELEM15(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P) P
-#endif
 
 /** <p>Obsolete. Use BOOST_PP_TUPLE_ELEM().</p> */
 #define BOOST_PREPROCESSOR_TUPLE_ELEM(N,I,T) BOOST_PP_TUPLE_ELEM(N,I,T)
diff --git a/include/boost/preprocessor/tuple/reverse.hpp b/include/boost/preprocessor/tuple/reverse.hpp
index b2e14f6..358a49c 100644
--- a/include/boost/preprocessor/tuple/reverse.hpp
+++ b/include/boost/preprocessor/tuple/reverse.hpp
@@ -25,7 +25,6 @@
 */
 #define BOOST_PP_TUPLE_REVERSE(N,T) BOOST_PP_TUPLE_REVERSE_DELAY(N,T)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 /* This is a workaround for a CodeWarrior PP bug. Strictly speaking
  * this workaround invokes undefined behavior, but it works as desired.
@@ -52,4 +51,3 @@
 #define BOOST_PP_TUPLE15_REVERSE(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O) (O,N,M,L,K,J,I,H,G,F,E,D,C,B,A)
 #define BOOST_PP_TUPLE16_REVERSE(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P) (P,O,N,M,L,K,J,I,H,G,F,E,D,C,B,A)
 #endif
-#endif
diff --git a/include/boost/preprocessor/tuple/to_list.hpp b/include/boost/preprocessor/tuple/to_list.hpp
index 14f9edf..458d41b 100644
--- a/include/boost/preprocessor/tuple/to_list.hpp
+++ b/include/boost/preprocessor/tuple/to_list.hpp
@@ -39,7 +39,6 @@
 */
 #define BOOST_PP_TUPLE_TO_LIST(N,T) BOOST_PP_TUPLE_TO_LIST_DELAY(N,T)
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #if !defined(BOOST_NO_COMPILER_CONFIG) && defined(__MWERKS__) && __MWERKS__ <= 0x2406
 /* This is a workaround for a CodeWarrior PP bug. Strictly speaking
  * this workaround invokes undefined behavior, but it works as desired.
@@ -66,4 +65,3 @@
 #define BOOST_PP_TUPLE15_TO_LIST(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O) (A,(B,(C,(D,(E,(F,(G,(H,(I,(J,(K,(L,(M,(N,(O,(_,_,0),1),1),1),1),1),1),1),1),1),1),1),1),1),1),1)
 #define BOOST_PP_TUPLE16_TO_LIST(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P) (A,(B,(C,(D,(E,(F,(G,(H,(I,(J,(K,(L,(M,(N,(O,(P,(_,_,0),1),1),1),1),1),1),1),1),1),1),1),1),1),1),1),1)
 #endif
-#endif
diff --git a/include/boost/preprocessor/while.hpp b/include/boost/preprocessor/while.hpp
index 8fa8a9f..76aad85 100644
--- a/include/boost/preprocessor/while.hpp
+++ b/include/boost/preprocessor/while.hpp
@@ -61,7 +61,6 @@
 */
 #define BOOST_PP_WHILE(C,F,X) BOOST_PP_WHILE_C(C(1,X),0,X)(C,F,F(1,X))
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 #define BOOST_PP_WHILE_C(C,D,X) BOOST_PP_IF(C,BOOST_PP_WHILE##D,X BOOST_PP_TUPLE3_EAT)
 #define BOOST_PP_WHILE0(C,F,X) BOOST_PP_WHILE_C(C(2,X),1,X)(C,F,F(2,X))
 #define BOOST_PP_WHILE1(C,F,X) BOOST_PP_WHILE_C(C(3,X),2,X)(C,F,F(3,X))
@@ -324,4 +323,3 @@
 #define BOOST_PP_WHILE258(C,F,X) RECURSION DEPTH EXCEEDED!
 #define BOOST_PP_WHILE259(C,F,X) RECURSION DEPTH EXCEEDED!
 #endif
-#endif