diff --git a/src/commands/cmd_remove_layer.cpp b/src/commands/cmd_remove_layer.cpp
index 8da199f8c..4cee1e5a6 100644
--- a/src/commands/cmd_remove_layer.cpp
+++ b/src/commands/cmd_remove_layer.cpp
@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 #include "app.h"
 #include "commands/command.h"
diff --git a/src/commands/fx/cmd_convolution_matrix.cpp b/src/commands/fx/cmd_convolution_matrix.cpp
index b0917ace6..2b0240aad 100644
--- a/src/commands/fx/cmd_convolution_matrix.cpp
+++ b/src/commands/fx/cmd_convolution_matrix.cpp
@@ -29,7 +29,7 @@
 #include "gui/jlistbox.h"
 #include "gui/jslider.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"
 
 #include "app/color.h"
diff --git a/src/commands/fx/cmd_despeckle.cpp b/src/commands/fx/cmd_despeckle.cpp
index 859e99af3..3f8efbcf6 100644
--- a/src/commands/fx/cmd_despeckle.cpp
+++ b/src/commands/fx/cmd_despeckle.cpp
@@ -25,7 +25,7 @@
 #include "gui/button.h"
 #include "gui/jentry.h"
 #include "gui/jhook.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"
 
 #include "commands/command.h"
diff --git a/src/commands/fx/cmd_invert_color.cpp b/src/commands/fx/cmd_invert_color.cpp
index 64ed76ff9..3ad56058f 100644
--- a/src/commands/fx/cmd_invert_color.cpp
+++ b/src/commands/fx/cmd_invert_color.cpp
@@ -24,7 +24,7 @@
 #include "gui/jhook.h"
 #include "gui/label.h"
 #include "gui/jslider.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"
 
 #include "app/color.h"
diff --git a/src/dialogs/maskcol.cpp b/src/dialogs/maskcol.cpp
index 44e84d9c4..cda2317ee 100644
--- a/src/dialogs/maskcol.cpp
+++ b/src/dialogs/maskcol.cpp
@@ -24,7 +24,7 @@
 #include "gui/jhook.h"
 #include "gui/label.h"
 #include "gui/jslider.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"
 
 #include "app.h"
diff --git a/src/effect/effect.cpp b/src/effect/effect.cpp
index cedfa80a0..411bc96ac 100644
--- a/src/effect/effect.cpp
+++ b/src/effect/effect.cpp
@@ -25,7 +25,7 @@
 #include "gui/jrect.h"
 #include "gui/jregion.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 #include "console.h"
 #include "core/cfg.h"
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index c8585fb28..57fe5c97c 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -42,8 +42,8 @@ add_library(gui-lib
   jthread.cpp
   jtooltips.cpp
   jview.cpp
-  jwidget.cpp
   label.cpp
   preferred_size_event.cpp
   property.cpp
-  themes/jstandard_theme.cpp)
+  themes/jstandard_theme.cpp
+  widget.cpp)
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index c82242345..673eb36df 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -18,7 +18,7 @@
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"
 #include "gui/preferred_size_event.h"
 
diff --git a/src/gui/button.h b/src/gui/button.h
index b5fa6920e..a9aaa5ea1 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -8,7 +8,7 @@
 #define GUI_BUTTON_H_INCLUDED
 
 #include "base/signal.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include <vector>
 
 struct BITMAP;
diff --git a/src/gui/frame.h b/src/gui/frame.h
index a5c3c3a91..c81aac3b6 100644
--- a/src/gui/frame.h
+++ b/src/gui/frame.h
@@ -8,7 +8,7 @@
 #define GUI_FRAME_H_INCLUDED
 
 #include "base/signal.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 namespace Vaca {
   class CloseEvent { };		// TODO
diff --git a/src/gui/jbox.cpp b/src/gui/jbox.cpp
index 0e3ba3ffd..f0966f271 100644
--- a/src/gui/jbox.cpp
+++ b/src/gui/jbox.cpp
@@ -11,7 +11,7 @@
 #include "gui/jlist.h"
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/jtheme.h"
 #include "gfx/size.h"
 
diff --git a/src/gui/jcombobox.h b/src/gui/jcombobox.h
index 1af026981..7f36043f7 100644
--- a/src/gui/jcombobox.h
+++ b/src/gui/jcombobox.h
@@ -7,7 +7,7 @@
 #ifndef GUI_JCOMBOBOX_H_INCLUDED
 #define GUI_JCOMBOBOX_H_INCLUDED
 
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include <vector>
 #include <string>
 
