diff --git a/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp b/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp
index 7ba1b634bf..2e6f4644c5 100644
--- a/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp
+++ b/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp
@@ -22,10 +22,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <dialogs/dialog_configure_paths.h>
+
 #include "3d_info.h"
 #include "3d_cache.h"
 #include "3d_cache_dialogs.h"
-#include "dialog_configure_paths.h"
 #include "dlg_select_3dmodel.h"
 
 
diff --git a/common/dialogs/dialog_configure_paths.cpp b/common/dialogs/dialog_configure_paths.cpp
index 7dca1d12db..4c1246da9f 100644
--- a/common/dialogs/dialog_configure_paths.cpp
+++ b/common/dialogs/dialog_configure_paths.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <dialog_configure_paths.h>
+#include <dialogs/dialog_configure_paths.h>
 
 #include <confirm.h>
 #include <menus_helpers.h>
diff --git a/common/dialogs/dialog_edit_library_tables.cpp b/common/dialogs/dialog_edit_library_tables.cpp
index a2ac607a56..479159b43c 100644
--- a/common/dialogs/dialog_edit_library_tables.cpp
+++ b/common/dialogs/dialog_edit_library_tables.cpp
@@ -20,7 +20,7 @@
 #include <wx/statline.h>
 #include <wx/button.h>
 
-#include "dialog_edit_library_tables.h"
+#include <dialogs/dialog_edit_library_tables.h>
 
 
 DIALOG_EDIT_LIBRARY_TABLES::DIALOG_EDIT_LIBRARY_TABLES( wxWindow* aParent,
diff --git a/common/pgm_base.cpp b/common/pgm_base.cpp
index 70ed07fcd3..b48f78c8fb 100644
--- a/common/pgm_base.cpp
+++ b/common/pgm_base.cpp
@@ -43,7 +43,7 @@
 #include <build_version.h>
 #include <config_params.h>
 #include <confirm.h>
-#include <dialog_configure_paths.h>
+#include <dialogs/dialog_configure_paths.h>
 #include <eda_base_frame.h>
 #include <eda_draw_frame.h>
 #include <gal/gal_display_options.h>
diff --git a/common/tool/common_control.cpp b/common/tool/common_control.cpp
index b017445fd0..02f1a5571f 100644
--- a/common/tool/common_control.cpp
+++ b/common/tool/common_control.cpp
@@ -37,7 +37,7 @@
 #include <project.h>
 #include <kiface_i.h>
 #include <kicad_curl/kicad_curl_easy.h>
-#include <dialog_configure_paths.h>
+#include <dialogs/dialog_configure_paths.h>
 #include <eda_doc.h>
 
 #define URL_GET_INVOLVED "http://kicad-pcb.org/contribute/"
diff --git a/common/tool/common_tools.cpp b/common/tool/common_tools.cpp
index 45b0ed07fb..1f1a856576 100644
--- a/common/tool/common_tools.cpp
+++ b/common/tool/common_tools.cpp
@@ -27,7 +27,7 @@
 #include <base_units.h>
 #include <bitmaps.h>
 #include <class_draw_panel_gal.h>
-#include <dialog_configure_paths.h>
+#include <dialogs/dialog_configure_paths.h>
 #include <eda_draw_frame.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <id.h>
diff --git a/eeschema/dialogs/panel_sym_lib_table.h b/eeschema/dialogs/panel_sym_lib_table.h
index cd700424e7..f682bfbc04 100644
--- a/eeschema/dialogs/panel_sym_lib_table.h
+++ b/eeschema/dialogs/panel_sym_lib_table.h
@@ -21,7 +21,7 @@
 #ifndef PANEL_SYM_LIB_TABLE_H
 #define PANEL_SYM_LIB_TABLE_H
 
-#include <dialog_edit_library_tables.h>
+#include <dialogs/dialog_edit_library_tables.h>
 #include <panel_sym_lib_table_base.h>
 
 class SYMBOL_LIB_TABLE;
diff --git a/include/dialog_configure_paths.h b/include/dialogs/dialog_configure_paths.h
similarity index 100%
rename from include/dialog_configure_paths.h
rename to include/dialogs/dialog_configure_paths.h
diff --git a/include/dialog_edit_library_tables.h b/include/dialogs/dialog_edit_library_tables.h
similarity index 100%
rename from include/dialog_edit_library_tables.h
rename to include/dialogs/dialog_edit_library_tables.h
diff --git a/pcbnew/dialogs/panel_fp_lib_table.cpp b/pcbnew/dialogs/panel_fp_lib_table.cpp
index 24fbbdaf16..96a34a329c 100644
--- a/pcbnew/dialogs/panel_fp_lib_table.cpp
+++ b/pcbnew/dialogs/panel_fp_lib_table.cpp
@@ -51,7 +51,7 @@
 #include <pgm_base.h>
 #include <pcb_edit_frame.h>
 #include <env_paths.h>
-#include <dialog_edit_library_tables.h>
+#include <dialogs/dialog_edit_library_tables.h>
 #include <footprint_viewer_frame.h>
 #include <footprint_edit_frame.h>
 #include <kiway.h>
diff --git a/pcbnew/dialogs/panel_fp_lib_table.h b/pcbnew/dialogs/panel_fp_lib_table.h
index cbc23ca7a7..8735f29c67 100644
--- a/pcbnew/dialogs/panel_fp_lib_table.h
+++ b/pcbnew/dialogs/panel_fp_lib_table.h
@@ -20,7 +20,6 @@
 #ifndef PANEL_FP_LIB_TABLE_H
 #define PANEL_FP_LIB_TABLE_H
 
-#include <dialog_edit_library_tables.h>
 #include <panel_fp_lib_table_base.h>
 #include <widgets/wx_grid.h>
 
diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp
index 6f27fc65af..cfed7ae4ab 100644
--- a/pcbnew/pcbnew.cpp
+++ b/pcbnew/pcbnew.cpp
@@ -53,7 +53,7 @@
 #include <footprint_wizard_frame.h>
 #include <footprint_preview_panel.h>
 #include <footprint_info_impl.h>
-#include <dialog_configure_paths.h>
+#include <dialogs/dialog_configure_paths.h>
 #include "invoke_pcb_dialog.h"
 #include "dialog_global_fp_lib_table_config.h"