diff --git a/example/BitMachine/BitMachine.cpp b/example/BitMachine/BitMachine.cpp
index 7eb970a..a51d28d 100644
--- a/example/BitMachine/BitMachine.cpp
+++ b/example/BitMachine/BitMachine.cpp
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// (c) Copyright Andreas Huber Doenni 2002-2005
+// (c) Copyright Andreas Huber Doenni 2002-2006
 // Distributed under the Boost Software License, Version 1.0. (See accompany-
 // ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //////////////////////////////////////////////////////////////////////////////
@@ -7,7 +7,7 @@
 
 
 //////////////////////////////////////////////////////////////////////////////
-#define NO_OF_BITS 5
+#define NO_OF_BITS 3
 //////////////////////////////////////////////////////////////////////////////
 // This program demonstrates the fact that measures must be taken to hide some
 // of the complexity (e.g. in separate .cpp file) of a Boost.Statechart state
@@ -119,12 +119,12 @@ template< class StateNo >
 struct BitState : sc::simple_state< BitState< StateNo >, BitMachine >,
   UniqueObject< BitState< StateNo > >, IDisplay
 {
-  void * operator new( size_t size )
+  void * operator new( std::size_t size )
   {
     return UniqueObject< BitState< StateNo > >::operator new( size );
   }
 
-  void operator delete( void * p, size_t size )
+  void operator delete( void * p, std::size_t size )
   {
     UniqueObject< BitState< StateNo > >::operator delete( p, size );
   }
diff --git a/example/BitMachine/UniqueObject.hpp b/example/BitMachine/UniqueObject.hpp
index c9d5f9e..31b8bd1 100644
--- a/example/BitMachine/UniqueObject.hpp
+++ b/example/BitMachine/UniqueObject.hpp
@@ -1,7 +1,7 @@
 #ifndef BOOST_STATECHART_EXAMPLE_UNIQUE_OBJECT_HPP_INCLUDED
 #define BOOST_STATECHART_EXAMPLE_UNIQUE_OBJECT_HPP_INCLUDED
 //////////////////////////////////////////////////////////////////////////////
-// (c) Copyright Andreas Huber Doenni 2002-2005
+// (c) Copyright Andreas Huber Doenni 2002-2006
 // Distributed under the Boost Software License, Version 1.0. (See accompany-
 // ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //////////////////////////////////////////////////////////////////////////////
@@ -20,12 +20,12 @@ class UniqueObject
 {
   public:
     //////////////////////////////////////////////////////////////////////////
-    void * operator new( size_t size )
+    void * operator new( std::size_t size )
     {
       return UniqueObjectAllocator< Derived >::allocate( size );
     }
 
-    void operator delete( void * p, size_t size )
+    void operator delete( void * p, std::size_t size )
     {
       UniqueObjectAllocator< Derived >::deallocate( p, size );
     }
diff --git a/example/BitMachine/UniqueObjectAllocator.hpp b/example/BitMachine/UniqueObjectAllocator.hpp
index 571e3c6..60c1b98 100644
--- a/example/BitMachine/UniqueObjectAllocator.hpp
+++ b/example/BitMachine/UniqueObjectAllocator.hpp
@@ -1,7 +1,7 @@
 #ifndef BOOST_STATECHART_EXAMPLE_UNIQUE_OBJECT_ALLOCATOR_HPP_INCLUDED
 #define BOOST_STATECHART_EXAMPLE_UNIQUE_OBJECT_ALLOCATOR_HPP_INCLUDED
 //////////////////////////////////////////////////////////////////////////////
-// (c) Copyright Andreas Huber Doenni 2002-2005
+// (c) Copyright Andreas Huber Doenni 2002-2006
 // Distributed under the Boost Software License, Version 1.0. (See accompany-
 // ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //////////////////////////////////////////////////////////////////////////////
@@ -37,7 +37,7 @@ class UniqueObjectAllocator
 {
   public:
     //////////////////////////////////////////////////////////////////////////
-    static void * allocate( size_t size )
+    static void * allocate( std::size_t size )
     {
       boost::statechart::detail::avoid_unused_warning( size );
       BOOST_ASSERT( !constructed_ && ( size == sizeof( T ) ) );
@@ -45,7 +45,7 @@ class UniqueObjectAllocator
       return &storage_.data_[ 0 ];
     }
 
-    static void deallocate( void * p, size_t size )
+    static void deallocate( void * p, std::size_t size )
     {
       boost::statechart::detail::avoid_unused_warning( p );
       boost::statechart::detail::avoid_unused_warning( size );