diff --git a/src/gui/jdraw.cpp b/src/gui/jdraw.cpp
index ae0613dcb..d1c2f3419 100644
--- a/src/gui/jdraw.cpp
+++ b/src/gui/jdraw.cpp
@@ -16,7 +16,7 @@
 #include "gui/jrect.h"
 #include "gui/jregion.h"
 #include "gui/jsystem.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 using namespace gfx;
 
diff --git a/src/gui/jentry.cpp b/src/gui/jentry.cpp
index e96ac514d..75891bcf5 100644
--- a/src/gui/jentry.cpp
+++ b/src/gui/jentry.cpp
@@ -18,7 +18,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 #define CHARACTER_LENGTH(f, c) ((f)->vtable->char_length((f), (c)))
 
diff --git a/src/gui/jgrid.cpp b/src/gui/jgrid.cpp
index c1534a0a9..45baa0d47 100644
--- a/src/gui/jgrid.cpp
+++ b/src/gui/jgrid.cpp
@@ -13,7 +13,7 @@
 #include "gui/jlist.h"
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/jtheme.h"
 #include "gfx/size.h"
 
diff --git a/src/gui/jimage.cpp b/src/gui/jimage.cpp
index 3431ee460..e2efa9a27 100644
--- a/src/gui/jimage.cpp
+++ b/src/gui/jimage.cpp
@@ -14,7 +14,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 static bool image_msg_proc(JWidget widget, JMessage msg);
 
diff --git a/src/gui/jinete.h b/src/gui/jinete.h
index b1f03e68e..79d613d47 100644
--- a/src/gui/jinete.h
+++ b/src/gui/jinete.h
@@ -42,7 +42,7 @@
 #include "gui/jthread.h"
 #include "gui/jtooltips.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"
 
 #endif
diff --git a/src/gui/jintern.cpp b/src/gui/jintern.cpp
index 9fd861a2a..7d5c7d513 100644
--- a/src/gui/jintern.cpp
+++ b/src/gui/jintern.cpp
@@ -10,7 +10,7 @@
 
 #include "gui/jmanager.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"
 
 static std::vector<JWidget>* widgets;
diff --git a/src/gui/jlistbox.cpp b/src/gui/jlistbox.cpp
index d3ea201ae..7eb3362d0 100644
--- a/src/gui/jlistbox.cpp
+++ b/src/gui/jlistbox.cpp
@@ -15,7 +15,7 @@
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gfx/size.h"
 
 using namespace gfx;
diff --git a/src/gui/jmessage.cpp b/src/gui/jmessage.cpp
index 551266ccd..032c545a8 100644
--- a/src/gui/jmessage.cpp
+++ b/src/gui/jmessage.cpp
@@ -13,7 +13,7 @@
 #include "gui/jmanager.h"
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 static int registered_messages = JM_REGISTERED_MESSAGES;
 
diff --git a/src/gui/jpanel.cpp b/src/gui/jpanel.cpp
index baffc1e5a..0f098024d 100644
--- a/src/gui/jpanel.cpp
+++ b/src/gui/jpanel.cpp
@@ -11,7 +11,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gfx/size.h"
 
 typedef struct Panel
