diff --git a/3d-viewer/3d_canvas/board_adapter.h b/3d-viewer/3d_canvas/board_adapter.h
index f0ebd26366..58fed7429b 100644
--- a/3d-viewer/3d_canvas/board_adapter.h
+++ b/3d-viewer/3d_canvas/board_adapter.h
@@ -35,7 +35,7 @@
 #include "../3d_cache/3d_cache.h"
 #include "../common_ogl/ogl_attr_list.h"
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pad.h>
 #include <pcb_track.h>
 #include <wx/gdicmn.h>
diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.cpp b/3d-viewer/3d_viewer/eda_3d_viewer.cpp
index 9ed012523f..0a63ba59a7 100644
--- a/3d-viewer/3d_viewer/eda_3d_viewer.cpp
+++ b/3d-viewer/3d_viewer/eda_3d_viewer.cpp
@@ -39,7 +39,7 @@
 #include <board_design_settings.h>
 #include <board_stackup_manager/board_stackup.h>
 #include <core/arraydim.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gal/dpi_scaling.h>
 #include <pgm_base.h>
 #include <project.h>
diff --git a/bitmap2component/bitmap2component.cpp b/bitmap2component/bitmap2component.cpp
index 3d8d52d071..1368ffd8ed 100644
--- a/bitmap2component/bitmap2component.cpp
+++ b/bitmap2component/bitmap2component.cpp
@@ -32,7 +32,7 @@
 #include <vector>
 
 #include <convert_to_biu.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 #include <locale_io.h>
 #include <potracelib.h>
diff --git a/common/dialogs/panel_color_settings.cpp b/common/dialogs/panel_color_settings.cpp
index 4b4d0e8b57..f2dfc53f6b 100644
--- a/common/dialogs/panel_color_settings.cpp
+++ b/common/dialogs/panel_color_settings.cpp
@@ -21,7 +21,7 @@
 #include <bitmaps.h>
 #include <dialogs/dialog_color_picker.h>
 #include <launch_ext.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <menus_helpers.h>
 #include <dialogs/panel_color_settings.h>
 #include <pgm_base.h>
diff --git a/common/drawing_sheet/ds_draw_item.cpp b/common/drawing_sheet/ds_draw_item.cpp
index a406d4f783..d2b1bafb2d 100644
--- a/common/drawing_sheet/ds_draw_item.cpp
+++ b/common/drawing_sheet/ds_draw_item.cpp
@@ -55,7 +55,7 @@
 #include <drawing_sheet/ds_data_model.h>
 #include <base_units.h>
 #include <page_info.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gr_basic.h>
 #include <trigo.h>
 #include <render_settings.h>
diff --git a/common/drawing_sheet/ds_proxy_view_item.cpp b/common/drawing_sheet/ds_proxy_view_item.cpp
index 815bdce39a..dd825752c0 100644
--- a/common/drawing_sheet/ds_proxy_view_item.cpp
+++ b/common/drawing_sheet/ds_proxy_view_item.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <page_info.h>
 #include <drawing_sheet/ds_proxy_view_item.h>
 #include <drawing_sheet/ds_draw_item.h>
