diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 51617f56a..ac37c8659 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -5,7 +5,7 @@
 file(GLOB widget_files ${CMAKE_SOURCE_DIR}/data/widgets/*.xml)
 foreach(widget_file ${widget_files})
   get_filename_component(widget_name ${widget_file} NAME_WE)
-  set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/generated_${widget_name}.h)
+  set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/${widget_name}.xml.h)
 
   add_custom_command(
     OUTPUT ${output_fn}
@@ -21,7 +21,7 @@ endforeach()
 # Generate preference types from data/pref.xml
 set(pref_xml ${CMAKE_SOURCE_DIR}/data/pref.xml)
 
-set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/generated_pref_types.h)
+set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/pref.xml.h)
 add_custom_command(
   OUTPUT ${output_fn}
   COMMAND ${CMAKE_BINARY_DIR}/bin/gen --input ${pref_xml} --pref-h > ${output_fn}.tmp
@@ -31,7 +31,7 @@ add_custom_command(
   DEPENDS gen)
 list(APPEND generated_files ${output_fn})
 
-set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/generated_pref_types.cpp)
+set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/pref.xml.cpp)
 add_custom_command(
   OUTPUT ${output_fn}
   COMMAND ${CMAKE_BINARY_DIR}/bin/gen --input ${pref_xml} --pref-cpp > ${output_fn}.tmp
@@ -43,7 +43,7 @@ list(APPEND generated_files ${output_fn})
 
 # Generate generated_skin.h from data/skins/default/skin.xml
 set(skin_xml ${CMAKE_SOURCE_DIR}/data/skins/default/skin.xml)
-set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/generated_skin.h)
+set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/skin.xml.h)
 add_custom_command(
   OUTPUT ${output_fn}
   COMMAND ${CMAKE_BINARY_DIR}/bin/gen --input ${skin_xml} --skin > ${output_fn}.tmp
diff --git a/src/app/commands/cmd_canvas_size.cpp b/src/app/commands/cmd_canvas_size.cpp
index ee4bac641..4ffc62866 100644
--- a/src/app/commands/cmd_canvas_size.cpp
+++ b/src/app/commands/cmd_canvas_size.cpp
@@ -29,7 +29,7 @@
 #include "doc/sprite.h"
 #include "ui/ui.h"
 
-#include "generated_canvas_size.h"
+#include "canvas_size.xml.h"
 
 namespace app {
 
diff --git a/src/app/commands/cmd_cel_properties.cpp b/src/app/commands/cmd_cel_properties.cpp
index 00e7fb13a..90e074d46 100644
--- a/src/app/commands/cmd_cel_properties.cpp
+++ b/src/app/commands/cmd_cel_properties.cpp
@@ -34,7 +34,7 @@
 #include "doc/sprite.h"
 #include "ui/ui.h"
 
-#include "generated_cel_properties.h"
+#include "cel_properties.xml.h"
 
 namespace app {
 
diff --git a/src/app/commands/cmd_color_quantization.cpp b/src/app/commands/cmd_color_quantization.cpp
index 45b39719e..53b78dc3d 100644
--- a/src/app/commands/cmd_color_quantization.cpp
+++ b/src/app/commands/cmd_color_quantization.cpp
@@ -28,7 +28,7 @@
 #include "render/quantization.h"
 #include "ui/manager.h"
 
-#include "generated_palette_from_sprite.h"
+#include "palette_from_sprite.xml.h"
 
 namespace app {
 
diff --git a/src/app/commands/cmd_duplicate_sprite.cpp b/src/app/commands/cmd_duplicate_sprite.cpp
index 467156ec1..e2aac0e8d 100644
--- a/src/app/commands/cmd_duplicate_sprite.cpp
+++ b/src/app/commands/cmd_duplicate_sprite.cpp
@@ -21,7 +21,7 @@
 #include "doc/sprite.h"
 #include "ui/ui.h"
 
-#include "generated_duplicate_sprite.h"
+#include "duplicate_sprite.xml.h"
 
 #include <cstdio>
 
diff --git a/src/app/commands/cmd_export_sprite_sheet.cpp b/src/app/commands/cmd_export_sprite_sheet.cpp
index 79223eb6d..7206d4d44 100644
--- a/src/app/commands/cmd_export_sprite_sheet.cpp
+++ b/src/app/commands/cmd_export_sprite_sheet.cpp
@@ -30,7 +30,7 @@
 #include "doc/frame_tag.h"
 #include "doc/layer.h"
 
-#include "generated_export_sprite_sheet.h"
+#include "export_sprite_sheet.xml.h"
 
 #include <limits>
 #include <sstream>
diff --git a/src/app/commands/cmd_frame_properties.cpp b/src/app/commands/cmd_frame_properties.cpp
index 2bf2d1a93..8a262b8e5 100644
--- a/src/app/commands/cmd_frame_properties.cpp
+++ b/src/app/commands/cmd_frame_properties.cpp
@@ -23,7 +23,7 @@
 #include "doc/sprite.h"
 #include "ui/ui.h"
 
-#include "generated_frame_properties.h"
+#include "frame_properties.xml.h"
 
 namespace app {
 
diff --git a/src/app/commands/cmd_import_sprite_sheet.cpp b/src/app/commands/cmd_import_sprite_sheet.cpp
index 2c6ece3d7..fa5572bb7 100644
--- a/src/app/commands/cmd_import_sprite_sheet.cpp
+++ b/src/app/commands/cmd_import_sprite_sheet.cpp
@@ -37,7 +37,7 @@
 #include "doc/sprite.h"
 #include "ui/ui.h"
 
-#include "generated_import_sprite_sheet.h"
+#include "import_sprite_sheet.xml.h"
 
 namespace app {
 
diff --git a/src/app/commands/cmd_keyboard_shortcuts.cpp b/src/app/commands/cmd_keyboard_shortcuts.cpp
index d8321d864..3cb578e47 100644
--- a/src/app/commands/cmd_keyboard_shortcuts.cpp
+++ b/src/app/commands/cmd_keyboard_shortcuts.cpp
@@ -29,7 +29,7 @@
 #include "ui/preferred_size_event.h"
 #include "ui/resize_event.h"
 
-#include "generated_keyboard_shortcuts.h"
+#include "keyboard_shortcuts.xml.h"
 
 #define KEYBOARD_FILENAME_EXTENSION "aseprite-keys"
 
diff --git a/src/app/commands/cmd_layer_properties.cpp b/src/app/commands/cmd_layer_properties.cpp
index 7f82e35ef..61316fde8 100644
--- a/src/app/commands/cmd_layer_properties.cpp
+++ b/src/app/commands/cmd_layer_properties.cpp
@@ -28,7 +28,7 @@
 #include "doc/sprite.h"
 #include "ui/ui.h"
 
-#include "generated_layer_properties.h"
+#include "layer_properties.xml.h"
 
 namespace app {
 
diff --git a/src/app/commands/cmd_layer_visibility.cpp b/src/app/commands/cmd_layer_visibility.cpp
index a298634ed..bdb0d6be3 100644
--- a/src/app/commands/cmd_layer_visibility.cpp
+++ b/src/app/commands/cmd_layer_visibility.cpp
@@ -19,7 +19,7 @@
 #include "doc/image.h"
 #include "doc/layer.h"
 
-#include "generated_layer_properties.h"
+#include "layer_properties.xml.h"
 
 namespace app {
 
diff --git a/src/app/commands/cmd_new_file.cpp b/src/app/commands/cmd_new_file.cpp
index a01387492..74aa4a373 100644
--- a/src/app/commands/cmd_new_file.cpp
+++ b/src/app/commands/cmd_new_file.cpp
@@ -33,7 +33,7 @@
 #include "doc/sprite.h"
 #include "ui/ui.h"
 
-#include "generated_new_sprite.h"
+#include "new_sprite.xml.h"
 
 using namespace ui;
 
diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index 6b062df38..cf4ae1ae3 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -30,7 +30,7 @@
 #include "she/system.h"
 #include "ui/ui.h"
 
-#include "generated_options.h"
+#include "options.xml.h"
 
 namespace app {
 
diff --git a/src/app/commands/cmd_palette_size.cpp b/src/app/commands/cmd_palette_size.cpp
index 8219dd2d7..ff997c828 100644
--- a/src/app/commands/cmd_palette_size.cpp
+++ b/src/app/commands/cmd_palette_size.cpp
@@ -18,7 +18,7 @@
 #include "doc/palette.h"
 #include "doc/sprite.h"
 
-#include "generated_palette_size.h"
+#include "palette_size.xml.h"
 
 #include <climits>
 
diff --git a/src/app/commands/cmd_sprite_properties.cpp b/src/app/commands/cmd_sprite_properties.cpp
index 4dcb557e9..e1f0cfa18 100644
--- a/src/app/commands/cmd_sprite_properties.cpp
+++ b/src/app/commands/cmd_sprite_properties.cpp
@@ -25,7 +25,7 @@
 #include "doc/sprite.h"
 #include "ui/ui.h"
 
-#include "generated_sprite_properties.h"
+#include "sprite_properties.xml.h"
 
 #include <cstdio>
 
diff --git a/src/app/commands/filters/color_curve_editor.cpp b/src/app/commands/filters/color_curve_editor.cpp
index a7e018fcf..0f5d9667b 100644
--- a/src/app/commands/filters/color_curve_editor.cpp
+++ b/src/app/commands/filters/color_curve_editor.cpp
@@ -26,7 +26,7 @@
 #include "ui/widget.h"
 #include "ui/window.h"
 
-#include "generated_color_curve_point.h"
+#include "color_curve_point.xml.h"
 
 #include <cmath>
 #include <cstdio>
diff --git a/src/app/file/gif_format.cpp b/src/app/file/gif_format.cpp
index eef01bfb9..9e76573bc 100644
--- a/src/app/file/gif_format.cpp
+++ b/src/app/file/gif_format.cpp
@@ -28,7 +28,7 @@
 #include "ui/alert.h"
 #include "ui/button.h"
 
-#include "generated_gif_options.h"
+#include "gif_options.xml.h"
 
 #include <gif_lib.h>
 
diff --git a/src/app/pref/preferences.h b/src/app/pref/preferences.h
index 8bbedf0b0..2c559f735 100644
--- a/src/app/pref/preferences.h
+++ b/src/app/pref/preferences.h
@@ -25,7 +25,7 @@
 #include "gfx/rect.h"
 #include "render/onionskin_position.h"
 
-#include "generated_pref_types.h"
+#include "pref.xml.h"
 
 #include <map>
 #include <string>
diff --git a/src/app/send_crash.cpp b/src/app/send_crash.cpp
index 6894fed43..cc6cfa1f6 100644
--- a/src/app/send_crash.cpp
+++ b/src/app/send_crash.cpp
@@ -17,7 +17,7 @@
 #include "base/fs.h"
 #include "base/launcher.h"
 
-#include "generated_send_crash.h"
+#include "send_crash.xml.h"
 
 namespace app {
 
diff --git a/src/app/ui/configure_timeline_popup.cpp b/src/app/ui/configure_timeline_popup.cpp
index cafc5c126..616268c77 100644
--- a/src/app/ui/configure_timeline_popup.cpp
+++ b/src/app/ui/configure_timeline_popup.cpp
@@ -31,7 +31,7 @@
 #include "ui/slider.h"
 #include "ui/theme.h"
 
-#include "generated_timeline_conf.h"
+#include "timeline_conf.xml.h"
 
 namespace app {
 
diff --git a/src/app/ui/file_selector.cpp b/src/app/ui/file_selector.cpp
index 05387c7c6..da89ec751 100644
--- a/src/app/ui/file_selector.cpp
+++ b/src/app/ui/file_selector.cpp
@@ -32,7 +32,7 @@
 #include "base/unique_ptr.h"
 #include "ui/ui.h"
 
-#include "generated_new_folder_window.h"
+#include "new_folder_window.xml.h"
 
 #include <algorithm>
 #include <cctype>
diff --git a/src/app/ui/file_selector.h b/src/app/ui/file_selector.h
index 64c480bff..fde96c5e6 100644
--- a/src/app/ui/file_selector.h
+++ b/src/app/ui/file_selector.h
@@ -13,7 +13,7 @@
 #include "base/unique_ptr.h"
 #include "ui/window.h"
 
-#include "generated_file_selector.h"
+#include "file_selector.xml.h"
 
 #include <string>
 
diff --git a/src/app/ui/frame_tag_window.h b/src/app/ui/frame_tag_window.h
index 0cb3b95f4..39a32565d 100644
--- a/src/app/ui/frame_tag_window.h
+++ b/src/app/ui/frame_tag_window.h
@@ -13,7 +13,7 @@
 #include "doc/anidir.h"
 #include "doc/frame.h"
 
-#include "generated_frame_tag_properties.h"
+#include "frame_tag_properties.xml.h"
 
 namespace doc {
   class FrameTag;
diff --git a/src/app/ui/home_view.h b/src/app/ui/home_view.h
index f1241fb64..691510d5d 100644
--- a/src/app/ui/home_view.h
+++ b/src/app/ui/home_view.h
@@ -14,7 +14,7 @@
 #include "app/ui/workspace_view.h"
 #include "ui/box.h"
 
-#include "generated_home_view.h"
+#include "home_view.xml.h"
 
 namespace ui {
   class View;
diff --git a/src/app/ui/main_window.h b/src/app/ui/main_window.h
index 9ebbcd792..434744208 100644
--- a/src/app/ui/main_window.h
+++ b/src/app/ui/main_window.h
@@ -12,7 +12,7 @@
 #include "app/ui/tabs.h"
 #include "ui/window.h"
 
-#include "generated_main_window.h"
+#include "main_window.xml.h"
 
 namespace ui {
   class Splitter;
diff --git a/src/app/ui/palette_popup.cpp b/src/app/ui/palette_popup.cpp
index b9f3649ed..4da7e0d10 100644
--- a/src/app/ui/palette_popup.cpp
+++ b/src/app/ui/palette_popup.cpp
@@ -24,7 +24,7 @@
 #include "ui/theme.h"
 #include "ui/view.h"
 
-#include "generated_palette_popup.h"
+#include "palette_popup.xml.h"
 
 namespace app {
 
diff --git a/src/app/ui/select_accelerator.h b/src/app/ui/select_accelerator.h
index faea7f4f0..82171a87b 100644
--- a/src/app/ui/select_accelerator.h
+++ b/src/app/ui/select_accelerator.h
@@ -12,7 +12,7 @@
 #include "app/ui/keyboard_shortcuts.h"
 #include "ui/accelerator.h"
 
-#include "generated_select_accelerator.h"
+#include "select_accelerator.xml.h"
 
 namespace app {
 
diff --git a/src/app/ui/skin/skin_theme.h b/src/app/ui/skin/skin_theme.h
index 60e7301bd..62861ff8e 100644
--- a/src/app/ui/skin/skin_theme.h
+++ b/src/app/ui/skin/skin_theme.h
@@ -16,7 +16,7 @@
 #include "ui/manager.h"
 #include "ui/theme.h"
 
-#include "generated_skin.h"
+#include "skin.xml.h"
 
 #include <map>
 #include <string>