diff --git a/reactos/lib/user32/Makefile b/reactos/lib/user32/Makefile
index 9260a287ee1..c6c0172c997 100644
--- a/reactos/lib/user32/Makefile
+++ b/reactos/lib/user32/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.19 2003/07/19 01:35:27 royce Exp $
+# $Id: Makefile,v 1.20 2003/07/20 00:06:27 ekohl Exp $
 
 PATH_TO_TOP = ../..
 
@@ -46,6 +46,7 @@ MISC_OBJECTS = \
 	misc/timer.o
 
 WINDOWS_OBJECTS = \
+	windows/caret.o \
 	windows/class.o \
 	windows/message.o \
 	windows/window.o \
diff --git a/reactos/lib/user32/windows/caret.c b/reactos/lib/user32/windows/caret.c
new file mode 100644
index 00000000000..8d7646b2266
--- /dev/null
+++ b/reactos/lib/user32/windows/caret.c
@@ -0,0 +1,128 @@
+/*
+ *  ReactOS kernel
+ *  Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: caret.c,v 1.1 2003/07/20 00:06:16 ekohl Exp $
+ *
+ * PROJECT:         ReactOS user32.dll
+ * FILE:            lib/user32/windows/caret.c
+ * PURPOSE:         Caret
+ * PROGRAMMER:      Casper S. Hornstrup (chorns@users.sourceforge.net)
+ * UPDATE HISTORY:
+ *      09-05-2001  CSH  Created
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <windows.h>
+#include <user32.h>
+#include <debug.h>
+
+/* FUNCTIONS *****************************************************************/
+
+/*
+ * @unimplemented
+ */
+WINBOOL STDCALL
+CreateCaret(HWND hWnd,
+	    HBITMAP hBitmap,
+	    int nWidth,
+	    int nHeight)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+WINBOOL STDCALL
+DestroyCaret(VOID)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+UINT STDCALL
+GetCaretBlinkTime(VOID)
+{
+  UNIMPLEMENTED;
+  return 0;
+}
+
+
+/*
+ * @unimplemented
+ */
+WINBOOL STDCALL
+GetCaretPos(LPPOINT lpPoint)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+WINBOOL STDCALL
+HideCaret(HWND hWnd)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+WINBOOL STDCALL
+SetCaretBlinkTime(UINT uMSeconds)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+WINBOOL STDCALL
+SetCaretPos(int X,
+	    int Y)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+
+/*
+ * @unimplemented
+ */
+WINBOOL STDCALL
+ShowCaret(HWND hWnd)
+{
+  UNIMPLEMENTED;
+  return FALSE;
+}
+
+/* EOF */
diff --git a/reactos/lib/user32/windows/cursor.c b/reactos/lib/user32/windows/cursor.c
index 0fe4dd65f96..bbdfb5f9c68 100644
--- a/reactos/lib/user32/windows/cursor.c
+++ b/reactos/lib/user32/windows/cursor.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cursor.c,v 1.6 2003/07/10 21:04:31 chorns Exp $
+/* $Id: cursor.c,v 1.7 2003/07/20 00:06:16 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/cursor.c
@@ -34,19 +34,6 @@
 
 /* FUNCTIONS *****************************************************************/
 
-/*
- * @unimplemented
- */
-WINBOOL STDCALL
-CreateCaret(HWND hWnd,
-	    HBITMAP hBitmap,
-	    int nWidth,
-	    int nHeight)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 
 /*
  * @unimplemented
@@ -66,17 +53,6 @@ CreateCursor(HINSTANCE hInst,
 }
 
 
-/*
- * @unimplemented
- */
-WINBOOL STDCALL
-DestroyCaret(VOID)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-
 /*
  * @unimplemented
  */
@@ -88,28 +64,6 @@ DestroyCursor(HCURSOR hCursor)
 }
 
 
-/*
- * @unimplemented
- */
-UINT STDCALL
-GetCaretBlinkTime(VOID)
-{
-  UNIMPLEMENTED;
-  return 0;
-}
-
-
-/*
- * @unimplemented
- */
-WINBOOL STDCALL
-GetCaretPos(LPPOINT lpPoint)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-
 /*
  * @unimplemented
  */
@@ -154,17 +108,6 @@ GetCursorPos(LPPOINT lpPoint)
 }
 
 
-/*
- * @unimplemented
- */
-WINBOOL STDCALL
-HideCaret(HWND hWnd)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-
 /*
  * @implemented
  */
@@ -216,29 +159,6 @@ LoadCursorW(HINSTANCE hInstance,
 }
 
 
-/*
- * @unimplemented
- */
-WINBOOL STDCALL
-SetCaretBlinkTime(UINT uMSeconds)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-
-/*
- * @unimplemented
- */
-WINBOOL STDCALL
-SetCaretPos(int X,
-	    int Y)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-
 /*
  * @unimplemented
  */
@@ -274,17 +194,6 @@ SetSystemCursor(HCURSOR hcur,
 }
 
 
-/*
- * @unimplemented
- */
-WINBOOL STDCALL
-ShowCaret(HWND hWnd)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-
 /*
  * @unimplemented
  */