diff --git a/common/layer_id.cpp b/common/layer_id.cpp
index de360f40b1..3099745a87 100644
--- a/common/layer_id.cpp
+++ b/common/layer_id.cpp
@@ -17,7 +17,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <wx/translation.h>
 
 /**
diff --git a/common/lset.cpp b/common/lset.cpp
index 9ddb79a186..3d9801c4c4 100644
--- a/common/lset.cpp
+++ b/common/lset.cpp
@@ -30,7 +30,7 @@
 
 #include <core/arraydim.h>
 #include <math/util.h>                        // for Clamp
-#include <layers_id_colors_and_visibility.h>  // for LSET, PCB_LAYER_ID, LSEQ
+#include <layer_ids.h>  // for LSET, PCB_LAYER_ID, LSEQ
 #include <macros.h>                           // for arrayDim
 #include <wx/debug.h>                         // for wxASSERT, wxASSERT_MSG
 #include <wx/string.h>
diff --git a/common/plugins/eagle/eagle_parser.h b/common/plugins/eagle/eagle_parser.h
index 102ed0fa48..52339b8097 100644
--- a/common/plugins/eagle/eagle_parser.h
+++ b/common/plugins/eagle/eagle_parser.h
@@ -37,7 +37,7 @@
 #include <wx/string.h>
 #include <wx/filename.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <trigo.h>
 #include <core/wx_stl_compat.h>
 
diff --git a/common/preview_items/ruler_item.cpp b/common/preview_items/ruler_item.cpp
index 1661d923bd..2afbced42d 100644
--- a/common/preview_items/ruler_item.cpp
+++ b/common/preview_items/ruler_item.cpp
@@ -24,7 +24,7 @@
 #include <preview_items/ruler_item.h>
 #include <preview_items/preview_utils.h>
 #include <gal/graphics_abstraction_layer.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <painter.h>
 #include <view/view.h>
 #include <trigo.h>
diff --git a/common/settings/app_settings.cpp b/common/settings/app_settings.cpp
index e019065201..7c7cf587c2 100644
--- a/common/settings/app_settings.cpp
+++ b/common/settings/app_settings.cpp
@@ -20,7 +20,7 @@
 
 #include <class_draw_panel_gal.h>
 #include <common.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pgm_base.h>
 #include <settings/app_settings.h>
 #include <settings/json_settings_internals.h>
diff --git a/common/settings/color_settings.cpp b/common/settings/color_settings.cpp
index baa52a93e8..d585ee024e 100644
--- a/common/settings/color_settings.cpp
+++ b/common/settings/color_settings.cpp
@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pgm_base.h>
 #include <settings/color_settings.h>
 #include <settings/json_settings_internals.h>
diff --git a/common/swig/kicad.i b/common/swig/kicad.i
index 3b8737a5e0..5d441bfce4 100644
--- a/common/swig/kicad.i
+++ b/common/swig/kicad.i
@@ -100,7 +100,7 @@ principle should be easily implemented by adapting the current STL containers.
     #include <convert_to_biu.h>
     #include <id.h>
     #include <build_version.h>
-    #include <layers_id_colors_and_visibility.h>
+    #include <layer_ids.h>
     #include <settings/settings_manager.h>
 %}
 
diff --git a/common/view/view.cpp b/common/view/view.cpp
index abe2820b4b..b4c103b56a 100644
--- a/common/view/view.cpp
+++ b/common/view/view.cpp
@@ -27,7 +27,7 @@
 
 
 #include <eda_item.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <trace_helpers.h>
 
 #include <view/view.h>
diff --git a/common/view/view_group.cpp b/common/view/view_group.cpp
index 659193d8ef..41bb9a8ea6 100644
--- a/common/view/view_group.cpp
+++ b/common/view/view_group.cpp
@@ -36,7 +36,7 @@
 #include <view/view.h>
 #include <painter.h>
 #include <gal/graphics_abstraction_layer.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 using namespace KIGFX;
 
diff --git a/common/view/view_overlay.cpp b/common/view/view_overlay.cpp
index 61437283a3..50365e8620 100644
--- a/common/view/view_overlay.cpp
+++ b/common/view/view_overlay.cpp
@@ -30,7 +30,7 @@
 #include <gal/graphics_abstraction_layer.h>
 #include <painter.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <geometry/seg.h>
 
 namespace KIGFX {
diff --git a/common/widgets/layer_box_selector.cpp b/common/widgets/layer_box_selector.cpp
index 82b62603a9..9f2cb04650 100644
--- a/common/widgets/layer_box_selector.cpp
+++ b/common/widgets/layer_box_selector.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <bitmaps.h>
 
 #include <wx/dcmemory.h>
diff --git a/eeschema/dialogs/panel_eeschema_color_settings.cpp b/eeschema/dialogs/panel_eeschema_color_settings.cpp
index 562b93b1c1..9f549144d8 100644
--- a/eeschema/dialogs/panel_eeschema_color_settings.cpp
+++ b/eeschema/dialogs/panel_eeschema_color_settings.cpp
@@ -23,7 +23,7 @@
 #include <bitmaps.h>
 #include <eeschema_settings.h>
 #include <gal/gal_display_options.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <lib_polyline.h>
 #include <page_info.h>
 #include <panel_eeschema_color_settings.h>
diff --git a/eeschema/dialogs/panel_eeschema_color_settings.h b/eeschema/dialogs/panel_eeschema_color_settings.h
index 7e68018222..08f8080fbe 100644
--- a/eeschema/dialogs/panel_eeschema_color_settings.h
+++ b/eeschema/dialogs/panel_eeschema_color_settings.h
@@ -24,7 +24,7 @@
 
 #include <gal/color4d.h>
 #include <gal/gal_display_options.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <dialogs/panel_color_settings.h>
 
 class COLOR_SETTINGS;
diff --git a/eeschema/eeschema_settings.cpp b/eeschema/eeschema_settings.cpp
index 7f236c4db0..aa739c3734 100644
--- a/eeschema/eeschema_settings.cpp
+++ b/eeschema/eeschema_settings.cpp
@@ -25,7 +25,7 @@
 
 #include <dialogs/dialog_bom_cfg_lexer.h>
 #include <eeschema_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <symbol_editor_settings.h>
 #include <macros.h>
 #include <pgm_base.h>
diff --git a/eeschema/general.h b/eeschema/general.h
index 06e412ab77..98d3a8dca9 100644
--- a/eeschema/general.h
+++ b/eeschema/general.h
@@ -26,7 +26,7 @@
 #define _GENERAL_H_
 
 #include <gal/color4d.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 using KIGFX::COLOR4D;
 
diff --git a/eeschema/sch_draw_panel.cpp b/eeschema/sch_draw_panel.cpp
index 07f73c224e..c36c964602 100644
--- a/eeschema/sch_draw_panel.cpp
+++ b/eeschema/sch_draw_panel.cpp
@@ -38,7 +38,7 @@
 #include <eda_draw_frame.h>
 #include <gal/definitions.h>
 #include <gal/graphics_abstraction_layer.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <math/vector2d.h>
 #include <pgm_base.h>
 #include <settings/settings_manager.h>
diff --git a/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.h b/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.h
index b75a9b4ade..7e73a4367e 100644
--- a/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.h
+++ b/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.h
@@ -28,7 +28,7 @@
 
 #include <sch_plugins/cadstar/cadstar_sch_archive_parser.h>
 
-#include <layers_id_colors_and_visibility.h> // SCH_LAYER_ID
+#include <layer_ids.h> // SCH_LAYER_ID
 #include <plotter.h>                         // PLOT_DASH_TYPE
 #include <pin_type.h>                        // ELECTRICAL_PINTYPE
 #include <sch_io_mgr.h>
diff --git a/eeschema/sch_screen.h b/eeschema/sch_screen.h
index a4aba96532..3fb9dd6556 100644
--- a/eeschema/sch_screen.h
+++ b/eeschema/sch_screen.h
@@ -38,7 +38,7 @@
 #include <core/typeinfo.h>
 #include <kiid.h>
 #include <kiway_holder.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <marker_base.h>
 #include <page_info.h>
 #include <template_fieldnames.h>
diff --git a/eeschema/sch_symbol.h b/eeschema/sch_symbol.h
index a306c932e2..9db73be0c7 100644
--- a/eeschema/sch_symbol.h
+++ b/eeschema/sch_symbol.h
@@ -29,7 +29,7 @@
 
 #include <eda_item.h>
 #include <core/typeinfo.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <lib_id.h>
 #include <widgets/msgpanel.h>
 
diff --git a/eeschema/sch_view.cpp b/eeschema/sch_view.cpp
index 589aca9608..5c71c585f8 100644
--- a/eeschema/sch_view.cpp
+++ b/eeschema/sch_view.cpp
@@ -32,7 +32,7 @@
 #include <view/view_rtree.h>
 #include <view/wx_view_controls.h>
 #include <drawing_sheet/ds_proxy_view_item.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <sch_screen.h>
 #include <schematic.h>
 #include <sch_base_frame.h>
diff --git a/eeschema/sch_view.h b/eeschema/sch_view.h
index 0fcb7612b5..4bb299f492 100644
--- a/eeschema/sch_view.h
+++ b/eeschema/sch_view.h
@@ -24,7 +24,7 @@
 #ifndef SCH_VIEW_H_
 #define SCH_VIEW_H_
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <math/vector2d.h>
 #include <view/view.h>
 
diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp
index c2ebd35dad..d0fd8e1b4a 100644
--- a/eeschema/tools/ee_actions.cpp
+++ b/eeschema/tools/ee_actions.cpp
@@ -24,7 +24,7 @@
 
 #include <bitmaps.h>
 #include <core/typeinfo.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <sch_line_wire_bus_tool.h>
 #include <tools/ee_actions.h>
 #include <tool/tool_action.h>
diff --git a/eeschema/tools/sch_line_wire_bus_tool.cpp b/eeschema/tools/sch_line_wire_bus_tool.cpp
index 81c790a41f..aefb23044f 100644
--- a/eeschema/tools/sch_line_wire_bus_tool.cpp
+++ b/eeschema/tools/sch_line_wire_bus_tool.cpp
@@ -39,7 +39,7 @@
 #include <eda_item.h>
 #include <bitmaps.h>
 #include <core/typeinfo.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <math/vector2d.h>
 #include <advanced_config.h>
 #include <tool/actions.h>
diff --git a/gerbview/dialogs/dialog_layers_select_to_pcb.cpp b/gerbview/dialogs/dialog_layers_select_to_pcb.cpp
index 011242cba8..a3a38cae47 100644
--- a/gerbview/dialogs/dialog_layers_select_to_pcb.cpp
+++ b/gerbview/dialogs/dialog_layers_select_to_pcb.cpp
@@ -34,7 +34,7 @@
 #include <gerbview_id.h>
 #include <gerbview_settings.h>
 #include <kiface_i.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 #include <dialogs/dialog_layers_select_to_pcb.h>
 
diff --git a/gerbview/export_to_pcbnew.h b/gerbview/export_to_pcbnew.h
index 8fa884c0b6..5b5f7379c7 100644
--- a/gerbview/export_to_pcbnew.h
+++ b/gerbview/export_to_pcbnew.h
@@ -24,7 +24,7 @@
 
 #include <convert_to_biu.h>
 #include <geometry/shape_poly_set.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 
 struct EXPORT_VIA
diff --git a/gerbview/gerber_draw_item.h b/gerbview/gerber_draw_item.h
index a1491c63f0..24e7e89e71 100644
--- a/gerbview/gerber_draw_item.h
+++ b/gerbview/gerber_draw_item.h
@@ -30,7 +30,7 @@
 #define GERBER_DRAW_ITEM_H
 
 #include <eda_item.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gr_basic.h>
 #include <gbr_netlist_metadata.h>
 #include <dcode.h>
diff --git a/gerbview/gerbview_frame.h b/gerbview/gerbview_frame.h
index 7889804c0c..319e12a101 100644
--- a/gerbview/gerbview_frame.h
+++ b/gerbview/gerbview_frame.h
@@ -25,7 +25,7 @@
 #include <filehistory.h>
 #include <config_params.h>
 #include <eda_draw_frame.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gerbview.h>
 #include <convert_to_biu.h>
 #include <gbr_layout.h>
diff --git a/gerbview/gerbview_painter.h b/gerbview/gerbview_painter.h
index 293c922348..9401beb4db 100644
--- a/gerbview/gerbview_painter.h
+++ b/gerbview/gerbview_painter.h
@@ -21,7 +21,7 @@
 #ifndef __GERBVIEW_PAINTER_H
 #define __GERBVIEW_PAINTER_H
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <painter.h>
 
 #include <dcode.h>
diff --git a/gerbview/gerbview_settings.cpp b/gerbview/gerbview_settings.cpp
index 8090663fb1..b29ccc0f7a 100644
--- a/gerbview/gerbview_settings.cpp
+++ b/gerbview/gerbview_settings.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <gerbview_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pgm_base.h>
 #include <settings/common_settings.h>
 #include <settings/json_settings_internals.h>
diff --git a/gerbview/widgets/layer_widget.h b/gerbview/widgets/layer_widget.h
index 2787f426ae..d4f085ccf4 100644
--- a/gerbview/widgets/layer_widget.h
+++ b/gerbview/widgets/layer_widget.h
@@ -40,7 +40,7 @@
 #include <wx/bitmap.h>
 #include <wx/image.h>
 #include <wx/icon.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gal/color4d.h>
 #include <widgets/color_swatch.h>
 #include <widgets/indicator_icon.h>
diff --git a/include/board_item.h b/include/board_item.h
index beea03c5dc..e98db960e3 100644
--- a/include/board_item.h
+++ b/include/board_item.h
@@ -30,7 +30,7 @@
 #include <eda_units.h>
 #include <convert_to_biu.h>
 #include <gr_basic.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <geometry/geometry_utils.h>
 
 class BOARD;
diff --git a/include/board_printout.h b/include/board_printout.h
index 6ad8c7cf15..f0914859a8 100644
--- a/include/board_printout.h
+++ b/include/board_printout.h
@@ -34,7 +34,7 @@
 #define BOARD_PRINTOUT_H
 
 #include <wx/print.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <eda_rect.h>
 #include <printout.h>
 
diff --git a/include/eda_base_frame.h b/include/eda_base_frame.h
index b7cdebddcc..ba1515caea 100644
--- a/include/eda_base_frame.h
+++ b/include/eda_base_frame.h
@@ -35,7 +35,7 @@
 #include <vector>
 
 #include <wx/aui/aui.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <frame_type.h>
 #include <hotkeys_basic.h>
 #include <kiway_holder.h>
diff --git a/include/layers_id_colors_and_visibility.h b/include/layer_ids.h
similarity index 99%
rename from include/layers_id_colors_and_visibility.h
rename to include/layer_ids.h
index a988534e80..e7dd1c3085 100644
--- a/include/layers_id_colors_and_visibility.h
+++ b/include/layer_ids.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
  * Copyright (C) 2010 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2007-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2007-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -23,13 +23,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file layers_id_colors_and_visibility.h
- * @brief Board layer functions and definitions.
- */
-
-#ifndef LAYERS_ID_AND_VISIBILITY_H_
-#define LAYERS_ID_AND_VISIBILITY_H_
+#ifndef LAYER_IDS_H
+#define LAYER_IDS_H
 
 #include <set>
 #include <vector>
