diff --git a/app/tools/Makefile.am b/app/tools/Makefile.am
index 8bead60c81..b35855d617 100644
--- a/app/tools/Makefile.am
+++ b/app/tools/Makefile.am
@@ -168,8 +168,6 @@ libapptools_a_sources = \
 	gimpsourcetool.h		\
 	gimptextoptions.c		\
 	gimptextoptions.h		\
-	gimptextproxy.c			\
-	gimptextproxy.h			\
 	gimptexttool.c			\
 	gimptexttool.h			\
 	gimpthresholdtool.c		\
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index 60f28d1ca7..7f14f3db46 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -51,6 +51,7 @@
 #include "widgets/gimphelp-ids.h"
 #include "widgets/gimpmenufactory.h"
 #include "widgets/gimptexteditor.h"
+#include "widgets/gimptextproxy.h"
 #include "widgets/gimpuimanager.h"
 #include "widgets/gimpviewabledialog.h"
 
@@ -61,7 +62,6 @@
 #include "gimprectangletool.h"
 #include "gimprectangleoptions.h"
 #include "gimptextoptions.h"
-#include "gimptextproxy.h"
 #include "gimptexttool.h"
 #include "gimptoolcontrol.h"
 
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index bb072067bf..2261640e2f 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -277,6 +277,8 @@ libappwidgets_a_sources = \
 	gimptemplateview.h		\
 	gimptexteditor.c		\
 	gimptexteditor.h		\
+	gimptextproxy.c			\
+	gimptextproxy.h			\
 	gimpthumbbox.c			\
 	gimpthumbbox.h			\
 	gimptoggleaction.c		\
diff --git a/app/tools/gimptextproxy.c b/app/widgets/gimptextproxy.c
similarity index 100%
rename from app/tools/gimptextproxy.c
rename to app/widgets/gimptextproxy.c
diff --git a/app/tools/gimptextproxy.h b/app/widgets/gimptextproxy.h
similarity index 95%
rename from app/tools/gimptextproxy.h
rename to app/widgets/gimptextproxy.h
index 7a2058a69f..fa2c03d787 100644
--- a/app/tools/gimptextproxy.h
+++ b/app/widgets/gimptextproxy.h
@@ -1,6 +1,9 @@
 /* GIMP - The GNU Image Manipulation Program
  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
  *
+ * GimpTextProxy
+ * Copyright (C) 2009  Michael Natterer <mitch@gimp.org>
+ *
  * 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 3 of the License, or