diff --git a/rtgui/include/rtgui/widgets/textbox.h b/rtgui/include/rtgui/widgets/textbox.h
index e78a88032..5ee22ca4d 100644
--- a/rtgui/include/rtgui/widgets/textbox.h
+++ b/rtgui/include/rtgui/widgets/textbox.h
@@ -15,7 +15,6 @@
 #define __RTGUI_TEXTBOX_H__
 
 #include <rtgui/rtgui.h>
-#include <rtgui/caret.h>
 #include <rtgui/widgets/widget.h>
 
 /** Gets the type of a textbox */
diff --git a/rtgui/widgets/textbox.c b/rtgui/widgets/textbox.c
index 63b4483a1..0bc25acac 100644
--- a/rtgui/widgets/textbox.c
+++ b/rtgui/widgets/textbox.c
@@ -12,8 +12,9 @@
  * 2009-10-16     Bernard      first version
  */
 #include <rtgui/dc.h>
-#include <rtgui/widgets/textbox.h>
 #include <rtgui/rtgui_theme.h>
+#include <rtgui/rtgui_system.h>
+#include <rtgui/widgets/textbox.h>
 
 #ifndef _WIN32
 #include <ctype.h>
@@ -26,7 +27,7 @@ static void rtgui_textbox_onkey(struct rtgui_textbox* box, struct rtgui_event_kb
 static rt_bool_t rtgui_textbox_onfocus(struct rtgui_widget* widget, struct rtgui_event* event);
 static rt_bool_t rtgui_textbox_onunfocus(struct rtgui_widget* widget, struct rtgui_event* event);
 
-static void _rtgui_textbox_caret_timeout(void *parameter)
+static void _rtgui_textbox_caret_timeout(struct rtgui_timer* timer, void* parameter)
 {
 	rtgui_textbox_t* box;