diff --git a/demo/regress/regress.h b/demo/regress/regress.h
index aaefe559..145aa9c4 100644
--- a/demo/regress/regress.h
+++ b/demo/regress/regress.h
@@ -115,8 +115,8 @@ private:
    int* blocks, *count;
    jm_debug_alloc* guard;
 public:
-   typedef size_t    size_type;
-   typedef ptrdiff_t difference_type;
+   typedef std::size_t    size_type;
+   typedef std::ptrdiff_t difference_type;
    typedef char*        pointer;
    typedef const char*  const_pointer;
    typedef char&        reference;
@@ -182,7 +182,7 @@ public:
 // class debug_iterator
 //
 template <class T>
-struct debug_iterator : public BOOST_RE_RA_ITERATOR(T, ptrdiff_t)
+struct debug_iterator : public BOOST_RE_RA_ITERATOR(T, std::ptrdiff_t)
 {
    typedef std::ptrdiff_t                    difference_type;
    typedef char_t                            value_type;
@@ -190,7 +190,7 @@ struct debug_iterator : public BOOST_RE_RA_ITERATOR(T, ptrdiff_t)
    typedef char_t&                           reference;
    typedef std::random_access_iterator_tag   iterator_category;
    typedef debug_iterator                    self;
-   typedef size_t                            size_type;
+   typedef std::size_t                       size_type;
 
   T cur;
   T first;
diff --git a/include/boost/regex.hpp b/include/boost/regex.hpp
index e2ffc3e3..c4152a28 100644
--- a/include/boost/regex.hpp
+++ b/include/boost/regex.hpp
@@ -741,7 +741,7 @@ struct sub_match
       }
       return result;
    }
-   #ifndef BOOST_OLD_REGEX_H
+   #ifdef BOOST_OLD_REGEX_H
    //
    // the following are deprecated, do not use!!
    //
@@ -774,7 +774,7 @@ struct sub_match
    }
 };
 
-#ifndef BOOST_OLD_REGEX_H
+#ifdef BOOST_OLD_REGEX_H
 namespace re_detail{
 template <class iterator, class charT>
 int do_toi(iterator i, iterator j, char c, int radix)