diff --git a/src/gui/jquickmenu.cpp b/src/gui/jquickmenu.cpp
index b9f7a6244..9d6073de4 100644
--- a/src/gui/jquickmenu.cpp
+++ b/src/gui/jquickmenu.cpp
@@ -12,7 +12,7 @@
 #include "gui/jmessage.h"
 #include "gui/jquickmenu.h"
 #include "gui/jsep.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 typedef struct QuickData
 {
diff --git a/src/gui/jsep.cpp b/src/gui/jsep.cpp
index 1003958a5..f11b1c736 100644
--- a/src/gui/jsep.cpp
+++ b/src/gui/jsep.cpp
@@ -10,7 +10,7 @@
 #include "gui/jmessage.h"
 #include "gui/jrect.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gfx/size.h"
 
 using namespace gfx;
diff --git a/src/gui/jslider.cpp b/src/gui/jslider.cpp
index b79fb3823..475f904eb 100644
--- a/src/gui/jslider.cpp
+++ b/src/gui/jslider.cpp
@@ -14,7 +14,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 typedef struct Slider
 {
diff --git a/src/gui/jsystem.cpp b/src/gui/jsystem.cpp
index 118acd9d2..09b3562d9 100644
--- a/src/gui/jsystem.cpp
+++ b/src/gui/jsystem.cpp
@@ -17,7 +17,7 @@
 #include "gui/jregion.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 /* Global output bitmap.  */
 
diff --git a/src/gui/jtextbox.cpp b/src/gui/jtextbox.cpp
index 1cd5a5dd4..f202afa10 100644
--- a/src/gui/jtextbox.cpp
+++ b/src/gui/jtextbox.cpp
@@ -17,7 +17,7 @@
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 static bool textbox_msg_proc(JWidget widget, JMessage msg);
 static void textbox_request_size(JWidget widget, int *w, int *h);
diff --git a/src/gui/jtheme.cpp b/src/gui/jtheme.cpp
index afafca1ea..22028bc4a 100644
--- a/src/gui/jtheme.cpp
+++ b/src/gui/jtheme.cpp
@@ -16,7 +16,7 @@
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 static JTheme ji_current_theme = NULL;
 static JTheme ji_standard_theme = NULL;
diff --git a/src/gui/jview.cpp b/src/gui/jview.cpp
index 5440033a2..e0bf67008 100644
--- a/src/gui/jview.cpp
+++ b/src/gui/jview.cpp
@@ -14,7 +14,7 @@
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gfx/size.h"
 
 #define BAR_SIZE widget->theme->scrollbar_size
diff --git a/src/gui/label.h b/src/gui/label.h
index e3c86e2d3..3a0c78ba8 100644
--- a/src/gui/label.h
+++ b/src/gui/label.h
@@ -7,7 +7,7 @@
 #ifndef GUI_LABEL_H_INCLUDED
 #define GUI_LABEL_H_INCLUDED
 
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 class Label : public Widget
 {
diff --git a/src/gui/preferred_size_event.cpp b/src/gui/preferred_size_event.cpp
index 76d551d3d..511a96f79 100644
--- a/src/gui/preferred_size_event.cpp
+++ b/src/gui/preferred_size_event.cpp
@@ -5,7 +5,7 @@
 // read LICENSE.txt for more information.
 
 #include "gui/preferred_size_event.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 using namespace gfx;
 
diff --git a/src/gui/jwidget.cpp b/src/gui/widget.cpp
similarity index 100%
rename from src/gui/jwidget.cpp
rename to src/gui/widget.cpp
diff --git a/src/gui/jwidget.h b/src/gui/widget.h
similarity index 99%
rename from src/gui/jwidget.h
rename to src/gui/widget.h
index 352cdbe22..9131ecb58 100644
--- a/src/gui/jwidget.h
+++ b/src/gui/widget.h
@@ -4,8 +4,8 @@
 // This source file is ditributed under a BSD-like license, please
 // read LICENSE.txt for more information.
 
-#ifndef GUI_JWIDGET_H_INCLUDED
-#define GUI_JWIDGET_H_INCLUDED
+#ifndef GUI_WIDGET_H_INCLUDED
+#define GUI_WIDGET_H_INCLUDED
 
 #include <string>
 
diff --git a/src/job.cpp b/src/job.cpp
index 0e68ca549..af1d8cd81 100644
--- a/src/job.cpp
+++ b/src/job.cpp
@@ -20,7 +20,7 @@
 
 #include "gui/jalert.h"
 #include "gui/jthread.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"
 
 #include "app.h"
diff --git a/src/util/misc.cpp b/src/util/misc.cpp
index 684d52c60..a3a910cd0 100644
--- a/src/util/misc.cpp
+++ b/src/util/misc.cpp
@@ -27,7 +27,7 @@
 #include "gui/jlist.h"
 #include "gui/jmanager.h"
 #include "gui/jsystem.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
diff --git a/src/widgets/color_bar.h b/src/widgets/color_bar.h
index 6a1585e83..bcb4170c5 100644
--- a/src/widgets/color_bar.h
+++ b/src/widgets/color_bar.h
@@ -21,7 +21,7 @@
 
 #include "app/color.h"
 #include "base/signal.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 class ColorBar : public Widget
 {
diff --git a/src/widgets/colview.cpp b/src/widgets/colview.cpp
index ee8e596d0..a1a902955 100644
--- a/src/widgets/colview.cpp
+++ b/src/widgets/colview.cpp
@@ -27,7 +27,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "widgets/colview.h"
diff --git a/src/widgets/curvedit.cpp b/src/widgets/curvedit.cpp
index bd4c36f65..7cfd93cb2 100644
--- a/src/widgets/curvedit.cpp
+++ b/src/widgets/curvedit.cpp
@@ -32,7 +32,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "gui/frame.h"
 #include "modules/gui.h"
 #include "widgets/curvedit.h"
diff --git a/src/widgets/editor.h b/src/widgets/editor.h
index 07efea807..330848b38 100644
--- a/src/widgets/editor.h
+++ b/src/widgets/editor.h
@@ -22,7 +22,7 @@
 #include "app/color.h"
 #include "base/signal.h"
 #include "gui/jbase.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 #define MIN_ZOOM 0
 #define MAX_ZOOM 5
diff --git a/src/widgets/editor/click.cpp b/src/widgets/editor/click.cpp
index 11da23929..02f04a362 100644
--- a/src/widgets/editor/click.cpp
+++ b/src/widgets/editor/click.cpp
@@ -25,7 +25,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/gui.h"
 #include "widgets/editor.h"
 
diff --git a/src/widgets/editor/cursor.cpp b/src/widgets/editor/cursor.cpp
index 914152993..22faecf34 100644
--- a/src/widgets/editor/cursor.cpp
+++ b/src/widgets/editor/cursor.cpp
@@ -30,7 +30,7 @@
 #include "gui/jrect.h"
 #include "gui/jregion.h"
 #include "gui/jsystem.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/editors.h"
 #include "raster/image.h"
 #include "raster/layer.h"
diff --git a/src/widgets/editor/keys.cpp b/src/widgets/editor/keys.cpp
index cd1078be2..bc8833f75 100644
--- a/src/widgets/editor/keys.cpp
+++ b/src/widgets/editor/keys.cpp
@@ -25,7 +25,7 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "raster/image.h"
diff --git a/src/widgets/groupbut.cpp b/src/widgets/groupbut.cpp
index f4791a27a..784fcba88 100644
--- a/src/widgets/groupbut.cpp
+++ b/src/widgets/groupbut.cpp
@@ -28,7 +28,7 @@
 #include "gui/jlist.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/gui.h"
 #include "widgets/groupbut.h"
 
diff --git a/src/widgets/menuitem.cpp b/src/widgets/menuitem.cpp
index 1228b187e..40bd60c7e 100644
--- a/src/widgets/menuitem.cpp
+++ b/src/widgets/menuitem.cpp
@@ -27,7 +27,7 @@
 #include "gui/jhook.h"
 #include "gui/jmenu.h"
 #include "gui/jmessage.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/gui.h"
 #include "ui_context.h"
 
diff --git a/src/widgets/paledit.cpp b/src/widgets/paledit.cpp
index e5734f97b..73cb19c67 100644
--- a/src/widgets/paledit.cpp
+++ b/src/widgets/paledit.cpp
@@ -29,7 +29,7 @@
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
 #include "gui/jview.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
 #include "raster/blend.h"
diff --git a/src/widgets/paledit.h b/src/widgets/paledit.h
index bc50c1971..5b7c11765 100644
--- a/src/widgets/paledit.h
+++ b/src/widgets/paledit.h
@@ -21,7 +21,7 @@
 
 #include <allegro/color.h>
 
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 // TODO use some JI_SIGNAL_USER
 #define SIGNAL_PALETTE_EDITOR_CHANGE   0x10005
diff --git a/src/widgets/preview.cpp b/src/widgets/preview.cpp
index 1529adf86..90a0d9a5f 100644
--- a/src/widgets/preview.cpp
+++ b/src/widgets/preview.cpp
@@ -21,7 +21,7 @@
 #include "effect/effect.h"
 #include "gui/jmanager.h"
 #include "gui/jmessage.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "raster/sprite.h"
 #include "util/render.h"
 #include "widgets/preview.h"
diff --git a/src/widgets/statebar.h b/src/widgets/statebar.h
index d335238fe..77744d3b3 100644
--- a/src/widgets/statebar.h
+++ b/src/widgets/statebar.h
@@ -21,7 +21,7 @@
 
 #include "app/color.h"
 #include "gui/jbase.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 
 class Frame;
 class StatusBar;
diff --git a/src/widgets/tabs.h b/src/widgets/tabs.h
index 4d112b183..f7921c75b 100644
--- a/src/widgets/tabs.h
+++ b/src/widgets/tabs.h
@@ -19,7 +19,7 @@
 #ifndef WIDGETS_TABS_H_INCLUDED
 #define WIDGETS_TABS_H_INCLUDED
 
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include <vector>
 
 class Tabs;
diff --git a/src/widgets/target.cpp b/src/widgets/target.cpp
index df94ca29f..9808c1195 100644
--- a/src/widgets/target.cpp
+++ b/src/widgets/target.cpp
@@ -28,7 +28,7 @@
 #include "gui/button.h"
 #include "gui/jhook.h"
 #include "gui/jtheme.h"
-#include "gui/jwidget.h"
+#include "gui/widget.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "raster/image.h"