diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp
index 233fdb9f..198a7334 100644
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -70,6 +70,11 @@
 #  define BOOST_NO_SWPRINTF
 #endif
 
+#if defined(UNDER_CE)
+// Windows CE does not have a conforming signature for swprintf
+#  define BOOST_NO_SWPRINTF
+#endif
+
 #if _MSC_VER <= 1400  // 1400 == VC++ 8.0
 #  define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 #endif
@@ -82,9 +87,10 @@
 #  define BOOST_NO_INTRINSIC_WCHAR_T
 #endif
 
-#ifdef _WIN32_WCE
+#if defined(_WIN32_WCE) || defined(UNDER_CE)
 #  define BOOST_NO_THREADEX
 #  define BOOST_NO_GETSYSTEMTIMEASFILETIME
+#  define BOOST_NO_SWPRINTF
 #endif
 
 //   
diff --git a/include/boost/limits.hpp b/include/boost/limits.hpp
index 370c0f21..6d01daa3 100644
--- a/include/boost/limits.hpp
+++ b/include/boost/limits.hpp
@@ -30,6 +30,8 @@
 #  define BOOST_ULLT  ::boost::ulong_long_type
 #endif
 
+#include <climits>  // for CHAR_BIT
+
 namespace std
 {
   template<>