diff --git a/src/libraries/turtle/args.hpp b/src/libraries/turtle/args.hpp
index e5e9069..b05594a 100644
--- a/src/libraries/turtle/args.hpp
+++ b/src/libraries/turtle/args.hpp
@@ -59,7 +59,7 @@ namespace detail
         BOOST_PP_ARRAY_ELEM(2, d) )
 
 #define MOCK_ARGS(n, S, tpn) \
-    BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_ARG_PROXY, (3, (n, S, tpn)))
+    BOOST_PP_REPEAT(n, MOCK_ARG_PROXY, (3, (n, S, tpn)))
 
 #define MOCK_DECL(M, n, S, c, tpn) \
     tpn boost::function_types::result_type< S >::type M( \
diff --git a/src/libraries/turtle/expectation.hpp b/src/libraries/turtle/expectation.hpp
index 1aca145..927cbfb 100644
--- a/src/libraries/turtle/expectation.hpp
+++ b/src/libraries/turtle/expectation.hpp
@@ -186,32 +186,32 @@ namespace detail
         , public action< BOOST_DEDUCED_TYPENAME \
             boost::function_types::result_type< Signature >::type, Signature > \
     { \
-        BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_TYPEDEF, BOOST_PP_EMPTY) \
+        BOOST_PP_REPEAT(n, MOCK_EXPECTATION_TYPEDEF, BOOST_PP_EMPTY) \
     public: \
         expectation() \
-            : BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_CONSTRUCTOR, BOOST_PP_EMPTY) \
+            : BOOST_PP_REPEAT(n, MOCK_EXPECTATION_CONSTRUCTOR, BOOST_PP_EMPTY) \
         {} \
         template< BOOST_PP_ENUM_PARAMS(n, typename Constraint) > \
         expectation& with( BOOST_PP_ENUM_BINARY_PARAMS(n, Constraint, c) ) \
         { \
-            BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_WITH, BOOST_PP_EMPTY) \
+            BOOST_PP_REPEAT(n, MOCK_EXPECTATION_WITH, BOOST_PP_EMPTY) \
             return *this; \
         } \
-        bool is_valid( BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_ARGS, BOOST_PP_EMPTY) ) const \
+        bool is_valid( BOOST_PP_REPEAT(n, MOCK_EXPECTATION_ARGS, BOOST_PP_EMPTY) ) const \
         { \
             return ! i_->exhausted() \
-                BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_IS_VALID, BOOST_PP_EMPTY); \
+                BOOST_PP_REPEAT(n, MOCK_EXPECTATION_IS_VALID, BOOST_PP_EMPTY); \
         } \
         MOCK_EXPECTATION_METHODS \
         friend std::ostream& operator<<( std::ostream& s, const expectation& m ) \
         { \
             return s << (m.i_->exhausted() ? 'v' : '.') << ' ' << *m.i_ << ".with( " \
                 << \
-                BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_SERIALIZE, BOOST_PP_EMPTY) \
+                BOOST_PP_REPEAT(n, MOCK_EXPECTATION_SERIALIZE, BOOST_PP_EMPTY) \
                 << " )"; \
         } \
     private: \
-        BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_MEMBER, BOOST_PP_EMPTY) \
+        BOOST_PP_REPEAT(n, MOCK_EXPECTATION_MEMBER, BOOST_PP_EMPTY) \
     };
     BOOST_PP_REPEAT_FROM_TO(1, MOCK_NUM_ARGS, MOCK_EXPECTATION, BOOST_PP_EMPTY)
 
diff --git a/src/libraries/turtle/function.hpp b/src/libraries/turtle/function.hpp
index 267b53a..f8462ad 100644
--- a/src/libraries/turtle/function.hpp
+++ b/src/libraries/turtle/function.hpp
@@ -209,7 +209,7 @@ namespace mock
 #define MOCK_EXPECTATION_CALL_CONTEXT(n) \
     boost::unit_test::lazy_ostream::instance() \
         << lazy_context( this ) \
-        << "(" BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_FORMAT, BOOST_PP_DEC(n)) << ")" \
+        << "(" BOOST_PP_REPEAT(n, MOCK_EXPECTATION_FORMAT, BOOST_PP_DEC(n)) << ")" \
         << lazy_expectations( this )
 #define MOCK_EXPECTATION_INVOKE(z, n, A) \
     { \
@@ -238,7 +238,7 @@ namespace mock
     MOCK_DECL(operator(), n, Signature, const, BOOST_DEDUCED_TYPENAME) \
     MOCK_EXPECTATION_INVOKE(z, n, P)
 
-            BOOST_PP_REPEAT_FROM_TO(0, MOCK_NUM_ARGS, MOCK_EXPECTATION_OPERATOR, ErrorPolicy::abort())
+            BOOST_PP_REPEAT(MOCK_NUM_ARGS, MOCK_EXPECTATION_OPERATOR, ErrorPolicy::abort())
 
             void test() const
             MOCK_EXPECTATION_INVOKE(, 0,)
diff --git a/src/libraries/turtle/mock.hpp b/src/libraries/turtle/mock.hpp
index f62b7ac..6db9171 100644
--- a/src/libraries/turtle/mock.hpp
+++ b/src/libraries/turtle/mock.hpp
@@ -14,7 +14,7 @@
 #include "function.hpp"
 #include "type_name.hpp"
 #include "args.hpp"
-#include <boost/preprocessor/repetition/repeat_from_to.hpp>
+#include <boost/preprocessor/repetition/repeat.hpp>
 #include <boost/preprocessor/stringize.hpp>
 #include <boost/function_types/parameter_types.hpp>
 #include <boost/function_types/function_type.hpp>
@@ -164,7 +164,7 @@ namespace detail
     { \
         return e( BOOST_PP_ENUM_PARAMS(n, p) ); \
     }
-    BOOST_PP_REPEAT_FROM_TO(0, MOCK_NUM_ARGS, MOCK_CALL, BOOST_PP_EMPTY)
+    BOOST_PP_REPEAT(MOCK_NUM_ARGS, MOCK_CALL, BOOST_PP_EMPTY)
 #undef MOCK_CALL
 }
 }
@@ -256,7 +256,7 @@ namespace detail
     >::type \
         call( E BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM(n, MOCK_CALL_INVALID_TYPE, BOOST_PP_EMPTY) ) \
     {}
-    BOOST_PP_REPEAT_FROM_TO(0, MOCK_NUM_ARGS, MOCK_CALL, BOOST_PP_EMPTY)
+    BOOST_PP_REPEAT(MOCK_NUM_ARGS, MOCK_CALL, BOOST_PP_EMPTY)
 #undef MOCK_CALL
 #undef MOCK_CALL_INVALID_TYPE
 }
@@ -272,7 +272,7 @@ namespace detail
         BOOST_PP_ARRAY_ELEM(4, d))
 
 #define MOCK_METHOD_STUB_ALT(M, S, t, c, tpn) \
-    BOOST_PP_REPEAT_FROM_TO(0, MOCK_NUM_ARGS, MOCK_METHOD_STUB_PROXY, (5,(M, S, t, c, tpn)))
+    BOOST_PP_REPEAT(MOCK_NUM_ARGS, MOCK_METHOD_STUB_PROXY, (5,(M, S, t, c, tpn)))
 
 #define MOCK_METHOD_EXT_ALT(M, S, t) \
     MOCK_METHOD_STUB_ALT(M, S, t,,) \