@@ -1003,4 +998,4 @@ inline bool IsNetCopperLayer( LAYER_NUM aLayer )
 
 PCB_LAYER_ID ToLAYER_ID( int aLayer );
 
-#endif // LAYERS_ID_AND_VISIBILITY_H_
+#endif // LAYER_IDS_H
diff --git a/include/origin_viewitem.h b/include/origin_viewitem.h
index 4649ded0b6..7093e07036 100644
--- a/include/origin_viewitem.h
+++ b/include/origin_viewitem.h
@@ -29,7 +29,7 @@
 
 #include <math/box2.h>
 #include <view/view.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gal/color4d.h>
 #include <eda_item.h>
 
diff --git a/include/painter.h b/include/painter.h
index 31c11cdf37..dc9fa28e75 100644
--- a/include/painter.h
+++ b/include/painter.h
@@ -36,7 +36,7 @@
 
 #include <gal/color4d.h>
 #include <render_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <memory>
 
 namespace KIGFX
diff --git a/include/preview_items/arc_assistant.h b/include/preview_items/arc_assistant.h
index 77928dc625..27ffa72af3 100644
--- a/include/preview_items/arc_assistant.h
+++ b/include/preview_items/arc_assistant.h
@@ -26,7 +26,7 @@
 
 #include <eda_item.h>
 #include <preview_items/arc_geom_manager.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 namespace KIGFX
 {
diff --git a/include/preview_items/simple_overlay_item.h b/include/preview_items/simple_overlay_item.h
index 7beb7b3546..9bd2ad7f1d 100644
--- a/include/preview_items/simple_overlay_item.h
+++ b/include/preview_items/simple_overlay_item.h
@@ -26,7 +26,7 @@
 
 #include <eda_item.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gal/color4d.h>
 
 namespace KIGFX
diff --git a/include/preview_items/two_point_assistant.h b/include/preview_items/two_point_assistant.h
index ae71ed63ab..b4c0275e63 100644
--- a/include/preview_items/two_point_assistant.h
+++ b/include/preview_items/two_point_assistant.h
@@ -26,7 +26,7 @@
 
 #include <eda_item.h>
 #include <preview_items/two_point_geom_manager.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 namespace KIGFX
 {
diff --git a/include/project/board_project_settings.h b/include/project/board_project_settings.h
index 425027f22b..a28094156f 100644
--- a/include/project/board_project_settings.h
+++ b/include/project/board_project_settings.h
@@ -21,7 +21,7 @@
 #ifndef KICAD_BOARD_PROJECT_SETTINGS_H
 #define KICAD_BOARD_PROJECT_SETTINGS_H
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <settings/parameters.h>
 
 // Can be removed by refactoring PARAM_LAYER_PRESET
diff --git a/include/project/project_local_settings.h b/include/project/project_local_settings.h
index 1049224aef..fbbbbbe70f 100644
--- a/include/project/project_local_settings.h
+++ b/include/project/project_local_settings.h
@@ -22,7 +22,7 @@
 #ifndef KICAD_PROJECT_LOCAL_SETTINGS_H
 #define KICAD_PROJECT_LOCAL_SETTINGS_H
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <project/board_project_settings.h>
 #include <settings/json_settings.h>
 #include <wildcards_and_files_ext.h>
diff --git a/include/render_settings.h b/include/render_settings.h
index 243b240d30..afdb2c1d38 100644
--- a/include/render_settings.h
+++ b/include/render_settings.h
@@ -28,7 +28,7 @@
 #include <set>
 
 #include <gal/color4d.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <memory>
 
 #include <wx/dc.h>
diff --git a/include/settings/color_settings.h b/include/settings/color_settings.h
index fa54edd902..afdbe5ab44 100644
--- a/include/settings/color_settings.h
+++ b/include/settings/color_settings.h
@@ -104,7 +104,7 @@ private:
 
     /**
      * Map of all layer colors.
-     * The key needs to be a valid layer ID, see layers_id_colors_and_visibility.h
+     * The key needs to be a valid layer ID, see layer_ids.h
      */
     std::unordered_map<int, COLOR4D> m_colors;
 
diff --git a/include/tool/edit_points.h b/include/tool/edit_points.h
index 7289662c0c..bcfdf98330 100644
--- a/include/tool/edit_points.h
+++ b/include/tool/edit_points.h
@@ -28,7 +28,7 @@
 #define EDIT_POINTS_H_
 
 #include <eda_item.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 #include <list>
 #include <deque>
diff --git a/include/widgets/layer_box_selector.h b/include/widgets/layer_box_selector.h
index 4d4c907372..2389c75a42 100644
--- a/include/widgets/layer_box_selector.h
+++ b/include/widgets/layer_box_selector.h
@@ -27,7 +27,7 @@
 
 #include <wx/bmpcbox.h>
 #include <gal/color4d.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 using KIGFX::COLOR4D;
 
diff --git a/pcbnew/autorouter/ar_matrix.h b/pcbnew/autorouter/ar_matrix.h
index 7cbd8c16b2..9f932b174a 100644
--- a/pcbnew/autorouter/ar_matrix.h
+++ b/pcbnew/autorouter/ar_matrix.h
@@ -30,7 +30,7 @@
 #define __AR_MATRIX_H
 
 #include <eda_rect.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class PCB_SHAPE;
 class PAD;
diff --git a/pcbnew/board.h b/pcbnew/board.h
index 6cb26fdec0..6eb1aac897 100644
--- a/pcbnew/board.h
+++ b/pcbnew/board.h
@@ -28,7 +28,7 @@
 #include <board_item_container.h>
 #include <common.h> // Needed for stl hash extensions
 #include <convert_drawsegment_list_to_polygon.h> // for OUTLINE_ERROR_HANDLER
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <netinfo.h>
 #include <pcb_item_containers.h>
 #include <pcb_plot_params.h>
diff --git a/pcbnew/board_design_settings.cpp b/pcbnew/board_design_settings.cpp
index 9496399002..ea07393d8c 100644
--- a/pcbnew/board_design_settings.cpp
+++ b/pcbnew/board_design_settings.cpp
@@ -23,7 +23,7 @@
 
 #include <pcb_dimension.h>
 #include <pcb_track.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <kiface_i.h>
 #include <pad.h>
 #include <board_design_settings.h>
diff --git a/pcbnew/board_stackup_manager/board_stackup.cpp b/pcbnew/board_stackup_manager/board_stackup.cpp
index 007bd240e9..ed89d8f8cf 100644
--- a/pcbnew/board_stackup_manager/board_stackup.cpp
+++ b/pcbnew/board_stackup_manager/board_stackup.cpp
@@ -23,7 +23,7 @@
 #include <convert_to_biu.h>
 #include <base_units.h>
 #include <kicad_string.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <board_design_settings.h>
 #include <board.h>
 #include <i18n_utility.h>       // For _HKI definition
diff --git a/pcbnew/board_stackup_manager/board_stackup.h b/pcbnew/board_stackup_manager/board_stackup.h
index 7c98fcbfb1..f407ab5354 100644
--- a/pcbnew/board_stackup_manager/board_stackup.h
+++ b/pcbnew/board_stackup_manager/board_stackup.h
@@ -28,7 +28,7 @@
 
 #include <vector>
 #include <wx/string.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class BOARD;
 class BOARD_DESIGN_SETTINGS;
diff --git a/pcbnew/board_stackup_manager/stackup_predefined_prms.cpp b/pcbnew/board_stackup_manager/stackup_predefined_prms.cpp
index 2dc812ded8..f22d148162 100644
--- a/pcbnew/board_stackup_manager/stackup_predefined_prms.cpp
+++ b/pcbnew/board_stackup_manager/stackup_predefined_prms.cpp
@@ -30,7 +30,7 @@
 #include "board_stackup.h"
 #include <convert_to_biu.h>
 #include <core/arraydim.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <board_design_settings.h>
 #include <i18n_utility.h>       // _HKI definition
 #include <macros.h>
diff --git a/pcbnew/board_stackup_manager/stackup_predefined_prms.h b/pcbnew/board_stackup_manager/stackup_predefined_prms.h
index e375c49a0f..1a335ce94d 100644
--- a/pcbnew/board_stackup_manager/stackup_predefined_prms.h
+++ b/pcbnew/board_stackup_manager/stackup_predefined_prms.h
@@ -34,7 +34,7 @@
 #include <wx/arrstr.h>
 #include <wx/colour.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <i18n_utility.h>       // For _HKI definition
 
 // Keyword used in file to identify the dielectric layer type
diff --git a/pcbnew/collectors.h b/pcbnew/collectors.h
index c343e1ce11..6fa09c5986 100644
--- a/pcbnew/collectors.h
+++ b/pcbnew/collectors.h
@@ -33,7 +33,7 @@
 
 
 #include <collector.h>
-#include <layers_id_colors_and_visibility.h>              // LAYER_COUNT, layer defs
+#include <layer_ids.h>              // LAYER_COUNT, layer defs
 #include <view/view.h>
 #include <board_item.h>
 
diff --git a/pcbnew/dialogs/dialog_board_reannotate.h b/pcbnew/dialogs/dialog_board_reannotate.h
index b11e573f1d..89d89bdbc4 100644
--- a/pcbnew/dialogs/dialog_board_reannotate.h
+++ b/pcbnew/dialogs/dialog_board_reannotate.h
@@ -29,7 +29,7 @@
 #include <board.h>
 #include <footprint.h>
 #include <dialogs/dialog_board_reannotate_base.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <netlist_reader/pcb_netlist.h>
 #include <pcb_base_frame.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/dialogs/dialog_imported_layers.cpp b/pcbnew/dialogs/dialog_imported_layers.cpp
index 23c7e30b61..725f139978 100644
--- a/pcbnew/dialogs/dialog_imported_layers.cpp
+++ b/pcbnew/dialogs/dialog_imported_layers.cpp
@@ -19,7 +19,7 @@
  */
 
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <dialog_imported_layers.h>
 
 #include <wx/msgdlg.h>
diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index 9964cb972b..e9f5bf67e3 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@@ -32,7 +32,7 @@
 #include <gerber_jobfile_writer.h>
 #include <reporter.h>
 #include <wildcards_and_files_ext.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <locale_io.h>
 #include <bitmaps.h>
 #include <board.h>
diff --git a/pcbnew/dialogs/dialog_track_via_properties.h b/pcbnew/dialogs/dialog_track_via_properties.h
index 1be34539e2..d878996ab0 100644
--- a/pcbnew/dialogs/dialog_track_via_properties.h
+++ b/pcbnew/dialogs/dialog_track_via_properties.h
@@ -25,7 +25,7 @@
 #include <dialogs/dialog_track_via_properties_base.h>
 #include <widgets/unit_binder.h>
 #include <core/optional.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class PCB_SELECTION;
 class COMMIT;
diff --git a/pcbnew/dialogs/panel_fp_editor_color_settings.cpp b/pcbnew/dialogs/panel_fp_editor_color_settings.cpp
index 8ece7e9472..43d17bf80d 100644
--- a/pcbnew/dialogs/panel_fp_editor_color_settings.cpp
+++ b/pcbnew/dialogs/panel_fp_editor_color_settings.cpp
@@ -24,7 +24,7 @@
 #include <footprint_edit_frame.h>
 #include <footprint_editor_settings.h>
 #include <gal/gal_display_options.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <panel_fp_editor_color_settings.h>
 #include <settings/settings_manager.h>
 
diff --git a/pcbnew/dialogs/panel_fp_editor_color_settings.h b/pcbnew/dialogs/panel_fp_editor_color_settings.h
index 23181871af..ac2eb07712 100644
--- a/pcbnew/dialogs/panel_fp_editor_color_settings.h
+++ b/pcbnew/dialogs/panel_fp_editor_color_settings.h
@@ -22,7 +22,7 @@
 #define PANEL_FP_EDITOR_COLOR_SETTINGS_H
 
 #include <gal/color4d.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <dialogs/panel_color_settings.h>
 
 class COLOR_SETTINGS;
diff --git a/pcbnew/dialogs/panel_pcbnew_color_settings.cpp b/pcbnew/dialogs/panel_pcbnew_color_settings.cpp
index 934d4bfe1b..89a9d255ea 100644
--- a/pcbnew/dialogs/panel_pcbnew_color_settings.cpp
+++ b/pcbnew/dialogs/panel_pcbnew_color_settings.cpp
@@ -22,7 +22,7 @@
 
 #include <board.h>
 #include <gal/gal_display_options.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <panel_pcbnew_color_settings.h>
 #include <pcbnew_settings.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/dialogs/panel_pcbnew_color_settings.h b/pcbnew/dialogs/panel_pcbnew_color_settings.h
index a41627195f..565937b39a 100644
--- a/pcbnew/dialogs/panel_pcbnew_color_settings.h
+++ b/pcbnew/dialogs/panel_pcbnew_color_settings.h
@@ -22,7 +22,7 @@
 #define PANEL_PCBNEW_COLOR_SETTINGS_H_
 
 #include <gal/color4d.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <dialogs/panel_color_settings.h>
 
 class COLOR_SETTINGS;
diff --git a/pcbnew/drc/drc_rule.h b/pcbnew/drc/drc_rule.h
index 615879f3da..fc4f7d40f8 100644
--- a/pcbnew/drc/drc_rule.h
+++ b/pcbnew/drc/drc_rule.h
@@ -27,7 +27,7 @@
 #include <core/typeinfo.h>
 #include <core/optional.h>
 #include <core/minoptmax.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <netclass.h>
 #include <libeval_compiler/libeval_compiler.h>
 #include <wx/intl.h>
diff --git a/pcbnew/drc/drc_rule_condition.h b/pcbnew/drc/drc_rule_condition.h
index faeb709d80..0ea64f0a06 100644
--- a/pcbnew/drc/drc_rule_condition.h
+++ b/pcbnew/drc/drc_rule_condition.h
@@ -25,7 +25,7 @@
 #define DRC_RULE_CONDITION_H
 
 #include <core/typeinfo.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class BOARD_ITEM;
 class PCB_EXPR_UCODE;
diff --git a/pcbnew/drc/drc_rule_parser.h b/pcbnew/drc/drc_rule_parser.h
index b5b58d3709..19dfa2abde 100644
--- a/pcbnew/drc/drc_rule_parser.h
+++ b/pcbnew/drc/drc_rule_parser.h
@@ -26,7 +26,7 @@
 
 #include <core/typeinfo.h>
 #include <netclass.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <drc/drc_rule.h>
 #include <drc_rules_lexer.h>
 
diff --git a/pcbnew/exporters/gerber_placefile_writer.h b/pcbnew/exporters/gerber_placefile_writer.h
index e1c773d6d7..46a4e26f7e 100644
--- a/pcbnew/exporters/gerber_placefile_writer.h
+++ b/pcbnew/exporters/gerber_placefile_writer.h
@@ -26,7 +26,7 @@
 #ifndef PLACEFILE_GERBER_WRITER_H
 #define PLACEFILE_GERBER_WRITER_H
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <wx/gdicmn.h>
 
 class BOARD;
diff --git a/pcbnew/footprint.h b/pcbnew/footprint.h
index e1cc8468de..5844bc7fcb 100644
--- a/pcbnew/footprint.h
+++ b/pcbnew/footprint.h
@@ -31,7 +31,7 @@
 #include <board_item.h>
 #include <collectors.h>
 #include <convert_to_biu.h>
-#include <layers_id_colors_and_visibility.h> // ALL_LAYERS definition.
+#include <layer_ids.h> // ALL_LAYERS definition.
 #include <lib_id.h>
 #include <list>
 
diff --git a/pcbnew/footprint_editor_settings.cpp b/pcbnew/footprint_editor_settings.cpp
index cf670236f0..cff28419cb 100644
--- a/pcbnew/footprint_editor_settings.cpp
+++ b/pcbnew/footprint_editor_settings.cpp
@@ -20,7 +20,7 @@
 
 #include <common.h>
 #include <footprint_editor_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pgm_base.h>
 #include <settings/common_settings.h>
 #include <settings/json_settings_internals.h>
diff --git a/pcbnew/import_gfx/graphics_importer_pcbnew.h b/pcbnew/import_gfx/graphics_importer_pcbnew.h
index 958bd7204e..3a4fb4bdb5 100644
--- a/pcbnew/import_gfx/graphics_importer_pcbnew.h
+++ b/pcbnew/import_gfx/graphics_importer_pcbnew.h
@@ -29,7 +29,7 @@
 
 #include "graphics_importer.h"
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class BOARD_ITEM;
 class BOARD;
diff --git a/pcbnew/pcb_display_options.cpp b/pcbnew/pcb_display_options.cpp
index 8053bb71d1..dbc2788e9d 100644
--- a/pcbnew/pcb_display_options.cpp
+++ b/pcbnew/pcb_display_options.cpp
@@ -28,7 +28,7 @@
 #include <pcbnew.h>
 #include <pad.h>
 #include <board_design_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcb_display_options.h>
 #include <eda_text.h>
 
diff --git a/pcbnew/pcb_draw_panel_gal.h b/pcbnew/pcb_draw_panel_gal.h
index bafe9ba109..ec87f861ac 100644
--- a/pcbnew/pcb_draw_panel_gal.h
+++ b/pcbnew/pcb_draw_panel_gal.h
@@ -28,7 +28,7 @@
 #define PCB_DRAW_PANEL_GAL_H_
 
 #include <class_draw_panel_gal.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcb_view.h>
 
 class DS_PROXY_VIEW_ITEM;
diff --git a/pcbnew/pcb_layer_box_selector.cpp b/pcbnew/pcb_layer_box_selector.cpp
index 6015331409..a5313389c5 100644
--- a/pcbnew/pcb_layer_box_selector.cpp
+++ b/pcbnew/pcb_layer_box_selector.cpp
@@ -23,7 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 #include <pcb_edit_frame.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <settings/color_settings.h>
 
 #include <board.h>
diff --git a/pcbnew/pcb_marker.cpp b/pcbnew/pcb_marker.cpp
index 1d36be4412..d0d7b4ad19 100644
--- a/pcbnew/pcb_marker.cpp
+++ b/pcbnew/pcb_marker.cpp
@@ -29,7 +29,7 @@
 #include <board.h>
 #include <board_design_settings.h>
 #include <pcb_marker.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <settings/color_settings.h>
 #include <settings/settings_manager.h>
 #include <geometry/shape_null.h>
diff --git a/pcbnew/pcb_painter.cpp b/pcbnew/pcb_painter.cpp
index adadea0ae6..a2dca82746 100644
--- a/pcbnew/pcb_painter.cpp
+++ b/pcbnew/pcb_painter.cpp
@@ -41,7 +41,7 @@
 #include <advanced_config.h>
 #include <core/arraydim.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcb_painter.h>
 #include <pcb_display_options.h>
 #include <project/net_settings.h>
diff --git a/pcbnew/pcb_plot_params.cpp b/pcbnew/pcb_plot_params.cpp
index d7a08d2b7b..cbb98e11c2 100644
--- a/pcbnew/pcb_plot_params.cpp
+++ b/pcbnew/pcb_plot_params.cpp
@@ -23,7 +23,7 @@
 
 #include <board_design_settings.h>
 #include <convert_to_biu.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <macros.h>
 #include <math/util.h> // for KiROUND
 #include <pcb_plot_params.h>
diff --git a/pcbnew/pcb_plot_params.h b/pcbnew/pcb_plot_params.h
index 059dcb7dd7..478c3f3316 100644
--- a/pcbnew/pcb_plot_params.h
+++ b/pcbnew/pcb_plot_params.h
@@ -25,7 +25,7 @@
 
 #include <outline_mode.h>
 #include <plotter.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class COLOR_SETTINGS;
 class PCB_PLOT_PARAMS_PARSER;
diff --git a/pcbnew/pcb_screen.cpp b/pcbnew/pcb_screen.cpp
index e9e8ef9ffb..08c617ba32 100644
--- a/pcbnew/pcb_screen.cpp
+++ b/pcbnew/pcb_screen.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <pcb_screen.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 
 PCB_SCREEN::PCB_SCREEN( const wxSize& aPageSizeIU ) :
diff --git a/pcbnew/pcb_view.h b/pcbnew/pcb_view.h
index cdd7cfdb0b..56410a1c4d 100644
--- a/pcbnew/pcb_view.h
+++ b/pcbnew/pcb_view.h
@@ -25,7 +25,7 @@
 #ifndef __PCB_VIEW_H
 #define __PCB_VIEW_H
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <view/view.h>
 #include <board_item.h>
 
diff --git a/pcbnew/pcbnew_settings.cpp b/pcbnew/pcbnew_settings.cpp
index 6eb52a8efb..b2cfd15b7b 100644
--- a/pcbnew/pcbnew_settings.cpp
+++ b/pcbnew/pcbnew_settings.cpp
@@ -25,7 +25,7 @@
 
 #include <common.h>
 #include <footprint_editor_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcbnew_settings.h>
 #include <pgm_base.h>
 #include <router/pns_routing_settings.h>
diff --git a/pcbnew/pcbplot.h b/pcbnew/pcbplot.h
index 5c4bf2d163..d890bd4944 100644
--- a/pcbnew/pcbplot.h
+++ b/pcbnew/pcbplot.h
@@ -29,7 +29,7 @@
 #ifndef PCBPLOT_H_
 #define PCBPLOT_H_
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pad_shapes.h>
 #include <pcb_plot_params.h>
 #include <settings/color_settings.h>
diff --git a/pcbnew/plot_brditems_plotter.cpp b/pcbnew/plot_brditems_plotter.cpp
index fe14abf6e1..c4a93158a7 100644
--- a/pcbnew/plot_brditems_plotter.cpp
+++ b/pcbnew/plot_brditems_plotter.cpp
@@ -46,7 +46,7 @@
 #include <gal/color4d.h>                      // for COLOR4D, operator!=
 #include <gbr_metadata.h>
 #include <gbr_netlist_metadata.h>             // for GBR_NETLIST_METADATA
-#include <layers_id_colors_and_visibility.h>  // for LSET, IsCopperLayer
+#include <layer_ids.h>  // for LSET, IsCopperLayer
 #include <pad_shapes.h>                       // for PAD_ATTRIB::NPTH
 #include <pcbplot.h>
 #include <pcb_plot_params.h>                  // for PCB_PLOT_PARAMS, PCB_PL...
diff --git a/pcbnew/plotcontroller.h b/pcbnew/plotcontroller.h
index a90acab6a3..f792f02d61 100644
--- a/pcbnew/plotcontroller.h
+++ b/pcbnew/plotcontroller.h
@@ -31,7 +31,7 @@
 #define PLOTCONTROLLER_H_
 
 #include <pcb_plot_params.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class PLOTTER;
 class BOARD;
diff --git a/pcbnew/plugins/altium/altium_pcb.h b/pcbnew/plugins/altium/altium_pcb.h
index f9b655ab8e..0eb4e7d8b7 100644
--- a/pcbnew/plugins/altium/altium_pcb.h
+++ b/pcbnew/plugins/altium/altium_pcb.h
@@ -25,7 +25,7 @@
 #define ALTIUM_PCB_H
 
 #include <functional>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <vector>
 
 #include <altium_parser_pcb.h>
diff --git a/pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.h b/pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.h
index 3c689de2fa..2fa66f6ce7 100644
--- a/pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.h
+++ b/pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.h
@@ -29,7 +29,7 @@
 
 
 #include <io_mgr.h>
-#include <layers_id_colors_and_visibility.h> // PCB_LAYER_ID
+#include <layer_ids.h> // PCB_LAYER_ID
 #include <plugins/common/plugin_common_layer_mapping.h>
 
 
diff --git a/pcbnew/plugins/common/plugin_common_layer_mapping.h b/pcbnew/plugins/common/plugin_common_layer_mapping.h
index 255751e492..5fc5543948 100644
--- a/pcbnew/plugins/common/plugin_common_layer_mapping.h
+++ b/pcbnew/plugins/common/plugin_common_layer_mapping.h
@@ -26,7 +26,7 @@
 #include <map>
 
 #include <io_mgr.h>
-#include <layers_id_colors_and_visibility.h> // PCB_LAYER_ID
+#include <layer_ids.h> // PCB_LAYER_ID
 
 /**
  * @brief Describes an imported layer and how it could be mapped to KiCad Layers
diff --git a/pcbnew/plugins/eagle/eagle_plugin.h b/pcbnew/plugins/eagle/eagle_plugin.h
index f01cc267f4..9a4830e34e 100644
--- a/pcbnew/plugins/eagle/eagle_plugin.h
+++ b/pcbnew/plugins/eagle/eagle_plugin.h
@@ -27,7 +27,7 @@
 
 #include <convert_to_biu.h>
 #include <io_mgr.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <plugins/eagle/eagle_parser.h>
 #include <plugins/common/plugin_common_layer_mapping.h>
 
diff --git a/pcbnew/plugins/kicad/kicad_plugin.h b/pcbnew/plugins/kicad/kicad_plugin.h
index f9a29b4f30..3516868284 100644
--- a/pcbnew/plugins/kicad/kicad_plugin.h
+++ b/pcbnew/plugins/kicad/kicad_plugin.h
@@ -27,7 +27,7 @@
 
 #include <io_mgr.h>
 #include <string>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class BOARD;
 class BOARD_ITEM;
diff --git a/pcbnew/plugins/kicad/pcb_parser.h b/pcbnew/plugins/kicad/pcb_parser.h
index 8989f502fa..8023e0771a 100644
--- a/pcbnew/plugins/kicad/pcb_parser.h
+++ b/pcbnew/plugins/kicad/pcb_parser.h
@@ -33,7 +33,7 @@
 #include <convert_to_biu.h>                      // IU_PER_MM
 #include <core/wx_stl_compat.h>
 #include <hashtables.h>
-#include <layers_id_colors_and_visibility.h>     // PCB_LAYER_ID
+#include <layer_ids.h>     // PCB_LAYER_ID
 #include <pcb_lexer.h>
 #include <kiid.h>
 
diff --git a/pcbnew/plugins/legacy/legacy_plugin.h b/pcbnew/plugins/legacy/legacy_plugin.h
index 459e6f91ab..13a8812990 100644
--- a/pcbnew/plugins/legacy/legacy_plugin.h
+++ b/pcbnew/plugins/legacy/legacy_plugin.h
@@ -27,7 +27,7 @@
 
 #include <io_mgr.h>
 #include <string>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <memory>
 
 
diff --git a/pcbnew/plugins/pcad/pcb_callbacks.h b/pcbnew/plugins/pcad/pcb_callbacks.h
index 845a2ad55d..42ae393429 100644
--- a/pcbnew/plugins/pcad/pcb_callbacks.h
+++ b/pcbnew/plugins/pcad/pcb_callbacks.h
@@ -30,7 +30,7 @@
 #ifndef PCB_CALLBACKS_H_
 #define PCB_CALLBACKS_H_
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class wxString;
 
diff --git a/pcbnew/plugins/pcad/pcb_component.h b/pcbnew/plugins/pcad/pcb_component.h
index ae862411d7..181f79b3e7 100644
--- a/pcbnew/plugins/pcad/pcb_component.h
+++ b/pcbnew/plugins/pcad/pcb_component.h
@@ -31,7 +31,7 @@
 #include <pcad/pcb_callbacks.h>
 
 #include <kiid.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <wx/object.h>
 
 class BOARD;
diff --git a/pcbnew/python/swig/board.i b/pcbnew/python/swig/board.i
index 1e6b7bdca6..8c5f9fb173 100644
--- a/pcbnew/python/swig/board.i
+++ b/pcbnew/python/swig/board.i
@@ -42,7 +42,7 @@ file near the top; only class BOARD functions go in board.i.
 HANDLE_EXCEPTIONS(BOARD::TracksInNetBetweenPoints)
 
 
-%include layers_id_colors_and_visibility.i
+%include layer_ids.i
 %include board_item.i
 %include board_item_container.i
 %include board_connected_item.i
diff --git a/pcbnew/python/swig/layers_id_colors_and_visibility.i b/pcbnew/python/swig/layer_ids.i
similarity index 94%
rename from pcbnew/python/swig/layers_id_colors_and_visibility.i
rename to pcbnew/python/swig/layer_ids.i
index 0d4ce3fd5e..43cc8c9122 100644
--- a/pcbnew/python/swig/layers_id_colors_and_visibility.i
+++ b/pcbnew/python/swig/layer_ids.i
@@ -27,7 +27,7 @@
  */
 
 /**
- * @file layers_id_colors_and_visibility.i
+ * @file layer_ids.i
  * @brief layers IDs, draw layers IDs, layers set and templates
  * these IDs are used as physical layers or draw layers (for colors, visibility...)
  */
@@ -37,7 +37,7 @@
 %ignore GAL_SET::set(int, bool);
 %ignore GAL_SET::set(int);
 
-%include layers_id_colors_and_visibility.h
+%include layer_ids.h
 
 // Extend LSET by 2 methods to add or remove layers from the layer list
 // Mainly used to add or remove layers of a pad layer list
@@ -64,6 +64,6 @@
     %}
 }
 %{
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcbnew_scripting_helpers.h>
 %}
