diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d479db262..0a63081b8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,12 @@
+2013-12-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler.h (fhandler_dev_clipboard): Add private member
+	cygnativeformat.  Declare private method set_clipboard.
+	* fhandler_clipboard.cc (cygnativeformat): Convert static variable to
+	fhandler_dev_clipboard member.
+	(fhandler_dev_clipboard::set_clipboard): Convert from static function
+	to fhandler_dev_clipboard method.
+
 2013-12-09  Christopher Faylor  <me.cygwin2013@cgf.cx>
 
 	* globals.cc (hntdll): Define/declare.
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index d63e7448f..705363bcf 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -1688,9 +1688,12 @@ class fhandler_dev_random: public fhandler_base
 
 class fhandler_dev_clipboard: public fhandler_base
 {
+  UINT cygnativeformat;
   off_t pos;
   void *membuffer;
   size_t msize;
+  int set_clipboard (const void *buf, size_t len);
+
  public:
   fhandler_dev_clipboard ();
   int is_windows () { return 1; }
diff --git a/winsup/cygwin/fhandler_clipboard.cc b/winsup/cygwin/fhandler_clipboard.cc
index fd39f570e..92f833c3d 100644
--- a/winsup/cygwin/fhandler_clipboard.cc
+++ b/winsup/cygwin/fhandler_clipboard.cc
@@ -28,8 +28,6 @@ details. */
  */
 
 static const WCHAR *CYGWIN_NATIVE = L"CYGWIN_NATIVE_CLIPBOARD";
-/* this is MT safe because windows format id's are atomic */
-static UINT cygnativeformat;
 
 typedef struct
 {
@@ -61,8 +59,8 @@ fhandler_dev_clipboard::dup (fhandler_base * child, int flags)
   return fhandler_base::dup (child, flags);
 }
 
-static int
-set_clipboard (const void *buf, size_t len)
+int
+fhandler_dev_clipboard::set_clipboard (const void *buf, size_t len)
 {
   HGLOBAL hmem;
   /* Native CYGWIN format */