diff --git a/src/editor/Makefile.am b/src/editor/Makefile.am
index 20c1abe09..16685557e 100644
--- a/src/editor/Makefile.am
+++ b/src/editor/Makefile.am
@@ -7,8 +7,9 @@ noinst_LTLIBRARIES =
 endif
 
 libedit_la_SOURCES = \
-	bookmark.c edit.c editcmd.c editwidget.c editdraw.c editkeys.c \
-	editmenu.c editoptions.c edit-impl.h edit.h edit-widget.h \
+	bookmark.c edit.c editcmd.c editwidget.c editwidget.h \
+	editdraw.c editkeys.c \
+	editmenu.c editoptions.c edit-impl.h edit.h \
 	syntax.c wordproc.c \
 	choosesyntax.c etags.c etags.h editcmd_dialogs.c editcmd_dialogs.h
 
diff --git a/src/editor/bookmark.c b/src/editor/bookmark.c
index 679e01ce7..2eadb0de9 100644
--- a/src/editor/bookmark.c
+++ b/src/editor/bookmark.c
@@ -45,7 +45,7 @@
 #include "lib/global.h"
 #include "lib/util.h"           /* MAX_SAVED_BOOKMARKS */
 
-#include "edit-widget.h"
+#include "editwidget.h"
 
 /*** global variables ****************************************************************************/
 
diff --git a/src/editor/choosesyntax.c b/src/editor/choosesyntax.c
index 2057afa96..4e8cdbd09 100644
--- a/src/editor/choosesyntax.c
+++ b/src/editor/choosesyntax.c
@@ -41,7 +41,7 @@
 #include "lib/widget.h"         /* Listbox */
 
 #include "edit-impl.h"
-#include "edit-widget.h"
+#include "editwidget.h"
 
 /*** global variables ****************************************************************************/
 
diff --git a/src/editor/edit.c b/src/editor/edit.c
index 87791d60a..2d58c55e3 100644
--- a/src/editor/edit.c
+++ b/src/editor/edit.c
@@ -69,7 +69,7 @@
 #include "src/keybind-defaults.h"
 
 #include "edit-impl.h"
-#include "edit-widget.h"
+#include "editwidget.h"
 
 /*** global variables ****************************************************************************/
 
diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index a24981524..6482713f8 100644
--- a/src/editor/editcmd.c
+++ b/src/editor/editcmd.c
@@ -75,7 +75,7 @@
 #include "src/filemanager/layout.h"     /* mc_refresh()  */
 
 #include "edit-impl.h"
-#include "edit-widget.h"
+#include "editwidget.h"
 #include "editcmd_dialogs.h"
 #include "etags.h"
 
diff --git a/src/editor/editcmd_dialogs.c b/src/editor/editcmd_dialogs.c
index c1104d3f1..26436285a 100644
--- a/src/editor/editcmd_dialogs.c
+++ b/src/editor/editcmd_dialogs.c
@@ -39,7 +39,7 @@
 #include "src/main.h"
 #include "src/history.h"
 
-#include "src/editor/edit-widget.h"
+#include "src/editor/editwidget.h"
 #include "src/editor/etags.h"
 #include "src/editor/editcmd_dialogs.h"
 
diff --git a/src/editor/editdraw.c b/src/editor/editdraw.c
index e3941db84..3ee3e63c8 100644
--- a/src/editor/editdraw.c
+++ b/src/editor/editdraw.c
@@ -56,7 +56,7 @@
 #include "src/main.h"           /* macro_index */
 
 #include "edit-impl.h"
-#include "edit-widget.h"
+#include "editwidget.h"
 
 /*** global variables ****************************************************************************/
 
diff --git a/src/editor/editkeys.c b/src/editor/editkeys.c
index d9517ff6d..46f33ec95 100644
--- a/src/editor/editkeys.c
+++ b/src/editor/editkeys.c
@@ -51,7 +51,7 @@
 #endif
 
 #include "edit-impl.h"
-#include "edit-widget.h"        /* WEdit */
+#include "editwidget.h"         /* WEdit */
 #include "editcmd_dialogs.h"
 
 #include "src/keybind-defaults.h"       /* keybind_lookup_keymap_command() */
diff --git a/src/editor/editmenu.c b/src/editor/editmenu.c
index 315cf8a75..3612f127a 100644
--- a/src/editor/editmenu.c
+++ b/src/editor/editmenu.c
@@ -51,7 +51,7 @@
 #include "src/keybind-defaults.h"
 
 #include "edit-impl.h"
-#include "edit-widget.h"
+#include "editwidget.h"
 
 /*** global variables ****************************************************************************/
 
diff --git a/src/editor/editoptions.c b/src/editor/editoptions.c
index 3f2bcdc96..a90021eac 100644
--- a/src/editor/editoptions.c
+++ b/src/editor/editoptions.c
@@ -36,7 +36,7 @@
 #include "lib/global.h"
 #include "lib/widget.h"
 
-#include "edit-widget.h"
+#include "editwidget.h"
 #include "edit-impl.h"
 #include "src/setup.h"          /* option_tab_spacing */
 
diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c
index dd60c30a9..20ada3622 100644
--- a/src/editor/editwidget.c
+++ b/src/editor/editwidget.c
@@ -57,7 +57,7 @@
 #include "src/main.h"           /* home_dir */
 
 #include "edit-impl.h"
-#include "edit-widget.h"
+#include "editwidget.h"
 
 /*** global variables ****************************************************************************/
 
diff --git a/src/editor/edit-widget.h b/src/editor/editwidget.h
similarity index 100%
rename from src/editor/edit-widget.h
rename to src/editor/editwidget.h
diff --git a/src/editor/syntax.c b/src/editor/syntax.c
index 898d12654..dc7c99c20 100644
--- a/src/editor/syntax.c
+++ b/src/editor/syntax.c
@@ -60,7 +60,7 @@
 #include "lib/widget.h"         /* message() */
 
 #include "edit-impl.h"
-#include "edit-widget.h"
+#include "editwidget.h"
 
 /*** global variables ****************************************************************************/
 
diff --git a/src/editor/wordproc.c b/src/editor/wordproc.c
index f28b0ce01..7cbdf444c 100644
--- a/src/editor/wordproc.c
+++ b/src/editor/wordproc.c
@@ -50,7 +50,7 @@
 #include "src/setup.h"          /* option_tab_spacing */
 
 #include "edit-impl.h"
-#include "edit-widget.h"
+#include "editwidget.h"
 
 /*** global variables ****************************************************************************/