diff --git a/pcbnew/ratsnest/ratsnest_view_item.cpp b/pcbnew/ratsnest/ratsnest_view_item.cpp
index 0db84564d8..5dab4c8a02 100644
--- a/pcbnew/ratsnest/ratsnest_view_item.cpp
+++ b/pcbnew/ratsnest/ratsnest_view_item.cpp
@@ -34,7 +34,7 @@
 #include <pcb_painter.h>
 #include <ratsnest/ratsnest_data.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcb_base_frame.h>
 
 #include <memory>
diff --git a/pcbnew/router/pns_index.h b/pcbnew/router/pns_index.h
index 1c93ac949e..370ad65936 100644
--- a/pcbnew/router/pns_index.h
+++ b/pcbnew/router/pns_index.h
@@ -27,7 +27,7 @@
 #include <map>
 #include <unordered_set>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <geometry/shape_index.h>
 
 #include "pns_item.h"
diff --git a/pcbnew/router/pns_kicad_iface.cpp b/pcbnew/router/pns_kicad_iface.cpp
index 4669683805..9a4a75710d 100644
--- a/pcbnew/router/pns_kicad_iface.cpp
+++ b/pcbnew/router/pns_kicad_iface.cpp
@@ -30,7 +30,7 @@
 #include <pcb_shape.h>
 #include <pcb_text.h>
 #include <board_commit.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <geometry/convex_hull.h>
 #include <confirm.h>
 
diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp
index 8855410028..49bc5fa678 100644
--- a/pcbnew/tools/pcb_actions.cpp
+++ b/pcbnew/tools/pcb_actions.cpp
@@ -27,7 +27,7 @@
 #include "tool/tool_event.h"
 #include <pcbnew_id.h>
 #include <bitmaps.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <microwave/microwave_tool.h>
 #include <tool/tool_manager.h>
 #include <router/pns_router.h>
diff --git a/pcbnew/tools/pcb_picker_tool.h b/pcbnew/tools/pcb_picker_tool.h
index 06eae8c4c0..9dd0ae51f9 100644
--- a/pcbnew/tools/pcb_picker_tool.h
+++ b/pcbnew/tools/pcb_picker_tool.h
@@ -27,7 +27,7 @@
 #ifndef PCB_PICKER_TOOL_H
 #define PCB_PICKER_TOOL_H
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <tool/picker_tool.h>
 #include <tools/pcb_tool_base.h>
 
diff --git a/pcbnew/tools/pcb_selection.h b/pcbnew/tools/pcb_selection.h
index 439c223d1b..c6568569d8 100644
--- a/pcbnew/tools/pcb_selection.h
+++ b/pcbnew/tools/pcb_selection.h
@@ -24,7 +24,7 @@
 #ifndef PCB_SELECTION_H
 #define PCB_SELECTION_H
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <tool/selection.h>
 
 
diff --git a/pcbnew/widgets/appearance_controls.h b/pcbnew/widgets/appearance_controls.h
index 533f89f126..2dd831f807 100644
--- a/pcbnew/widgets/appearance_controls.h
+++ b/pcbnew/widgets/appearance_controls.h
@@ -25,7 +25,7 @@
 
 #include <board.h>
 #include <gal/color4d.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <project/board_project_settings.h>
 #include <widgets/appearance_controls_base.h>
 
diff --git a/pcbnew/zone.h b/pcbnew/zone.h
index 7dacde5c82..bca1167850 100644
--- a/pcbnew/zone.h
+++ b/pcbnew/zone.h
@@ -31,7 +31,7 @@
 #include <gr_basic.h>
 #include <board_item.h>
 #include <board_connected_item.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <geometry/shape_poly_set.h>
 #include <zone_settings.h>
 
diff --git a/pcbnew/zone_settings.h b/pcbnew/zone_settings.h
index d117594eaf..671b8ed7b1 100644
--- a/pcbnew/zone_settings.h
+++ b/pcbnew/zone_settings.h
@@ -30,7 +30,7 @@
 #ifndef ZONE_SETTINGS_H_
 #define ZONE_SETTINGS_H_
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <zones.h>
 
 class wxDataViewListCtrl;
diff --git a/qa/gal/gal_pixel_alignment/test_gal_pixel_alignment.cpp b/qa/gal/gal_pixel_alignment/test_gal_pixel_alignment.cpp
index 590ac9d5ff..15b5c5d818 100644
--- a/qa/gal/gal_pixel_alignment/test_gal_pixel_alignment.cpp
+++ b/qa/gal/gal_pixel_alignment/test_gal_pixel_alignment.cpp
@@ -6,7 +6,7 @@
 #include <view/view_item.h>
 #include <pcb_draw_panel_gal.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 const VECTOR2D xform2( const MATRIX3x3D& minv, const VECTOR2D& p )
 {
diff --git a/qa/pcbnew/test_libeval_compiler.cpp b/qa/pcbnew/test_libeval_compiler.cpp
index ac2e81b6b5..4f5aa23391 100644
--- a/qa/pcbnew/test_libeval_compiler.cpp
+++ b/qa/pcbnew/test_libeval_compiler.cpp
@@ -25,7 +25,7 @@
 
 #include <qa_utils/wx_utils/unit_test_utils.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcbnew/pcb_expr_evaluator.h>
 
 #include <pcbnew/board.h>
diff --git a/qa/pcbnew/test_lset.cpp b/qa/pcbnew/test_lset.cpp
index 4e1085c55b..36d848d4c3 100644
--- a/qa/pcbnew/test_lset.cpp
+++ b/qa/pcbnew/test_lset.cpp
@@ -23,7 +23,7 @@
 
 #include <qa_utils/wx_utils/unit_test_utils.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 BOOST_AUTO_TEST_SUITE( LSet )
 
diff --git a/qa/pcbnew_utils/include/pcbnew_utils/board_construction_utils.h b/qa/pcbnew_utils/include/pcbnew_utils/board_construction_utils.h
index 5df63d4353..e6f2b45de9 100644
--- a/qa/pcbnew_utils/include/pcbnew_utils/board_construction_utils.h
+++ b/qa/pcbnew_utils/include/pcbnew_utils/board_construction_utils.h
@@ -31,7 +31,7 @@
 
 #include <vector>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <math/vector2d.h>
 
 class FOOTPRINT;
diff --git a/qa/qa_utils/pcb_test_frame.cpp b/qa/qa_utils/pcb_test_frame.cpp
index 30db64f782..97a497802e 100644
--- a/qa/qa_utils/pcb_test_frame.cpp
+++ b/qa/qa_utils/pcb_test_frame.cpp
@@ -35,7 +35,7 @@
 #include <pgm_base.h>
 #include <settings/settings_manager.h>
 #include <settings/color_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 #include <gal/graphics_abstraction_layer.h>
 #include <view/view.h>