← Back to team overview

kicad-developers team mailing list archive

[PATCH] Build fixes: bitmaps and polygon

 

Hi,

Two patches for building these libs:

1) Make bitmaps a "Proper" library. By splitting it off like this, the
includes for each of the hundreds of XPM cpp files do not need to suck
in WX headers. This speeds compilation by something like 10x or more
(it now builds in <5 seconds with -j6), with a similar reduction in
the size of libbitmaps.a. Also, making it a proper library allows to
use the CMake dependency mechanism better.
2) Do the same for the CMake of the polygon libraries, again
simplifying all the "downstream" targets - they no longer need to
manually specify the linkage to polygon or the include dirs.

Apparently, both these libraries were setting off static analysers, as
they were a circular dependency. For example, bitmaps required common
for the defs, but common required bitmaps for the images. This ended
up pushing all the linkage down to the final executables, which is now
much simpler (just link common, and you should get what you need, with
includes set correctly).

Jenkins passes (MSVC and Msys2), but might be worth getting an OSX
build as there is a different CMake command in there!

Cheers,

John
From 69b0e4e9a376727f498cf7cfb3848e592d1c9f19 Mon Sep 17 00:00:00 2001
From: John Beard <john.j.beard@gmail.com>
Date: Thu, 31 Jan 2019 11:53:01 +0000
Subject: [PATCH 2/2] Build: libpolygon provides its own includes

Libpolygon can provide its own includes via target_include_dirs PUBLIC.
This means any linking targets do not need to specifiy them manually.

As common requires polygon, the polygon dep is also now no longer
required downstream of libcommon, as it's transisitvely implied
by libcommon's target_link_libraries.

This resolves a circular dependency previously detected and also
simplifies CMakeLists.
---
 3d-viewer/CMakeLists.txt                          |  2 +-
 bitmap2component/CMakeLists.txt                   |  2 --
 common/CMakeLists.txt                             | 11 ++++++++---
 cvpcb/CMakeLists.txt                              |  4 ----
 eeschema/CMakeLists.txt                           |  4 ----
 gerbview/CMakeLists.txt                           |  4 ----
 include/geometry/shape_line_chain.h               |  3 ++-
 kicad/CMakeLists.txt                              |  2 --
 pagelayout_editor/CMakeLists.txt                  |  3 ---
 pcb_calculator/CMakeLists.txt                     |  2 --
 pcbnew/CMakeLists.txt                             |  3 +--
 pcbnew/connectivity/CMakeLists.txt                |  1 -
 pcbnew/router/CMakeLists.txt                      |  1 -
 polygon/CMakeLists.txt                            |  3 +++
 polygon/{ => include}/SutherlandHodgmanClipPoly.h |  0
 polygon/{ => include}/clipper.hpp                 |  0
 polygon/{ => include}/math_for_graphics.h         |  0
 polygon/{ => include}/polygon_test_point_inside.h |  0
 qa/common/CMakeLists.txt                          |  2 --
 qa/common_tools/CMakeLists.txt                    |  2 --
 qa/pcb_test_window/CMakeLists.txt                 |  5 -----
 qa/pcbnew/CMakeLists.txt                          |  1 -
 qa/pcbnew_tools/CMakeLists.txt                    |  1 -
 qa/pcbnew_utils/CMakeLists.txt                    |  2 --
 tools/CMakeLists.txt                              |  1 -
 25 files changed, 15 insertions(+), 44 deletions(-)
 rename polygon/{ => include}/SutherlandHodgmanClipPoly.h (100%)
 rename polygon/{ => include}/clipper.hpp (100%)
 rename polygon/{ => include}/math_for_graphics.h (100%)
 rename polygon/{ => include}/polygon_test_point_inside.h (100%)

diff --git a/3d-viewer/CMakeLists.txt b/3d-viewer/CMakeLists.txt
index 728f1c3f7..3a0c78151 100644
--- a/3d-viewer/CMakeLists.txt
+++ b/3d-viewer/CMakeLists.txt
@@ -8,7 +8,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ../include/legacy_wx
     ../pcbnew
-    ../polygon
     3d_canvas
     3d_cache
     3d_rendering
@@ -108,6 +107,7 @@ add_dependencies( 3d-viewer pcbcommon )
 
 target_link_libraries( 3d-viewer
                        gal
+                       polygon
                        ${Boost_}
                        ${wxWidgets_LIBRARIES}
                        ${OPENGL_LIBRARIES}
diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt
index f0c624aeb..78b05c9f7 100644
--- a/bitmap2component/CMakeLists.txt
+++ b/bitmap2component/CMakeLists.txt
@@ -6,7 +6,6 @@ endif()
 include_directories( BEFORE ${INC_BEFORE} )
 include_directories(
     ../potrace
-    ../polygon
     ${INC_AFTER}
     )
 
@@ -49,7 +48,6 @@ add_executable( bitmap2component WIN32 MACOSX_BUNDLE
 
 target_link_libraries( bitmap2component
     common
-    polygon
     gal
     ${wxWidgets_LIBRARIES}
     potrace
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 2c37df527..915acb7e7 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -17,7 +17,6 @@ include_directories(
     ${CURL_INCLUDE_DIRS}
     ../3d-viewer
     ../pcbnew
-    ../polygon
     ${INC_AFTER}
     ${OCE_INCLUDE_DIRS}
     ${OCC_INCLUDE_DIR}
@@ -93,10 +92,11 @@ add_library( legacy_wx STATIC ${LEGACY_WX_SRCS} )
 target_include_directories( legacy_wx PUBLIC ../include/legacy_wx )
 target_include_directories( legacy_gal PUBLIC ../include/legacy_gal )
 
-target_link_libraries( legacy_wx PRIVATE bitmaps )
-target_link_libraries( legacy_gal PRIVATE bitmaps )
+target_link_libraries( legacy_wx PRIVATE bitmaps polygon )
+target_link_libraries( legacy_gal PRIVATE bitmaps polygon )
 
 target_link_libraries( gal
+    polygon
     bitmaps
     ${GLEW_LIBRARIES}
     ${CAIRO_LIBRARIES}
@@ -423,6 +423,7 @@ add_library( common STATIC ${COMMON_SRCS} )
 add_dependencies( common version_header )
 target_link_libraries( common
     bitmaps
+    polygon
     gal
     ${Boost_LIBRARIES}
     ${CURL_LIBRARIES}
@@ -504,6 +505,10 @@ target_include_directories( pcbcommon PUBLIC
     ../include/legacy_wx
 )
 
+target_link_libraries( pcbcommon PUBLIC
+    common
+)
+
 
 # auto-generate netlist_lexer.h and netlist_keywords.cpp
 make_lexer(
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index 42acb5b6a..d300ee44a 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -12,7 +12,6 @@ include_directories(
     ../3d-viewer
     ../pcbnew
     ../pcbnew/dialogs
-    ../polygon
     ../common
     ${GLM_INCLUDE_DIR}
     ${INC_AFTER}
@@ -146,21 +145,18 @@ target_link_libraries( cvpcb_kiface
     pcad2kicadpcb
     3d-viewer
     common
-    polygon
     gal
     legacy_wx
     pcbcommon
     pcad2kicadpcb
     3d-viewer
     common
-    polygon
     gal
     legacy_wx
     pcbcommon
     pcad2kicadpcb
     3d-viewer
     common
-    polygon
     gal
     legacy_wx
     ${wxWidgets_LIBRARIES}
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index f6708cb6b..c56ac2d9c 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -342,19 +342,15 @@ add_library( eeschema_kiface SHARED
     )
 target_link_libraries( eeschema_kiface
     common
-    polygon
     gal
     legacy_gal
     common
-    polygon
     gal
     legacy_gal
     common
-    polygon
     gal
     legacy_gal
     common
-    polygon
     gal
     legacy_gal
     ${wxWidgets_LIBRARIES}
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index e455d64e9..66269d5e2 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -12,7 +12,6 @@ include_directories(
     dialogs
     ../common
     ../3d-viewer
-    ../polygon
     ${INC_AFTER}
     )
 
@@ -143,15 +142,12 @@ set_target_properties( gerbview_kiface PROPERTIES
     )
 target_link_libraries( gerbview_kiface
     common
-    polygon
     gal
     legacy_wx
     common
-    polygon
     gal
     legacy_wx
     common
-    polygon
     gal
     legacy_wx
     ${wxWidgets_LIBRARIES}
diff --git a/include/geometry/shape_line_chain.h b/include/geometry/shape_line_chain.h
index 795d0012e..8e56bc16a 100644
--- a/include/geometry/shape_line_chain.h
+++ b/include/geometry/shape_line_chain.h
@@ -34,7 +34,8 @@
 #include <math/vector2d.h>
 #include <geometry/shape.h>
 #include <geometry/seg.h>
-#include <../polygon/clipper.hpp>
+
+#include <clipper.hpp>
 
 /**
  * Class SHAPE_LINE_CHAIN
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index 06ae3853c..1c693aded 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -71,13 +71,11 @@ if( APPLE )
         )
     target_link_libraries( kicad
         common
-        polygon
         ${wxWidgets_LIBRARIES}
         )
 else()
     target_link_libraries( kicad
         common
-        polygon
         gal
         ${wxWidgets_LIBRARIES}
         ${GDI_PLUS_LIBRARIES}
diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt
index 59bb248b8..5e013398b 100644
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@@ -109,15 +109,12 @@ add_library( pl_editor_kiface MODULE
     )
 target_link_libraries( pl_editor_kiface
     common
-    polygon
     gal
     legacy_wx
     common
-    polygon
     gal
     legacy_wx
     common
-    polygon
     gal
     legacy_wx
     ${wxWidgets_LIBRARIES}
diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt
index ad01dbb03..e04045129 100644
--- a/pcb_calculator/CMakeLists.txt
+++ b/pcb_calculator/CMakeLists.txt
@@ -5,7 +5,6 @@ include_directories(
     dialogs
     transline
     attenuators
-    ../polygon
     ../common
     ${INC_AFTER}
     )
@@ -88,7 +87,6 @@ set_target_properties( pcb_calculator_kiface PROPERTIES
     )
 target_link_libraries( pcb_calculator_kiface
     common
-    polygon
     ${wxWidgets_LIBRARIES}
     )
 set_source_files_properties( pcb_calculator.cpp PROPERTIES
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index a0c929691..117a5efe0 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -42,7 +42,6 @@ include_directories(
     ./autorouter
     ../3d-viewer
     ../common
-    ../polygon
     ../common/dialogs
     ./exporters
     ../dxflib_qcad
@@ -645,6 +644,7 @@ add_library( pcbnew_kiface_objects OBJECT
 
 target_link_libraries( pcbnew_kiface_objects PRIVATE
     bitmaps
+    polygon
 )
 
 add_library( pcbnew_kiface MODULE $<TARGET_OBJECTS:pcbnew_kiface_objects> )
@@ -677,7 +677,6 @@ set( PCBNEW_KIFACE_LIBRARIES
     pcad2kicadpcb
     legacy_wx
     common
-    polygon
     gal
     lib_dxf
     idf3
diff --git a/pcbnew/connectivity/CMakeLists.txt b/pcbnew/connectivity/CMakeLists.txt
index 2932ed8ba..69e238741 100644
--- a/pcbnew/connectivity/CMakeLists.txt
+++ b/pcbnew/connectivity/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories(
     ./
     ../
     ../../include
-    ../../polygon
     ${INC_AFTER}
 )
 
diff --git a/pcbnew/router/CMakeLists.txt b/pcbnew/router/CMakeLists.txt
index 44a945644..e7ca4422c 100644
--- a/pcbnew/router/CMakeLists.txt
+++ b/pcbnew/router/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(
     ../../include
     ../../3d-viewer
     ../../pcbnew
-    ../../polygon
     ${INC_AFTER}
 )
 
diff --git a/polygon/CMakeLists.txt b/polygon/CMakeLists.txt
index 439961405..881f42681 100644
--- a/polygon/CMakeLists.txt
+++ b/polygon/CMakeLists.txt
@@ -16,3 +16,6 @@ set(POLYGON_SRCS
 
 add_library(polygon STATIC ${POLYGON_SRCS})
 
+target_include_directories( polygon PUBLIC
+    include
+)
\ No newline at end of file
diff --git a/polygon/SutherlandHodgmanClipPoly.h b/polygon/include/SutherlandHodgmanClipPoly.h
similarity index 100%
rename from polygon/SutherlandHodgmanClipPoly.h
rename to polygon/include/SutherlandHodgmanClipPoly.h
diff --git a/polygon/clipper.hpp b/polygon/include/clipper.hpp
similarity index 100%
rename from polygon/clipper.hpp
rename to polygon/include/clipper.hpp
diff --git a/polygon/math_for_graphics.h b/polygon/include/math_for_graphics.h
similarity index 100%
rename from polygon/math_for_graphics.h
rename to polygon/include/math_for_graphics.h
diff --git a/polygon/polygon_test_point_inside.h b/polygon/include/polygon_test_point_inside.h
similarity index 100%
rename from polygon/polygon_test_point_inside.h
rename to polygon/include/polygon_test_point_inside.h
diff --git a/qa/common/CMakeLists.txt b/qa/common/CMakeLists.txt
index 55d8d8f89..9ac55d56b 100644
--- a/qa/common/CMakeLists.txt
+++ b/qa/common/CMakeLists.txt
@@ -62,7 +62,6 @@ set( common_srcs
 set( common_libs
     common
     legacy_gal
-    polygon
     gal
     qa_utils
     unit_test_utils
@@ -89,7 +88,6 @@ include_directories(
     ${CMAKE_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/pcbnew
     ${CMAKE_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/polygon
     ${INC_AFTER}
 )
 
diff --git a/qa/common_tools/CMakeLists.txt b/qa/common_tools/CMakeLists.txt
index 9267bfe7d..445f1d217 100644
--- a/qa/common_tools/CMakeLists.txt
+++ b/qa/common_tools/CMakeLists.txt
@@ -41,14 +41,12 @@ add_executable( qa_common_tools
 include_directories(
     ${CMAKE_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/polygon
     ${INC_AFTER}
 )
 
 target_link_libraries( qa_common_tools
     common
     legacy_gal
-    polygon
     gal
     qa_utils
     ${wxWidgets_LIBRARIES}
diff --git a/qa/pcb_test_window/CMakeLists.txt b/qa/pcb_test_window/CMakeLists.txt
index 7e8eed0c0..e1ab06d4c 100644
--- a/qa/pcb_test_window/CMakeLists.txt
+++ b/qa/pcb_test_window/CMakeLists.txt
@@ -55,7 +55,6 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/pcbnew/router
     ${CMAKE_SOURCE_DIR}/pcbnew/tools
     ${CMAKE_SOURCE_DIR}/pcbnew/dialogs
-    ${CMAKE_SOURCE_DIR}/polygon
     ${CMAKE_SOURCE_DIR}/common/geometry
     ${CMAKE_SOURCE_DIR}/qa/qa_utils
     ${Boost_INCLUDE_DIR}
@@ -63,19 +62,15 @@ include_directories(
 )
 
 target_link_libraries( test_window
-    polygon
     pnsrouter
     common
     pcbcommon
-    polygon
     pnsrouter
     common
     pcbcommon
-    polygon
     pnsrouter
     common
     pcbcommon
-    polygon
     pnsrouter
     common
     pcbcommon
diff --git a/qa/pcbnew/CMakeLists.txt b/qa/pcbnew/CMakeLists.txt
index a3645cbc0..e194cd650 100644
--- a/qa/pcbnew/CMakeLists.txt
+++ b/qa/pcbnew/CMakeLists.txt
@@ -64,7 +64,6 @@ target_link_libraries( qa_pcbnew
     common
     pcbcommon
     legacy_wx
-    polygon
     gal
     qa_utils
     lib_dxf
diff --git a/qa/pcbnew_tools/CMakeLists.txt b/qa/pcbnew_tools/CMakeLists.txt
index 2b9550e2f..76934655c 100644
--- a/qa/pcbnew_tools/CMakeLists.txt
+++ b/qa/pcbnew_tools/CMakeLists.txt
@@ -52,7 +52,6 @@ target_link_libraries( qa_pcbnew_tools
     common
     pcbcommon
     legacy_wx
-    polygon
     gal
     qa_utils
     lib_dxf
diff --git a/qa/pcbnew_utils/CMakeLists.txt b/qa/pcbnew_utils/CMakeLists.txt
index a6c46130f..f8aab2656 100644
--- a/qa/pcbnew_utils/CMakeLists.txt
+++ b/qa/pcbnew_utils/CMakeLists.txt
@@ -45,7 +45,6 @@ target_include_directories( qa_pcbnew_utils PUBLIC
     # target_include_directories and made PUBLIC)
     ${CMAKE_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/polygon
     ${CMAKE_SOURCE_DIR}/pcbnew
     ${CMAKE_SOURCE_DIR}/common
     ${CMAKE_SOURCE_DIR}/pcbnew/router
@@ -65,7 +64,6 @@ target_link_libraries( qa_pcbnew_utils PUBLIC
 #     common
 #     pcbcommon
 #     legacy_wx
-#     polygon
 #     gal
 #     qa_utils
 #     lib_dxf
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 40602e92d..2c9587bbf 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -14,7 +14,6 @@ add_executable( container_test
     )
 target_link_libraries( container_test
     common
-    polygon
     ${wxWidgets_LIBRARIES}
     )
 
-- 
2.20.1

From c28b6b1513e11449fb78d74a7218950807dec266 Mon Sep 17 00:00:00 2001
From: John Beard <john.j.beard@gmail.com>
Date: Wed, 23 Jan 2019 15:58:16 +0000
Subject: [PATCH 1/2] Bitmaps: move bitmap defs to bitmaps library

The bitmap definitions (BITMAP_DEF and so on) do not
have any dependencies on other libs, including WX. This
means the bitmaps library can be isolated from the other
dependencies.

Common now depends on bitmaps, and libraries that depend
on common can pick it up from the common target_link_libraries,
as it is PUBLIC. This means a lot of targets no longer
need manual bitmap linkage.

This avoids a circular dependency that was previously reported
by static analysis.

Avoiding pulling in WX and other headers into the include
tree of each bitmap .cpp is a huge speed up (around 10x) in
compilation, and the generated static library is also 10x
smaller (20MB vs 200MB)

Add common as a link library to pnsrouter,connectivity.
THese library do still use common code (including bitmaps,
via base_screen.h) and this allows them to pick up the libcommon
includes correctly.
---
 CMakeModules/PNG2cpp.cmake                    |   2 +-
 bitmap2component/CMakeLists.txt               |   1 -
 bitmaps_png/CMakeLists.txt                    |  12 +-
 bitmaps_png/cpp_16/folder.cpp                 |   2 +-
 bitmaps_png/cpp_16/pinorient_down.cpp         |   2 +-
 bitmaps_png/cpp_16/pinorient_left.cpp         |   2 +-
 bitmaps_png/cpp_16/pinorient_right.cpp        |   2 +-
 bitmaps_png/cpp_16/pinorient_up.cpp           |   2 +-
 .../cpp_16/pinshape_active_low_input.cpp      |   2 +-
 .../cpp_16/pinshape_active_low_output.cpp     |   2 +-
 .../cpp_16/pinshape_clock_active_low.cpp      |   2 +-
 bitmaps_png/cpp_16/pinshape_clock_fall.cpp    |   2 +-
 bitmaps_png/cpp_16/pinshape_clock_invert.cpp  |   2 +-
 bitmaps_png/cpp_16/pinshape_clock_normal.cpp  |   2 +-
 bitmaps_png/cpp_16/pinshape_invert.cpp        |   2 +-
 bitmaps_png/cpp_16/pinshape_nonlogic.cpp      |   2 +-
 bitmaps_png/cpp_16/pinshape_normal.cpp        |   2 +-
 bitmaps_png/cpp_16/pintype_3states.cpp        |   2 +-
 bitmaps_png/cpp_16/pintype_bidi.cpp           |   2 +-
 bitmaps_png/cpp_16/pintype_input.cpp          |   2 +-
 bitmaps_png/cpp_16/pintype_noconnect.cpp      |   2 +-
 bitmaps_png/cpp_16/pintype_notspecif.cpp      |   2 +-
 bitmaps_png/cpp_16/pintype_opencoll.cpp       |   2 +-
 bitmaps_png/cpp_16/pintype_openemit.cpp       |   2 +-
 bitmaps_png/cpp_16/pintype_output.cpp         |   2 +-
 bitmaps_png/cpp_16/pintype_passive.cpp        |   2 +-
 bitmaps_png/cpp_16/pintype_powerinput.cpp     |   2 +-
 bitmaps_png/cpp_16/pintype_poweroutput.cpp    |   2 +-
 bitmaps_png/cpp_16/refresh.cpp                |   2 +-
 bitmaps_png/cpp_16/small_down.cpp             |   2 +-
 bitmaps_png/cpp_16/small_edit.cpp             |   2 +-
 bitmaps_png/cpp_16/small_library.cpp          |   2 +-
 bitmaps_png/cpp_16/small_plus.cpp             |   2 +-
 bitmaps_png/cpp_16/small_up.cpp               |   2 +-
 bitmaps_png/cpp_16/trash.cpp                  |   2 +-
 bitmaps_png/cpp_16/tree_nosel.cpp             |   2 +-
 bitmaps_png/cpp_16/tree_sel.cpp               |   2 +-
 bitmaps_png/cpp_16/www.cpp                    |   2 +-
 bitmaps_png/cpp_26/about.cpp                  |   2 +-
 bitmaps_png/cpp_26/add_arc.cpp                |   2 +-
 bitmaps_png/cpp_26/add_board.cpp              |   2 +-
 bitmaps_png/cpp_26/add_bus.cpp                |   2 +-
 bitmaps_png/cpp_26/add_bus2bus.cpp            |   2 +-
 bitmaps_png/cpp_26/add_circle.cpp             |   2 +-
 bitmaps_png/cpp_26/add_component.cpp          |   2 +-
 bitmaps_png/cpp_26/add_corner.cpp             |   2 +-
 bitmaps_png/cpp_26/add_dashed_line.cpp        |   2 +-
 bitmaps_png/cpp_26/add_dimension.cpp          |   2 +-
 bitmaps_png/cpp_26/add_document.cpp           |   2 +-
 bitmaps_png/cpp_26/add_gerber.cpp             |   2 +-
 bitmaps_png/cpp_26/add_glabel.cpp             |   2 +-
 bitmaps_png/cpp_26/add_graphical_polygon.cpp  |   2 +-
 bitmaps_png/cpp_26/add_graphical_segments.cpp |   2 +-
 bitmaps_png/cpp_26/add_hierar_pin.cpp         |   2 +-
 bitmaps_png/cpp_26/add_hierarchical_label.cpp |   2 +-
 .../cpp_26/add_hierarchical_subsheet.cpp      |   2 +-
 bitmaps_png/cpp_26/add_junction.cpp           |   2 +-
 bitmaps_png/cpp_26/add_keepout_area.cpp       |   2 +-
 bitmaps_png/cpp_26/add_library.cpp            |   2 +-
 bitmaps_png/cpp_26/add_line.cpp               |   2 +-
 bitmaps_png/cpp_26/add_line2bus.cpp           |   2 +-
 bitmaps_png/cpp_26/add_line_label.cpp         |   2 +-
 bitmaps_png/cpp_26/add_pcb_target.cpp         |   2 +-
 bitmaps_png/cpp_26/add_polygon.cpp            |   2 +-
 bitmaps_png/cpp_26/add_power.cpp              |   2 +-
 bitmaps_png/cpp_26/add_rectangle.cpp          |   2 +-
 bitmaps_png/cpp_26/add_tracks.cpp             |   2 +-
 bitmaps_png/cpp_26/add_via.cpp                |   2 +-
 bitmaps_png/cpp_26/add_zone.cpp               |   2 +-
 bitmaps_png/cpp_26/add_zone_cutout.cpp        |   2 +-
 bitmaps_png/cpp_26/align_items.cpp            |   2 +-
 bitmaps_png/cpp_26/align_items_bottom.cpp     |   2 +-
 bitmaps_png/cpp_26/align_items_center.cpp     |   2 +-
 bitmaps_png/cpp_26/align_items_left.cpp       |   2 +-
 bitmaps_png/cpp_26/align_items_middle.cpp     |   2 +-
 bitmaps_png/cpp_26/align_items_right.cpp      |   2 +-
 bitmaps_png/cpp_26/align_items_top.cpp        |   2 +-
 bitmaps_png/cpp_26/anchor.cpp                 |   2 +-
 bitmaps_png/cpp_26/annotate.cpp               |   2 +-
 bitmaps_png/cpp_26/annotate_down_right.cpp    |   2 +-
 bitmaps_png/cpp_26/annotate_right_down.cpp    |   2 +-
 bitmaps_png/cpp_26/apply_pad_settings.cpp     |   2 +-
 bitmaps_png/cpp_26/array.cpp                  |   2 +-
 bitmaps_png/cpp_26/auto_associe.cpp           |   2 +-
 bitmaps_png/cpp_26/auto_delete_track.cpp      |   2 +-
 bitmaps_png/cpp_26/auto_track_width.cpp       |   2 +-
 bitmaps_png/cpp_26/autoplace_fields.cpp       |   2 +-
 bitmaps_png/cpp_26/axis3d.cpp                 |   2 +-
 bitmaps_png/cpp_26/axis3d_back.cpp            |   2 +-
 bitmaps_png/cpp_26/axis3d_bottom.cpp          |   2 +-
 bitmaps_png/cpp_26/axis3d_front.cpp           |   2 +-
 bitmaps_png/cpp_26/axis3d_left.cpp            |   2 +-
 bitmaps_png/cpp_26/axis3d_right.cpp           |   2 +-
 bitmaps_png/cpp_26/axis3d_top.cpp             |   2 +-
 bitmaps_png/cpp_26/bitmap2component.cpp       |   2 +-
 bitmaps_png/cpp_26/bom.cpp                    |   2 +-
 bitmaps_png/cpp_26/book.cpp                   |   2 +-
 bitmaps_png/cpp_26/break_bus.cpp              |   2 +-
 bitmaps_png/cpp_26/break_line.cpp             |   2 +-
 bitmaps_png/cpp_26/browse_files.cpp           |   2 +-
 bitmaps_png/cpp_26/calculator.cpp             |   2 +-
 bitmaps_png/cpp_26/cancel.cpp                 |   2 +-
 bitmaps_png/cpp_26/change_entry_orient.cpp    |   2 +-
 bitmaps_png/cpp_26/checked_ok.cpp             |   2 +-
 bitmaps_png/cpp_26/color_materials.cpp        |   2 +-
 .../component_select_alternate_shape.cpp      |   2 +-
 bitmaps_png/cpp_26/component_select_unit.cpp  |   2 +-
 bitmaps_png/cpp_26/config.cpp                 |   2 +-
 bitmaps_png/cpp_26/contrast_mode.cpp          |   2 +-
 bitmaps_png/cpp_26/copper_layers_setup.cpp    |   2 +-
 bitmaps_png/cpp_26/copy.cpp                   |   2 +-
 bitmaps_png/cpp_26/copy_pad_settings.cpp      |   2 +-
 bitmaps_png/cpp_26/create_cmp_file.cpp        |   2 +-
 bitmaps_png/cpp_26/cursor.cpp                 |   2 +-
 bitmaps_png/cpp_26/cursor_shape.cpp           |   2 +-
 .../cpp_26/custom_pad_to_primitives.cpp       |   2 +-
 bitmaps_png/cpp_26/cut.cpp                    |   2 +-
 bitmaps_png/cpp_26/cvpcb.cpp                  |   2 +-
 bitmaps_png/cpp_26/dashline.cpp               |   2 +-
 bitmaps_png/cpp_26/datasheet.cpp              |   2 +-
 bitmaps_png/cpp_26/delete.cpp                 |   2 +-
 bitmaps_png/cpp_26/delete_association.cpp     |   2 +-
 bitmaps_png/cpp_26/delete_bus.cpp             |   2 +-
 bitmaps_png/cpp_26/delete_circle.cpp          |   2 +-
 bitmaps_png/cpp_26/delete_connection.cpp      |   2 +-
 bitmaps_png/cpp_26/delete_dimension.cpp       |   2 +-
 bitmaps_png/cpp_26/delete_field.cpp           |   2 +-
 bitmaps_png/cpp_26/delete_gerber.cpp          |   2 +-
 bitmaps_png/cpp_26/delete_glabel.cpp          |   2 +-
 bitmaps_png/cpp_26/delete_line.cpp            |   2 +-
 bitmaps_png/cpp_26/delete_module.cpp          |   2 +-
 bitmaps_png/cpp_26/delete_net.cpp             |   2 +-
 bitmaps_png/cpp_26/delete_node.cpp            |   2 +-
 bitmaps_png/cpp_26/delete_pad.cpp             |   2 +-
 bitmaps_png/cpp_26/delete_polygon.cpp         |   2 +-
 bitmaps_png/cpp_26/delete_rectangle.cpp       |   2 +-
 bitmaps_png/cpp_26/delete_sheet.cpp           |   2 +-
 bitmaps_png/cpp_26/delete_track.cpp           |   2 +-
 bitmaps_png/cpp_26/directory.cpp              |   2 +-
 bitmaps_png/cpp_26/directory_browser.cpp      |   2 +-
 bitmaps_png/cpp_26/display_options.cpp        |   2 +-
 bitmaps_png/cpp_26/distribute_horizontal.cpp  |   2 +-
 bitmaps_png/cpp_26/distribute_vertical.cpp    |   2 +-
 bitmaps_png/cpp_26/down.cpp                   |   2 +-
 bitmaps_png/cpp_26/drag.cpp                   |   2 +-
 bitmaps_png/cpp_26/drag_outline_segment.cpp   |   2 +-
 bitmaps_png/cpp_26/drag_pad.cpp               |   2 +-
 bitmaps_png/cpp_26/drag_segment_withslope.cpp |   2 +-
 bitmaps_png/cpp_26/drc.cpp                    |   2 +-
 bitmaps_png/cpp_26/drc_off.cpp                |   2 +-
 bitmaps_png/cpp_26/duplicate.cpp              |   2 +-
 bitmaps_png/cpp_26/edges_sketch.cpp           |   2 +-
 bitmaps_png/cpp_26/edit.cpp                   |   2 +-
 bitmaps_png/cpp_26/edit_cmp_symb_links.cpp    |   2 +-
 bitmaps_png/cpp_26/edit_comp_footprint.cpp    |   2 +-
 bitmaps_png/cpp_26/edit_comp_ref.cpp          |   2 +-
 bitmaps_png/cpp_26/edit_comp_value.cpp        |   2 +-
 bitmaps_png/cpp_26/edit_module.cpp            |   2 +-
 bitmaps_png/cpp_26/edit_text.cpp              |   2 +-
 bitmaps_png/cpp_26/editor.cpp                 |   2 +-
 bitmaps_png/cpp_26/eeschema.cpp               |   2 +-
 bitmaps_png/cpp_26/enter_sheet.cpp            |   2 +-
 bitmaps_png/cpp_26/erc.cpp                    |   2 +-
 bitmaps_png/cpp_26/erc_green.cpp              |   2 +-
 bitmaps_png/cpp_26/ercerr.cpp                 |   2 +-
 bitmaps_png/cpp_26/ercwarn.cpp                |   2 +-
 bitmaps_png/cpp_26/exchange.cpp               |   2 +-
 bitmaps_png/cpp_26/exit.cpp                   |   2 +-
 bitmaps_png/cpp_26/export.cpp                 |   2 +-
 bitmaps_png/cpp_26/export3d.cpp               |   2 +-
 bitmaps_png/cpp_26/export_dsn.cpp             |   2 +-
 bitmaps_png/cpp_26/export_footprint_names.cpp |   2 +-
 bitmaps_png/cpp_26/export_idf.cpp             |   2 +-
 bitmaps_png/cpp_26/export_module.cpp          |   2 +-
 bitmaps_png/cpp_26/export_part.cpp            |   2 +-
 bitmaps_png/cpp_26/export_step.cpp            |   2 +-
 bitmaps_png/cpp_26/fabrication.cpp            |   2 +-
 bitmaps_png/cpp_26/file_footprint.cpp         |   2 +-
 bitmaps_png/cpp_26/fill_zone.cpp              |   2 +-
 bitmaps_png/cpp_26/find.cpp                   |   2 +-
 bitmaps_png/cpp_26/find_replace.cpp           |   2 +-
 bitmaps_png/cpp_26/flag.cpp                   |   2 +-
 bitmaps_png/cpp_26/flip_board.cpp             |   2 +-
 bitmaps_png/cpp_26/fonts.cpp                  |   2 +-
 bitmaps_png/cpp_26/footprint_text.cpp         |   2 +-
 bitmaps_png/cpp_26/gbr_select_mode0.cpp       |   2 +-
 bitmaps_png/cpp_26/gbr_select_mode1.cpp       |   2 +-
 bitmaps_png/cpp_26/gbr_select_mode2.cpp       |   2 +-
 bitmaps_png/cpp_26/general_deletions.cpp      |   2 +-
 bitmaps_png/cpp_26/general_ratsnest.cpp       |   2 +-
 bitmaps_png/cpp_26/gerber_file.cpp            |   2 +-
 bitmaps_png/cpp_26/gerber_job_file.cpp        |   2 +-
 bitmaps_png/cpp_26/gerbview_clear_layers.cpp  |   2 +-
 bitmaps_png/cpp_26/gerbview_drill_file.cpp    |   2 +-
 .../cpp_26/gerbview_show_negative_objects.cpp |   2 +-
 bitmaps_png/cpp_26/gl_change.cpp              |   2 +-
 bitmaps_png/cpp_26/glabel2label.cpp           |   2 +-
 bitmaps_png/cpp_26/glabel2text.cpp            |   2 +-
 bitmaps_png/cpp_26/go_down.cpp                |   2 +-
 bitmaps_png/cpp_26/go_up.cpp                  |   2 +-
 bitmaps_png/cpp_26/green.cpp                  |   2 +-
 bitmaps_png/cpp_26/grid.cpp                   |   2 +-
 bitmaps_png/cpp_26/grid_select.cpp            |   2 +-
 bitmaps_png/cpp_26/grid_select_axis.cpp       |   2 +-
 bitmaps_png/cpp_26/hammer.cpp                 |   2 +-
 bitmaps_png/cpp_26/help.cpp                   |   2 +-
 bitmaps_png/cpp_26/hidden_pin.cpp             |   2 +-
 bitmaps_png/cpp_26/hierarchy_nav.cpp          |   2 +-
 bitmaps_png/cpp_26/highlight_remove.cpp       |   2 +-
 bitmaps_png/cpp_26/hotkeys.cpp                |   2 +-
 bitmaps_png/cpp_26/hotkeys_export.cpp         |   2 +-
 bitmaps_png/cpp_26/hotkeys_import.cpp         |   2 +-
 bitmaps_png/cpp_26/html.cpp                   |   2 +-
 bitmaps_png/cpp_26/icon.cpp                   |   2 +-
 bitmaps_png/cpp_26/icon_cvpcb_small.cpp       |   2 +-
 bitmaps_png/cpp_26/icon_gerbview_small.cpp    |   2 +-
 bitmaps_png/cpp_26/image.cpp                  |   2 +-
 bitmaps_png/cpp_26/import.cpp                 |   2 +-
 bitmaps_png/cpp_26/import3d.cpp               |   2 +-
 bitmaps_png/cpp_26/import_brd_file.cpp        |   2 +-
 bitmaps_png/cpp_26/import_document.cpp        |   2 +-
 bitmaps_png/cpp_26/import_footprint_names.cpp |   2 +-
 .../cpp_26/import_hierarchical_label.cpp      |   2 +-
 bitmaps_png/cpp_26/import_module.cpp          |   2 +-
 bitmaps_png/cpp_26/import_part.cpp            |   2 +-
 bitmaps_png/cpp_26/import_project.cpp         |   2 +-
 bitmaps_png/cpp_26/import_setup.cpp           |   2 +-
 bitmaps_png/cpp_26/info.cpp                   |   2 +-
 bitmaps_png/cpp_26/insert_module_board.cpp    |   2 +-
 bitmaps_png/cpp_26/invisible_text.cpp         |   2 +-
 bitmaps_png/cpp_26/kicad_icon_small.cpp       |   2 +-
 bitmaps_png/cpp_26/label.cpp                  |   2 +-
 bitmaps_png/cpp_26/label2glabel.cpp           |   2 +-
 bitmaps_png/cpp_26/label2text.cpp             |   2 +-
 bitmaps_png/cpp_26/lang_bg.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_ca.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_cs.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_de.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_def.cpp               |   2 +-
 bitmaps_png/cpp_26/lang_en.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_es.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_fi.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_fr.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_gr.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_hu.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_it.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_jp.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_ko.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_lt.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_nl.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_pl.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_pt.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_ru.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_sk.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_sl.cpp                |   2 +-
 bitmaps_png/cpp_26/lang_zh.cpp                |   2 +-
 bitmaps_png/cpp_26/language.cpp               |   2 +-
 bitmaps_png/cpp_26/layers_manager.cpp         |   2 +-
 bitmaps_png/cpp_26/leave_sheet.cpp            |   2 +-
 bitmaps_png/cpp_26/left.cpp                   |   2 +-
 bitmaps_png/cpp_26/lib_next.cpp               |   2 +-
 bitmaps_png/cpp_26/lib_previous.cpp           |   2 +-
 bitmaps_png/cpp_26/libedit.cpp                |   2 +-
 bitmaps_png/cpp_26/library.cpp                |   2 +-
 bitmaps_png/cpp_26/library_archive.cpp        |   2 +-
 bitmaps_png/cpp_26/library_archive_as.cpp     |   2 +-
 bitmaps_png/cpp_26/library_browse.cpp         |   2 +-
 bitmaps_png/cpp_26/library_option.cpp         |   2 +-
 bitmaps_png/cpp_26/library_table.cpp          |   2 +-
 bitmaps_png/cpp_26/lines90.cpp                |   2 +-
 bitmaps_png/cpp_26/list_nets.cpp              |   2 +-
 bitmaps_png/cpp_26/load_gerber.cpp            |   2 +-
 bitmaps_png/cpp_26/load_module_board.cpp      |   2 +-
 bitmaps_png/cpp_26/load_module_lib.cpp        |   2 +-
 bitmaps_png/cpp_26/local_ratsnest.cpp         |   2 +-
 bitmaps_png/cpp_26/lock_unlock.cpp            |   2 +-
 bitmaps_png/cpp_26/locked.cpp                 |   2 +-
 bitmaps_png/cpp_26/measurement.cpp            |   2 +-
 bitmaps_png/cpp_26/minus.cpp                  |   2 +-
 bitmaps_png/cpp_26/mirror_h.cpp               |   2 +-
 bitmaps_png/cpp_26/mirror_v.cpp               |   2 +-
 bitmaps_png/cpp_26/mode_module.cpp            |   2 +-
 bitmaps_png/cpp_26/mode_track.cpp             |   2 +-
 bitmaps_png/cpp_26/modratsnest.cpp            |   2 +-
 bitmaps_png/cpp_26/module.cpp                 |   2 +-
 bitmaps_png/cpp_26/module_check.cpp           |   2 +-
 bitmaps_png/cpp_26/module_editor.cpp          |   2 +-
 bitmaps_png/cpp_26/module_filtered_list.cpp   |   2 +-
 bitmaps_png/cpp_26/module_full_list.cpp       |   2 +-
 bitmaps_png/cpp_26/module_library_list.cpp    |   2 +-
 .../cpp_26/module_name_filtered_list.cpp      |   2 +-
 bitmaps_png/cpp_26/module_options.cpp         |   2 +-
 .../cpp_26/module_pin_filtered_list.cpp       |   2 +-
 bitmaps_png/cpp_26/module_ratsnest.cpp        |   2 +-
 bitmaps_png/cpp_26/module_wizard.cpp          |   2 +-
 bitmaps_png/cpp_26/modview_icon.cpp           |   2 +-
 bitmaps_png/cpp_26/morgan1.cpp                |   2 +-
 bitmaps_png/cpp_26/morgan2.cpp                |   2 +-
 bitmaps_png/cpp_26/move.cpp                   |   2 +-
 bitmaps_png/cpp_26/move_exactly.cpp           |   2 +-
 bitmaps_png/cpp_26/move_glabel.cpp            |   2 +-
 bitmaps_png/cpp_26/move_pad.cpp               |   2 +-
 bitmaps_png/cpp_26/move_polygon.cpp           |   2 +-
 bitmaps_png/cpp_26/move_rectangle.cpp         |   2 +-
 bitmaps_png/cpp_26/move_relative.cpp          |   2 +-
 bitmaps_png/cpp_26/move_sheet.cpp             |   2 +-
 bitmaps_png/cpp_26/move_target.cpp            |   2 +-
 bitmaps_png/cpp_26/mw_add_gap.cpp             |   2 +-
 bitmaps_png/cpp_26/mw_add_line.cpp            |   2 +-
 bitmaps_png/cpp_26/mw_add_shape.cpp           |   2 +-
 bitmaps_png/cpp_26/mw_add_stub.cpp            |   2 +-
 bitmaps_png/cpp_26/mw_add_stub_arc.cpp        |   2 +-
 bitmaps_png/cpp_26/mw_toolbar.cpp             |   2 +-
 bitmaps_png/cpp_26/net_highlight.cpp          |   2 +-
 .../cpp_26/net_highlight_schematic.cpp        |   2 +-
 bitmaps_png/cpp_26/net_locked.cpp             |   2 +-
 bitmaps_png/cpp_26/net_unlocked.cpp           |   2 +-
 bitmaps_png/cpp_26/netlist.cpp                |   2 +-
 bitmaps_png/cpp_26/new_board.cpp              |   2 +-
 bitmaps_png/cpp_26/new_component.cpp          |   2 +-
 bitmaps_png/cpp_26/new_cvpcb.cpp              |   2 +-
 bitmaps_png/cpp_26/new_document.cpp           |   2 +-
 bitmaps_png/cpp_26/new_footprint.cpp          |   2 +-
 bitmaps_png/cpp_26/new_generic.cpp            |   2 +-
 bitmaps_png/cpp_26/new_library.cpp            |   2 +-
 bitmaps_png/cpp_26/new_page_layout.cpp        |   2 +-
 bitmaps_png/cpp_26/new_project.cpp            |   2 +-
 .../cpp_26/new_project_with_template.cpp      |   2 +-
 bitmaps_png/cpp_26/noconn.cpp                 |   2 +-
 bitmaps_png/cpp_26/normal.cpp                 |   2 +-
 bitmaps_png/cpp_26/online_help.cpp            |   2 +-
 bitmaps_png/cpp_26/open_brd_file.cpp          |   2 +-
 bitmaps_png/cpp_26/open_document.cpp          |   2 +-
 bitmaps_png/cpp_26/open_library.cpp           |   2 +-
 bitmaps_png/cpp_26/open_page_layout.cpp       |   2 +-
 bitmaps_png/cpp_26/open_project.cpp           |   2 +-
 bitmaps_png/cpp_26/opt_show_polygon.cpp       |   2 +-
 bitmaps_png/cpp_26/options_3drender.cpp       |   2 +-
 bitmaps_png/cpp_26/options_all_tracks.cpp     |   2 +-
 .../cpp_26/options_all_tracks_and_vias.cpp    |   2 +-
 bitmaps_png/cpp_26/options_all_vias.cpp       |   2 +-
 bitmaps_png/cpp_26/options_arc.cpp            |   2 +-
 bitmaps_png/cpp_26/options_board.cpp          |   2 +-
 bitmaps_png/cpp_26/options_circle.cpp         |   2 +-
 bitmaps_png/cpp_26/options_generic.cpp        |   2 +-
 bitmaps_png/cpp_26/options_module.cpp         |   2 +-
 bitmaps_png/cpp_26/options_pad.cpp            |   2 +-
 bitmaps_png/cpp_26/options_pin.cpp            |   2 +-
 bitmaps_png/cpp_26/options_pinsheet.cpp       |   2 +-
 bitmaps_png/cpp_26/options_rectangle.cpp      |   2 +-
 bitmaps_png/cpp_26/options_segment.cpp        |   2 +-
 bitmaps_png/cpp_26/options_track.cpp          |   2 +-
 bitmaps_png/cpp_26/options_tracks.cpp         |   2 +-
 bitmaps_png/cpp_26/options_vias.cpp           |   2 +-
 bitmaps_png/cpp_26/orient.cpp                 |   2 +-
 bitmaps_png/cpp_26/ortho.cpp                  |   2 +-
 bitmaps_png/cpp_26/pad.cpp                    |   2 +-
 bitmaps_png/cpp_26/pad_dimensions.cpp         |   2 +-
 bitmaps_png/cpp_26/pad_enumerate.cpp          |   2 +-
 bitmaps_png/cpp_26/pad_sketch.cpp             |   2 +-
 bitmaps_png/cpp_26/pads_mask_layers.cpp       |   2 +-
 bitmaps_png/cpp_26/pagelayout_load.cpp        |   2 +-
 .../cpp_26/pagelayout_normal_view_mode.cpp    |   2 +-
 .../cpp_26/pagelayout_special_view_mode.cpp   |   2 +-
 bitmaps_png/cpp_26/palette.cpp                |   2 +-
 bitmaps_png/cpp_26/part_properties.cpp        |   2 +-
 bitmaps_png/cpp_26/paste.cpp                  |   2 +-
 bitmaps_png/cpp_26/path.cpp                   |   2 +-
 bitmaps_png/cpp_26/pcb_offset.cpp             |   2 +-
 bitmaps_png/cpp_26/pcb_target.cpp             |   2 +-
 bitmaps_png/cpp_26/pcbcalculator.cpp          |   2 +-
 bitmaps_png/cpp_26/pcbnew.cpp                 |   2 +-
 bitmaps_png/cpp_26/pin.cpp                    |   2 +-
 bitmaps_png/cpp_26/pin2pin.cpp                |   2 +-
 bitmaps_png/cpp_26/pin_name_to.cpp            |   2 +-
 bitmaps_png/cpp_26/pin_number_to.cpp          |   2 +-
 bitmaps_png/cpp_26/pin_show_etype.cpp         |   2 +-
 bitmaps_png/cpp_26/pin_size_to.cpp            |   2 +-
 bitmaps_png/cpp_26/pin_table.cpp              |   2 +-
 bitmaps_png/cpp_26/pin_to.cpp                 |   2 +-
 bitmaps_png/cpp_26/plot.cpp                   |   2 +-
 bitmaps_png/cpp_26/plot_dxf.cpp               |   2 +-
 bitmaps_png/cpp_26/plot_hpg.cpp               |   2 +-
 bitmaps_png/cpp_26/plot_pdf.cpp               |   2 +-
 bitmaps_png/cpp_26/plot_ps.cpp                |   2 +-
 bitmaps_png/cpp_26/plot_svg.cpp               |   2 +-
 bitmaps_png/cpp_26/plus.cpp                   |   2 +-
 bitmaps_png/cpp_26/polar_coord.cpp            |   2 +-
 bitmaps_png/cpp_26/post_compo.cpp             |   2 +-
 bitmaps_png/cpp_26/post_drill.cpp             |   2 +-
 bitmaps_png/cpp_26/post_module.cpp            |   2 +-
 bitmaps_png/cpp_26/preference.cpp             |   2 +-
 .../cpp_26/primitives_to_custom_pad.cpp       |   2 +-
 bitmaps_png/cpp_26/print_button.cpp           |   2 +-
 bitmaps_png/cpp_26/ps_diff_pair.cpp           |   2 +-
 bitmaps_png/cpp_26/ps_diff_pair_gap.cpp       |   2 +-
 .../cpp_26/ps_diff_pair_tune_length.cpp       |   2 +-
 .../cpp_26/ps_diff_pair_tune_phase.cpp        |   2 +-
 bitmaps_png/cpp_26/ps_diff_pair_via_gap.cpp   |   2 +-
 bitmaps_png/cpp_26/ps_router.cpp              |   2 +-
 bitmaps_png/cpp_26/ps_tune_length.cpp         |   2 +-
 bitmaps_png/cpp_26/push_pad_settings.cpp      |   2 +-
 bitmaps_png/cpp_26/py_script.cpp              |   2 +-
 bitmaps_png/cpp_26/ratsnest.cpp               |   2 +-
 bitmaps_png/cpp_26/read_setup.cpp             |   2 +-
 bitmaps_png/cpp_26/recent.cpp                 |   2 +-
 bitmaps_png/cpp_26/red.cpp                    |   2 +-
 bitmaps_png/cpp_26/redo.cpp                   |   2 +-
 bitmaps_png/cpp_26/reload.cpp                 |   2 +-
 bitmaps_png/cpp_26/reload2.cpp                |   2 +-
 bitmaps_png/cpp_26/render_mode.cpp            |   2 +-
 bitmaps_png/cpp_26/rescue.cpp                 |   2 +-
 bitmaps_png/cpp_26/reset_text.cpp             |   2 +-
 bitmaps_png/cpp_26/resize_sheet.cpp           |   2 +-
 bitmaps_png/cpp_26/right.cpp                  |   2 +-
 bitmaps_png/cpp_26/rotate_ccw.cpp             |   2 +-
 bitmaps_png/cpp_26/rotate_cw.cpp              |   2 +-
 bitmaps_png/cpp_26/rotate_neg_x.cpp           |   2 +-
 bitmaps_png/cpp_26/rotate_neg_y.cpp           |   2 +-
 bitmaps_png/cpp_26/rotate_neg_z.cpp           |   2 +-
 bitmaps_png/cpp_26/rotate_pos_x.cpp           |   2 +-
 bitmaps_png/cpp_26/rotate_pos_y.cpp           |   2 +-
 bitmaps_png/cpp_26/rotate_pos_z.cpp           |   2 +-
 bitmaps_png/cpp_26/router_len_tuner.cpp       |   2 +-
 .../router_len_tuner_amplitude_decr.cpp       |   2 +-
 .../router_len_tuner_amplitude_incr.cpp       |   2 +-
 .../cpp_26/router_len_tuner_dist_decr.cpp     |   2 +-
 .../cpp_26/router_len_tuner_dist_incr.cpp     |   2 +-
 bitmaps_png/cpp_26/router_len_tuner_setup.cpp |   2 +-
 bitmaps_png/cpp_26/save.cpp                   |   2 +-
 bitmaps_png/cpp_26/save_as.cpp                |   2 +-
 bitmaps_png/cpp_26/save_fp_to_board.cpp       |   2 +-
 bitmaps_png/cpp_26/save_gerber.cpp            |   2 +-
 bitmaps_png/cpp_26/save_library.cpp           |   2 +-
 bitmaps_png/cpp_26/save_project.cpp           |   2 +-
 bitmaps_png/cpp_26/save_setup.cpp             |   2 +-
 bitmaps_png/cpp_26/search_tree.cpp            |   2 +-
 bitmaps_png/cpp_26/select_grid.cpp            |   2 +-
 bitmaps_png/cpp_26/select_layer_pair.cpp      |   2 +-
 bitmaps_png/cpp_26/select_same_sheet.cpp      |   2 +-
 bitmaps_png/cpp_26/select_w_layer.cpp         |   2 +-
 bitmaps_png/cpp_26/setcolor_3d_bg.cpp         |   2 +-
 bitmaps_png/cpp_26/setcolor_board_body.cpp    |   2 +-
 bitmaps_png/cpp_26/setcolor_copper.cpp        |   2 +-
 bitmaps_png/cpp_26/setcolor_silkscreen.cpp    |   2 +-
 bitmaps_png/cpp_26/setcolor_soldermask.cpp    |   2 +-
 bitmaps_png/cpp_26/setcolor_solderpaste.cpp   |   2 +-
 bitmaps_png/cpp_26/shape_3d.cpp               |   2 +-
 bitmaps_png/cpp_26/sheetset.cpp               |   2 +-
 bitmaps_png/cpp_26/show_all_copper_layers.cpp |   2 +-
 bitmaps_png/cpp_26/show_all_layers.cpp        |   2 +-
 bitmaps_png/cpp_26/show_dcodenumber.cpp       |   2 +-
 bitmaps_png/cpp_26/show_footprint.cpp         |   2 +-
 bitmaps_png/cpp_26/show_mod_edge.cpp          |   2 +-
 bitmaps_png/cpp_26/show_no_copper_layers.cpp  |   2 +-
 bitmaps_png/cpp_26/show_no_layers.cpp         |   2 +-
 bitmaps_png/cpp_26/show_zone.cpp              |   2 +-
 bitmaps_png/cpp_26/show_zone_disable.cpp      |   2 +-
 bitmaps_png/cpp_26/show_zone_outline_only.cpp |   2 +-
 bitmaps_png/cpp_26/showtrack.cpp              |   2 +-
 bitmaps_png/cpp_26/sim_add_signal.cpp         |   2 +-
 bitmaps_png/cpp_26/sim_probe.cpp              |   2 +-
 bitmaps_png/cpp_26/sim_run.cpp                |   2 +-
 bitmaps_png/cpp_26/sim_settings.cpp           |   2 +-
 bitmaps_png/cpp_26/sim_stop.cpp               |   2 +-
 bitmaps_png/cpp_26/sim_tune.cpp               |   2 +-
 bitmaps_png/cpp_26/simulator.cpp              |   2 +-
 bitmaps_png/cpp_26/spreadsheet.cpp            |   2 +-
 bitmaps_png/cpp_26/svg_file.cpp               |   2 +-
 bitmaps_png/cpp_26/swap_layer.cpp             |   2 +-
 bitmaps_png/cpp_26/text.cpp                   |   2 +-
 bitmaps_png/cpp_26/text_sketch.cpp            |   2 +-
 bitmaps_png/cpp_26/three_d.cpp                |   2 +-
 bitmaps_png/cpp_26/tool_ratsnest.cpp          |   2 +-
 bitmaps_png/cpp_26/tools.cpp                  |   2 +-
 bitmaps_png/cpp_26/track_locked.cpp           |   2 +-
 bitmaps_png/cpp_26/track_sketch.cpp           |   2 +-
 bitmaps_png/cpp_26/track_unlocked.cpp         |   2 +-
 bitmaps_png/cpp_26/transistor.cpp             |   2 +-
 bitmaps_png/cpp_26/undelete.cpp               |   2 +-
 bitmaps_png/cpp_26/undo.cpp                   |   2 +-
 bitmaps_png/cpp_26/unit_inch.cpp              |   2 +-
 bitmaps_png/cpp_26/unit_mm.cpp                |   2 +-
 bitmaps_png/cpp_26/unknown.cpp                |   2 +-
 bitmaps_png/cpp_26/unlocked.cpp               |   2 +-
 bitmaps_png/cpp_26/unzip.cpp                  |   2 +-
 bitmaps_png/cpp_26/up.cpp                     |   2 +-
 bitmaps_png/cpp_26/update_fields.cpp          |   2 +-
 bitmaps_png/cpp_26/update_module_board.cpp    |   2 +-
 bitmaps_png/cpp_26/update_pcb_from_sch.cpp    |   2 +-
 .../cpp_26/use_3D_copper_thickness.cpp        |   2 +-
 bitmaps_png/cpp_26/via.cpp                    |   2 +-
 bitmaps_png/cpp_26/via_buried.cpp             |   2 +-
 bitmaps_png/cpp_26/via_microvia.cpp           |   2 +-
 bitmaps_png/cpp_26/via_sketch.cpp             |   2 +-
 bitmaps_png/cpp_26/warning.cpp                |   2 +-
 bitmaps_png/cpp_26/web_support.cpp            |   2 +-
 bitmaps_png/cpp_26/width_net.cpp              |   2 +-
 bitmaps_png/cpp_26/width_segment.cpp          |   2 +-
 bitmaps_png/cpp_26/width_track.cpp            |   2 +-
 bitmaps_png/cpp_26/width_track_via.cpp        |   2 +-
 bitmaps_png/cpp_26/width_vias.cpp             |   2 +-
 bitmaps_png/cpp_26/wizard_add_fplib_small.cpp |   2 +-
 bitmaps_png/cpp_26/zip.cpp                    |   2 +-
 bitmaps_png/cpp_26/zip_tool.cpp               |   2 +-
 bitmaps_png/cpp_26/zone_duplicate.cpp         |   2 +-
 bitmaps_png/cpp_26/zone_unfill.cpp            |   2 +-
 bitmaps_png/cpp_26/zoom.cpp                   |   2 +-
 bitmaps_png/cpp_26/zoom_area.cpp              |   2 +-
 bitmaps_png/cpp_26/zoom_center_on_screen.cpp  |   2 +-
 bitmaps_png/cpp_26/zoom_fit_in_page.cpp       |   2 +-
 bitmaps_png/cpp_26/zoom_in.cpp                |   2 +-
 bitmaps_png/cpp_26/zoom_out.cpp               |   2 +-
 bitmaps_png/cpp_26/zoom_redraw.cpp            |   2 +-
 bitmaps_png/cpp_26/zoom_selection.cpp         |   2 +-
 bitmaps_png/cpp_48/dialog_warning.cpp         |   2 +-
 bitmaps_png/cpp_48/icon_3d.cpp                |   2 +-
 bitmaps_png/cpp_48/icon_bitmap2component.cpp  |   2 +-
 bitmaps_png/cpp_48/icon_cvpcb.cpp             |   2 +-
 bitmaps_png/cpp_48/icon_eeschema.cpp          |   2 +-
 bitmaps_png/cpp_48/icon_gerbview.cpp          |   2 +-
 bitmaps_png/cpp_48/icon_kicad.cpp             |   2 +-
 bitmaps_png/cpp_48/icon_libedit.cpp           |   2 +-
 bitmaps_png/cpp_48/icon_modedit.cpp           |   2 +-
 bitmaps_png/cpp_48/icon_pagelayout_editor.cpp |   2 +-
 bitmaps_png/cpp_48/icon_pcbcalculator.cpp     |   2 +-
 bitmaps_png/cpp_48/icon_pcbnew.cpp            |   2 +-
 bitmaps_png/cpp_48/viewlibs_icon.cpp          |   2 +-
 bitmaps_png/cpp_48/wizard_add_fplib_icon.cpp  |   2 +-
 .../tune_diff_pair_length_legend.cpp          |   2 +-
 .../cpp_other/tune_diff_pair_skew_legend.cpp  |   2 +-
 .../tune_single_track_length_legend.cpp       |   2 +-
 bitmaps_png/include/bitmaps_png/bitmap_def.h  |  45 ++
 .../include/bitmaps_png/bitmaps_list.h        | 568 ++++++++++++++++++
 common/CMakeLists.txt                         |   7 +-
 cvpcb/CMakeLists.txt                          |   4 -
 eeschema/CMakeLists.txt                       |   8 -
 gerbview/CMakeLists.txt                       |   4 -
 include/bitmap_types.h                        |  18 +-
 include/bitmaps.h                             | 540 +----------------
 kicad/CMakeLists.txt                          |   2 -
 pagelayout_editor/CMakeLists.txt              |   7 -
 pcb_calculator/CMakeLists.txt                 |   2 -
 pcbnew/CMakeLists.txt                         |   6 +-
 pcbnew/connectivity/CMakeLists.txt            |   4 +
 pcbnew/pcad2kicadpcb_plugin/CMakeLists.txt    |   3 +-
 pcbnew/router/CMakeLists.txt                  |   4 +
 qa/common/CMakeLists.txt                      |   1 -
 qa/common_tools/CMakeLists.txt                |   1 -
 qa/pcb_test_window/CMakeLists.txt             |   4 -
 qa/pcbnew/CMakeLists.txt                      |   2 -
 qa/pcbnew_tools/CMakeLists.txt                |   2 -
 qa/pcbnew_utils/CMakeLists.txt                |   2 -
 tools/CMakeLists.txt                          |   1 -
 utils/kicad-ogltest/CMakeLists.txt            |   1 -
 555 files changed, 1168 insertions(+), 1141 deletions(-)
 create mode 100644 bitmaps_png/include/bitmaps_png/bitmap_def.h
 create mode 100644 bitmaps_png/include/bitmaps_png/bitmaps_list.h

diff --git a/CMakeModules/PNG2cpp.cmake b/CMakeModules/PNG2cpp.cmake
index 986f534d4..655c66e3f 100644
--- a/CMakeModules/PNG2cpp.cmake
+++ b/CMakeModules/PNG2cpp.cmake
@@ -47,7 +47,7 @@ set( output_begin "
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {"
 )
diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt
index 3aeafd98f..f0c624aeb 100644
--- a/bitmap2component/CMakeLists.txt
+++ b/bitmap2component/CMakeLists.txt
@@ -50,7 +50,6 @@ add_executable( bitmap2component WIN32 MACOSX_BUNDLE
 target_link_libraries( bitmap2component
     common
     polygon
-    bitmaps
     gal
     ${wxWidgets_LIBRARIES}
     potrace
diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index fa57403fd..5a95af6e0 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -55,14 +55,6 @@ option( MAINTAIN_PNGS
 # Used Only to maintain PNG files (and therefore to recreate .cpp files)
 # The png2cpp creates files with native End of Line format.
 
-include_directories(BEFORE ${INC_BEFORE})
-include_directories(
-    ${INC_AFTER}
-    )
-
-
-
-
 # Plan for three sizes of bitmaps:
 # SMALL - for menus         - 16 x 16
 # MID   - for toolbars      - 26 x 26
@@ -794,3 +786,7 @@ endforeach()
 
 #add_library( bitmaps SHARED ${CPP_LIST} )
 add_library( bitmaps STATIC ${CPP_LIST} )
+
+target_include_directories( bitmaps PUBLIC
+    include
+)
\ No newline at end of file
diff --git a/bitmaps_png/cpp_16/folder.cpp b/bitmaps_png/cpp_16/folder.cpp
index 04f1c9754..a4c3a2298 100644
--- a/bitmaps_png/cpp_16/folder.cpp
+++ b/bitmaps_png/cpp_16/folder.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinorient_down.cpp b/bitmaps_png/cpp_16/pinorient_down.cpp
index ae7b1b8fb..10385cf90 100644
--- a/bitmaps_png/cpp_16/pinorient_down.cpp
+++ b/bitmaps_png/cpp_16/pinorient_down.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinorient_left.cpp b/bitmaps_png/cpp_16/pinorient_left.cpp
index 6d26d1a65..a9985ed0d 100644
--- a/bitmaps_png/cpp_16/pinorient_left.cpp
+++ b/bitmaps_png/cpp_16/pinorient_left.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinorient_right.cpp b/bitmaps_png/cpp_16/pinorient_right.cpp
index 1a31a37c4..4a2d697b2 100644
--- a/bitmaps_png/cpp_16/pinorient_right.cpp
+++ b/bitmaps_png/cpp_16/pinorient_right.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinorient_up.cpp b/bitmaps_png/cpp_16/pinorient_up.cpp
index 33256dab5..5f6c24680 100644
--- a/bitmaps_png/cpp_16/pinorient_up.cpp
+++ b/bitmaps_png/cpp_16/pinorient_up.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_active_low_input.cpp b/bitmaps_png/cpp_16/pinshape_active_low_input.cpp
index de7bd9491..c6e8ac2f4 100644
--- a/bitmaps_png/cpp_16/pinshape_active_low_input.cpp
+++ b/bitmaps_png/cpp_16/pinshape_active_low_input.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_active_low_output.cpp b/bitmaps_png/cpp_16/pinshape_active_low_output.cpp
index 6f66616c8..b5a75241c 100644
--- a/bitmaps_png/cpp_16/pinshape_active_low_output.cpp
+++ b/bitmaps_png/cpp_16/pinshape_active_low_output.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_clock_active_low.cpp b/bitmaps_png/cpp_16/pinshape_clock_active_low.cpp
index 13c0b8d06..4d200f524 100644
--- a/bitmaps_png/cpp_16/pinshape_clock_active_low.cpp
+++ b/bitmaps_png/cpp_16/pinshape_clock_active_low.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_clock_fall.cpp b/bitmaps_png/cpp_16/pinshape_clock_fall.cpp
index 729af6597..b7b1e338a 100644
--- a/bitmaps_png/cpp_16/pinshape_clock_fall.cpp
+++ b/bitmaps_png/cpp_16/pinshape_clock_fall.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_clock_invert.cpp b/bitmaps_png/cpp_16/pinshape_clock_invert.cpp
index a7a3b1535..709d9fab0 100644
--- a/bitmaps_png/cpp_16/pinshape_clock_invert.cpp
+++ b/bitmaps_png/cpp_16/pinshape_clock_invert.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_clock_normal.cpp b/bitmaps_png/cpp_16/pinshape_clock_normal.cpp
index f76330430..7172e0c88 100644
--- a/bitmaps_png/cpp_16/pinshape_clock_normal.cpp
+++ b/bitmaps_png/cpp_16/pinshape_clock_normal.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_invert.cpp b/bitmaps_png/cpp_16/pinshape_invert.cpp
index 0f105ec55..aafd0c0f8 100644
--- a/bitmaps_png/cpp_16/pinshape_invert.cpp
+++ b/bitmaps_png/cpp_16/pinshape_invert.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_nonlogic.cpp b/bitmaps_png/cpp_16/pinshape_nonlogic.cpp
index c7c61ea94..49618ff44 100644
--- a/bitmaps_png/cpp_16/pinshape_nonlogic.cpp
+++ b/bitmaps_png/cpp_16/pinshape_nonlogic.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pinshape_normal.cpp b/bitmaps_png/cpp_16/pinshape_normal.cpp
index 636a314c8..86efadb2f 100644
--- a/bitmaps_png/cpp_16/pinshape_normal.cpp
+++ b/bitmaps_png/cpp_16/pinshape_normal.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_3states.cpp b/bitmaps_png/cpp_16/pintype_3states.cpp
index fc58edfaa..070d865f4 100644
--- a/bitmaps_png/cpp_16/pintype_3states.cpp
+++ b/bitmaps_png/cpp_16/pintype_3states.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_bidi.cpp b/bitmaps_png/cpp_16/pintype_bidi.cpp
index 0b6e4863e..8fe2aaf33 100644
--- a/bitmaps_png/cpp_16/pintype_bidi.cpp
+++ b/bitmaps_png/cpp_16/pintype_bidi.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_input.cpp b/bitmaps_png/cpp_16/pintype_input.cpp
index e2c5ff341..ff0fe8866 100644
--- a/bitmaps_png/cpp_16/pintype_input.cpp
+++ b/bitmaps_png/cpp_16/pintype_input.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_noconnect.cpp b/bitmaps_png/cpp_16/pintype_noconnect.cpp
index 94dc5c90c..55208d750 100644
--- a/bitmaps_png/cpp_16/pintype_noconnect.cpp
+++ b/bitmaps_png/cpp_16/pintype_noconnect.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_notspecif.cpp b/bitmaps_png/cpp_16/pintype_notspecif.cpp
index 59a55af95..97a08346a 100644
--- a/bitmaps_png/cpp_16/pintype_notspecif.cpp
+++ b/bitmaps_png/cpp_16/pintype_notspecif.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_opencoll.cpp b/bitmaps_png/cpp_16/pintype_opencoll.cpp
index 487107ddf..99531c038 100644
--- a/bitmaps_png/cpp_16/pintype_opencoll.cpp
+++ b/bitmaps_png/cpp_16/pintype_opencoll.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_openemit.cpp b/bitmaps_png/cpp_16/pintype_openemit.cpp
index 226ff10fb..3ce13da28 100644
--- a/bitmaps_png/cpp_16/pintype_openemit.cpp
+++ b/bitmaps_png/cpp_16/pintype_openemit.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_output.cpp b/bitmaps_png/cpp_16/pintype_output.cpp
index 81bfc4623..f8b3d9e33 100644
--- a/bitmaps_png/cpp_16/pintype_output.cpp
+++ b/bitmaps_png/cpp_16/pintype_output.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_passive.cpp b/bitmaps_png/cpp_16/pintype_passive.cpp
index c91a48ec4..578f1e948 100644
--- a/bitmaps_png/cpp_16/pintype_passive.cpp
+++ b/bitmaps_png/cpp_16/pintype_passive.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_powerinput.cpp b/bitmaps_png/cpp_16/pintype_powerinput.cpp
index 2eeee148a..31e38d384 100644
--- a/bitmaps_png/cpp_16/pintype_powerinput.cpp
+++ b/bitmaps_png/cpp_16/pintype_powerinput.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/pintype_poweroutput.cpp b/bitmaps_png/cpp_16/pintype_poweroutput.cpp
index 7a50ee1be..83b1f05c1 100644
--- a/bitmaps_png/cpp_16/pintype_poweroutput.cpp
+++ b/bitmaps_png/cpp_16/pintype_poweroutput.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/refresh.cpp b/bitmaps_png/cpp_16/refresh.cpp
index e9d516ab2..b23420cc8 100644
--- a/bitmaps_png/cpp_16/refresh.cpp
+++ b/bitmaps_png/cpp_16/refresh.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/small_down.cpp b/bitmaps_png/cpp_16/small_down.cpp
index 5d0bd6bf9..64620cf73 100644
--- a/bitmaps_png/cpp_16/small_down.cpp
+++ b/bitmaps_png/cpp_16/small_down.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/small_edit.cpp b/bitmaps_png/cpp_16/small_edit.cpp
index 31dcd6b3c..3c21bacbd 100644
--- a/bitmaps_png/cpp_16/small_edit.cpp
+++ b/bitmaps_png/cpp_16/small_edit.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/small_library.cpp b/bitmaps_png/cpp_16/small_library.cpp
index 0837e1306..034eff098 100644
--- a/bitmaps_png/cpp_16/small_library.cpp
+++ b/bitmaps_png/cpp_16/small_library.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/small_plus.cpp b/bitmaps_png/cpp_16/small_plus.cpp
index 381690f7b..b35cc28f8 100644
--- a/bitmaps_png/cpp_16/small_plus.cpp
+++ b/bitmaps_png/cpp_16/small_plus.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/small_up.cpp b/bitmaps_png/cpp_16/small_up.cpp
index 08f3dceed..a6c54e71d 100644
--- a/bitmaps_png/cpp_16/small_up.cpp
+++ b/bitmaps_png/cpp_16/small_up.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/trash.cpp b/bitmaps_png/cpp_16/trash.cpp
index d9da852bf..4fdb73537 100644
--- a/bitmaps_png/cpp_16/trash.cpp
+++ b/bitmaps_png/cpp_16/trash.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/tree_nosel.cpp b/bitmaps_png/cpp_16/tree_nosel.cpp
index 2304a7d5c..f8bf0318f 100644
--- a/bitmaps_png/cpp_16/tree_nosel.cpp
+++ b/bitmaps_png/cpp_16/tree_nosel.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/tree_sel.cpp b/bitmaps_png/cpp_16/tree_sel.cpp
index f0531060a..36aa5b340 100644
--- a/bitmaps_png/cpp_16/tree_sel.cpp
+++ b/bitmaps_png/cpp_16/tree_sel.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_16/www.cpp b/bitmaps_png/cpp_16/www.cpp
index f1cad35f6..74159f0ff 100644
--- a/bitmaps_png/cpp_16/www.cpp
+++ b/bitmaps_png/cpp_16/www.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/about.cpp b/bitmaps_png/cpp_26/about.cpp
index 6638154e8..f98bd5757 100644
--- a/bitmaps_png/cpp_26/about.cpp
+++ b/bitmaps_png/cpp_26/about.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_arc.cpp b/bitmaps_png/cpp_26/add_arc.cpp
index 88db8f05e..721dd4a30 100644
--- a/bitmaps_png/cpp_26/add_arc.cpp
+++ b/bitmaps_png/cpp_26/add_arc.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_board.cpp b/bitmaps_png/cpp_26/add_board.cpp
index 82ab6edde..15deeafa2 100644
--- a/bitmaps_png/cpp_26/add_board.cpp
+++ b/bitmaps_png/cpp_26/add_board.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_bus.cpp b/bitmaps_png/cpp_26/add_bus.cpp
index fdadfeafe..0222817cb 100644
--- a/bitmaps_png/cpp_26/add_bus.cpp
+++ b/bitmaps_png/cpp_26/add_bus.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_bus2bus.cpp b/bitmaps_png/cpp_26/add_bus2bus.cpp
index 0484fb5ed..4e4e6c6bd 100644
--- a/bitmaps_png/cpp_26/add_bus2bus.cpp
+++ b/bitmaps_png/cpp_26/add_bus2bus.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_circle.cpp b/bitmaps_png/cpp_26/add_circle.cpp
index 127b4e2fa..575037f42 100644
--- a/bitmaps_png/cpp_26/add_circle.cpp
+++ b/bitmaps_png/cpp_26/add_circle.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_component.cpp b/bitmaps_png/cpp_26/add_component.cpp
index af6080e0c..18b55d690 100644
--- a/bitmaps_png/cpp_26/add_component.cpp
+++ b/bitmaps_png/cpp_26/add_component.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_corner.cpp b/bitmaps_png/cpp_26/add_corner.cpp
index a88c19e13..d18ebe779 100644
--- a/bitmaps_png/cpp_26/add_corner.cpp
+++ b/bitmaps_png/cpp_26/add_corner.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_dashed_line.cpp b/bitmaps_png/cpp_26/add_dashed_line.cpp
index 2ef823da0..128581084 100644
--- a/bitmaps_png/cpp_26/add_dashed_line.cpp
+++ b/bitmaps_png/cpp_26/add_dashed_line.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_dimension.cpp b/bitmaps_png/cpp_26/add_dimension.cpp
index 70b55fb0e..316e705e6 100644
--- a/bitmaps_png/cpp_26/add_dimension.cpp
+++ b/bitmaps_png/cpp_26/add_dimension.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_document.cpp b/bitmaps_png/cpp_26/add_document.cpp
index 1f4f4e79e..01d835606 100644
--- a/bitmaps_png/cpp_26/add_document.cpp
+++ b/bitmaps_png/cpp_26/add_document.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_gerber.cpp b/bitmaps_png/cpp_26/add_gerber.cpp
index b84e1676e..b047a28af 100644
--- a/bitmaps_png/cpp_26/add_gerber.cpp
+++ b/bitmaps_png/cpp_26/add_gerber.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_glabel.cpp b/bitmaps_png/cpp_26/add_glabel.cpp
index 4b6b2b3c7..ad6598ff3 100644
--- a/bitmaps_png/cpp_26/add_glabel.cpp
+++ b/bitmaps_png/cpp_26/add_glabel.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_graphical_polygon.cpp b/bitmaps_png/cpp_26/add_graphical_polygon.cpp
index 0e9879024..a15011fad 100644
--- a/bitmaps_png/cpp_26/add_graphical_polygon.cpp
+++ b/bitmaps_png/cpp_26/add_graphical_polygon.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_graphical_segments.cpp b/bitmaps_png/cpp_26/add_graphical_segments.cpp
index 1207ed087..3b3b678db 100644
--- a/bitmaps_png/cpp_26/add_graphical_segments.cpp
+++ b/bitmaps_png/cpp_26/add_graphical_segments.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_hierar_pin.cpp b/bitmaps_png/cpp_26/add_hierar_pin.cpp
index 5308c69fc..0c6d7bec3 100644
--- a/bitmaps_png/cpp_26/add_hierar_pin.cpp
+++ b/bitmaps_png/cpp_26/add_hierar_pin.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_hierarchical_label.cpp b/bitmaps_png/cpp_26/add_hierarchical_label.cpp
index 970e2155e..c69f07d5b 100644
--- a/bitmaps_png/cpp_26/add_hierarchical_label.cpp
+++ b/bitmaps_png/cpp_26/add_hierarchical_label.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp b/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp
index 642471429..8a13a1f38 100644
--- a/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp
+++ b/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_junction.cpp b/bitmaps_png/cpp_26/add_junction.cpp
index 62d1e47fb..b09d18c52 100644
--- a/bitmaps_png/cpp_26/add_junction.cpp
+++ b/bitmaps_png/cpp_26/add_junction.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_keepout_area.cpp b/bitmaps_png/cpp_26/add_keepout_area.cpp
index ca8ae058e..ceeaf7765 100644
--- a/bitmaps_png/cpp_26/add_keepout_area.cpp
+++ b/bitmaps_png/cpp_26/add_keepout_area.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_library.cpp b/bitmaps_png/cpp_26/add_library.cpp
index ea0f10f85..8f5b0a21a 100644
--- a/bitmaps_png/cpp_26/add_library.cpp
+++ b/bitmaps_png/cpp_26/add_library.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_line.cpp b/bitmaps_png/cpp_26/add_line.cpp
index 7fa0b8c1c..6e3ff625d 100644
--- a/bitmaps_png/cpp_26/add_line.cpp
+++ b/bitmaps_png/cpp_26/add_line.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_line2bus.cpp b/bitmaps_png/cpp_26/add_line2bus.cpp
index 0813cb1dd..ec4763e49 100644
--- a/bitmaps_png/cpp_26/add_line2bus.cpp
+++ b/bitmaps_png/cpp_26/add_line2bus.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_line_label.cpp b/bitmaps_png/cpp_26/add_line_label.cpp
index 8757be4b1..3fb6371ae 100644
--- a/bitmaps_png/cpp_26/add_line_label.cpp
+++ b/bitmaps_png/cpp_26/add_line_label.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_pcb_target.cpp b/bitmaps_png/cpp_26/add_pcb_target.cpp
index df94c6466..78a33b2ea 100644
--- a/bitmaps_png/cpp_26/add_pcb_target.cpp
+++ b/bitmaps_png/cpp_26/add_pcb_target.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_polygon.cpp b/bitmaps_png/cpp_26/add_polygon.cpp
index a8909d292..377a1b609 100644
--- a/bitmaps_png/cpp_26/add_polygon.cpp
+++ b/bitmaps_png/cpp_26/add_polygon.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_power.cpp b/bitmaps_png/cpp_26/add_power.cpp
index a521403f2..89e32853d 100644
--- a/bitmaps_png/cpp_26/add_power.cpp
+++ b/bitmaps_png/cpp_26/add_power.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_rectangle.cpp b/bitmaps_png/cpp_26/add_rectangle.cpp
index 592e3903d..ab087e4b6 100644
--- a/bitmaps_png/cpp_26/add_rectangle.cpp
+++ b/bitmaps_png/cpp_26/add_rectangle.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_tracks.cpp b/bitmaps_png/cpp_26/add_tracks.cpp
index d5ee2c9e6..c51d1b03e 100644
--- a/bitmaps_png/cpp_26/add_tracks.cpp
+++ b/bitmaps_png/cpp_26/add_tracks.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_via.cpp b/bitmaps_png/cpp_26/add_via.cpp
index 5a732c6bf..32a4008dd 100644
--- a/bitmaps_png/cpp_26/add_via.cpp
+++ b/bitmaps_png/cpp_26/add_via.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_zone.cpp b/bitmaps_png/cpp_26/add_zone.cpp
index 4a17b5fc7..992d54a3c 100644
--- a/bitmaps_png/cpp_26/add_zone.cpp
+++ b/bitmaps_png/cpp_26/add_zone.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/add_zone_cutout.cpp b/bitmaps_png/cpp_26/add_zone_cutout.cpp
index d3201390d..bafb7da4e 100644
--- a/bitmaps_png/cpp_26/add_zone_cutout.cpp
+++ b/bitmaps_png/cpp_26/add_zone_cutout.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/align_items.cpp b/bitmaps_png/cpp_26/align_items.cpp
index 04642e2cb..23c1dcfc7 100644
--- a/bitmaps_png/cpp_26/align_items.cpp
+++ b/bitmaps_png/cpp_26/align_items.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/align_items_bottom.cpp b/bitmaps_png/cpp_26/align_items_bottom.cpp
index 618b3d741..2a9309f5c 100644
--- a/bitmaps_png/cpp_26/align_items_bottom.cpp
+++ b/bitmaps_png/cpp_26/align_items_bottom.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/align_items_center.cpp b/bitmaps_png/cpp_26/align_items_center.cpp
index 87f52fe70..57ec59303 100644
--- a/bitmaps_png/cpp_26/align_items_center.cpp
+++ b/bitmaps_png/cpp_26/align_items_center.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/align_items_left.cpp b/bitmaps_png/cpp_26/align_items_left.cpp
index 8bcbaf7ef..12c41e615 100644
--- a/bitmaps_png/cpp_26/align_items_left.cpp
+++ b/bitmaps_png/cpp_26/align_items_left.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/align_items_middle.cpp b/bitmaps_png/cpp_26/align_items_middle.cpp
index 1ed8cc039..95d5b37c8 100644
--- a/bitmaps_png/cpp_26/align_items_middle.cpp
+++ b/bitmaps_png/cpp_26/align_items_middle.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/align_items_right.cpp b/bitmaps_png/cpp_26/align_items_right.cpp
index 33184fbb3..594ba09ce 100644
--- a/bitmaps_png/cpp_26/align_items_right.cpp
+++ b/bitmaps_png/cpp_26/align_items_right.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/align_items_top.cpp b/bitmaps_png/cpp_26/align_items_top.cpp
index aa6816d52..bbac74eb3 100644
--- a/bitmaps_png/cpp_26/align_items_top.cpp
+++ b/bitmaps_png/cpp_26/align_items_top.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/anchor.cpp b/bitmaps_png/cpp_26/anchor.cpp
index 275f6bb21..2cd512016 100644
--- a/bitmaps_png/cpp_26/anchor.cpp
+++ b/bitmaps_png/cpp_26/anchor.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/annotate.cpp b/bitmaps_png/cpp_26/annotate.cpp
index 5cd536624..a4ba1613d 100644
--- a/bitmaps_png/cpp_26/annotate.cpp
+++ b/bitmaps_png/cpp_26/annotate.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/annotate_down_right.cpp b/bitmaps_png/cpp_26/annotate_down_right.cpp
index f3c2ac9bb..4c4bd2f38 100644
--- a/bitmaps_png/cpp_26/annotate_down_right.cpp
+++ b/bitmaps_png/cpp_26/annotate_down_right.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/annotate_right_down.cpp b/bitmaps_png/cpp_26/annotate_right_down.cpp
index caddaaa0e..fe35a6a18 100644
--- a/bitmaps_png/cpp_26/annotate_right_down.cpp
+++ b/bitmaps_png/cpp_26/annotate_right_down.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/apply_pad_settings.cpp b/bitmaps_png/cpp_26/apply_pad_settings.cpp
index 672164894..9482afe1e 100644
--- a/bitmaps_png/cpp_26/apply_pad_settings.cpp
+++ b/bitmaps_png/cpp_26/apply_pad_settings.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/array.cpp b/bitmaps_png/cpp_26/array.cpp
index 56761238a..47bda4308 100644
--- a/bitmaps_png/cpp_26/array.cpp
+++ b/bitmaps_png/cpp_26/array.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/auto_associe.cpp b/bitmaps_png/cpp_26/auto_associe.cpp
index a345ac231..193be2a48 100644
--- a/bitmaps_png/cpp_26/auto_associe.cpp
+++ b/bitmaps_png/cpp_26/auto_associe.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/auto_delete_track.cpp b/bitmaps_png/cpp_26/auto_delete_track.cpp
index 90c5e74cc..cf6b2ec50 100644
--- a/bitmaps_png/cpp_26/auto_delete_track.cpp
+++ b/bitmaps_png/cpp_26/auto_delete_track.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/auto_track_width.cpp b/bitmaps_png/cpp_26/auto_track_width.cpp
index 982e76ef3..73f17805e 100644
--- a/bitmaps_png/cpp_26/auto_track_width.cpp
+++ b/bitmaps_png/cpp_26/auto_track_width.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/autoplace_fields.cpp b/bitmaps_png/cpp_26/autoplace_fields.cpp
index 61ec3c7cf..8c0db556c 100644
--- a/bitmaps_png/cpp_26/autoplace_fields.cpp
+++ b/bitmaps_png/cpp_26/autoplace_fields.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d.cpp b/bitmaps_png/cpp_26/axis3d.cpp
index 3e0e3ddc2..9be1772e1 100644
--- a/bitmaps_png/cpp_26/axis3d.cpp
+++ b/bitmaps_png/cpp_26/axis3d.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d_back.cpp b/bitmaps_png/cpp_26/axis3d_back.cpp
index d996ee57b..5bb264dda 100644
--- a/bitmaps_png/cpp_26/axis3d_back.cpp
+++ b/bitmaps_png/cpp_26/axis3d_back.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d_bottom.cpp b/bitmaps_png/cpp_26/axis3d_bottom.cpp
index d6d7c2386..276382ce4 100644
--- a/bitmaps_png/cpp_26/axis3d_bottom.cpp
+++ b/bitmaps_png/cpp_26/axis3d_bottom.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d_front.cpp b/bitmaps_png/cpp_26/axis3d_front.cpp
index c70a5470b..58e791341 100644
--- a/bitmaps_png/cpp_26/axis3d_front.cpp
+++ b/bitmaps_png/cpp_26/axis3d_front.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d_left.cpp b/bitmaps_png/cpp_26/axis3d_left.cpp
index 2184237af..829130f6b 100644
--- a/bitmaps_png/cpp_26/axis3d_left.cpp
+++ b/bitmaps_png/cpp_26/axis3d_left.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d_right.cpp b/bitmaps_png/cpp_26/axis3d_right.cpp
index 16609862d..29875c41c 100644
--- a/bitmaps_png/cpp_26/axis3d_right.cpp
+++ b/bitmaps_png/cpp_26/axis3d_right.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/axis3d_top.cpp b/bitmaps_png/cpp_26/axis3d_top.cpp
index 2af0ef793..e9a08007e 100644
--- a/bitmaps_png/cpp_26/axis3d_top.cpp
+++ b/bitmaps_png/cpp_26/axis3d_top.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/bitmap2component.cpp b/bitmaps_png/cpp_26/bitmap2component.cpp
index bcaafebcc..b379356b2 100644
--- a/bitmaps_png/cpp_26/bitmap2component.cpp
+++ b/bitmaps_png/cpp_26/bitmap2component.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/bom.cpp b/bitmaps_png/cpp_26/bom.cpp
index 521482413..d09c2e2aa 100644
--- a/bitmaps_png/cpp_26/bom.cpp
+++ b/bitmaps_png/cpp_26/bom.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/book.cpp b/bitmaps_png/cpp_26/book.cpp
index 4f2960f28..382385820 100644
--- a/bitmaps_png/cpp_26/book.cpp
+++ b/bitmaps_png/cpp_26/book.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/break_bus.cpp b/bitmaps_png/cpp_26/break_bus.cpp
index 897185805..9b69093a0 100644
--- a/bitmaps_png/cpp_26/break_bus.cpp
+++ b/bitmaps_png/cpp_26/break_bus.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/break_line.cpp b/bitmaps_png/cpp_26/break_line.cpp
index 2fbf415f1..1a8469a77 100644
--- a/bitmaps_png/cpp_26/break_line.cpp
+++ b/bitmaps_png/cpp_26/break_line.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/browse_files.cpp b/bitmaps_png/cpp_26/browse_files.cpp
index b84033210..3820bef67 100644
--- a/bitmaps_png/cpp_26/browse_files.cpp
+++ b/bitmaps_png/cpp_26/browse_files.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/calculator.cpp b/bitmaps_png/cpp_26/calculator.cpp
index 10e2135ee..a10d266df 100644
--- a/bitmaps_png/cpp_26/calculator.cpp
+++ b/bitmaps_png/cpp_26/calculator.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/cancel.cpp b/bitmaps_png/cpp_26/cancel.cpp
index bd160e117..2a077cd78 100644
--- a/bitmaps_png/cpp_26/cancel.cpp
+++ b/bitmaps_png/cpp_26/cancel.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/change_entry_orient.cpp b/bitmaps_png/cpp_26/change_entry_orient.cpp
index a8c6550c8..c33d357aa 100644
--- a/bitmaps_png/cpp_26/change_entry_orient.cpp
+++ b/bitmaps_png/cpp_26/change_entry_orient.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/checked_ok.cpp b/bitmaps_png/cpp_26/checked_ok.cpp
index b905ce54a..0dbcab331 100644
--- a/bitmaps_png/cpp_26/checked_ok.cpp
+++ b/bitmaps_png/cpp_26/checked_ok.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/color_materials.cpp b/bitmaps_png/cpp_26/color_materials.cpp
index 3beb180db..6c60cf886 100644
--- a/bitmaps_png/cpp_26/color_materials.cpp
+++ b/bitmaps_png/cpp_26/color_materials.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/component_select_alternate_shape.cpp b/bitmaps_png/cpp_26/component_select_alternate_shape.cpp
index 2fdf91542..ba3c4be57 100644
--- a/bitmaps_png/cpp_26/component_select_alternate_shape.cpp
+++ b/bitmaps_png/cpp_26/component_select_alternate_shape.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/component_select_unit.cpp b/bitmaps_png/cpp_26/component_select_unit.cpp
index 3fe763e0a..c23c155fe 100644
--- a/bitmaps_png/cpp_26/component_select_unit.cpp
+++ b/bitmaps_png/cpp_26/component_select_unit.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/config.cpp b/bitmaps_png/cpp_26/config.cpp
index 80e2d83c2..e1c8123b3 100644
--- a/bitmaps_png/cpp_26/config.cpp
+++ b/bitmaps_png/cpp_26/config.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/contrast_mode.cpp b/bitmaps_png/cpp_26/contrast_mode.cpp
index e97caf094..f6e476ddf 100644
--- a/bitmaps_png/cpp_26/contrast_mode.cpp
+++ b/bitmaps_png/cpp_26/contrast_mode.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/copper_layers_setup.cpp b/bitmaps_png/cpp_26/copper_layers_setup.cpp
index 85e6a2833..71ad7ef25 100644
--- a/bitmaps_png/cpp_26/copper_layers_setup.cpp
+++ b/bitmaps_png/cpp_26/copper_layers_setup.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/copy.cpp b/bitmaps_png/cpp_26/copy.cpp
index 56b3b9bf0..010192c33 100644
--- a/bitmaps_png/cpp_26/copy.cpp
+++ b/bitmaps_png/cpp_26/copy.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/copy_pad_settings.cpp b/bitmaps_png/cpp_26/copy_pad_settings.cpp
index c6ddabe2b..d794a9c7c 100644
--- a/bitmaps_png/cpp_26/copy_pad_settings.cpp
+++ b/bitmaps_png/cpp_26/copy_pad_settings.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/create_cmp_file.cpp b/bitmaps_png/cpp_26/create_cmp_file.cpp
index 8d3607ad2..6c1b82bd1 100644
--- a/bitmaps_png/cpp_26/create_cmp_file.cpp
+++ b/bitmaps_png/cpp_26/create_cmp_file.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/cursor.cpp b/bitmaps_png/cpp_26/cursor.cpp
index 76edfc073..680c2cdcc 100644
--- a/bitmaps_png/cpp_26/cursor.cpp
+++ b/bitmaps_png/cpp_26/cursor.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/cursor_shape.cpp b/bitmaps_png/cpp_26/cursor_shape.cpp
index a7d71c346..f979c5a1b 100644
--- a/bitmaps_png/cpp_26/cursor_shape.cpp
+++ b/bitmaps_png/cpp_26/cursor_shape.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/custom_pad_to_primitives.cpp b/bitmaps_png/cpp_26/custom_pad_to_primitives.cpp
index 202e2129a..73a205e7d 100644
--- a/bitmaps_png/cpp_26/custom_pad_to_primitives.cpp
+++ b/bitmaps_png/cpp_26/custom_pad_to_primitives.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/cut.cpp b/bitmaps_png/cpp_26/cut.cpp
index b52ef0197..fb3944c97 100644
--- a/bitmaps_png/cpp_26/cut.cpp
+++ b/bitmaps_png/cpp_26/cut.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/cvpcb.cpp b/bitmaps_png/cpp_26/cvpcb.cpp
index 0c91be8a1..f11aeff05 100644
--- a/bitmaps_png/cpp_26/cvpcb.cpp
+++ b/bitmaps_png/cpp_26/cvpcb.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/dashline.cpp b/bitmaps_png/cpp_26/dashline.cpp
index f3d7f9824..496263420 100644
--- a/bitmaps_png/cpp_26/dashline.cpp
+++ b/bitmaps_png/cpp_26/dashline.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/datasheet.cpp b/bitmaps_png/cpp_26/datasheet.cpp
index 8e82b9149..1701d0cd9 100644
--- a/bitmaps_png/cpp_26/datasheet.cpp
+++ b/bitmaps_png/cpp_26/datasheet.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete.cpp b/bitmaps_png/cpp_26/delete.cpp
index a8244ff71..3222497d7 100644
--- a/bitmaps_png/cpp_26/delete.cpp
+++ b/bitmaps_png/cpp_26/delete.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_association.cpp b/bitmaps_png/cpp_26/delete_association.cpp
index 99007a9af..320318629 100644
--- a/bitmaps_png/cpp_26/delete_association.cpp
+++ b/bitmaps_png/cpp_26/delete_association.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_bus.cpp b/bitmaps_png/cpp_26/delete_bus.cpp
index d1e82a9ed..6ce508545 100644
--- a/bitmaps_png/cpp_26/delete_bus.cpp
+++ b/bitmaps_png/cpp_26/delete_bus.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_circle.cpp b/bitmaps_png/cpp_26/delete_circle.cpp
index 9cf963f11..17dcc1267 100644
--- a/bitmaps_png/cpp_26/delete_circle.cpp
+++ b/bitmaps_png/cpp_26/delete_circle.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_connection.cpp b/bitmaps_png/cpp_26/delete_connection.cpp
index 2bdfc55a5..b1961fccd 100644
--- a/bitmaps_png/cpp_26/delete_connection.cpp
+++ b/bitmaps_png/cpp_26/delete_connection.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_dimension.cpp b/bitmaps_png/cpp_26/delete_dimension.cpp
index 85208d452..b1c7a2ab6 100644
--- a/bitmaps_png/cpp_26/delete_dimension.cpp
+++ b/bitmaps_png/cpp_26/delete_dimension.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_field.cpp b/bitmaps_png/cpp_26/delete_field.cpp
index 93ec45383..d1a7620e7 100644
--- a/bitmaps_png/cpp_26/delete_field.cpp
+++ b/bitmaps_png/cpp_26/delete_field.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_gerber.cpp b/bitmaps_png/cpp_26/delete_gerber.cpp
index 576f3a5a5..6b9647df9 100644
--- a/bitmaps_png/cpp_26/delete_gerber.cpp
+++ b/bitmaps_png/cpp_26/delete_gerber.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_glabel.cpp b/bitmaps_png/cpp_26/delete_glabel.cpp
index 45d34c840..79d2bdbdc 100644
--- a/bitmaps_png/cpp_26/delete_glabel.cpp
+++ b/bitmaps_png/cpp_26/delete_glabel.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_line.cpp b/bitmaps_png/cpp_26/delete_line.cpp
index 46d5eba2f..b6dfce12a 100644
--- a/bitmaps_png/cpp_26/delete_line.cpp
+++ b/bitmaps_png/cpp_26/delete_line.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_module.cpp b/bitmaps_png/cpp_26/delete_module.cpp
index 5f4d89a97..627dc5700 100644
--- a/bitmaps_png/cpp_26/delete_module.cpp
+++ b/bitmaps_png/cpp_26/delete_module.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_net.cpp b/bitmaps_png/cpp_26/delete_net.cpp
index e78178e57..af6078b04 100644
--- a/bitmaps_png/cpp_26/delete_net.cpp
+++ b/bitmaps_png/cpp_26/delete_net.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_node.cpp b/bitmaps_png/cpp_26/delete_node.cpp
index e41f0fc23..822c39fb5 100644
--- a/bitmaps_png/cpp_26/delete_node.cpp
+++ b/bitmaps_png/cpp_26/delete_node.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_pad.cpp b/bitmaps_png/cpp_26/delete_pad.cpp
index b6c66ff52..a781d8cc8 100644
--- a/bitmaps_png/cpp_26/delete_pad.cpp
+++ b/bitmaps_png/cpp_26/delete_pad.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_polygon.cpp b/bitmaps_png/cpp_26/delete_polygon.cpp
index 541954a7e..1853385af 100644
--- a/bitmaps_png/cpp_26/delete_polygon.cpp
+++ b/bitmaps_png/cpp_26/delete_polygon.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_rectangle.cpp b/bitmaps_png/cpp_26/delete_rectangle.cpp
index 56a60d2dd..93449ad40 100644
--- a/bitmaps_png/cpp_26/delete_rectangle.cpp
+++ b/bitmaps_png/cpp_26/delete_rectangle.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_sheet.cpp b/bitmaps_png/cpp_26/delete_sheet.cpp
index 89d2bc4bb..0ea1d3944 100644
--- a/bitmaps_png/cpp_26/delete_sheet.cpp
+++ b/bitmaps_png/cpp_26/delete_sheet.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/delete_track.cpp b/bitmaps_png/cpp_26/delete_track.cpp
index bc5cdca4e..74f044c43 100644
--- a/bitmaps_png/cpp_26/delete_track.cpp
+++ b/bitmaps_png/cpp_26/delete_track.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/directory.cpp b/bitmaps_png/cpp_26/directory.cpp
index a0f0353a3..2a05aecd1 100644
--- a/bitmaps_png/cpp_26/directory.cpp
+++ b/bitmaps_png/cpp_26/directory.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/directory_browser.cpp b/bitmaps_png/cpp_26/directory_browser.cpp
index edb6ae293..bbd635aad 100644
--- a/bitmaps_png/cpp_26/directory_browser.cpp
+++ b/bitmaps_png/cpp_26/directory_browser.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/display_options.cpp b/bitmaps_png/cpp_26/display_options.cpp
index d6735aea7..a4eb08809 100644
--- a/bitmaps_png/cpp_26/display_options.cpp
+++ b/bitmaps_png/cpp_26/display_options.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/distribute_horizontal.cpp b/bitmaps_png/cpp_26/distribute_horizontal.cpp
index a69fb9bc1..78ecf8dcd 100644
--- a/bitmaps_png/cpp_26/distribute_horizontal.cpp
+++ b/bitmaps_png/cpp_26/distribute_horizontal.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/distribute_vertical.cpp b/bitmaps_png/cpp_26/distribute_vertical.cpp
index 1b5d77c6a..7c14dbf2a 100644
--- a/bitmaps_png/cpp_26/distribute_vertical.cpp
+++ b/bitmaps_png/cpp_26/distribute_vertical.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/down.cpp b/bitmaps_png/cpp_26/down.cpp
index 82311214b..ad96becf0 100644
--- a/bitmaps_png/cpp_26/down.cpp
+++ b/bitmaps_png/cpp_26/down.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drag.cpp b/bitmaps_png/cpp_26/drag.cpp
index ecdd76478..cb794773c 100644
--- a/bitmaps_png/cpp_26/drag.cpp
+++ b/bitmaps_png/cpp_26/drag.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drag_outline_segment.cpp b/bitmaps_png/cpp_26/drag_outline_segment.cpp
index cce6d20ec..2c2d98285 100644
--- a/bitmaps_png/cpp_26/drag_outline_segment.cpp
+++ b/bitmaps_png/cpp_26/drag_outline_segment.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drag_pad.cpp b/bitmaps_png/cpp_26/drag_pad.cpp
index e5f549b9a..eaebc7899 100644
--- a/bitmaps_png/cpp_26/drag_pad.cpp
+++ b/bitmaps_png/cpp_26/drag_pad.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drag_segment_withslope.cpp b/bitmaps_png/cpp_26/drag_segment_withslope.cpp
index 7b028c7d4..201e57113 100644
--- a/bitmaps_png/cpp_26/drag_segment_withslope.cpp
+++ b/bitmaps_png/cpp_26/drag_segment_withslope.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drc.cpp b/bitmaps_png/cpp_26/drc.cpp
index 825fca8bf..d66bee9f7 100644
--- a/bitmaps_png/cpp_26/drc.cpp
+++ b/bitmaps_png/cpp_26/drc.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/drc_off.cpp b/bitmaps_png/cpp_26/drc_off.cpp
index b315caed7..ed01a4536 100644
--- a/bitmaps_png/cpp_26/drc_off.cpp
+++ b/bitmaps_png/cpp_26/drc_off.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/duplicate.cpp b/bitmaps_png/cpp_26/duplicate.cpp
index 7365ff27b..d1768775f 100644
--- a/bitmaps_png/cpp_26/duplicate.cpp
+++ b/bitmaps_png/cpp_26/duplicate.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edges_sketch.cpp b/bitmaps_png/cpp_26/edges_sketch.cpp
index 604c6c064..c742ddab1 100644
--- a/bitmaps_png/cpp_26/edges_sketch.cpp
+++ b/bitmaps_png/cpp_26/edges_sketch.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit.cpp b/bitmaps_png/cpp_26/edit.cpp
index b55e0fba6..3c1ec6260 100644
--- a/bitmaps_png/cpp_26/edit.cpp
+++ b/bitmaps_png/cpp_26/edit.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_cmp_symb_links.cpp b/bitmaps_png/cpp_26/edit_cmp_symb_links.cpp
index 57f48df8d..4ce437c59 100644
--- a/bitmaps_png/cpp_26/edit_cmp_symb_links.cpp
+++ b/bitmaps_png/cpp_26/edit_cmp_symb_links.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_comp_footprint.cpp b/bitmaps_png/cpp_26/edit_comp_footprint.cpp
index 4ae30ffca..f8dd3d17b 100644
--- a/bitmaps_png/cpp_26/edit_comp_footprint.cpp
+++ b/bitmaps_png/cpp_26/edit_comp_footprint.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_comp_ref.cpp b/bitmaps_png/cpp_26/edit_comp_ref.cpp
index 6f15482be..6b06e1023 100644
--- a/bitmaps_png/cpp_26/edit_comp_ref.cpp
+++ b/bitmaps_png/cpp_26/edit_comp_ref.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_comp_value.cpp b/bitmaps_png/cpp_26/edit_comp_value.cpp
index b02555288..7ad67c282 100644
--- a/bitmaps_png/cpp_26/edit_comp_value.cpp
+++ b/bitmaps_png/cpp_26/edit_comp_value.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_module.cpp b/bitmaps_png/cpp_26/edit_module.cpp
index 1a8025a67..62619631b 100644
--- a/bitmaps_png/cpp_26/edit_module.cpp
+++ b/bitmaps_png/cpp_26/edit_module.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/edit_text.cpp b/bitmaps_png/cpp_26/edit_text.cpp
index efbbb943b..c1c81d185 100644
--- a/bitmaps_png/cpp_26/edit_text.cpp
+++ b/bitmaps_png/cpp_26/edit_text.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/editor.cpp b/bitmaps_png/cpp_26/editor.cpp
index e196ac811..e81cad12d 100644
--- a/bitmaps_png/cpp_26/editor.cpp
+++ b/bitmaps_png/cpp_26/editor.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/eeschema.cpp b/bitmaps_png/cpp_26/eeschema.cpp
index f5ead3db1..6fb8ae1c0 100644
--- a/bitmaps_png/cpp_26/eeschema.cpp
+++ b/bitmaps_png/cpp_26/eeschema.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/enter_sheet.cpp b/bitmaps_png/cpp_26/enter_sheet.cpp
index 5e0abc3c0..1005ae27b 100644
--- a/bitmaps_png/cpp_26/enter_sheet.cpp
+++ b/bitmaps_png/cpp_26/enter_sheet.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/erc.cpp b/bitmaps_png/cpp_26/erc.cpp
index 7473fda0d..dedf1cd5d 100644
--- a/bitmaps_png/cpp_26/erc.cpp
+++ b/bitmaps_png/cpp_26/erc.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/erc_green.cpp b/bitmaps_png/cpp_26/erc_green.cpp
index 1526caa0a..b1bb73692 100644
--- a/bitmaps_png/cpp_26/erc_green.cpp
+++ b/bitmaps_png/cpp_26/erc_green.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ercerr.cpp b/bitmaps_png/cpp_26/ercerr.cpp
index f5339de29..e833641b9 100644
--- a/bitmaps_png/cpp_26/ercerr.cpp
+++ b/bitmaps_png/cpp_26/ercerr.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ercwarn.cpp b/bitmaps_png/cpp_26/ercwarn.cpp
index 9f7d3ff65..cc3ba66b5 100644
--- a/bitmaps_png/cpp_26/ercwarn.cpp
+++ b/bitmaps_png/cpp_26/ercwarn.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/exchange.cpp b/bitmaps_png/cpp_26/exchange.cpp
index 76f061c87..addf60792 100644
--- a/bitmaps_png/cpp_26/exchange.cpp
+++ b/bitmaps_png/cpp_26/exchange.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/exit.cpp b/bitmaps_png/cpp_26/exit.cpp
index 6f113c844..6bbae598e 100644
--- a/bitmaps_png/cpp_26/exit.cpp
+++ b/bitmaps_png/cpp_26/exit.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/export.cpp b/bitmaps_png/cpp_26/export.cpp
index 6d8620ad4..540000ca2 100644
--- a/bitmaps_png/cpp_26/export.cpp
+++ b/bitmaps_png/cpp_26/export.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/export3d.cpp b/bitmaps_png/cpp_26/export3d.cpp
index 7a9f26980..3e054fb70 100644
--- a/bitmaps_png/cpp_26/export3d.cpp
+++ b/bitmaps_png/cpp_26/export3d.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/export_dsn.cpp b/bitmaps_png/cpp_26/export_dsn.cpp
index 013bb99be..582263c70 100644
--- a/bitmaps_png/cpp_26/export_dsn.cpp
+++ b/bitmaps_png/cpp_26/export_dsn.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/export_footprint_names.cpp b/bitmaps_png/cpp_26/export_footprint_names.cpp
index 3a99a7c12..655117aa6 100644
--- a/bitmaps_png/cpp_26/export_footprint_names.cpp
+++ b/bitmaps_png/cpp_26/export_footprint_names.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/export_idf.cpp b/bitmaps_png/cpp_26/export_idf.cpp
index dc830d912..81216ede8 100644
--- a/bitmaps_png/cpp_26/export_idf.cpp
+++ b/bitmaps_png/cpp_26/export_idf.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/export_module.cpp b/bitmaps_png/cpp_26/export_module.cpp
index 261ddac95..61f5fba5e 100644
--- a/bitmaps_png/cpp_26/export_module.cpp
+++ b/bitmaps_png/cpp_26/export_module.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/export_part.cpp b/bitmaps_png/cpp_26/export_part.cpp
index 2ff2d64fb..201b743c3 100644
--- a/bitmaps_png/cpp_26/export_part.cpp
+++ b/bitmaps_png/cpp_26/export_part.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/export_step.cpp b/bitmaps_png/cpp_26/export_step.cpp
index 8bf9a4d07..84596f6ae 100644
--- a/bitmaps_png/cpp_26/export_step.cpp
+++ b/bitmaps_png/cpp_26/export_step.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/fabrication.cpp b/bitmaps_png/cpp_26/fabrication.cpp
index c4560c9c6..9198fd072 100644
--- a/bitmaps_png/cpp_26/fabrication.cpp
+++ b/bitmaps_png/cpp_26/fabrication.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/file_footprint.cpp b/bitmaps_png/cpp_26/file_footprint.cpp
index 4a187c9a0..8083e27c0 100644
--- a/bitmaps_png/cpp_26/file_footprint.cpp
+++ b/bitmaps_png/cpp_26/file_footprint.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/fill_zone.cpp b/bitmaps_png/cpp_26/fill_zone.cpp
index ef77635c4..4d32500fe 100644
--- a/bitmaps_png/cpp_26/fill_zone.cpp
+++ b/bitmaps_png/cpp_26/fill_zone.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/find.cpp b/bitmaps_png/cpp_26/find.cpp
index db3378403..d5523e207 100644
--- a/bitmaps_png/cpp_26/find.cpp
+++ b/bitmaps_png/cpp_26/find.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/find_replace.cpp b/bitmaps_png/cpp_26/find_replace.cpp
index 3148ccfea..b39fb1ef8 100644
--- a/bitmaps_png/cpp_26/find_replace.cpp
+++ b/bitmaps_png/cpp_26/find_replace.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/flag.cpp b/bitmaps_png/cpp_26/flag.cpp
index fc5973465..ebab46b00 100644
--- a/bitmaps_png/cpp_26/flag.cpp
+++ b/bitmaps_png/cpp_26/flag.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/flip_board.cpp b/bitmaps_png/cpp_26/flip_board.cpp
index e1038ded5..358e4015d 100644
--- a/bitmaps_png/cpp_26/flip_board.cpp
+++ b/bitmaps_png/cpp_26/flip_board.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/fonts.cpp b/bitmaps_png/cpp_26/fonts.cpp
index 080bd1334..bbd860fd7 100644
--- a/bitmaps_png/cpp_26/fonts.cpp
+++ b/bitmaps_png/cpp_26/fonts.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/footprint_text.cpp b/bitmaps_png/cpp_26/footprint_text.cpp
index 9b27ef862..d832e1517 100644
--- a/bitmaps_png/cpp_26/footprint_text.cpp
+++ b/bitmaps_png/cpp_26/footprint_text.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gbr_select_mode0.cpp b/bitmaps_png/cpp_26/gbr_select_mode0.cpp
index b51528006..a4effe1ed 100644
--- a/bitmaps_png/cpp_26/gbr_select_mode0.cpp
+++ b/bitmaps_png/cpp_26/gbr_select_mode0.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gbr_select_mode1.cpp b/bitmaps_png/cpp_26/gbr_select_mode1.cpp
index a1eb876c4..a9f9c68b2 100644
--- a/bitmaps_png/cpp_26/gbr_select_mode1.cpp
+++ b/bitmaps_png/cpp_26/gbr_select_mode1.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gbr_select_mode2.cpp b/bitmaps_png/cpp_26/gbr_select_mode2.cpp
index eb1433996..8b7a89cf7 100644
--- a/bitmaps_png/cpp_26/gbr_select_mode2.cpp
+++ b/bitmaps_png/cpp_26/gbr_select_mode2.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/general_deletions.cpp b/bitmaps_png/cpp_26/general_deletions.cpp
index 521ba2ab4..357ec385c 100644
--- a/bitmaps_png/cpp_26/general_deletions.cpp
+++ b/bitmaps_png/cpp_26/general_deletions.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/general_ratsnest.cpp b/bitmaps_png/cpp_26/general_ratsnest.cpp
index 51d4474d3..4f5e51462 100644
--- a/bitmaps_png/cpp_26/general_ratsnest.cpp
+++ b/bitmaps_png/cpp_26/general_ratsnest.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gerber_file.cpp b/bitmaps_png/cpp_26/gerber_file.cpp
index 40fef3a8c..3f4cb951a 100644
--- a/bitmaps_png/cpp_26/gerber_file.cpp
+++ b/bitmaps_png/cpp_26/gerber_file.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gerber_job_file.cpp b/bitmaps_png/cpp_26/gerber_job_file.cpp
index 807def975..3cd575e78 100644
--- a/bitmaps_png/cpp_26/gerber_job_file.cpp
+++ b/bitmaps_png/cpp_26/gerber_job_file.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gerbview_clear_layers.cpp b/bitmaps_png/cpp_26/gerbview_clear_layers.cpp
index a751d724c..7b9886d0d 100644
--- a/bitmaps_png/cpp_26/gerbview_clear_layers.cpp
+++ b/bitmaps_png/cpp_26/gerbview_clear_layers.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gerbview_drill_file.cpp b/bitmaps_png/cpp_26/gerbview_drill_file.cpp
index cf118a0b7..0255c293a 100644
--- a/bitmaps_png/cpp_26/gerbview_drill_file.cpp
+++ b/bitmaps_png/cpp_26/gerbview_drill_file.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gerbview_show_negative_objects.cpp b/bitmaps_png/cpp_26/gerbview_show_negative_objects.cpp
index d6a52efe4..932c46985 100644
--- a/bitmaps_png/cpp_26/gerbview_show_negative_objects.cpp
+++ b/bitmaps_png/cpp_26/gerbview_show_negative_objects.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/gl_change.cpp b/bitmaps_png/cpp_26/gl_change.cpp
index 3373f93b1..827dafd7e 100644
--- a/bitmaps_png/cpp_26/gl_change.cpp
+++ b/bitmaps_png/cpp_26/gl_change.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/glabel2label.cpp b/bitmaps_png/cpp_26/glabel2label.cpp
index 0414f2c95..01dc0ccb4 100644
--- a/bitmaps_png/cpp_26/glabel2label.cpp
+++ b/bitmaps_png/cpp_26/glabel2label.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/glabel2text.cpp b/bitmaps_png/cpp_26/glabel2text.cpp
index 001fca55d..bda9b6ce3 100644
--- a/bitmaps_png/cpp_26/glabel2text.cpp
+++ b/bitmaps_png/cpp_26/glabel2text.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/go_down.cpp b/bitmaps_png/cpp_26/go_down.cpp
index 13cc7238a..ad9985e9a 100644
--- a/bitmaps_png/cpp_26/go_down.cpp
+++ b/bitmaps_png/cpp_26/go_down.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/go_up.cpp b/bitmaps_png/cpp_26/go_up.cpp
index 9370506c7..5d6d749bd 100644
--- a/bitmaps_png/cpp_26/go_up.cpp
+++ b/bitmaps_png/cpp_26/go_up.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/green.cpp b/bitmaps_png/cpp_26/green.cpp
index 25860b81a..14f7b78f6 100644
--- a/bitmaps_png/cpp_26/green.cpp
+++ b/bitmaps_png/cpp_26/green.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/grid.cpp b/bitmaps_png/cpp_26/grid.cpp
index ae071f86c..85f37f8fc 100644
--- a/bitmaps_png/cpp_26/grid.cpp
+++ b/bitmaps_png/cpp_26/grid.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/grid_select.cpp b/bitmaps_png/cpp_26/grid_select.cpp
index 9e53a7c28..4b4e3cc00 100644
--- a/bitmaps_png/cpp_26/grid_select.cpp
+++ b/bitmaps_png/cpp_26/grid_select.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/grid_select_axis.cpp b/bitmaps_png/cpp_26/grid_select_axis.cpp
index b21395bb4..1098aa66c 100644
--- a/bitmaps_png/cpp_26/grid_select_axis.cpp
+++ b/bitmaps_png/cpp_26/grid_select_axis.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/hammer.cpp b/bitmaps_png/cpp_26/hammer.cpp
index 9beabec95..7e2633edf 100644
--- a/bitmaps_png/cpp_26/hammer.cpp
+++ b/bitmaps_png/cpp_26/hammer.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/help.cpp b/bitmaps_png/cpp_26/help.cpp
index f89994e1a..775bd1e1e 100644
--- a/bitmaps_png/cpp_26/help.cpp
+++ b/bitmaps_png/cpp_26/help.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/hidden_pin.cpp b/bitmaps_png/cpp_26/hidden_pin.cpp
index 2edf57bcf..25ea88326 100644
--- a/bitmaps_png/cpp_26/hidden_pin.cpp
+++ b/bitmaps_png/cpp_26/hidden_pin.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/hierarchy_nav.cpp b/bitmaps_png/cpp_26/hierarchy_nav.cpp
index 5c6019050..1de45992c 100644
--- a/bitmaps_png/cpp_26/hierarchy_nav.cpp
+++ b/bitmaps_png/cpp_26/hierarchy_nav.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/highlight_remove.cpp b/bitmaps_png/cpp_26/highlight_remove.cpp
index 070008d1e..d1947e150 100644
--- a/bitmaps_png/cpp_26/highlight_remove.cpp
+++ b/bitmaps_png/cpp_26/highlight_remove.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/hotkeys.cpp b/bitmaps_png/cpp_26/hotkeys.cpp
index 4a58d6bf5..6f1ceb4d3 100644
--- a/bitmaps_png/cpp_26/hotkeys.cpp
+++ b/bitmaps_png/cpp_26/hotkeys.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/hotkeys_export.cpp b/bitmaps_png/cpp_26/hotkeys_export.cpp
index 51fc30a82..3f8619c8c 100644
--- a/bitmaps_png/cpp_26/hotkeys_export.cpp
+++ b/bitmaps_png/cpp_26/hotkeys_export.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/hotkeys_import.cpp b/bitmaps_png/cpp_26/hotkeys_import.cpp
index 9d9e40a26..6aeaa437f 100644
--- a/bitmaps_png/cpp_26/hotkeys_import.cpp
+++ b/bitmaps_png/cpp_26/hotkeys_import.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/html.cpp b/bitmaps_png/cpp_26/html.cpp
index 5feb1abba..9518fdad4 100644
--- a/bitmaps_png/cpp_26/html.cpp
+++ b/bitmaps_png/cpp_26/html.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/icon.cpp b/bitmaps_png/cpp_26/icon.cpp
index 9dd9d6d2b..e384f45cb 100644
--- a/bitmaps_png/cpp_26/icon.cpp
+++ b/bitmaps_png/cpp_26/icon.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/icon_cvpcb_small.cpp b/bitmaps_png/cpp_26/icon_cvpcb_small.cpp
index 69581dd4a..6c4ed50c5 100644
--- a/bitmaps_png/cpp_26/icon_cvpcb_small.cpp
+++ b/bitmaps_png/cpp_26/icon_cvpcb_small.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/icon_gerbview_small.cpp b/bitmaps_png/cpp_26/icon_gerbview_small.cpp
index 827e19b8d..205a44d14 100644
--- a/bitmaps_png/cpp_26/icon_gerbview_small.cpp
+++ b/bitmaps_png/cpp_26/icon_gerbview_small.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/image.cpp b/bitmaps_png/cpp_26/image.cpp
index e99938642..d2a7d0eba 100644
--- a/bitmaps_png/cpp_26/image.cpp
+++ b/bitmaps_png/cpp_26/image.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import.cpp b/bitmaps_png/cpp_26/import.cpp
index 47a4628c3..e37795ae1 100644
--- a/bitmaps_png/cpp_26/import.cpp
+++ b/bitmaps_png/cpp_26/import.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import3d.cpp b/bitmaps_png/cpp_26/import3d.cpp
index 988ecd95c..7ff51bfd8 100644
--- a/bitmaps_png/cpp_26/import3d.cpp
+++ b/bitmaps_png/cpp_26/import3d.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import_brd_file.cpp b/bitmaps_png/cpp_26/import_brd_file.cpp
index 6d41d1d9e..d93545110 100644
--- a/bitmaps_png/cpp_26/import_brd_file.cpp
+++ b/bitmaps_png/cpp_26/import_brd_file.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import_document.cpp b/bitmaps_png/cpp_26/import_document.cpp
index 439c0ff49..21acfe193 100644
--- a/bitmaps_png/cpp_26/import_document.cpp
+++ b/bitmaps_png/cpp_26/import_document.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import_footprint_names.cpp b/bitmaps_png/cpp_26/import_footprint_names.cpp
index 613c7db77..fd9ea80ce 100644
--- a/bitmaps_png/cpp_26/import_footprint_names.cpp
+++ b/bitmaps_png/cpp_26/import_footprint_names.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import_hierarchical_label.cpp b/bitmaps_png/cpp_26/import_hierarchical_label.cpp
index 9c0e7b81e..42cd58bee 100644
--- a/bitmaps_png/cpp_26/import_hierarchical_label.cpp
+++ b/bitmaps_png/cpp_26/import_hierarchical_label.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import_module.cpp b/bitmaps_png/cpp_26/import_module.cpp
index 105741f4c..be2e60945 100644
--- a/bitmaps_png/cpp_26/import_module.cpp
+++ b/bitmaps_png/cpp_26/import_module.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import_part.cpp b/bitmaps_png/cpp_26/import_part.cpp
index 7f875988c..d8dac977e 100644
--- a/bitmaps_png/cpp_26/import_part.cpp
+++ b/bitmaps_png/cpp_26/import_part.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import_project.cpp b/bitmaps_png/cpp_26/import_project.cpp
index 37c608f25..9bd6655fc 100644
--- a/bitmaps_png/cpp_26/import_project.cpp
+++ b/bitmaps_png/cpp_26/import_project.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/import_setup.cpp b/bitmaps_png/cpp_26/import_setup.cpp
index 277fb1df4..dbc3c7661 100644
--- a/bitmaps_png/cpp_26/import_setup.cpp
+++ b/bitmaps_png/cpp_26/import_setup.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/info.cpp b/bitmaps_png/cpp_26/info.cpp
index 964b7f8f2..f0f8c5b9a 100644
--- a/bitmaps_png/cpp_26/info.cpp
+++ b/bitmaps_png/cpp_26/info.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/insert_module_board.cpp b/bitmaps_png/cpp_26/insert_module_board.cpp
index 170e8bfba..de04719da 100644
--- a/bitmaps_png/cpp_26/insert_module_board.cpp
+++ b/bitmaps_png/cpp_26/insert_module_board.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/invisible_text.cpp b/bitmaps_png/cpp_26/invisible_text.cpp
index 31b12efb3..37209ca82 100644
--- a/bitmaps_png/cpp_26/invisible_text.cpp
+++ b/bitmaps_png/cpp_26/invisible_text.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/kicad_icon_small.cpp b/bitmaps_png/cpp_26/kicad_icon_small.cpp
index 6ad750766..77c389258 100644
--- a/bitmaps_png/cpp_26/kicad_icon_small.cpp
+++ b/bitmaps_png/cpp_26/kicad_icon_small.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/label.cpp b/bitmaps_png/cpp_26/label.cpp
index 3b3988413..bd01c57b0 100644
--- a/bitmaps_png/cpp_26/label.cpp
+++ b/bitmaps_png/cpp_26/label.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/label2glabel.cpp b/bitmaps_png/cpp_26/label2glabel.cpp
index 6e2614c9f..3bc7685fd 100644
--- a/bitmaps_png/cpp_26/label2glabel.cpp
+++ b/bitmaps_png/cpp_26/label2glabel.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/label2text.cpp b/bitmaps_png/cpp_26/label2text.cpp
index 3d79682ac..03c01c874 100644
--- a/bitmaps_png/cpp_26/label2text.cpp
+++ b/bitmaps_png/cpp_26/label2text.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_bg.cpp b/bitmaps_png/cpp_26/lang_bg.cpp
index 8157e0a93..4c1eabe79 100644
--- a/bitmaps_png/cpp_26/lang_bg.cpp
+++ b/bitmaps_png/cpp_26/lang_bg.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_ca.cpp b/bitmaps_png/cpp_26/lang_ca.cpp
index 71e72fb21..347bcb5e3 100644
--- a/bitmaps_png/cpp_26/lang_ca.cpp
+++ b/bitmaps_png/cpp_26/lang_ca.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_cs.cpp b/bitmaps_png/cpp_26/lang_cs.cpp
index 3fdc7e458..adbb3421b 100644
--- a/bitmaps_png/cpp_26/lang_cs.cpp
+++ b/bitmaps_png/cpp_26/lang_cs.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_de.cpp b/bitmaps_png/cpp_26/lang_de.cpp
index d49e0944b..ff23d3bbf 100644
--- a/bitmaps_png/cpp_26/lang_de.cpp
+++ b/bitmaps_png/cpp_26/lang_de.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_def.cpp b/bitmaps_png/cpp_26/lang_def.cpp
index 81654985b..2e34e4553 100644
--- a/bitmaps_png/cpp_26/lang_def.cpp
+++ b/bitmaps_png/cpp_26/lang_def.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_en.cpp b/bitmaps_png/cpp_26/lang_en.cpp
index 0f15e53b0..7be7c63da 100644
--- a/bitmaps_png/cpp_26/lang_en.cpp
+++ b/bitmaps_png/cpp_26/lang_en.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_es.cpp b/bitmaps_png/cpp_26/lang_es.cpp
index 8b94d493c..5e03107e6 100644
--- a/bitmaps_png/cpp_26/lang_es.cpp
+++ b/bitmaps_png/cpp_26/lang_es.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_fi.cpp b/bitmaps_png/cpp_26/lang_fi.cpp
index e6d9e4034..974a4dd75 100644
--- a/bitmaps_png/cpp_26/lang_fi.cpp
+++ b/bitmaps_png/cpp_26/lang_fi.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_fr.cpp b/bitmaps_png/cpp_26/lang_fr.cpp
index 498e4d6f5..52fdca279 100644
--- a/bitmaps_png/cpp_26/lang_fr.cpp
+++ b/bitmaps_png/cpp_26/lang_fr.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_gr.cpp b/bitmaps_png/cpp_26/lang_gr.cpp
index 4bf50eaef..82259a089 100644
--- a/bitmaps_png/cpp_26/lang_gr.cpp
+++ b/bitmaps_png/cpp_26/lang_gr.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_hu.cpp b/bitmaps_png/cpp_26/lang_hu.cpp
index 019c22328..0fa51f795 100644
--- a/bitmaps_png/cpp_26/lang_hu.cpp
+++ b/bitmaps_png/cpp_26/lang_hu.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_it.cpp b/bitmaps_png/cpp_26/lang_it.cpp
index 36c36a70d..083a4eeab 100644
--- a/bitmaps_png/cpp_26/lang_it.cpp
+++ b/bitmaps_png/cpp_26/lang_it.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_jp.cpp b/bitmaps_png/cpp_26/lang_jp.cpp
index 5076ddb25..79c527278 100644
--- a/bitmaps_png/cpp_26/lang_jp.cpp
+++ b/bitmaps_png/cpp_26/lang_jp.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_ko.cpp b/bitmaps_png/cpp_26/lang_ko.cpp
index c6fb702c3..7654c955e 100644
--- a/bitmaps_png/cpp_26/lang_ko.cpp
+++ b/bitmaps_png/cpp_26/lang_ko.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_lt.cpp b/bitmaps_png/cpp_26/lang_lt.cpp
index 95b452b4c..893d95a1d 100644
--- a/bitmaps_png/cpp_26/lang_lt.cpp
+++ b/bitmaps_png/cpp_26/lang_lt.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_nl.cpp b/bitmaps_png/cpp_26/lang_nl.cpp
index 2d8629a52..282482338 100644
--- a/bitmaps_png/cpp_26/lang_nl.cpp
+++ b/bitmaps_png/cpp_26/lang_nl.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_pl.cpp b/bitmaps_png/cpp_26/lang_pl.cpp
index a353a2ddd..493058b93 100644
--- a/bitmaps_png/cpp_26/lang_pl.cpp
+++ b/bitmaps_png/cpp_26/lang_pl.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_pt.cpp b/bitmaps_png/cpp_26/lang_pt.cpp
index 97885a85a..b525eb82b 100644
--- a/bitmaps_png/cpp_26/lang_pt.cpp
+++ b/bitmaps_png/cpp_26/lang_pt.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_ru.cpp b/bitmaps_png/cpp_26/lang_ru.cpp
index 188c61975..611017c02 100644
--- a/bitmaps_png/cpp_26/lang_ru.cpp
+++ b/bitmaps_png/cpp_26/lang_ru.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_sk.cpp b/bitmaps_png/cpp_26/lang_sk.cpp
index 0367e2558..30e7f1c82 100644
--- a/bitmaps_png/cpp_26/lang_sk.cpp
+++ b/bitmaps_png/cpp_26/lang_sk.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_sl.cpp b/bitmaps_png/cpp_26/lang_sl.cpp
index 24de5ff74..f5c74a577 100644
--- a/bitmaps_png/cpp_26/lang_sl.cpp
+++ b/bitmaps_png/cpp_26/lang_sl.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lang_zh.cpp b/bitmaps_png/cpp_26/lang_zh.cpp
index e423ce851..7245b6963 100644
--- a/bitmaps_png/cpp_26/lang_zh.cpp
+++ b/bitmaps_png/cpp_26/lang_zh.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/language.cpp b/bitmaps_png/cpp_26/language.cpp
index f549b5a9d..b9f929bdb 100644
--- a/bitmaps_png/cpp_26/language.cpp
+++ b/bitmaps_png/cpp_26/language.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/layers_manager.cpp b/bitmaps_png/cpp_26/layers_manager.cpp
index b9e781600..29910132f 100644
--- a/bitmaps_png/cpp_26/layers_manager.cpp
+++ b/bitmaps_png/cpp_26/layers_manager.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/leave_sheet.cpp b/bitmaps_png/cpp_26/leave_sheet.cpp
index c7c405737..143434d37 100644
--- a/bitmaps_png/cpp_26/leave_sheet.cpp
+++ b/bitmaps_png/cpp_26/leave_sheet.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/left.cpp b/bitmaps_png/cpp_26/left.cpp
index 84e75c0ad..d07ae2eea 100644
--- a/bitmaps_png/cpp_26/left.cpp
+++ b/bitmaps_png/cpp_26/left.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lib_next.cpp b/bitmaps_png/cpp_26/lib_next.cpp
index d7a90fb9b..2fd3afaf7 100644
--- a/bitmaps_png/cpp_26/lib_next.cpp
+++ b/bitmaps_png/cpp_26/lib_next.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lib_previous.cpp b/bitmaps_png/cpp_26/lib_previous.cpp
index 58455e168..4d7a7375a 100644
--- a/bitmaps_png/cpp_26/lib_previous.cpp
+++ b/bitmaps_png/cpp_26/lib_previous.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/libedit.cpp b/bitmaps_png/cpp_26/libedit.cpp
index 57fec2a42..17f639077 100644
--- a/bitmaps_png/cpp_26/libedit.cpp
+++ b/bitmaps_png/cpp_26/libedit.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/library.cpp b/bitmaps_png/cpp_26/library.cpp
index d13067e23..9832530e0 100644
--- a/bitmaps_png/cpp_26/library.cpp
+++ b/bitmaps_png/cpp_26/library.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/library_archive.cpp b/bitmaps_png/cpp_26/library_archive.cpp
index 7bb483ce1..26d203681 100644
--- a/bitmaps_png/cpp_26/library_archive.cpp
+++ b/bitmaps_png/cpp_26/library_archive.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/library_archive_as.cpp b/bitmaps_png/cpp_26/library_archive_as.cpp
index 89cbcaedc..19009a81a 100644
--- a/bitmaps_png/cpp_26/library_archive_as.cpp
+++ b/bitmaps_png/cpp_26/library_archive_as.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/library_browse.cpp b/bitmaps_png/cpp_26/library_browse.cpp
index faa9a2c63..c330c9f05 100644
--- a/bitmaps_png/cpp_26/library_browse.cpp
+++ b/bitmaps_png/cpp_26/library_browse.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
     0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/library_option.cpp b/bitmaps_png/cpp_26/library_option.cpp
index 8e90fbf18..e3adc5ab3 100644
--- a/bitmaps_png/cpp_26/library_option.cpp
+++ b/bitmaps_png/cpp_26/library_option.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/library_table.cpp b/bitmaps_png/cpp_26/library_table.cpp
index 9753c0bd5..cde666c2d 100644
--- a/bitmaps_png/cpp_26/library_table.cpp
+++ b/bitmaps_png/cpp_26/library_table.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lines90.cpp b/bitmaps_png/cpp_26/lines90.cpp
index ab6f17fc7..73c0e2b93 100644
--- a/bitmaps_png/cpp_26/lines90.cpp
+++ b/bitmaps_png/cpp_26/lines90.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/list_nets.cpp b/bitmaps_png/cpp_26/list_nets.cpp
index 4304c9b89..519393c80 100644
--- a/bitmaps_png/cpp_26/list_nets.cpp
+++ b/bitmaps_png/cpp_26/list_nets.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/load_gerber.cpp b/bitmaps_png/cpp_26/load_gerber.cpp
index 93fb4e72e..14f586baa 100644
--- a/bitmaps_png/cpp_26/load_gerber.cpp
+++ b/bitmaps_png/cpp_26/load_gerber.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/load_module_board.cpp b/bitmaps_png/cpp_26/load_module_board.cpp
index 0dbd479aa..f0ff60320 100644
--- a/bitmaps_png/cpp_26/load_module_board.cpp
+++ b/bitmaps_png/cpp_26/load_module_board.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/load_module_lib.cpp b/bitmaps_png/cpp_26/load_module_lib.cpp
index 4f241b504..37bf5ed8a 100644
--- a/bitmaps_png/cpp_26/load_module_lib.cpp
+++ b/bitmaps_png/cpp_26/load_module_lib.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/local_ratsnest.cpp b/bitmaps_png/cpp_26/local_ratsnest.cpp
index a75b839cf..39a79fbe1 100644
--- a/bitmaps_png/cpp_26/local_ratsnest.cpp
+++ b/bitmaps_png/cpp_26/local_ratsnest.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/lock_unlock.cpp b/bitmaps_png/cpp_26/lock_unlock.cpp
index 89695add6..8e48da192 100644
--- a/bitmaps_png/cpp_26/lock_unlock.cpp
+++ b/bitmaps_png/cpp_26/lock_unlock.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/locked.cpp b/bitmaps_png/cpp_26/locked.cpp
index 941260a11..2614df9aa 100644
--- a/bitmaps_png/cpp_26/locked.cpp
+++ b/bitmaps_png/cpp_26/locked.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/measurement.cpp b/bitmaps_png/cpp_26/measurement.cpp
index 6e7ac39e0..7897b476a 100644
--- a/bitmaps_png/cpp_26/measurement.cpp
+++ b/bitmaps_png/cpp_26/measurement.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/minus.cpp b/bitmaps_png/cpp_26/minus.cpp
index d348f64d9..f421eacef 100644
--- a/bitmaps_png/cpp_26/minus.cpp
+++ b/bitmaps_png/cpp_26/minus.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mirror_h.cpp b/bitmaps_png/cpp_26/mirror_h.cpp
index f541bd79c..2b2a116bf 100644
--- a/bitmaps_png/cpp_26/mirror_h.cpp
+++ b/bitmaps_png/cpp_26/mirror_h.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mirror_v.cpp b/bitmaps_png/cpp_26/mirror_v.cpp
index 34f8e6822..7e62eeb10 100644
--- a/bitmaps_png/cpp_26/mirror_v.cpp
+++ b/bitmaps_png/cpp_26/mirror_v.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mode_module.cpp b/bitmaps_png/cpp_26/mode_module.cpp
index 731c45b58..6934e91df 100644
--- a/bitmaps_png/cpp_26/mode_module.cpp
+++ b/bitmaps_png/cpp_26/mode_module.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mode_track.cpp b/bitmaps_png/cpp_26/mode_track.cpp
index 5d71a3397..a4ad3ee1c 100644
--- a/bitmaps_png/cpp_26/mode_track.cpp
+++ b/bitmaps_png/cpp_26/mode_track.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/modratsnest.cpp b/bitmaps_png/cpp_26/modratsnest.cpp
index f5a644c02..377da4c96 100644
--- a/bitmaps_png/cpp_26/modratsnest.cpp
+++ b/bitmaps_png/cpp_26/modratsnest.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module.cpp b/bitmaps_png/cpp_26/module.cpp
index 2182154fb..4aeccaaf2 100644
--- a/bitmaps_png/cpp_26/module.cpp
+++ b/bitmaps_png/cpp_26/module.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_check.cpp b/bitmaps_png/cpp_26/module_check.cpp
index c1a3ac1e6..e5dd62026 100644
--- a/bitmaps_png/cpp_26/module_check.cpp
+++ b/bitmaps_png/cpp_26/module_check.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_editor.cpp b/bitmaps_png/cpp_26/module_editor.cpp
index 38cb97dcb..9c546f6b6 100644
--- a/bitmaps_png/cpp_26/module_editor.cpp
+++ b/bitmaps_png/cpp_26/module_editor.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_filtered_list.cpp b/bitmaps_png/cpp_26/module_filtered_list.cpp
index c594524f0..f6b3b01ed 100644
--- a/bitmaps_png/cpp_26/module_filtered_list.cpp
+++ b/bitmaps_png/cpp_26/module_filtered_list.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_full_list.cpp b/bitmaps_png/cpp_26/module_full_list.cpp
index 967087983..40a72710f 100644
--- a/bitmaps_png/cpp_26/module_full_list.cpp
+++ b/bitmaps_png/cpp_26/module_full_list.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_library_list.cpp b/bitmaps_png/cpp_26/module_library_list.cpp
index 552abd2c6..3e60b9508 100644
--- a/bitmaps_png/cpp_26/module_library_list.cpp
+++ b/bitmaps_png/cpp_26/module_library_list.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_name_filtered_list.cpp b/bitmaps_png/cpp_26/module_name_filtered_list.cpp
index ca61eb262..2fdd47a6c 100644
--- a/bitmaps_png/cpp_26/module_name_filtered_list.cpp
+++ b/bitmaps_png/cpp_26/module_name_filtered_list.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_options.cpp b/bitmaps_png/cpp_26/module_options.cpp
index fb0dd7d30..aaf5a57d3 100644
--- a/bitmaps_png/cpp_26/module_options.cpp
+++ b/bitmaps_png/cpp_26/module_options.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_pin_filtered_list.cpp b/bitmaps_png/cpp_26/module_pin_filtered_list.cpp
index 8a8520c5d..03c52fcc7 100644
--- a/bitmaps_png/cpp_26/module_pin_filtered_list.cpp
+++ b/bitmaps_png/cpp_26/module_pin_filtered_list.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_ratsnest.cpp b/bitmaps_png/cpp_26/module_ratsnest.cpp
index 37fb7f7ac..de3d6180f 100644
--- a/bitmaps_png/cpp_26/module_ratsnest.cpp
+++ b/bitmaps_png/cpp_26/module_ratsnest.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/module_wizard.cpp b/bitmaps_png/cpp_26/module_wizard.cpp
index ab8e94a3a..d7dcf32c6 100644
--- a/bitmaps_png/cpp_26/module_wizard.cpp
+++ b/bitmaps_png/cpp_26/module_wizard.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/modview_icon.cpp b/bitmaps_png/cpp_26/modview_icon.cpp
index f41aa7fc8..80dfa42ca 100644
--- a/bitmaps_png/cpp_26/modview_icon.cpp
+++ b/bitmaps_png/cpp_26/modview_icon.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/morgan1.cpp b/bitmaps_png/cpp_26/morgan1.cpp
index a5550aa31..1cad1fc93 100644
--- a/bitmaps_png/cpp_26/morgan1.cpp
+++ b/bitmaps_png/cpp_26/morgan1.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/morgan2.cpp b/bitmaps_png/cpp_26/morgan2.cpp
index 5efca6090..8c7e4ceea 100644
--- a/bitmaps_png/cpp_26/morgan2.cpp
+++ b/bitmaps_png/cpp_26/morgan2.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move.cpp b/bitmaps_png/cpp_26/move.cpp
index a53b13440..e547ceaed 100644
--- a/bitmaps_png/cpp_26/move.cpp
+++ b/bitmaps_png/cpp_26/move.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_exactly.cpp b/bitmaps_png/cpp_26/move_exactly.cpp
index 8340be7fb..8a559d59b 100644
--- a/bitmaps_png/cpp_26/move_exactly.cpp
+++ b/bitmaps_png/cpp_26/move_exactly.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_glabel.cpp b/bitmaps_png/cpp_26/move_glabel.cpp
index 472febba0..3b526782e 100644
--- a/bitmaps_png/cpp_26/move_glabel.cpp
+++ b/bitmaps_png/cpp_26/move_glabel.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_pad.cpp b/bitmaps_png/cpp_26/move_pad.cpp
index 482e71538..2d79f5e51 100644
--- a/bitmaps_png/cpp_26/move_pad.cpp
+++ b/bitmaps_png/cpp_26/move_pad.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_polygon.cpp b/bitmaps_png/cpp_26/move_polygon.cpp
index 840a75f10..bdd94ace5 100644
--- a/bitmaps_png/cpp_26/move_polygon.cpp
+++ b/bitmaps_png/cpp_26/move_polygon.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_rectangle.cpp b/bitmaps_png/cpp_26/move_rectangle.cpp
index 5619d4331..c820b2c06 100644
--- a/bitmaps_png/cpp_26/move_rectangle.cpp
+++ b/bitmaps_png/cpp_26/move_rectangle.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_relative.cpp b/bitmaps_png/cpp_26/move_relative.cpp
index 0fb8d40da..6a5f9a5f6 100644
--- a/bitmaps_png/cpp_26/move_relative.cpp
+++ b/bitmaps_png/cpp_26/move_relative.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_sheet.cpp b/bitmaps_png/cpp_26/move_sheet.cpp
index ac77b148a..fedc7dbc4 100644
--- a/bitmaps_png/cpp_26/move_sheet.cpp
+++ b/bitmaps_png/cpp_26/move_sheet.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/move_target.cpp b/bitmaps_png/cpp_26/move_target.cpp
index 4de66e18d..81948a731 100644
--- a/bitmaps_png/cpp_26/move_target.cpp
+++ b/bitmaps_png/cpp_26/move_target.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mw_add_gap.cpp b/bitmaps_png/cpp_26/mw_add_gap.cpp
index bee25c46d..26a391025 100644
--- a/bitmaps_png/cpp_26/mw_add_gap.cpp
+++ b/bitmaps_png/cpp_26/mw_add_gap.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mw_add_line.cpp b/bitmaps_png/cpp_26/mw_add_line.cpp
index 0ff0f74eb..f0a933f08 100644
--- a/bitmaps_png/cpp_26/mw_add_line.cpp
+++ b/bitmaps_png/cpp_26/mw_add_line.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mw_add_shape.cpp b/bitmaps_png/cpp_26/mw_add_shape.cpp
index e78ea0b0d..412cb007f 100644
--- a/bitmaps_png/cpp_26/mw_add_shape.cpp
+++ b/bitmaps_png/cpp_26/mw_add_shape.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mw_add_stub.cpp b/bitmaps_png/cpp_26/mw_add_stub.cpp
index 542314916..79c78b9e7 100644
--- a/bitmaps_png/cpp_26/mw_add_stub.cpp
+++ b/bitmaps_png/cpp_26/mw_add_stub.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mw_add_stub_arc.cpp b/bitmaps_png/cpp_26/mw_add_stub_arc.cpp
index 4d0f1e7e0..0d7174fd8 100644
--- a/bitmaps_png/cpp_26/mw_add_stub_arc.cpp
+++ b/bitmaps_png/cpp_26/mw_add_stub_arc.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/mw_toolbar.cpp b/bitmaps_png/cpp_26/mw_toolbar.cpp
index c1e57374a..859267c91 100644
--- a/bitmaps_png/cpp_26/mw_toolbar.cpp
+++ b/bitmaps_png/cpp_26/mw_toolbar.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/net_highlight.cpp b/bitmaps_png/cpp_26/net_highlight.cpp
index 82be17167..9d7b4424d 100644
--- a/bitmaps_png/cpp_26/net_highlight.cpp
+++ b/bitmaps_png/cpp_26/net_highlight.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/net_highlight_schematic.cpp b/bitmaps_png/cpp_26/net_highlight_schematic.cpp
index df5d73bb2..6faa162e2 100644
--- a/bitmaps_png/cpp_26/net_highlight_schematic.cpp
+++ b/bitmaps_png/cpp_26/net_highlight_schematic.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/net_locked.cpp b/bitmaps_png/cpp_26/net_locked.cpp
index 569d15b7a..8b9f4a000 100644
--- a/bitmaps_png/cpp_26/net_locked.cpp
+++ b/bitmaps_png/cpp_26/net_locked.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/net_unlocked.cpp b/bitmaps_png/cpp_26/net_unlocked.cpp
index 81e2c0840..73fd45498 100644
--- a/bitmaps_png/cpp_26/net_unlocked.cpp
+++ b/bitmaps_png/cpp_26/net_unlocked.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/netlist.cpp b/bitmaps_png/cpp_26/netlist.cpp
index 1fe362804..6936dd251 100644
--- a/bitmaps_png/cpp_26/netlist.cpp
+++ b/bitmaps_png/cpp_26/netlist.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_board.cpp b/bitmaps_png/cpp_26/new_board.cpp
index e30d6b162..e0fd2edfa 100644
--- a/bitmaps_png/cpp_26/new_board.cpp
+++ b/bitmaps_png/cpp_26/new_board.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_component.cpp b/bitmaps_png/cpp_26/new_component.cpp
index 6ee39f421..8a44306ea 100644
--- a/bitmaps_png/cpp_26/new_component.cpp
+++ b/bitmaps_png/cpp_26/new_component.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_cvpcb.cpp b/bitmaps_png/cpp_26/new_cvpcb.cpp
index 5c8c94d95..60a5835b7 100644
--- a/bitmaps_png/cpp_26/new_cvpcb.cpp
+++ b/bitmaps_png/cpp_26/new_cvpcb.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_document.cpp b/bitmaps_png/cpp_26/new_document.cpp
index c1c516f77..c690f1bc2 100644
--- a/bitmaps_png/cpp_26/new_document.cpp
+++ b/bitmaps_png/cpp_26/new_document.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_footprint.cpp b/bitmaps_png/cpp_26/new_footprint.cpp
index 4b7b31587..1913d6110 100644
--- a/bitmaps_png/cpp_26/new_footprint.cpp
+++ b/bitmaps_png/cpp_26/new_footprint.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_generic.cpp b/bitmaps_png/cpp_26/new_generic.cpp
index fa2bd91dd..da45381f6 100644
--- a/bitmaps_png/cpp_26/new_generic.cpp
+++ b/bitmaps_png/cpp_26/new_generic.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_library.cpp b/bitmaps_png/cpp_26/new_library.cpp
index 566447c2c..0cbaef0ed 100644
--- a/bitmaps_png/cpp_26/new_library.cpp
+++ b/bitmaps_png/cpp_26/new_library.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_page_layout.cpp b/bitmaps_png/cpp_26/new_page_layout.cpp
index 410160f37..3ae7e772a 100644
--- a/bitmaps_png/cpp_26/new_page_layout.cpp
+++ b/bitmaps_png/cpp_26/new_page_layout.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_project.cpp b/bitmaps_png/cpp_26/new_project.cpp
index 63b0bccfb..0e4c61c60 100644
--- a/bitmaps_png/cpp_26/new_project.cpp
+++ b/bitmaps_png/cpp_26/new_project.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/new_project_with_template.cpp b/bitmaps_png/cpp_26/new_project_with_template.cpp
index 17722bc81..b39655179 100644
--- a/bitmaps_png/cpp_26/new_project_with_template.cpp
+++ b/bitmaps_png/cpp_26/new_project_with_template.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/noconn.cpp b/bitmaps_png/cpp_26/noconn.cpp
index 0a7b0d4a9..c038e2671 100644
--- a/bitmaps_png/cpp_26/noconn.cpp
+++ b/bitmaps_png/cpp_26/noconn.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/normal.cpp b/bitmaps_png/cpp_26/normal.cpp
index ed42ff6b4..405805880 100644
--- a/bitmaps_png/cpp_26/normal.cpp
+++ b/bitmaps_png/cpp_26/normal.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/online_help.cpp b/bitmaps_png/cpp_26/online_help.cpp
index 0f26daf67..102d7a8d9 100644
--- a/bitmaps_png/cpp_26/online_help.cpp
+++ b/bitmaps_png/cpp_26/online_help.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/open_brd_file.cpp b/bitmaps_png/cpp_26/open_brd_file.cpp
index 7328b0d54..06c6819a1 100644
--- a/bitmaps_png/cpp_26/open_brd_file.cpp
+++ b/bitmaps_png/cpp_26/open_brd_file.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/open_document.cpp b/bitmaps_png/cpp_26/open_document.cpp
index 11a5e283f..fc8dea4ca 100644
--- a/bitmaps_png/cpp_26/open_document.cpp
+++ b/bitmaps_png/cpp_26/open_document.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/open_library.cpp b/bitmaps_png/cpp_26/open_library.cpp
index a3e1cdf3a..1d0f431a1 100644
--- a/bitmaps_png/cpp_26/open_library.cpp
+++ b/bitmaps_png/cpp_26/open_library.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/open_page_layout.cpp b/bitmaps_png/cpp_26/open_page_layout.cpp
index 2ca5303e4..417a30a2f 100644
--- a/bitmaps_png/cpp_26/open_page_layout.cpp
+++ b/bitmaps_png/cpp_26/open_page_layout.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/open_project.cpp b/bitmaps_png/cpp_26/open_project.cpp
index 8ab7931eb..9094a3a02 100644
--- a/bitmaps_png/cpp_26/open_project.cpp
+++ b/bitmaps_png/cpp_26/open_project.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/opt_show_polygon.cpp b/bitmaps_png/cpp_26/opt_show_polygon.cpp
index 453530af7..5b589691c 100644
--- a/bitmaps_png/cpp_26/opt_show_polygon.cpp
+++ b/bitmaps_png/cpp_26/opt_show_polygon.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_3drender.cpp b/bitmaps_png/cpp_26/options_3drender.cpp
index c49bc69af..2382c3e6a 100644
--- a/bitmaps_png/cpp_26/options_3drender.cpp
+++ b/bitmaps_png/cpp_26/options_3drender.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_all_tracks.cpp b/bitmaps_png/cpp_26/options_all_tracks.cpp
index 74b94fbf3..cdec9ed1d 100644
--- a/bitmaps_png/cpp_26/options_all_tracks.cpp
+++ b/bitmaps_png/cpp_26/options_all_tracks.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_all_tracks_and_vias.cpp b/bitmaps_png/cpp_26/options_all_tracks_and_vias.cpp
index 34cdb62bf..1e8164514 100644
--- a/bitmaps_png/cpp_26/options_all_tracks_and_vias.cpp
+++ b/bitmaps_png/cpp_26/options_all_tracks_and_vias.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_all_vias.cpp b/bitmaps_png/cpp_26/options_all_vias.cpp
index 9d1f8637f..4b05164e8 100644
--- a/bitmaps_png/cpp_26/options_all_vias.cpp
+++ b/bitmaps_png/cpp_26/options_all_vias.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_arc.cpp b/bitmaps_png/cpp_26/options_arc.cpp
index 1de43ea7e..b90c79ea7 100644
--- a/bitmaps_png/cpp_26/options_arc.cpp
+++ b/bitmaps_png/cpp_26/options_arc.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_board.cpp b/bitmaps_png/cpp_26/options_board.cpp
index 7e02513fa..9235f157d 100644
--- a/bitmaps_png/cpp_26/options_board.cpp
+++ b/bitmaps_png/cpp_26/options_board.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_circle.cpp b/bitmaps_png/cpp_26/options_circle.cpp
index 308a3e0c8..1bdc87576 100644
--- a/bitmaps_png/cpp_26/options_circle.cpp
+++ b/bitmaps_png/cpp_26/options_circle.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_generic.cpp b/bitmaps_png/cpp_26/options_generic.cpp
index f0683d930..c6bf3a2ae 100644
--- a/bitmaps_png/cpp_26/options_generic.cpp
+++ b/bitmaps_png/cpp_26/options_generic.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_module.cpp b/bitmaps_png/cpp_26/options_module.cpp
index 9e69d8cc8..a0a886b4b 100644
--- a/bitmaps_png/cpp_26/options_module.cpp
+++ b/bitmaps_png/cpp_26/options_module.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_pad.cpp b/bitmaps_png/cpp_26/options_pad.cpp
index aed18f210..f714e8654 100644
--- a/bitmaps_png/cpp_26/options_pad.cpp
+++ b/bitmaps_png/cpp_26/options_pad.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_pin.cpp b/bitmaps_png/cpp_26/options_pin.cpp
index 5369ec0f7..5255f508e 100644
--- a/bitmaps_png/cpp_26/options_pin.cpp
+++ b/bitmaps_png/cpp_26/options_pin.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_pinsheet.cpp b/bitmaps_png/cpp_26/options_pinsheet.cpp
index 6b93c2eb2..696a08a7f 100644
--- a/bitmaps_png/cpp_26/options_pinsheet.cpp
+++ b/bitmaps_png/cpp_26/options_pinsheet.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_rectangle.cpp b/bitmaps_png/cpp_26/options_rectangle.cpp
index a3a08dd7c..715c32cbe 100644
--- a/bitmaps_png/cpp_26/options_rectangle.cpp
+++ b/bitmaps_png/cpp_26/options_rectangle.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_segment.cpp b/bitmaps_png/cpp_26/options_segment.cpp
index 6b4a07a29..736387ead 100644
--- a/bitmaps_png/cpp_26/options_segment.cpp
+++ b/bitmaps_png/cpp_26/options_segment.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_track.cpp b/bitmaps_png/cpp_26/options_track.cpp
index 7cd43b989..2e1c4ac8a 100644
--- a/bitmaps_png/cpp_26/options_track.cpp
+++ b/bitmaps_png/cpp_26/options_track.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_tracks.cpp b/bitmaps_png/cpp_26/options_tracks.cpp
index 8ee91d57b..224e800dc 100644
--- a/bitmaps_png/cpp_26/options_tracks.cpp
+++ b/bitmaps_png/cpp_26/options_tracks.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/options_vias.cpp b/bitmaps_png/cpp_26/options_vias.cpp
index 4e1eb779a..c6a4d7842 100644
--- a/bitmaps_png/cpp_26/options_vias.cpp
+++ b/bitmaps_png/cpp_26/options_vias.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/orient.cpp b/bitmaps_png/cpp_26/orient.cpp
index 6c397f996..a34fe7020 100644
--- a/bitmaps_png/cpp_26/orient.cpp
+++ b/bitmaps_png/cpp_26/orient.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ortho.cpp b/bitmaps_png/cpp_26/ortho.cpp
index 66dfbaaba..305d909b5 100644
--- a/bitmaps_png/cpp_26/ortho.cpp
+++ b/bitmaps_png/cpp_26/ortho.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pad.cpp b/bitmaps_png/cpp_26/pad.cpp
index 3783dd097..55fc8cf5b 100644
--- a/bitmaps_png/cpp_26/pad.cpp
+++ b/bitmaps_png/cpp_26/pad.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pad_dimensions.cpp b/bitmaps_png/cpp_26/pad_dimensions.cpp
index 9cbe81384..026da48b2 100644
--- a/bitmaps_png/cpp_26/pad_dimensions.cpp
+++ b/bitmaps_png/cpp_26/pad_dimensions.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pad_enumerate.cpp b/bitmaps_png/cpp_26/pad_enumerate.cpp
index ec130a3d3..5e4534da6 100644
--- a/bitmaps_png/cpp_26/pad_enumerate.cpp
+++ b/bitmaps_png/cpp_26/pad_enumerate.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pad_sketch.cpp b/bitmaps_png/cpp_26/pad_sketch.cpp
index 06553c351..44f5e026a 100644
--- a/bitmaps_png/cpp_26/pad_sketch.cpp
+++ b/bitmaps_png/cpp_26/pad_sketch.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pads_mask_layers.cpp b/bitmaps_png/cpp_26/pads_mask_layers.cpp
index ce59ae9ca..31e65740e 100644
--- a/bitmaps_png/cpp_26/pads_mask_layers.cpp
+++ b/bitmaps_png/cpp_26/pads_mask_layers.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pagelayout_load.cpp b/bitmaps_png/cpp_26/pagelayout_load.cpp
index 805ba6445..435d4e6c8 100644
--- a/bitmaps_png/cpp_26/pagelayout_load.cpp
+++ b/bitmaps_png/cpp_26/pagelayout_load.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pagelayout_normal_view_mode.cpp b/bitmaps_png/cpp_26/pagelayout_normal_view_mode.cpp
index f511a50ed..19df992c4 100644
--- a/bitmaps_png/cpp_26/pagelayout_normal_view_mode.cpp
+++ b/bitmaps_png/cpp_26/pagelayout_normal_view_mode.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pagelayout_special_view_mode.cpp b/bitmaps_png/cpp_26/pagelayout_special_view_mode.cpp
index ef26e59d7..029645384 100644
--- a/bitmaps_png/cpp_26/pagelayout_special_view_mode.cpp
+++ b/bitmaps_png/cpp_26/pagelayout_special_view_mode.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/palette.cpp b/bitmaps_png/cpp_26/palette.cpp
index 48850553c..e89b94ce2 100644
--- a/bitmaps_png/cpp_26/palette.cpp
+++ b/bitmaps_png/cpp_26/palette.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/part_properties.cpp b/bitmaps_png/cpp_26/part_properties.cpp
index 54a97d4f3..07679596d 100644
--- a/bitmaps_png/cpp_26/part_properties.cpp
+++ b/bitmaps_png/cpp_26/part_properties.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/paste.cpp b/bitmaps_png/cpp_26/paste.cpp
index 6283df085..3b17485fd 100644
--- a/bitmaps_png/cpp_26/paste.cpp
+++ b/bitmaps_png/cpp_26/paste.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/path.cpp b/bitmaps_png/cpp_26/path.cpp
index 7eb317985..5068de1e3 100644
--- a/bitmaps_png/cpp_26/path.cpp
+++ b/bitmaps_png/cpp_26/path.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pcb_offset.cpp b/bitmaps_png/cpp_26/pcb_offset.cpp
index ea1bf9515..0bb9444cf 100644
--- a/bitmaps_png/cpp_26/pcb_offset.cpp
+++ b/bitmaps_png/cpp_26/pcb_offset.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pcb_target.cpp b/bitmaps_png/cpp_26/pcb_target.cpp
index ef43a4fcf..cab49a8c1 100644
--- a/bitmaps_png/cpp_26/pcb_target.cpp
+++ b/bitmaps_png/cpp_26/pcb_target.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pcbcalculator.cpp b/bitmaps_png/cpp_26/pcbcalculator.cpp
index 7a4bc4c17..1f7bac88a 100644
--- a/bitmaps_png/cpp_26/pcbcalculator.cpp
+++ b/bitmaps_png/cpp_26/pcbcalculator.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pcbnew.cpp b/bitmaps_png/cpp_26/pcbnew.cpp
index 0e48965cd..efd898468 100644
--- a/bitmaps_png/cpp_26/pcbnew.cpp
+++ b/bitmaps_png/cpp_26/pcbnew.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin.cpp b/bitmaps_png/cpp_26/pin.cpp
index 0379e07fd..76bb60567 100644
--- a/bitmaps_png/cpp_26/pin.cpp
+++ b/bitmaps_png/cpp_26/pin.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin2pin.cpp b/bitmaps_png/cpp_26/pin2pin.cpp
index 80a5d24b0..5e65a4da0 100644
--- a/bitmaps_png/cpp_26/pin2pin.cpp
+++ b/bitmaps_png/cpp_26/pin2pin.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin_name_to.cpp b/bitmaps_png/cpp_26/pin_name_to.cpp
index b1c77e93f..dd5b3ceec 100644
--- a/bitmaps_png/cpp_26/pin_name_to.cpp
+++ b/bitmaps_png/cpp_26/pin_name_to.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin_number_to.cpp b/bitmaps_png/cpp_26/pin_number_to.cpp
index b69c77f9f..0853a5721 100644
--- a/bitmaps_png/cpp_26/pin_number_to.cpp
+++ b/bitmaps_png/cpp_26/pin_number_to.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin_show_etype.cpp b/bitmaps_png/cpp_26/pin_show_etype.cpp
index ee6913056..6915ae94e 100644
--- a/bitmaps_png/cpp_26/pin_show_etype.cpp
+++ b/bitmaps_png/cpp_26/pin_show_etype.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin_size_to.cpp b/bitmaps_png/cpp_26/pin_size_to.cpp
index d2c942d8d..b6f6c471b 100644
--- a/bitmaps_png/cpp_26/pin_size_to.cpp
+++ b/bitmaps_png/cpp_26/pin_size_to.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin_table.cpp b/bitmaps_png/cpp_26/pin_table.cpp
index 84dd97ee9..bd6e8f1a1 100644
--- a/bitmaps_png/cpp_26/pin_table.cpp
+++ b/bitmaps_png/cpp_26/pin_table.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/pin_to.cpp b/bitmaps_png/cpp_26/pin_to.cpp
index 622f4c7ff..07d8f9b10 100644
--- a/bitmaps_png/cpp_26/pin_to.cpp
+++ b/bitmaps_png/cpp_26/pin_to.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/plot.cpp b/bitmaps_png/cpp_26/plot.cpp
index cb6a0361c..8d6cef3d1 100644
--- a/bitmaps_png/cpp_26/plot.cpp
+++ b/bitmaps_png/cpp_26/plot.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/plot_dxf.cpp b/bitmaps_png/cpp_26/plot_dxf.cpp
index c2b14d631..d562d33e5 100644
--- a/bitmaps_png/cpp_26/plot_dxf.cpp
+++ b/bitmaps_png/cpp_26/plot_dxf.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/plot_hpg.cpp b/bitmaps_png/cpp_26/plot_hpg.cpp
index d8a888dfa..612c916a7 100644
--- a/bitmaps_png/cpp_26/plot_hpg.cpp
+++ b/bitmaps_png/cpp_26/plot_hpg.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/plot_pdf.cpp b/bitmaps_png/cpp_26/plot_pdf.cpp
index 3aca0a668..879b8e9b5 100644
--- a/bitmaps_png/cpp_26/plot_pdf.cpp
+++ b/bitmaps_png/cpp_26/plot_pdf.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/plot_ps.cpp b/bitmaps_png/cpp_26/plot_ps.cpp
index 2d76dfcac..6cd4a38f6 100644
--- a/bitmaps_png/cpp_26/plot_ps.cpp
+++ b/bitmaps_png/cpp_26/plot_ps.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/plot_svg.cpp b/bitmaps_png/cpp_26/plot_svg.cpp
index 42d4cccd2..8d0a73d09 100644
--- a/bitmaps_png/cpp_26/plot_svg.cpp
+++ b/bitmaps_png/cpp_26/plot_svg.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/plus.cpp b/bitmaps_png/cpp_26/plus.cpp
index b3432bbe1..a7226ffaf 100644
--- a/bitmaps_png/cpp_26/plus.cpp
+++ b/bitmaps_png/cpp_26/plus.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/polar_coord.cpp b/bitmaps_png/cpp_26/polar_coord.cpp
index fe3881bc6..373573461 100644
--- a/bitmaps_png/cpp_26/polar_coord.cpp
+++ b/bitmaps_png/cpp_26/polar_coord.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/post_compo.cpp b/bitmaps_png/cpp_26/post_compo.cpp
index cd9a202a3..4aacfd62a 100644
--- a/bitmaps_png/cpp_26/post_compo.cpp
+++ b/bitmaps_png/cpp_26/post_compo.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/post_drill.cpp b/bitmaps_png/cpp_26/post_drill.cpp
index ab3999916..20404967b 100644
--- a/bitmaps_png/cpp_26/post_drill.cpp
+++ b/bitmaps_png/cpp_26/post_drill.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/post_module.cpp b/bitmaps_png/cpp_26/post_module.cpp
index d234aff8a..1c332ce64 100644
--- a/bitmaps_png/cpp_26/post_module.cpp
+++ b/bitmaps_png/cpp_26/post_module.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/preference.cpp b/bitmaps_png/cpp_26/preference.cpp
index a7c6f10e2..cad3b65f2 100644
--- a/bitmaps_png/cpp_26/preference.cpp
+++ b/bitmaps_png/cpp_26/preference.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/primitives_to_custom_pad.cpp b/bitmaps_png/cpp_26/primitives_to_custom_pad.cpp
index 0af47486d..b8092b1a0 100644
--- a/bitmaps_png/cpp_26/primitives_to_custom_pad.cpp
+++ b/bitmaps_png/cpp_26/primitives_to_custom_pad.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/print_button.cpp b/bitmaps_png/cpp_26/print_button.cpp
index 97f33ebc6..173b6269d 100644
--- a/bitmaps_png/cpp_26/print_button.cpp
+++ b/bitmaps_png/cpp_26/print_button.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ps_diff_pair.cpp b/bitmaps_png/cpp_26/ps_diff_pair.cpp
index 713f56cf4..26b9f930f 100644
--- a/bitmaps_png/cpp_26/ps_diff_pair.cpp
+++ b/bitmaps_png/cpp_26/ps_diff_pair.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ps_diff_pair_gap.cpp b/bitmaps_png/cpp_26/ps_diff_pair_gap.cpp
index b0e7cc8f9..9bd8424ed 100644
--- a/bitmaps_png/cpp_26/ps_diff_pair_gap.cpp
+++ b/bitmaps_png/cpp_26/ps_diff_pair_gap.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ps_diff_pair_tune_length.cpp b/bitmaps_png/cpp_26/ps_diff_pair_tune_length.cpp
index 7078692d4..d628e85c0 100644
--- a/bitmaps_png/cpp_26/ps_diff_pair_tune_length.cpp
+++ b/bitmaps_png/cpp_26/ps_diff_pair_tune_length.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ps_diff_pair_tune_phase.cpp b/bitmaps_png/cpp_26/ps_diff_pair_tune_phase.cpp
index aa450eed5..a2f159464 100644
--- a/bitmaps_png/cpp_26/ps_diff_pair_tune_phase.cpp
+++ b/bitmaps_png/cpp_26/ps_diff_pair_tune_phase.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ps_diff_pair_via_gap.cpp b/bitmaps_png/cpp_26/ps_diff_pair_via_gap.cpp
index aa0d64fcb..5caa87dfc 100644
--- a/bitmaps_png/cpp_26/ps_diff_pair_via_gap.cpp
+++ b/bitmaps_png/cpp_26/ps_diff_pair_via_gap.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ps_router.cpp b/bitmaps_png/cpp_26/ps_router.cpp
index e48fcdac8..ecd5f8b29 100644
--- a/bitmaps_png/cpp_26/ps_router.cpp
+++ b/bitmaps_png/cpp_26/ps_router.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ps_tune_length.cpp b/bitmaps_png/cpp_26/ps_tune_length.cpp
index 95cde9f33..ca6c522ea 100644
--- a/bitmaps_png/cpp_26/ps_tune_length.cpp
+++ b/bitmaps_png/cpp_26/ps_tune_length.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/push_pad_settings.cpp b/bitmaps_png/cpp_26/push_pad_settings.cpp
index fc975125e..dc1904cec 100644
--- a/bitmaps_png/cpp_26/push_pad_settings.cpp
+++ b/bitmaps_png/cpp_26/push_pad_settings.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/py_script.cpp b/bitmaps_png/cpp_26/py_script.cpp
index 93815ccae..e09c8f2f2 100644
--- a/bitmaps_png/cpp_26/py_script.cpp
+++ b/bitmaps_png/cpp_26/py_script.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/ratsnest.cpp b/bitmaps_png/cpp_26/ratsnest.cpp
index 44e865e14..14640c4e8 100644
--- a/bitmaps_png/cpp_26/ratsnest.cpp
+++ b/bitmaps_png/cpp_26/ratsnest.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/read_setup.cpp b/bitmaps_png/cpp_26/read_setup.cpp
index cab351504..7cd605600 100644
--- a/bitmaps_png/cpp_26/read_setup.cpp
+++ b/bitmaps_png/cpp_26/read_setup.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/recent.cpp b/bitmaps_png/cpp_26/recent.cpp
index 57ff2674c..7ad644fe9 100644
--- a/bitmaps_png/cpp_26/recent.cpp
+++ b/bitmaps_png/cpp_26/recent.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/red.cpp b/bitmaps_png/cpp_26/red.cpp
index df0db4b95..686908e41 100644
--- a/bitmaps_png/cpp_26/red.cpp
+++ b/bitmaps_png/cpp_26/red.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/redo.cpp b/bitmaps_png/cpp_26/redo.cpp
index 9bfcca47a..2bb139a6d 100644
--- a/bitmaps_png/cpp_26/redo.cpp
+++ b/bitmaps_png/cpp_26/redo.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/reload.cpp b/bitmaps_png/cpp_26/reload.cpp
index ec4ed266f..f4a1c935c 100644
--- a/bitmaps_png/cpp_26/reload.cpp
+++ b/bitmaps_png/cpp_26/reload.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/reload2.cpp b/bitmaps_png/cpp_26/reload2.cpp
index 3dc4aa140..4f316113f 100644
--- a/bitmaps_png/cpp_26/reload2.cpp
+++ b/bitmaps_png/cpp_26/reload2.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/render_mode.cpp b/bitmaps_png/cpp_26/render_mode.cpp
index a99ee780a..31a4911ec 100644
--- a/bitmaps_png/cpp_26/render_mode.cpp
+++ b/bitmaps_png/cpp_26/render_mode.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rescue.cpp b/bitmaps_png/cpp_26/rescue.cpp
index 00a370f31..115afc2e6 100644
--- a/bitmaps_png/cpp_26/rescue.cpp
+++ b/bitmaps_png/cpp_26/rescue.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/reset_text.cpp b/bitmaps_png/cpp_26/reset_text.cpp
index 87dbc74ce..6a4572b06 100644
--- a/bitmaps_png/cpp_26/reset_text.cpp
+++ b/bitmaps_png/cpp_26/reset_text.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/resize_sheet.cpp b/bitmaps_png/cpp_26/resize_sheet.cpp
index 1cf8373c8..91060449a 100644
--- a/bitmaps_png/cpp_26/resize_sheet.cpp
+++ b/bitmaps_png/cpp_26/resize_sheet.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/right.cpp b/bitmaps_png/cpp_26/right.cpp
index 796f70162..d9c5a7878 100644
--- a/bitmaps_png/cpp_26/right.cpp
+++ b/bitmaps_png/cpp_26/right.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_ccw.cpp b/bitmaps_png/cpp_26/rotate_ccw.cpp
index 47878ef57..10ab3f33e 100644
--- a/bitmaps_png/cpp_26/rotate_ccw.cpp
+++ b/bitmaps_png/cpp_26/rotate_ccw.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_cw.cpp b/bitmaps_png/cpp_26/rotate_cw.cpp
index 01396a266..42b1909e4 100644
--- a/bitmaps_png/cpp_26/rotate_cw.cpp
+++ b/bitmaps_png/cpp_26/rotate_cw.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_neg_x.cpp b/bitmaps_png/cpp_26/rotate_neg_x.cpp
index 195041893..8234cd047 100644
--- a/bitmaps_png/cpp_26/rotate_neg_x.cpp
+++ b/bitmaps_png/cpp_26/rotate_neg_x.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_neg_y.cpp b/bitmaps_png/cpp_26/rotate_neg_y.cpp
index 493d4a1b5..7c93b4dc9 100644
--- a/bitmaps_png/cpp_26/rotate_neg_y.cpp
+++ b/bitmaps_png/cpp_26/rotate_neg_y.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_neg_z.cpp b/bitmaps_png/cpp_26/rotate_neg_z.cpp
index ade643845..b73198490 100644
--- a/bitmaps_png/cpp_26/rotate_neg_z.cpp
+++ b/bitmaps_png/cpp_26/rotate_neg_z.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_pos_x.cpp b/bitmaps_png/cpp_26/rotate_pos_x.cpp
index 4982ef422..133b632e6 100644
--- a/bitmaps_png/cpp_26/rotate_pos_x.cpp
+++ b/bitmaps_png/cpp_26/rotate_pos_x.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_pos_y.cpp b/bitmaps_png/cpp_26/rotate_pos_y.cpp
index 4abdeda45..be8e700e3 100644
--- a/bitmaps_png/cpp_26/rotate_pos_y.cpp
+++ b/bitmaps_png/cpp_26/rotate_pos_y.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/rotate_pos_z.cpp b/bitmaps_png/cpp_26/rotate_pos_z.cpp
index df6130367..a4b043aae 100644
--- a/bitmaps_png/cpp_26/rotate_pos_z.cpp
+++ b/bitmaps_png/cpp_26/rotate_pos_z.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/router_len_tuner.cpp b/bitmaps_png/cpp_26/router_len_tuner.cpp
index 3db07af86..67a2d4415 100644
--- a/bitmaps_png/cpp_26/router_len_tuner.cpp
+++ b/bitmaps_png/cpp_26/router_len_tuner.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/router_len_tuner_amplitude_decr.cpp b/bitmaps_png/cpp_26/router_len_tuner_amplitude_decr.cpp
index 44c5dc1d0..34b625bcc 100644
--- a/bitmaps_png/cpp_26/router_len_tuner_amplitude_decr.cpp
+++ b/bitmaps_png/cpp_26/router_len_tuner_amplitude_decr.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/router_len_tuner_amplitude_incr.cpp b/bitmaps_png/cpp_26/router_len_tuner_amplitude_incr.cpp
index 97614d517..13977a206 100644
--- a/bitmaps_png/cpp_26/router_len_tuner_amplitude_incr.cpp
+++ b/bitmaps_png/cpp_26/router_len_tuner_amplitude_incr.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/router_len_tuner_dist_decr.cpp b/bitmaps_png/cpp_26/router_len_tuner_dist_decr.cpp
index 1af36dfb1..98ab7e49b 100644
--- a/bitmaps_png/cpp_26/router_len_tuner_dist_decr.cpp
+++ b/bitmaps_png/cpp_26/router_len_tuner_dist_decr.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/router_len_tuner_dist_incr.cpp b/bitmaps_png/cpp_26/router_len_tuner_dist_incr.cpp
index 2ccb63dcd..9d4c7ae04 100644
--- a/bitmaps_png/cpp_26/router_len_tuner_dist_incr.cpp
+++ b/bitmaps_png/cpp_26/router_len_tuner_dist_incr.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/router_len_tuner_setup.cpp b/bitmaps_png/cpp_26/router_len_tuner_setup.cpp
index ba7c53d03..c2b270534 100644
--- a/bitmaps_png/cpp_26/router_len_tuner_setup.cpp
+++ b/bitmaps_png/cpp_26/router_len_tuner_setup.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save.cpp b/bitmaps_png/cpp_26/save.cpp
index c9109c855..b2d36f6cd 100644
--- a/bitmaps_png/cpp_26/save.cpp
+++ b/bitmaps_png/cpp_26/save.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save_as.cpp b/bitmaps_png/cpp_26/save_as.cpp
index ac3124a44..a3189c1f6 100644
--- a/bitmaps_png/cpp_26/save_as.cpp
+++ b/bitmaps_png/cpp_26/save_as.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save_fp_to_board.cpp b/bitmaps_png/cpp_26/save_fp_to_board.cpp
index 9b89a8957..fe5efd2d4 100644
--- a/bitmaps_png/cpp_26/save_fp_to_board.cpp
+++ b/bitmaps_png/cpp_26/save_fp_to_board.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save_gerber.cpp b/bitmaps_png/cpp_26/save_gerber.cpp
index 476259d22..4e560dd64 100644
--- a/bitmaps_png/cpp_26/save_gerber.cpp
+++ b/bitmaps_png/cpp_26/save_gerber.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save_library.cpp b/bitmaps_png/cpp_26/save_library.cpp
index 76dccc254..eff12e84e 100644
--- a/bitmaps_png/cpp_26/save_library.cpp
+++ b/bitmaps_png/cpp_26/save_library.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save_project.cpp b/bitmaps_png/cpp_26/save_project.cpp
index cfbd26c44..6d5b188ae 100644
--- a/bitmaps_png/cpp_26/save_project.cpp
+++ b/bitmaps_png/cpp_26/save_project.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/save_setup.cpp b/bitmaps_png/cpp_26/save_setup.cpp
index ad399c771..d15a41142 100644
--- a/bitmaps_png/cpp_26/save_setup.cpp
+++ b/bitmaps_png/cpp_26/save_setup.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/search_tree.cpp b/bitmaps_png/cpp_26/search_tree.cpp
index 8529d063f..9629a4f19 100644
--- a/bitmaps_png/cpp_26/search_tree.cpp
+++ b/bitmaps_png/cpp_26/search_tree.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/select_grid.cpp b/bitmaps_png/cpp_26/select_grid.cpp
index 18e2fcead..c1b0bd225 100644
--- a/bitmaps_png/cpp_26/select_grid.cpp
+++ b/bitmaps_png/cpp_26/select_grid.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/select_layer_pair.cpp b/bitmaps_png/cpp_26/select_layer_pair.cpp
index 4d6c98362..4770c99c0 100644
--- a/bitmaps_png/cpp_26/select_layer_pair.cpp
+++ b/bitmaps_png/cpp_26/select_layer_pair.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/select_same_sheet.cpp b/bitmaps_png/cpp_26/select_same_sheet.cpp
index 0e0827c6a..a6bc690f1 100644
--- a/bitmaps_png/cpp_26/select_same_sheet.cpp
+++ b/bitmaps_png/cpp_26/select_same_sheet.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/select_w_layer.cpp b/bitmaps_png/cpp_26/select_w_layer.cpp
index 7a8578308..18cc0c874 100644
--- a/bitmaps_png/cpp_26/select_w_layer.cpp
+++ b/bitmaps_png/cpp_26/select_w_layer.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/setcolor_3d_bg.cpp b/bitmaps_png/cpp_26/setcolor_3d_bg.cpp
index 27a6b14b6..20afd4223 100644
--- a/bitmaps_png/cpp_26/setcolor_3d_bg.cpp
+++ b/bitmaps_png/cpp_26/setcolor_3d_bg.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/setcolor_board_body.cpp b/bitmaps_png/cpp_26/setcolor_board_body.cpp
index 68f5e812b..78d4b4fba 100644
--- a/bitmaps_png/cpp_26/setcolor_board_body.cpp
+++ b/bitmaps_png/cpp_26/setcolor_board_body.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/setcolor_copper.cpp b/bitmaps_png/cpp_26/setcolor_copper.cpp
index 584fe2abb..6a8178389 100644
--- a/bitmaps_png/cpp_26/setcolor_copper.cpp
+++ b/bitmaps_png/cpp_26/setcolor_copper.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/setcolor_silkscreen.cpp b/bitmaps_png/cpp_26/setcolor_silkscreen.cpp
index c0b019d22..3aa97f9f4 100644
--- a/bitmaps_png/cpp_26/setcolor_silkscreen.cpp
+++ b/bitmaps_png/cpp_26/setcolor_silkscreen.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/setcolor_soldermask.cpp b/bitmaps_png/cpp_26/setcolor_soldermask.cpp
index 56a712244..565fd3fa7 100644
--- a/bitmaps_png/cpp_26/setcolor_soldermask.cpp
+++ b/bitmaps_png/cpp_26/setcolor_soldermask.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/setcolor_solderpaste.cpp b/bitmaps_png/cpp_26/setcolor_solderpaste.cpp
index 690d75807..2e0eb7772 100644
--- a/bitmaps_png/cpp_26/setcolor_solderpaste.cpp
+++ b/bitmaps_png/cpp_26/setcolor_solderpaste.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/shape_3d.cpp b/bitmaps_png/cpp_26/shape_3d.cpp
index 7a755b7ee..21153ae69 100644
--- a/bitmaps_png/cpp_26/shape_3d.cpp
+++ b/bitmaps_png/cpp_26/shape_3d.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/sheetset.cpp b/bitmaps_png/cpp_26/sheetset.cpp
index a5505863f..8eca90975 100644
--- a/bitmaps_png/cpp_26/sheetset.cpp
+++ b/bitmaps_png/cpp_26/sheetset.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_all_copper_layers.cpp b/bitmaps_png/cpp_26/show_all_copper_layers.cpp
index 38ee421bb..6c8199bb4 100644
--- a/bitmaps_png/cpp_26/show_all_copper_layers.cpp
+++ b/bitmaps_png/cpp_26/show_all_copper_layers.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_all_layers.cpp b/bitmaps_png/cpp_26/show_all_layers.cpp
index cda197208..b4376059a 100644
--- a/bitmaps_png/cpp_26/show_all_layers.cpp
+++ b/bitmaps_png/cpp_26/show_all_layers.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_dcodenumber.cpp b/bitmaps_png/cpp_26/show_dcodenumber.cpp
index a15f8edef..5a7c11550 100644
--- a/bitmaps_png/cpp_26/show_dcodenumber.cpp
+++ b/bitmaps_png/cpp_26/show_dcodenumber.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_footprint.cpp b/bitmaps_png/cpp_26/show_footprint.cpp
index eddd53ab5..317c3f714 100644
--- a/bitmaps_png/cpp_26/show_footprint.cpp
+++ b/bitmaps_png/cpp_26/show_footprint.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_mod_edge.cpp b/bitmaps_png/cpp_26/show_mod_edge.cpp
index d7b253de8..c1f97aa5e 100644
--- a/bitmaps_png/cpp_26/show_mod_edge.cpp
+++ b/bitmaps_png/cpp_26/show_mod_edge.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_no_copper_layers.cpp b/bitmaps_png/cpp_26/show_no_copper_layers.cpp
index 2736857e2..ae80954f0 100644
--- a/bitmaps_png/cpp_26/show_no_copper_layers.cpp
+++ b/bitmaps_png/cpp_26/show_no_copper_layers.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_no_layers.cpp b/bitmaps_png/cpp_26/show_no_layers.cpp
index 725ccc05b..81ba2b34d 100644
--- a/bitmaps_png/cpp_26/show_no_layers.cpp
+++ b/bitmaps_png/cpp_26/show_no_layers.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_zone.cpp b/bitmaps_png/cpp_26/show_zone.cpp
index 56dd226ac..701b580ec 100644
--- a/bitmaps_png/cpp_26/show_zone.cpp
+++ b/bitmaps_png/cpp_26/show_zone.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_zone_disable.cpp b/bitmaps_png/cpp_26/show_zone_disable.cpp
index 22bd66232..aa0c09c66 100644
--- a/bitmaps_png/cpp_26/show_zone_disable.cpp
+++ b/bitmaps_png/cpp_26/show_zone_disable.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/show_zone_outline_only.cpp b/bitmaps_png/cpp_26/show_zone_outline_only.cpp
index 7bf113c71..b2d7dee03 100644
--- a/bitmaps_png/cpp_26/show_zone_outline_only.cpp
+++ b/bitmaps_png/cpp_26/show_zone_outline_only.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/showtrack.cpp b/bitmaps_png/cpp_26/showtrack.cpp
index 5c33235a0..e1354c25a 100644
--- a/bitmaps_png/cpp_26/showtrack.cpp
+++ b/bitmaps_png/cpp_26/showtrack.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/sim_add_signal.cpp b/bitmaps_png/cpp_26/sim_add_signal.cpp
index e4c8e45f0..898d1a9e7 100644
--- a/bitmaps_png/cpp_26/sim_add_signal.cpp
+++ b/bitmaps_png/cpp_26/sim_add_signal.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/sim_probe.cpp b/bitmaps_png/cpp_26/sim_probe.cpp
index d036d56c1..c3cd358d2 100644
--- a/bitmaps_png/cpp_26/sim_probe.cpp
+++ b/bitmaps_png/cpp_26/sim_probe.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/sim_run.cpp b/bitmaps_png/cpp_26/sim_run.cpp
index c94591436..0b3410438 100644
--- a/bitmaps_png/cpp_26/sim_run.cpp
+++ b/bitmaps_png/cpp_26/sim_run.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/sim_settings.cpp b/bitmaps_png/cpp_26/sim_settings.cpp
index 048aa6150..4f8c0e411 100644
--- a/bitmaps_png/cpp_26/sim_settings.cpp
+++ b/bitmaps_png/cpp_26/sim_settings.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/sim_stop.cpp b/bitmaps_png/cpp_26/sim_stop.cpp
index c688fc981..3fa5eb4c6 100644
--- a/bitmaps_png/cpp_26/sim_stop.cpp
+++ b/bitmaps_png/cpp_26/sim_stop.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/sim_tune.cpp b/bitmaps_png/cpp_26/sim_tune.cpp
index aec2f87b7..503f6dc91 100644
--- a/bitmaps_png/cpp_26/sim_tune.cpp
+++ b/bitmaps_png/cpp_26/sim_tune.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/simulator.cpp b/bitmaps_png/cpp_26/simulator.cpp
index 5cf2c4498..284df1862 100644
--- a/bitmaps_png/cpp_26/simulator.cpp
+++ b/bitmaps_png/cpp_26/simulator.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/spreadsheet.cpp b/bitmaps_png/cpp_26/spreadsheet.cpp
index 096541d5a..cce6be35c 100644
--- a/bitmaps_png/cpp_26/spreadsheet.cpp
+++ b/bitmaps_png/cpp_26/spreadsheet.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/svg_file.cpp b/bitmaps_png/cpp_26/svg_file.cpp
index 547524753..790a5dc8e 100644
--- a/bitmaps_png/cpp_26/svg_file.cpp
+++ b/bitmaps_png/cpp_26/svg_file.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/swap_layer.cpp b/bitmaps_png/cpp_26/swap_layer.cpp
index 1313ef104..167afb1b0 100644
--- a/bitmaps_png/cpp_26/swap_layer.cpp
+++ b/bitmaps_png/cpp_26/swap_layer.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/text.cpp b/bitmaps_png/cpp_26/text.cpp
index 4a8b1ddcc..624a472e0 100644
--- a/bitmaps_png/cpp_26/text.cpp
+++ b/bitmaps_png/cpp_26/text.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/text_sketch.cpp b/bitmaps_png/cpp_26/text_sketch.cpp
index d479e829e..6d7797c61 100644
--- a/bitmaps_png/cpp_26/text_sketch.cpp
+++ b/bitmaps_png/cpp_26/text_sketch.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/three_d.cpp b/bitmaps_png/cpp_26/three_d.cpp
index fc145f6dd..316e4df5c 100644
--- a/bitmaps_png/cpp_26/three_d.cpp
+++ b/bitmaps_png/cpp_26/three_d.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/tool_ratsnest.cpp b/bitmaps_png/cpp_26/tool_ratsnest.cpp
index f8f908825..0594584af 100644
--- a/bitmaps_png/cpp_26/tool_ratsnest.cpp
+++ b/bitmaps_png/cpp_26/tool_ratsnest.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/tools.cpp b/bitmaps_png/cpp_26/tools.cpp
index fd84b66be..542bd4939 100644
--- a/bitmaps_png/cpp_26/tools.cpp
+++ b/bitmaps_png/cpp_26/tools.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/track_locked.cpp b/bitmaps_png/cpp_26/track_locked.cpp
index d33245d9c..98d1ab0a8 100644
--- a/bitmaps_png/cpp_26/track_locked.cpp
+++ b/bitmaps_png/cpp_26/track_locked.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/track_sketch.cpp b/bitmaps_png/cpp_26/track_sketch.cpp
index 573cef956..87985283a 100644
--- a/bitmaps_png/cpp_26/track_sketch.cpp
+++ b/bitmaps_png/cpp_26/track_sketch.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/track_unlocked.cpp b/bitmaps_png/cpp_26/track_unlocked.cpp
index a1aed4816..0268be02a 100644
--- a/bitmaps_png/cpp_26/track_unlocked.cpp
+++ b/bitmaps_png/cpp_26/track_unlocked.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/transistor.cpp b/bitmaps_png/cpp_26/transistor.cpp
index 075de70b9..c9a138f7d 100644
--- a/bitmaps_png/cpp_26/transistor.cpp
+++ b/bitmaps_png/cpp_26/transistor.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/undelete.cpp b/bitmaps_png/cpp_26/undelete.cpp
index dc9efc205..63cbe5b1e 100644
--- a/bitmaps_png/cpp_26/undelete.cpp
+++ b/bitmaps_png/cpp_26/undelete.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/undo.cpp b/bitmaps_png/cpp_26/undo.cpp
index d08661969..b214eddad 100644
--- a/bitmaps_png/cpp_26/undo.cpp
+++ b/bitmaps_png/cpp_26/undo.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/unit_inch.cpp b/bitmaps_png/cpp_26/unit_inch.cpp
index 962a8a986..913b71f9b 100644
--- a/bitmaps_png/cpp_26/unit_inch.cpp
+++ b/bitmaps_png/cpp_26/unit_inch.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/unit_mm.cpp b/bitmaps_png/cpp_26/unit_mm.cpp
index 40b21bd16..df9dbdbca 100644
--- a/bitmaps_png/cpp_26/unit_mm.cpp
+++ b/bitmaps_png/cpp_26/unit_mm.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/unknown.cpp b/bitmaps_png/cpp_26/unknown.cpp
index d41f5947c..f0d4ef707 100644
--- a/bitmaps_png/cpp_26/unknown.cpp
+++ b/bitmaps_png/cpp_26/unknown.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/unlocked.cpp b/bitmaps_png/cpp_26/unlocked.cpp
index 062928dc6..61559b31b 100644
--- a/bitmaps_png/cpp_26/unlocked.cpp
+++ b/bitmaps_png/cpp_26/unlocked.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/unzip.cpp b/bitmaps_png/cpp_26/unzip.cpp
index c66103fe0..180895b53 100644
--- a/bitmaps_png/cpp_26/unzip.cpp
+++ b/bitmaps_png/cpp_26/unzip.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/up.cpp b/bitmaps_png/cpp_26/up.cpp
index 4c12875e1..36b1871b2 100644
--- a/bitmaps_png/cpp_26/up.cpp
+++ b/bitmaps_png/cpp_26/up.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/update_fields.cpp b/bitmaps_png/cpp_26/update_fields.cpp
index c3261ee9b..664dd9c0f 100644
--- a/bitmaps_png/cpp_26/update_fields.cpp
+++ b/bitmaps_png/cpp_26/update_fields.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/update_module_board.cpp b/bitmaps_png/cpp_26/update_module_board.cpp
index 2180d38db..19ded66a8 100644
--- a/bitmaps_png/cpp_26/update_module_board.cpp
+++ b/bitmaps_png/cpp_26/update_module_board.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/update_pcb_from_sch.cpp b/bitmaps_png/cpp_26/update_pcb_from_sch.cpp
index b087f8647..4c3b3fcdd 100644
--- a/bitmaps_png/cpp_26/update_pcb_from_sch.cpp
+++ b/bitmaps_png/cpp_26/update_pcb_from_sch.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/use_3D_copper_thickness.cpp b/bitmaps_png/cpp_26/use_3D_copper_thickness.cpp
index 582e2d8fb..a467b5715 100644
--- a/bitmaps_png/cpp_26/use_3D_copper_thickness.cpp
+++ b/bitmaps_png/cpp_26/use_3D_copper_thickness.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/via.cpp b/bitmaps_png/cpp_26/via.cpp
index 9d6514d94..baf0f55f2 100644
--- a/bitmaps_png/cpp_26/via.cpp
+++ b/bitmaps_png/cpp_26/via.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/via_buried.cpp b/bitmaps_png/cpp_26/via_buried.cpp
index 3fe7ee725..720ed4707 100644
--- a/bitmaps_png/cpp_26/via_buried.cpp
+++ b/bitmaps_png/cpp_26/via_buried.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/via_microvia.cpp b/bitmaps_png/cpp_26/via_microvia.cpp
index a2246b28f..606569125 100644
--- a/bitmaps_png/cpp_26/via_microvia.cpp
+++ b/bitmaps_png/cpp_26/via_microvia.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/via_sketch.cpp b/bitmaps_png/cpp_26/via_sketch.cpp
index dcef32bcf..1f1c06c9a 100644
--- a/bitmaps_png/cpp_26/via_sketch.cpp
+++ b/bitmaps_png/cpp_26/via_sketch.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/warning.cpp b/bitmaps_png/cpp_26/warning.cpp
index 6fbbb4785..d9d9f0190 100644
--- a/bitmaps_png/cpp_26/warning.cpp
+++ b/bitmaps_png/cpp_26/warning.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/web_support.cpp b/bitmaps_png/cpp_26/web_support.cpp
index f36ffc9c7..67fbdefb8 100644
--- a/bitmaps_png/cpp_26/web_support.cpp
+++ b/bitmaps_png/cpp_26/web_support.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/width_net.cpp b/bitmaps_png/cpp_26/width_net.cpp
index 3366c9fdd..60c2a5b04 100644
--- a/bitmaps_png/cpp_26/width_net.cpp
+++ b/bitmaps_png/cpp_26/width_net.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/width_segment.cpp b/bitmaps_png/cpp_26/width_segment.cpp
index f8fab57e2..9a65b5bd3 100644
--- a/bitmaps_png/cpp_26/width_segment.cpp
+++ b/bitmaps_png/cpp_26/width_segment.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/width_track.cpp b/bitmaps_png/cpp_26/width_track.cpp
index 79813fff9..76d5a0631 100644
--- a/bitmaps_png/cpp_26/width_track.cpp
+++ b/bitmaps_png/cpp_26/width_track.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/width_track_via.cpp b/bitmaps_png/cpp_26/width_track_via.cpp
index 6fe378ee5..9a0a60ecd 100644
--- a/bitmaps_png/cpp_26/width_track_via.cpp
+++ b/bitmaps_png/cpp_26/width_track_via.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/width_vias.cpp b/bitmaps_png/cpp_26/width_vias.cpp
index 9893d7166..c7abc1252 100644
--- a/bitmaps_png/cpp_26/width_vias.cpp
+++ b/bitmaps_png/cpp_26/width_vias.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/wizard_add_fplib_small.cpp b/bitmaps_png/cpp_26/wizard_add_fplib_small.cpp
index 37333eccd..6d3032e2a 100644
--- a/bitmaps_png/cpp_26/wizard_add_fplib_small.cpp
+++ b/bitmaps_png/cpp_26/wizard_add_fplib_small.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zip.cpp b/bitmaps_png/cpp_26/zip.cpp
index 4d3bbc34f..9e32c6f4f 100644
--- a/bitmaps_png/cpp_26/zip.cpp
+++ b/bitmaps_png/cpp_26/zip.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zip_tool.cpp b/bitmaps_png/cpp_26/zip_tool.cpp
index 5362b7934..416385679 100644
--- a/bitmaps_png/cpp_26/zip_tool.cpp
+++ b/bitmaps_png/cpp_26/zip_tool.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zone_duplicate.cpp b/bitmaps_png/cpp_26/zone_duplicate.cpp
index 9252b9699..47717f6af 100644
--- a/bitmaps_png/cpp_26/zone_duplicate.cpp
+++ b/bitmaps_png/cpp_26/zone_duplicate.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zone_unfill.cpp b/bitmaps_png/cpp_26/zone_unfill.cpp
index 49bf3f3c2..23042668d 100644
--- a/bitmaps_png/cpp_26/zone_unfill.cpp
+++ b/bitmaps_png/cpp_26/zone_unfill.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom.cpp b/bitmaps_png/cpp_26/zoom.cpp
index d46402645..9a6c86eed 100644
--- a/bitmaps_png/cpp_26/zoom.cpp
+++ b/bitmaps_png/cpp_26/zoom.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_area.cpp b/bitmaps_png/cpp_26/zoom_area.cpp
index d76027aa7..355d5d59c 100644
--- a/bitmaps_png/cpp_26/zoom_area.cpp
+++ b/bitmaps_png/cpp_26/zoom_area.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_center_on_screen.cpp b/bitmaps_png/cpp_26/zoom_center_on_screen.cpp
index cf274c703..38c613e95 100644
--- a/bitmaps_png/cpp_26/zoom_center_on_screen.cpp
+++ b/bitmaps_png/cpp_26/zoom_center_on_screen.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_fit_in_page.cpp b/bitmaps_png/cpp_26/zoom_fit_in_page.cpp
index 2bb4d39af..a1981547c 100644
--- a/bitmaps_png/cpp_26/zoom_fit_in_page.cpp
+++ b/bitmaps_png/cpp_26/zoom_fit_in_page.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_in.cpp b/bitmaps_png/cpp_26/zoom_in.cpp
index c0c1e104b..dd4513d88 100644
--- a/bitmaps_png/cpp_26/zoom_in.cpp
+++ b/bitmaps_png/cpp_26/zoom_in.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_out.cpp b/bitmaps_png/cpp_26/zoom_out.cpp
index 0de6d64df..0a751ed58 100644
--- a/bitmaps_png/cpp_26/zoom_out.cpp
+++ b/bitmaps_png/cpp_26/zoom_out.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_redraw.cpp b/bitmaps_png/cpp_26/zoom_redraw.cpp
index 2cf9458de..c783d5429 100644
--- a/bitmaps_png/cpp_26/zoom_redraw.cpp
+++ b/bitmaps_png/cpp_26/zoom_redraw.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_26/zoom_selection.cpp b/bitmaps_png/cpp_26/zoom_selection.cpp
index 3d3c524e7..03d2fc4f0 100644
--- a/bitmaps_png/cpp_26/zoom_selection.cpp
+++ b/bitmaps_png/cpp_26/zoom_selection.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/dialog_warning.cpp b/bitmaps_png/cpp_48/dialog_warning.cpp
index 6a2652071..4ce9c71ce 100644
--- a/bitmaps_png/cpp_48/dialog_warning.cpp
+++ b/bitmaps_png/cpp_48/dialog_warning.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_3d.cpp b/bitmaps_png/cpp_48/icon_3d.cpp
index c09599f6d..a23074403 100644
--- a/bitmaps_png/cpp_48/icon_3d.cpp
+++ b/bitmaps_png/cpp_48/icon_3d.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_bitmap2component.cpp b/bitmaps_png/cpp_48/icon_bitmap2component.cpp
index 21e911830..a928cf832 100644
--- a/bitmaps_png/cpp_48/icon_bitmap2component.cpp
+++ b/bitmaps_png/cpp_48/icon_bitmap2component.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_cvpcb.cpp b/bitmaps_png/cpp_48/icon_cvpcb.cpp
index 00504c616..ff0bffbeb 100644
--- a/bitmaps_png/cpp_48/icon_cvpcb.cpp
+++ b/bitmaps_png/cpp_48/icon_cvpcb.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_eeschema.cpp b/bitmaps_png/cpp_48/icon_eeschema.cpp
index 517d56fd3..7cece05fe 100644
--- a/bitmaps_png/cpp_48/icon_eeschema.cpp
+++ b/bitmaps_png/cpp_48/icon_eeschema.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_gerbview.cpp b/bitmaps_png/cpp_48/icon_gerbview.cpp
index 9215813df..b1fedb02c 100644
--- a/bitmaps_png/cpp_48/icon_gerbview.cpp
+++ b/bitmaps_png/cpp_48/icon_gerbview.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_kicad.cpp b/bitmaps_png/cpp_48/icon_kicad.cpp
index 5ba927bc3..fd78e16ad 100644
--- a/bitmaps_png/cpp_48/icon_kicad.cpp
+++ b/bitmaps_png/cpp_48/icon_kicad.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_libedit.cpp b/bitmaps_png/cpp_48/icon_libedit.cpp
index f6f8a915e..39fee612d 100644
--- a/bitmaps_png/cpp_48/icon_libedit.cpp
+++ b/bitmaps_png/cpp_48/icon_libedit.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_modedit.cpp b/bitmaps_png/cpp_48/icon_modedit.cpp
index 2cdaeebb1..8e400d313 100644
--- a/bitmaps_png/cpp_48/icon_modedit.cpp
+++ b/bitmaps_png/cpp_48/icon_modedit.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_pagelayout_editor.cpp b/bitmaps_png/cpp_48/icon_pagelayout_editor.cpp
index f1547bffb..52bd49ce9 100644
--- a/bitmaps_png/cpp_48/icon_pagelayout_editor.cpp
+++ b/bitmaps_png/cpp_48/icon_pagelayout_editor.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_pcbcalculator.cpp b/bitmaps_png/cpp_48/icon_pcbcalculator.cpp
index 8e646978f..d9695e641 100644
--- a/bitmaps_png/cpp_48/icon_pcbcalculator.cpp
+++ b/bitmaps_png/cpp_48/icon_pcbcalculator.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/icon_pcbnew.cpp b/bitmaps_png/cpp_48/icon_pcbnew.cpp
index 71d7e0c7d..1346fd4cf 100644
--- a/bitmaps_png/cpp_48/icon_pcbnew.cpp
+++ b/bitmaps_png/cpp_48/icon_pcbnew.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/viewlibs_icon.cpp b/bitmaps_png/cpp_48/viewlibs_icon.cpp
index b981d74bd..4b1330165 100644
--- a/bitmaps_png/cpp_48/viewlibs_icon.cpp
+++ b/bitmaps_png/cpp_48/viewlibs_icon.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_48/wizard_add_fplib_icon.cpp b/bitmaps_png/cpp_48/wizard_add_fplib_icon.cpp
index 0612fd65d..cabc9cdea 100644
--- a/bitmaps_png/cpp_48/wizard_add_fplib_icon.cpp
+++ b/bitmaps_png/cpp_48/wizard_add_fplib_icon.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_other/tune_diff_pair_length_legend.cpp b/bitmaps_png/cpp_other/tune_diff_pair_length_legend.cpp
index 58dee697b..b7751e2e0 100644
--- a/bitmaps_png/cpp_other/tune_diff_pair_length_legend.cpp
+++ b/bitmaps_png/cpp_other/tune_diff_pair_length_legend.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_other/tune_diff_pair_skew_legend.cpp b/bitmaps_png/cpp_other/tune_diff_pair_skew_legend.cpp
index 212be2465..ebe427b20 100644
--- a/bitmaps_png/cpp_other/tune_diff_pair_skew_legend.cpp
+++ b/bitmaps_png/cpp_other/tune_diff_pair_skew_legend.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/cpp_other/tune_single_track_length_legend.cpp b/bitmaps_png/cpp_other/tune_single_track_length_legend.cpp
index 4c6cf7a2e..1d6a599ad 100644
--- a/bitmaps_png/cpp_other/tune_single_track_length_legend.cpp
+++ b/bitmaps_png/cpp_other/tune_single_track_length_legend.cpp
@@ -3,7 +3,7 @@
  * PNG2cpp CMake script, using a *.png file as input.
  */
 
-#include <bitmaps.h>
+#include <bitmaps_png/bitmaps_list.h>
 
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
diff --git a/bitmaps_png/include/bitmaps_png/bitmap_def.h b/bitmaps_png/include/bitmaps_png/bitmap_def.h
new file mode 100644
index 000000000..af0b49147
--- /dev/null
+++ b/bitmaps_png/include/bitmaps_png/bitmap_def.h
@@ -0,0 +1,45 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2007-2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2019 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef BITMAPS_PNG_BITMAP_DEF__H
+#define BITMAPS_PNG_BITMAP_DEF__H
+
+/// PNG memory record (file in memory).
+struct BITMAP_OPAQUE
+{
+    const unsigned char* png;
+    int         byteCount;
+    const char* name;       // for debug, or future lazy dynamic linking
+};
+
+// declared as single element _array_, so its name assigns to pointer
+#define EXTERN_BITMAP( x ) extern const BITMAP_OPAQUE x[1];
+
+
+/// a BITMAP_DEF is really a const pointer to an opaque
+/// structure.  So you should never need to use 'const' with it.
+typedef const BITMAP_OPAQUE *BITMAP_DEF;
+
+
+#endif // BITMAPS_PNG_BITMAP_DEF__H
\ No newline at end of file
diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
new file mode 100644
index 000000000..af94229d4
--- /dev/null
+++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
@@ -0,0 +1,568 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2007-2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2019 KiCad Developers, see CHANGELOG.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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef BITMAPS_PNG_BITMAPS_LIST__H
+#define BITMAPS_PNG_BITMAPS_LIST__H
+
+#include <bitmaps_png/bitmap_def.h>
+
+// may eventually generate this file automatically.
+EXTERN_BITMAP( about_xpm )
+EXTERN_BITMAP( add_arc_xpm )
+EXTERN_BITMAP( add_board_xpm )
+EXTERN_BITMAP( add_bus2bus_xpm )
+EXTERN_BITMAP( add_bus_xpm )
+EXTERN_BITMAP( add_circle_xpm )
+EXTERN_BITMAP( add_component_xpm )
+EXTERN_BITMAP( add_corner_xpm )
+EXTERN_BITMAP( add_dashed_line_xpm )
+EXTERN_BITMAP( add_dimension_xpm )
+EXTERN_BITMAP( add_document_xpm )
+EXTERN_BITMAP( add_gerber_xpm )
+EXTERN_BITMAP( add_glabel_xpm )
+EXTERN_BITMAP( add_graphical_segments_xpm )
+EXTERN_BITMAP( add_graphical_polygon_xpm )
+EXTERN_BITMAP( add_hierarchical_label_xpm )
+EXTERN_BITMAP( add_hierarchical_subsheet_xpm )
+EXTERN_BITMAP( add_hierar_pin_xpm )
+EXTERN_BITMAP( add_junction_xpm )
+EXTERN_BITMAP( add_keepout_area_xpm )
+EXTERN_BITMAP( add_library_xpm )
+EXTERN_BITMAP( add_line2bus_xpm )
+EXTERN_BITMAP( add_line_label_xpm )
+EXTERN_BITMAP( add_line_xpm )
+EXTERN_BITMAP( add_pcb_target_xpm )
+EXTERN_BITMAP( add_polygon_xpm )
+EXTERN_BITMAP( add_power_xpm )
+EXTERN_BITMAP( add_rectangle_xpm )
+EXTERN_BITMAP( add_tracks_xpm )
+EXTERN_BITMAP( add_via_xpm )
+EXTERN_BITMAP( add_zone_cutout_xpm )
+EXTERN_BITMAP( add_zone_xpm )
+EXTERN_BITMAP( anchor_xpm )
+EXTERN_BITMAP( annotate_down_right_xpm )
+EXTERN_BITMAP( annotate_right_down_xpm )
+EXTERN_BITMAP( annotate_xpm )
+EXTERN_BITMAP( align_items_xpm )
+EXTERN_BITMAP( align_items_left_xpm )
+EXTERN_BITMAP( align_items_right_xpm )
+EXTERN_BITMAP( align_items_top_xpm )
+EXTERN_BITMAP( align_items_bottom_xpm )
+EXTERN_BITMAP( align_items_center_xpm )
+EXTERN_BITMAP( align_items_middle_xpm )
+EXTERN_BITMAP( apply_pad_settings_xpm )
+EXTERN_BITMAP( array_xpm )
+EXTERN_BITMAP( auto_associe_xpm )
+EXTERN_BITMAP( auto_delete_track_xpm )
+EXTERN_BITMAP( auto_track_width_xpm )
+EXTERN_BITMAP( autoplace_fields_xpm )
+EXTERN_BITMAP( axis3d_back_xpm )
+EXTERN_BITMAP( axis3d_bottom_xpm )
+EXTERN_BITMAP( axis3d_front_xpm )
+EXTERN_BITMAP( axis3d_left_xpm )
+EXTERN_BITMAP( axis3d_right_xpm )
+EXTERN_BITMAP( axis3d_top_xpm )
+EXTERN_BITMAP( axis3d_xpm )
+EXTERN_BITMAP( bitmap2component_xpm )
+EXTERN_BITMAP( bom_xpm )
+EXTERN_BITMAP( book_xpm )
+EXTERN_BITMAP( break_bus_xpm )
+EXTERN_BITMAP( break_line_xpm )
+EXTERN_BITMAP( browse_files_xpm )
+EXTERN_BITMAP( calculator_xpm )
+EXTERN_BITMAP( cancel_xpm )
+EXTERN_BITMAP( change_entry_orient_xpm )
+EXTERN_BITMAP( change_label_xpm )
+EXTERN_BITMAP( change_hlabel_xpm )
+EXTERN_BITMAP( change_glabel_xpm )
+EXTERN_BITMAP( change_text_xpm )
+EXTERN_BITMAP( contrast_mode_xpm )
+EXTERN_BITMAP( checked_ok_xpm )
+EXTERN_BITMAP( color_materials_xpm )
+EXTERN_BITMAP( component_select_alternate_shape_xpm )
+EXTERN_BITMAP( component_select_unit_xpm )
+EXTERN_BITMAP( config_xpm )
+EXTERN_BITMAP( copper_layers_setup_xpm )
+EXTERN_BITMAP( copy_xpm )
+EXTERN_BITMAP( copy_pad_settings_xpm )
+EXTERN_BITMAP( create_cmp_file_xpm )
+EXTERN_BITMAP( cursor_shape_xpm )
+EXTERN_BITMAP( custom_pad_to_primitives_xpm )
+EXTERN_BITMAP( cursor_xpm )
+EXTERN_BITMAP( cut_xpm )
+EXTERN_BITMAP( cvpcb_xpm )
+EXTERN_BITMAP( dashline_xpm )
+EXTERN_BITMAP( datasheet_xpm )
+EXTERN_BITMAP( delete_association_xpm )
+EXTERN_BITMAP( delete_bus_xpm )
+EXTERN_BITMAP( delete_circle_xpm )
+EXTERN_BITMAP( delete_connection_xpm )
+EXTERN_BITMAP( delete_dimension_xpm )
+EXTERN_BITMAP( delete_field_xpm )
+EXTERN_BITMAP( delete_gerber_xpm )
+EXTERN_BITMAP( delete_glabel_xpm )
+EXTERN_BITMAP( delete_line_xpm )
+EXTERN_BITMAP( delete_module_xpm )
+EXTERN_BITMAP( delete_net_xpm )
+EXTERN_BITMAP( delete_node_xpm )
+EXTERN_BITMAP( delete_pad_xpm )
+EXTERN_BITMAP( delete_polygon_xpm )
+EXTERN_BITMAP( delete_rectangle_xpm )
+EXTERN_BITMAP( delete_sheet_xpm )
+EXTERN_BITMAP( delete_track_xpm )
+EXTERN_BITMAP( delete_xpm )
+EXTERN_BITMAP( dialog_warning_xpm )
+EXTERN_BITMAP( directory_xpm )
+EXTERN_BITMAP( directory_browser_xpm )
+EXTERN_BITMAP( display_options_xpm )
+EXTERN_BITMAP( distribute_horizontal_xpm )
+EXTERN_BITMAP( distribute_vertical_xpm )
+EXTERN_BITMAP( down_xpm )
+EXTERN_BITMAP( ortho_xpm )
+EXTERN_BITMAP( drag_xpm )
+EXTERN_BITMAP( drag_outline_segment_xpm )
+EXTERN_BITMAP( drag_pad_xpm )
+EXTERN_BITMAP( drag_segment_withslope_xpm )
+EXTERN_BITMAP( drc_off_xpm )
+EXTERN_BITMAP( drc_xpm )
+EXTERN_BITMAP( duplicate_xpm )
+EXTERN_BITMAP( edges_sketch_xpm )
+EXTERN_BITMAP( edit_comp_footprint_xpm )
+EXTERN_BITMAP( edit_comp_ref_xpm )
+EXTERN_BITMAP( edit_comp_value_xpm )
+EXTERN_BITMAP( edit_module_xpm )
+EXTERN_BITMAP( editor_xpm )
+EXTERN_BITMAP( edit_text_xpm )
+EXTERN_BITMAP( edit_cmp_symb_links_xpm )
+EXTERN_BITMAP( edit_xpm )
+EXTERN_BITMAP( eeschema_xpm )
+EXTERN_BITMAP( enter_sheet_xpm )
+EXTERN_BITMAP( erc_xpm )
+EXTERN_BITMAP( ercerr_xpm )
+EXTERN_BITMAP( ercwarn_xpm )
+EXTERN_BITMAP( erc_green_xpm )
+EXTERN_BITMAP( exchange_xpm )
+EXTERN_BITMAP( exit_xpm )
+EXTERN_BITMAP( export3d_xpm )
+EXTERN_BITMAP( export_dsn_xpm )
+EXTERN_BITMAP( export_idf_xpm )
+EXTERN_BITMAP( export_footprint_names_xpm )
+EXTERN_BITMAP( export_module_xpm )
+EXTERN_BITMAP( export_part_xpm )
+EXTERN_BITMAP( export_step_xpm )
+EXTERN_BITMAP( export_xpm )
+EXTERN_BITMAP( fabrication_xpm )
+EXTERN_BITMAP( file_footprint_xpm )
+EXTERN_BITMAP( fill_zone_xpm )
+EXTERN_BITMAP( find_xpm )
+EXTERN_BITMAP( find_replace_xpm )
+EXTERN_BITMAP( flag_xpm )
+EXTERN_BITMAP( flip_board_xpm )
+EXTERN_BITMAP( folder_xpm )
+EXTERN_BITMAP( fonts_xpm )
+EXTERN_BITMAP( footprint_text_xpm )
+EXTERN_BITMAP( gbr_select_mode0_xpm )
+EXTERN_BITMAP( gbr_select_mode1_xpm )
+EXTERN_BITMAP( gbr_select_mode2_xpm )
+EXTERN_BITMAP( gerbview_drill_file_xpm )
+EXTERN_BITMAP( gerber_job_file_xpm )
+EXTERN_BITMAP( gerber_file_xpm )
+EXTERN_BITMAP( gerbview_clear_layers_xpm )
+EXTERN_BITMAP( gerbview_show_negative_objects_xpm )
+EXTERN_BITMAP( general_deletions_xpm )
+EXTERN_BITMAP( general_ratsnest_xpm )
+EXTERN_BITMAP( glabel2label_xpm )
+EXTERN_BITMAP( glabel2text_xpm )
+EXTERN_BITMAP( gl_change_xpm )
+EXTERN_BITMAP( go_down_xpm )
+EXTERN_BITMAP( go_up_xpm )
+EXTERN_BITMAP( green_xpm )
+EXTERN_BITMAP( grid_select_axis_xpm )
+EXTERN_BITMAP( grid_select_xpm )
+EXTERN_BITMAP( grid_xpm )
+EXTERN_BITMAP( hammer_xpm )
+EXTERN_BITMAP( help_xpm )
+EXTERN_BITMAP( hidden_pin_xpm )
+EXTERN_BITMAP( hierarchy_nav_xpm )
+EXTERN_BITMAP( highlight_remove_xpm )
+EXTERN_BITMAP( hotkeys_xpm )
+EXTERN_BITMAP( hotkeys_import_xpm )
+EXTERN_BITMAP( hotkeys_export_xpm )
+EXTERN_BITMAP( html_xpm )
+EXTERN_BITMAP( icon_xpm )
+EXTERN_BITMAP( icon_cvpcb_small_xpm )
+EXTERN_BITMAP( icon_cvpcb_xpm )
+EXTERN_BITMAP( icon_eeschema_xpm )
+EXTERN_BITMAP( icon_gerbview_small_xpm )
+EXTERN_BITMAP( icon_gerbview_xpm )
+EXTERN_BITMAP( icon_kicad_xpm )
+EXTERN_BITMAP( icon_modedit_xpm )
+EXTERN_BITMAP( icon_pcbnew_xpm )
+EXTERN_BITMAP( icon_3d_xpm )
+EXTERN_BITMAP( icon_bitmap2component_xpm )
+EXTERN_BITMAP( icon_libedit_xpm )
+EXTERN_BITMAP( icon_pcbcalculator_xpm )
+EXTERN_BITMAP( icon_pagelayout_editor_xpm )
+EXTERN_BITMAP( image_xpm )
+EXTERN_BITMAP( import_brd_file_xpm )
+EXTERN_BITMAP( import_document_xpm )
+EXTERN_BITMAP( import_footprint_names_xpm )
+EXTERN_BITMAP( import_hierarchical_label_xpm )
+EXTERN_BITMAP( import_module_xpm )
+EXTERN_BITMAP( import_part_xpm )
+EXTERN_BITMAP( import_project_xpm )
+EXTERN_BITMAP( import_setup_xpm )
+EXTERN_BITMAP( import_xpm )
+EXTERN_BITMAP( import3d_xpm )
+EXTERN_BITMAP( info_xpm )
+EXTERN_BITMAP( insert_module_board_xpm )
+EXTERN_BITMAP( invisible_text_xpm )
+EXTERN_BITMAP( kicad_icon_small_xpm )
+EXTERN_BITMAP( label2glabel_xpm )
+EXTERN_BITMAP( label2text_xpm )
+EXTERN_BITMAP( label_xpm )
+EXTERN_BITMAP( lang_bg_xpm )
+EXTERN_BITMAP( lang_ca_xpm )
+EXTERN_BITMAP( lang_zh_xpm )
+EXTERN_BITMAP( lang_cs_xpm )
+EXTERN_BITMAP( lang_def_xpm )
+EXTERN_BITMAP( lang_de_xpm )
+EXTERN_BITMAP( lang_en_xpm )
+EXTERN_BITMAP( lang_es_xpm )
+EXTERN_BITMAP( lang_fr_xpm )
+EXTERN_BITMAP( lang_fi_xpm )
+EXTERN_BITMAP( lang_gr_xpm )
+EXTERN_BITMAP( lang_hu_xpm )
+EXTERN_BITMAP( lang_it_xpm )
+EXTERN_BITMAP( lang_jp_xpm )
+EXTERN_BITMAP( lang_ko_xpm )
+EXTERN_BITMAP( lang_lt_xpm )
+EXTERN_BITMAP( lang_nl_xpm )
+EXTERN_BITMAP( lang_pl_xpm )
+EXTERN_BITMAP( lang_pt_xpm )
+EXTERN_BITMAP( lang_ru_xpm )
+EXTERN_BITMAP( lang_sk_xpm )
+EXTERN_BITMAP( lang_sl_xpm )
+EXTERN_BITMAP( language_xpm )
+EXTERN_BITMAP( layers_manager_xpm )
+EXTERN_BITMAP( leave_sheet_xpm )
+EXTERN_BITMAP( left_xpm )
+EXTERN_BITMAP( libedit_xpm )
+EXTERN_BITMAP( lib_next_xpm )
+EXTERN_BITMAP( lib_previous_xpm )
+EXTERN_BITMAP( library_browse_xpm )
+EXTERN_BITMAP( library_archive_xpm )
+EXTERN_BITMAP( library_archive_as_xpm )
+EXTERN_BITMAP( library_xpm )
+EXTERN_BITMAP( library_table_xpm )
+EXTERN_BITMAP( lines90_xpm )
+EXTERN_BITMAP( list_nets_xpm )
+EXTERN_BITMAP( load_gerber_xpm )
+EXTERN_BITMAP( load_module_board_xpm )
+EXTERN_BITMAP( load_module_lib_xpm )
+EXTERN_BITMAP( local_ratsnest_xpm )
+EXTERN_BITMAP( locked_xpm )
+EXTERN_BITMAP( lock_unlock_xpm )
+EXTERN_BITMAP( measurement_xpm )
+EXTERN_BITMAP( minus_xpm )
+EXTERN_BITMAP( mirror_h_xpm )
+EXTERN_BITMAP( mirror_v_xpm )
+EXTERN_BITMAP( mode_module_xpm )
+EXTERN_BITMAP( mode_track_xpm )
+EXTERN_BITMAP( modratsnest_xpm )
+EXTERN_BITMAP( module_check_xpm )
+EXTERN_BITMAP( module_editor_xpm )
+EXTERN_BITMAP( module_wizard_xpm )
+EXTERN_BITMAP( module_filtered_list_xpm )
+EXTERN_BITMAP( module_pin_filtered_list_xpm )
+EXTERN_BITMAP( module_library_list_xpm )
+EXTERN_BITMAP( module_name_filtered_list_xpm )
+EXTERN_BITMAP( module_full_list_xpm )
+EXTERN_BITMAP( module_options_xpm )
+EXTERN_BITMAP( module_ratsnest_xpm )
+EXTERN_BITMAP( module_xpm )
+EXTERN_BITMAP( modview_icon_xpm )
+EXTERN_BITMAP( morgan1_xpm )
+EXTERN_BITMAP( morgan2_xpm )
+EXTERN_BITMAP( move_glabel_xpm )
+EXTERN_BITMAP( move_exactly_xpm )
+EXTERN_BITMAP( move_relative_xpm )
+EXTERN_BITMAP( move_pad_xpm )
+EXTERN_BITMAP( move_polygon_xpm )
+EXTERN_BITMAP( move_rectangle_xpm )
+EXTERN_BITMAP( move_sheet_xpm )
+EXTERN_BITMAP( move_target_xpm )
+EXTERN_BITMAP( move_xpm )
+EXTERN_BITMAP( mw_add_gap_xpm )
+EXTERN_BITMAP( mw_add_line_xpm )
+EXTERN_BITMAP( mw_add_shape_xpm )
+EXTERN_BITMAP( mw_add_stub_arc_xpm )
+EXTERN_BITMAP( mw_add_stub_xpm )
+EXTERN_BITMAP( mw_toolbar_xpm )
+EXTERN_BITMAP( net_highlight_xpm )
+EXTERN_BITMAP( net_highlight_schematic_xpm )
+EXTERN_BITMAP( netlist_xpm )
+EXTERN_BITMAP( net_locked_xpm )
+EXTERN_BITMAP( net_unlocked_xpm )
+EXTERN_BITMAP( new_board_xpm )
+EXTERN_BITMAP( new_component_xpm )
+EXTERN_BITMAP( new_cvpcb_xpm )
+EXTERN_BITMAP( new_document_xpm )
+EXTERN_BITMAP( new_footprint_xpm )
+EXTERN_BITMAP( new_gerb_xpm )
+EXTERN_BITMAP( new_library_xpm )
+EXTERN_BITMAP( new_generic_xpm )
+EXTERN_BITMAP( new_page_layout_xpm )
+EXTERN_BITMAP( new_project_xpm )
+EXTERN_BITMAP( new_project_with_template_xpm )
+EXTERN_BITMAP( new_python_xpm )
+EXTERN_BITMAP( noconn_xpm )
+EXTERN_BITMAP( normal_xpm )
+EXTERN_BITMAP( online_help_xpm )
+EXTERN_BITMAP( open_brd_file_xpm )
+EXTERN_BITMAP( open_document_xpm )
+EXTERN_BITMAP( open_library_xpm )
+EXTERN_BITMAP( open_page_layout_xpm )
+EXTERN_BITMAP( open_project_xpm )
+EXTERN_BITMAP( options_3drender_xpm )
+EXTERN_BITMAP( options_all_tracks_and_vias_xpm )
+EXTERN_BITMAP( options_all_tracks_xpm )
+EXTERN_BITMAP( options_all_vias_xpm )
+EXTERN_BITMAP( options_arc_xpm )
+EXTERN_BITMAP( options_board_xpm )
+EXTERN_BITMAP( options_circle_xpm )
+EXTERN_BITMAP( options_generic_xpm )
+EXTERN_BITMAP( options_module_xpm )
+EXTERN_BITMAP( options_pad_xpm )
+EXTERN_BITMAP( options_pinsheet_xpm )
+EXTERN_BITMAP( options_pin_xpm )
+EXTERN_BITMAP( options_rectangle_xpm )
+EXTERN_BITMAP( options_segment_xpm )
+EXTERN_BITMAP( options_tracks_xpm )
+EXTERN_BITMAP( options_track_xpm )
+EXTERN_BITMAP( options_vias_xpm )
+EXTERN_BITMAP( opt_show_polygon_xpm )
+EXTERN_BITMAP( orient_xpm )
+EXTERN_BITMAP( pad_sketch_xpm )
+EXTERN_BITMAP( pad_xpm )
+EXTERN_BITMAP( pad_dimensions_xpm )
+EXTERN_BITMAP( pad_enumerate_xpm )
+EXTERN_BITMAP( pads_mask_layers_xpm )
+EXTERN_BITMAP( pagelayout_load_xpm )
+EXTERN_BITMAP( pagelayout_normal_view_mode_xpm )
+EXTERN_BITMAP( pagelayout_special_view_mode_xpm )
+EXTERN_BITMAP( palette_xpm )
+EXTERN_BITMAP( part_properties_xpm )
+EXTERN_BITMAP( paste_xpm )
+EXTERN_BITMAP( path_xpm )
+EXTERN_BITMAP( pcb_target_xpm )
+EXTERN_BITMAP( pcbnew_xpm )
+EXTERN_BITMAP( pcbcalculator_xpm )
+EXTERN_BITMAP( pcb_offset_xpm )
+EXTERN_BITMAP( pin2pin_xpm )
+EXTERN_BITMAP( pin_name_to_xpm )
+EXTERN_BITMAP( pin_number_to_xpm )
+EXTERN_BITMAP( pin_size_to_xpm )
+EXTERN_BITMAP( pin_show_etype_xpm )
+EXTERN_BITMAP( pin_table_xpm )
+EXTERN_BITMAP( pinorient_right_xpm )
+EXTERN_BITMAP( pinorient_left_xpm )
+EXTERN_BITMAP( pinorient_up_xpm )
+EXTERN_BITMAP( pinorient_down_xpm )
+EXTERN_BITMAP( pinshape_nonlogic_xpm )
+EXTERN_BITMAP( pinshape_normal_xpm )
+EXTERN_BITMAP( pinshape_invert_xpm )
+EXTERN_BITMAP( pinshape_clock_fall_xpm )
+EXTERN_BITMAP( pinshape_clock_normal_xpm )
+EXTERN_BITMAP( pinshape_clock_invert_xpm )
+EXTERN_BITMAP( pinshape_active_low_input_xpm )
+EXTERN_BITMAP( pinshape_clock_active_low_xpm )
+EXTERN_BITMAP( pinshape_active_low_output_xpm )
+EXTERN_BITMAP( pintype_input_xpm )
+EXTERN_BITMAP( pintype_output_xpm )
+EXTERN_BITMAP( pintype_bidi_xpm )
+EXTERN_BITMAP( pintype_3states_xpm )
+EXTERN_BITMAP( pintype_passive_xpm )
+EXTERN_BITMAP( pintype_notspecif_xpm )
+EXTERN_BITMAP( pintype_powerinput_xpm )
+EXTERN_BITMAP( pintype_poweroutput_xpm )
+EXTERN_BITMAP( pintype_opencoll_xpm )
+EXTERN_BITMAP( pintype_openemit_xpm )
+EXTERN_BITMAP( pintype_noconnect_xpm )
+EXTERN_BITMAP( pin_to_xpm )
+EXTERN_BITMAP( pin_xpm )
+EXTERN_BITMAP( plot_xpm )
+EXTERN_BITMAP( plot_dxf_xpm )
+EXTERN_BITMAP( plot_hpg_xpm )
+EXTERN_BITMAP( plot_pdf_xpm )
+EXTERN_BITMAP( plot_ps_xpm )
+EXTERN_BITMAP( plot_svg_xpm )
+EXTERN_BITMAP( plus_xpm )
+EXTERN_BITMAP( polar_coord_xpm )
+EXTERN_BITMAP( post_compo_xpm )
+EXTERN_BITMAP( post_drill_xpm )
+EXTERN_BITMAP( post_module_xpm )
+EXTERN_BITMAP( push_pad_settings_xpm )
+EXTERN_BITMAP( preference_xpm )
+EXTERN_BITMAP( primitives_to_custom_pad_xpm )
+EXTERN_BITMAP( print_button_xpm )
+EXTERN_BITMAP( ps_router_xpm )
+EXTERN_BITMAP( ps_diff_pair_xpm )
+EXTERN_BITMAP( ps_diff_pair_gap_xpm )
+EXTERN_BITMAP( ps_diff_pair_tune_length_xpm )
+EXTERN_BITMAP( ps_diff_pair_tune_phase_xpm )
+EXTERN_BITMAP( ps_diff_pair_via_gap_xpm )
+EXTERN_BITMAP( ps_tune_length_xpm )
+EXTERN_BITMAP( py_script_xpm )
+EXTERN_BITMAP( ratsnest_xpm )
+EXTERN_BITMAP( read_setup_xpm )
+EXTERN_BITMAP( recent_xpm )
+EXTERN_BITMAP( redo_xpm )
+EXTERN_BITMAP( red_xpm )
+EXTERN_BITMAP( refresh_xpm )
+EXTERN_BITMAP( render_mode_xpm )
+EXTERN_BITMAP( reload2_xpm )
+EXTERN_BITMAP( reload_xpm )
+EXTERN_BITMAP( repaint_xpm )
+EXTERN_BITMAP( reset_text_xpm )
+EXTERN_BITMAP( resize_sheet_xpm )
+EXTERN_BITMAP( rescue_xpm )
+EXTERN_BITMAP( right_xpm )
+EXTERN_BITMAP( router_len_tuner_xpm )
+EXTERN_BITMAP( router_len_tuner_setup_xpm )
+EXTERN_BITMAP( router_len_tuner_amplitude_decr_xpm )
+EXTERN_BITMAP( router_len_tuner_amplitude_incr_xpm )
+EXTERN_BITMAP( router_len_tuner_dist_decr_xpm )
+EXTERN_BITMAP( router_len_tuner_dist_incr_xpm )
+EXTERN_BITMAP( rotate_cw_xpm )
+EXTERN_BITMAP( rotate_ccw_xpm )
+EXTERN_BITMAP( rotate_neg_x_xpm )
+EXTERN_BITMAP( rotate_pos_x_xpm )
+EXTERN_BITMAP( rotate_neg_y_xpm )
+EXTERN_BITMAP( rotate_pos_y_xpm )
+EXTERN_BITMAP( rotate_neg_z_xpm )
+EXTERN_BITMAP( rotate_pos_z_xpm )
+EXTERN_BITMAP( save_as_xpm )
+EXTERN_BITMAP( save_gerber_xpm )
+EXTERN_BITMAP( save_fp_to_board_xpm )
+EXTERN_BITMAP( save_library_xpm )
+EXTERN_BITMAP( save_project_xpm )
+EXTERN_BITMAP( save_setup_xpm )
+EXTERN_BITMAP( save_xpm )
+EXTERN_BITMAP( search_tree_xpm )
+EXTERN_BITMAP( select_grid_xpm )
+EXTERN_BITMAP( select_layer_pair_xpm )
+EXTERN_BITMAP( select_w_layer_xpm )
+EXTERN_BITMAP( select_same_sheet_xpm )
+EXTERN_BITMAP( sheetset_xpm )
+EXTERN_BITMAP( setcolor_3d_bg_xpm )
+EXTERN_BITMAP( setcolor_silkscreen_xpm )
+EXTERN_BITMAP( setcolor_soldermask_xpm )
+EXTERN_BITMAP( setcolor_solderpaste_xpm )
+EXTERN_BITMAP( setcolor_copper_xpm )
+EXTERN_BITMAP( setcolor_board_body_xpm )
+EXTERN_BITMAP( shape_3d_xpm )
+EXTERN_BITMAP( show_dcodenumber_xpm )
+EXTERN_BITMAP( show_footprint_xpm )
+EXTERN_BITMAP( show_mod_edge_xpm )
+EXTERN_BITMAP( show_all_layers_xpm )
+EXTERN_BITMAP( show_no_layers_xpm )
+EXTERN_BITMAP( show_no_copper_layers_xpm )
+EXTERN_BITMAP( show_all_copper_layers_xpm )
+EXTERN_BITMAP( showtrack_xpm )
+EXTERN_BITMAP( show_zone_xpm )
+EXTERN_BITMAP( show_zone_disable_xpm )
+EXTERN_BITMAP( show_zone_outline_only_xpm )
+EXTERN_BITMAP( small_down_xpm )
+EXTERN_BITMAP( small_edit_xpm )
+EXTERN_BITMAP( small_library_xpm )
+EXTERN_BITMAP( small_plus_xpm )
+EXTERN_BITMAP( small_up_xpm )
+EXTERN_BITMAP( spreadsheet_xpm )
+EXTERN_BITMAP( svg_file_xpm )
+EXTERN_BITMAP( swap_layer_xpm )
+EXTERN_BITMAP( text_xpm )
+EXTERN_BITMAP( text_sketch_xpm )
+EXTERN_BITMAP( three_d_xpm )
+EXTERN_BITMAP( tool_ratsnest_xpm )
+EXTERN_BITMAP( tools_xpm )
+EXTERN_BITMAP( track_locked_xpm )
+EXTERN_BITMAP( track_sketch_xpm )
+EXTERN_BITMAP( track_unlocked_xpm )
+EXTERN_BITMAP( transistor_xpm )
+EXTERN_BITMAP( trash_xpm )
+EXTERN_BITMAP( tree_nosel_xpm )
+EXTERN_BITMAP( tree_sel_xpm )
+EXTERN_BITMAP( undelete_xpm )
+EXTERN_BITMAP( undo_xpm )
+EXTERN_BITMAP( unit_inch_xpm )
+EXTERN_BITMAP( unit_mm_xpm )
+EXTERN_BITMAP( unknown_xpm )
+EXTERN_BITMAP( unlocked_xpm )
+EXTERN_BITMAP( unzip_xpm )
+EXTERN_BITMAP( up_xpm )
+EXTERN_BITMAP( update_fields_xpm )
+EXTERN_BITMAP( update_module_board_xpm )
+EXTERN_BITMAP( update_pcb_from_sch_xpm )
+EXTERN_BITMAP( use_3D_copper_thickness_xpm )
+EXTERN_BITMAP( via_xpm )
+EXTERN_BITMAP( via_microvia_xpm )
+EXTERN_BITMAP( via_buried_xpm )
+EXTERN_BITMAP( via_sketch_xpm )
+EXTERN_BITMAP( viewlibs_icon_xpm )
+EXTERN_BITMAP( warning_xpm )
+EXTERN_BITMAP( web_support_xpm )
+EXTERN_BITMAP( width_net_xpm )
+EXTERN_BITMAP( width_segment_xpm )
+EXTERN_BITMAP( width_track_via_xpm )
+EXTERN_BITMAP( width_track_xpm )
+EXTERN_BITMAP( width_vias_xpm )
+EXTERN_BITMAP( wizard_add_fplib_icon_xpm )
+EXTERN_BITMAP( wizard_add_fplib_small_xpm )
+EXTERN_BITMAP( www_xpm )
+EXTERN_BITMAP( zip_tool_xpm )
+EXTERN_BITMAP( zip_xpm )
+EXTERN_BITMAP( zone_duplicate_xpm )
+EXTERN_BITMAP( zone_unfill_xpm )
+EXTERN_BITMAP( zoom_area_xpm )
+EXTERN_BITMAP( zoom_center_on_screen_xpm )
+EXTERN_BITMAP( zoom_redraw_xpm )
+EXTERN_BITMAP( zoom_fit_in_page_xpm )
+EXTERN_BITMAP( zoom_in_xpm )
+EXTERN_BITMAP( zoom_out_xpm )
+EXTERN_BITMAP( zoom_page_xpm )
+EXTERN_BITMAP( zoom_selection_xpm )
+EXTERN_BITMAP( zoom_xpm )
+EXTERN_BITMAP( tune_diff_pair_length_legend_xpm )
+EXTERN_BITMAP( tune_diff_pair_skew_legend_xpm )
+EXTERN_BITMAP( tune_single_track_length_legend_xpm )
+EXTERN_BITMAP( simulator_xpm )
+EXTERN_BITMAP( sim_run_xpm )
+EXTERN_BITMAP( sim_stop_xpm )
+EXTERN_BITMAP( sim_tune_xpm )
+EXTERN_BITMAP( sim_probe_xpm )
+EXTERN_BITMAP( sim_add_signal_xpm )
+EXTERN_BITMAP( sim_settings_xpm )
+
+#endif // BITMAPS_PNG_BITMAPS_LIST__H
\ No newline at end of file
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 3c95045f0..2c37df527 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -93,7 +93,11 @@ add_library( legacy_wx STATIC ${LEGACY_WX_SRCS} )
 target_include_directories( legacy_wx PUBLIC ../include/legacy_wx )
 target_include_directories( legacy_gal PUBLIC ../include/legacy_gal )
 
+target_link_libraries( legacy_wx PRIVATE bitmaps )
+target_link_libraries( legacy_gal PRIVATE bitmaps )
+
 target_link_libraries( gal
+    bitmaps
     ${GLEW_LIBRARIES}
     ${CAIRO_LIBRARIES}
     ${PIXMAN_LIBRARIES}
@@ -603,7 +607,7 @@ add_dependencies( common page_layout_lexer_source_files )
 add_executable( dsntest EXCLUDE_FROM_ALL dsnlexer.cpp )
 target_link_libraries( dsntest common ${wxWidgets_LIBRARIES} rt )
 
-target_link_libraries( pcbcommon )
+target_link_libraries( pcbcommon PUBLIC bitmaps )
 
 
 # _kiway.so
@@ -646,7 +650,6 @@ if( false ) # future
 
     swig_link_libraries( kiway
         common
-        bitmaps
         ${wxWidgets_LIBRARIES}
         ${PYTHON_LIBRARIES}
         )
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index eb77f6b68..42acb5b6a 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -89,7 +89,6 @@ if( false ) # no CVPCB exe any more, only the *.kiface
         #singletop  # replaces common, giving us restrictive control and link warnings.
         # There's way too much crap coming in from common yet.
         common
-        bitmaps
         ${wxWidgets_LIBRARIES}
         )
     if( MAKE_LINK_MAPS )
@@ -147,7 +146,6 @@ target_link_libraries( cvpcb_kiface
     pcad2kicadpcb
     3d-viewer
     common
-    bitmaps
     polygon
     gal
     legacy_wx
@@ -155,7 +153,6 @@ target_link_libraries( cvpcb_kiface
     pcad2kicadpcb
     3d-viewer
     common
-    bitmaps
     polygon
     gal
     legacy_wx
@@ -163,7 +160,6 @@ target_link_libraries( cvpcb_kiface
     pcad2kicadpcb
     3d-viewer
     common
-    bitmaps
     polygon
     gal
     legacy_wx
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index d79f95c60..f6708cb6b 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -321,19 +321,15 @@ target_link_libraries( eeschema
     #singletop  # replaces common, giving us restrictive control and link warnings.
     # There's way too much crap coming in from common yet.
     common
-    bitmaps
     gal
     legacy_gal
     common
-    bitmaps
     gal
     legacy_gal
     common
-    bitmaps
     gal
     legacy_gal
     common
-    bitmaps
     gal
     legacy_gal
     ${wxWidgets_LIBRARIES}
@@ -346,22 +342,18 @@ add_library( eeschema_kiface SHARED
     )
 target_link_libraries( eeschema_kiface
     common
-    bitmaps
     polygon
     gal
     legacy_gal
     common
-    bitmaps
     polygon
     gal
     legacy_gal
     common
-    bitmaps
     polygon
     gal
     legacy_gal
     common
-    bitmaps
     polygon
     gal
     legacy_gal
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 0cc5fd248..e455d64e9 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -119,7 +119,6 @@ target_link_libraries( gerbview
     #singletop  # replaces common, giving us restrictive control and link warnings.
     # There's way too much crap coming in from common yet.
     common
-    bitmaps
     gal
     legacy_wx
     ${wxWidgets_LIBRARIES}
@@ -145,17 +144,14 @@ set_target_properties( gerbview_kiface PROPERTIES
 target_link_libraries( gerbview_kiface
     common
     polygon
-    bitmaps
     gal
     legacy_wx
     common
     polygon
-    bitmaps
     gal
     legacy_wx
     common
     polygon
-    bitmaps
     gal
     legacy_wx
     ${wxWidgets_LIBRARIES}
diff --git a/include/bitmap_types.h b/include/bitmap_types.h
index 98b3eb737..c3855b953 100644
--- a/include/bitmap_types.h
+++ b/include/bitmap_types.h
@@ -38,23 +38,7 @@ class wxAuiToolBar;
 #include <config.h>
 #include <wx/gdicmn.h>  // wxBitmapType
 
-
-/// PNG memory record (file in memory).
-struct BITMAP_OPAQUE
-{
-    const unsigned char* png;
-    int         byteCount;
-    const char* name;       // for debug, or future lazy dynamic linking
-};
-
-// declared as single element _array_, so its name assigns to pointer
-#define EXTERN_BITMAP( x ) extern const BITMAP_OPAQUE x[1];
-
-
-/// a BITMAP_DEF is really a const pointer to an opaque
-/// structure.  So you should never need to use 'const' with it.
-typedef const BITMAP_OPAQUE *BITMAP_DEF;
-
+#include <bitmaps_png/bitmap_def.h>
 
 /**
  * Construct a wxBitmap from a memory record, held in a BITMAP_DEF.
diff --git a/include/bitmaps.h b/include/bitmaps.h
index a4238ac2a..7b2ab3988 100644
--- a/include/bitmaps.h
+++ b/include/bitmaps.h
@@ -26,545 +26,7 @@
 #ifndef BITMAPS_H_
 #define BITMAPS_H_
 
+#include <bitmaps_png/bitmaps_list.h>
 #include <bitmap_types.h>
 
-
-// may eventually generate this file automatically.
-EXTERN_BITMAP( about_xpm )
-EXTERN_BITMAP( add_arc_xpm )
-EXTERN_BITMAP( add_board_xpm )
-EXTERN_BITMAP( add_bus2bus_xpm )
-EXTERN_BITMAP( add_bus_xpm )
-EXTERN_BITMAP( add_circle_xpm )
-EXTERN_BITMAP( add_component_xpm )
-EXTERN_BITMAP( add_corner_xpm )
-EXTERN_BITMAP( add_dashed_line_xpm )
-EXTERN_BITMAP( add_dimension_xpm )
-EXTERN_BITMAP( add_document_xpm )
-EXTERN_BITMAP( add_gerber_xpm )
-EXTERN_BITMAP( add_glabel_xpm )
-EXTERN_BITMAP( add_graphical_segments_xpm )
-EXTERN_BITMAP( add_graphical_polygon_xpm )
-EXTERN_BITMAP( add_hierarchical_label_xpm )
-EXTERN_BITMAP( add_hierarchical_subsheet_xpm )
-EXTERN_BITMAP( add_hierar_pin_xpm )
-EXTERN_BITMAP( add_junction_xpm )
-EXTERN_BITMAP( add_keepout_area_xpm )
-EXTERN_BITMAP( add_library_xpm )
-EXTERN_BITMAP( add_line2bus_xpm )
-EXTERN_BITMAP( add_line_label_xpm )
-EXTERN_BITMAP( add_line_xpm )
-EXTERN_BITMAP( add_pcb_target_xpm )
-EXTERN_BITMAP( add_polygon_xpm )
-EXTERN_BITMAP( add_power_xpm )
-EXTERN_BITMAP( add_rectangle_xpm )
-EXTERN_BITMAP( add_tracks_xpm )
-EXTERN_BITMAP( add_via_xpm )
-EXTERN_BITMAP( add_zone_cutout_xpm )
-EXTERN_BITMAP( add_zone_xpm )
-EXTERN_BITMAP( anchor_xpm )
-EXTERN_BITMAP( annotate_down_right_xpm )
-EXTERN_BITMAP( annotate_right_down_xpm )
-EXTERN_BITMAP( annotate_xpm )
-EXTERN_BITMAP( align_items_xpm )
-EXTERN_BITMAP( align_items_left_xpm )
-EXTERN_BITMAP( align_items_right_xpm )
-EXTERN_BITMAP( align_items_top_xpm )
-EXTERN_BITMAP( align_items_bottom_xpm )
-EXTERN_BITMAP( align_items_center_xpm )
-EXTERN_BITMAP( align_items_middle_xpm )
-EXTERN_BITMAP( apply_pad_settings_xpm )
-EXTERN_BITMAP( array_xpm )
-EXTERN_BITMAP( auto_associe_xpm )
-EXTERN_BITMAP( auto_delete_track_xpm )
-EXTERN_BITMAP( auto_track_width_xpm )
-EXTERN_BITMAP( autoplace_fields_xpm )
-EXTERN_BITMAP( axis3d_back_xpm )
-EXTERN_BITMAP( axis3d_bottom_xpm )
-EXTERN_BITMAP( axis3d_front_xpm )
-EXTERN_BITMAP( axis3d_left_xpm )
-EXTERN_BITMAP( axis3d_right_xpm )
-EXTERN_BITMAP( axis3d_top_xpm )
-EXTERN_BITMAP( axis3d_xpm )
-EXTERN_BITMAP( bitmap2component_xpm )
-EXTERN_BITMAP( bom_xpm )
-EXTERN_BITMAP( book_xpm )
-EXTERN_BITMAP( break_bus_xpm )
-EXTERN_BITMAP( break_line_xpm )
-EXTERN_BITMAP( browse_files_xpm )
-EXTERN_BITMAP( calculator_xpm )
-EXTERN_BITMAP( cancel_xpm )
-EXTERN_BITMAP( change_entry_orient_xpm )
-EXTERN_BITMAP( change_label_xpm )
-EXTERN_BITMAP( change_hlabel_xpm )
-EXTERN_BITMAP( change_glabel_xpm )
-EXTERN_BITMAP( change_text_xpm )
-EXTERN_BITMAP( contrast_mode_xpm )
-EXTERN_BITMAP( checked_ok_xpm )
-EXTERN_BITMAP( color_materials_xpm )
-EXTERN_BITMAP( component_select_alternate_shape_xpm )
-EXTERN_BITMAP( component_select_unit_xpm )
-EXTERN_BITMAP( config_xpm )
-EXTERN_BITMAP( copper_layers_setup_xpm )
-EXTERN_BITMAP( copy_xpm )
-EXTERN_BITMAP( copy_pad_settings_xpm )
-EXTERN_BITMAP( create_cmp_file_xpm )
-EXTERN_BITMAP( cursor_shape_xpm )
-EXTERN_BITMAP( custom_pad_to_primitives_xpm )
-EXTERN_BITMAP( cursor_xpm )
-EXTERN_BITMAP( cut_xpm )
-EXTERN_BITMAP( cvpcb_xpm )
-EXTERN_BITMAP( dashline_xpm )
-EXTERN_BITMAP( datasheet_xpm )
-EXTERN_BITMAP( delete_association_xpm )
-EXTERN_BITMAP( delete_bus_xpm )
-EXTERN_BITMAP( delete_circle_xpm )
-EXTERN_BITMAP( delete_connection_xpm )
-EXTERN_BITMAP( delete_dimension_xpm )
-EXTERN_BITMAP( delete_field_xpm )
-EXTERN_BITMAP( delete_gerber_xpm )
-EXTERN_BITMAP( delete_glabel_xpm )
-EXTERN_BITMAP( delete_line_xpm )
-EXTERN_BITMAP( delete_module_xpm )
-EXTERN_BITMAP( delete_net_xpm )
-EXTERN_BITMAP( delete_node_xpm )
-EXTERN_BITMAP( delete_pad_xpm )
-EXTERN_BITMAP( delete_polygon_xpm )
-EXTERN_BITMAP( delete_rectangle_xpm )
-EXTERN_BITMAP( delete_sheet_xpm )
-EXTERN_BITMAP( delete_track_xpm )
-EXTERN_BITMAP( delete_xpm )
-EXTERN_BITMAP( dialog_warning_xpm )
-EXTERN_BITMAP( directory_xpm )
-EXTERN_BITMAP( directory_browser_xpm )
-EXTERN_BITMAP( display_options_xpm )
-EXTERN_BITMAP( distribute_horizontal_xpm )
-EXTERN_BITMAP( distribute_vertical_xpm )
-EXTERN_BITMAP( down_xpm )
-EXTERN_BITMAP( ortho_xpm )
-EXTERN_BITMAP( drag_xpm )
-EXTERN_BITMAP( drag_outline_segment_xpm )
-EXTERN_BITMAP( drag_pad_xpm )
-EXTERN_BITMAP( drag_segment_withslope_xpm )
-EXTERN_BITMAP( drc_off_xpm )
-EXTERN_BITMAP( drc_xpm )
-EXTERN_BITMAP( duplicate_xpm )
-EXTERN_BITMAP( edges_sketch_xpm )
-EXTERN_BITMAP( edit_comp_footprint_xpm )
-EXTERN_BITMAP( edit_comp_ref_xpm )
-EXTERN_BITMAP( edit_comp_value_xpm )
-EXTERN_BITMAP( edit_module_xpm )
-EXTERN_BITMAP( editor_xpm )
-EXTERN_BITMAP( edit_text_xpm )
-EXTERN_BITMAP( edit_cmp_symb_links_xpm )
-EXTERN_BITMAP( edit_xpm )
-EXTERN_BITMAP( eeschema_xpm )
-EXTERN_BITMAP( enter_sheet_xpm )
-EXTERN_BITMAP( erc_xpm )
-EXTERN_BITMAP( ercerr_xpm )
-EXTERN_BITMAP( ercwarn_xpm )
-EXTERN_BITMAP( erc_green_xpm )
-EXTERN_BITMAP( exchange_xpm )
-EXTERN_BITMAP( exit_xpm )
-EXTERN_BITMAP( export3d_xpm )
-EXTERN_BITMAP( export_dsn_xpm )
-EXTERN_BITMAP( export_idf_xpm )
-EXTERN_BITMAP( export_footprint_names_xpm )
-EXTERN_BITMAP( export_module_xpm )
-EXTERN_BITMAP( export_part_xpm )
-EXTERN_BITMAP( export_step_xpm )
-EXTERN_BITMAP( export_xpm )
-EXTERN_BITMAP( fabrication_xpm )
-EXTERN_BITMAP( file_footprint_xpm )
-EXTERN_BITMAP( fill_zone_xpm )
-EXTERN_BITMAP( find_xpm )
-EXTERN_BITMAP( find_replace_xpm )
-EXTERN_BITMAP( flag_xpm )
-EXTERN_BITMAP( flip_board_xpm )
-EXTERN_BITMAP( folder_xpm )
-EXTERN_BITMAP( fonts_xpm )
-EXTERN_BITMAP( footprint_text_xpm )
-EXTERN_BITMAP( gbr_select_mode0_xpm )
-EXTERN_BITMAP( gbr_select_mode1_xpm )
-EXTERN_BITMAP( gbr_select_mode2_xpm )
-EXTERN_BITMAP( gerbview_drill_file_xpm )
-EXTERN_BITMAP( gerber_job_file_xpm )
-EXTERN_BITMAP( gerber_file_xpm )
-EXTERN_BITMAP( gerbview_clear_layers_xpm )
-EXTERN_BITMAP( gerbview_show_negative_objects_xpm )
-EXTERN_BITMAP( general_deletions_xpm )
-EXTERN_BITMAP( general_ratsnest_xpm )
-EXTERN_BITMAP( glabel2label_xpm )
-EXTERN_BITMAP( glabel2text_xpm )
-EXTERN_BITMAP( gl_change_xpm )
-EXTERN_BITMAP( go_down_xpm )
-EXTERN_BITMAP( go_up_xpm )
-EXTERN_BITMAP( green_xpm )
-EXTERN_BITMAP( grid_select_axis_xpm )
-EXTERN_BITMAP( grid_select_xpm )
-EXTERN_BITMAP( grid_xpm )
-EXTERN_BITMAP( hammer_xpm )
-EXTERN_BITMAP( help_xpm )
-EXTERN_BITMAP( hidden_pin_xpm )
-EXTERN_BITMAP( hierarchy_nav_xpm )
-EXTERN_BITMAP( highlight_remove_xpm )
-EXTERN_BITMAP( hotkeys_xpm )
-EXTERN_BITMAP( hotkeys_import_xpm )
-EXTERN_BITMAP( hotkeys_export_xpm )
-EXTERN_BITMAP( html_xpm )
-EXTERN_BITMAP( icon_xpm )
-EXTERN_BITMAP( icon_cvpcb_small_xpm )
-EXTERN_BITMAP( icon_cvpcb_xpm )
-EXTERN_BITMAP( icon_eeschema_xpm )
-EXTERN_BITMAP( icon_gerbview_small_xpm )
-EXTERN_BITMAP( icon_gerbview_xpm )
-EXTERN_BITMAP( icon_kicad_xpm )
-EXTERN_BITMAP( icon_modedit_xpm )
-EXTERN_BITMAP( icon_pcbnew_xpm )
-EXTERN_BITMAP( icon_3d_xpm )
-EXTERN_BITMAP( icon_bitmap2component_xpm )
-EXTERN_BITMAP( icon_libedit_xpm )
-EXTERN_BITMAP( icon_pcbcalculator_xpm )
-EXTERN_BITMAP( icon_pagelayout_editor_xpm )
-EXTERN_BITMAP( image_xpm )
-EXTERN_BITMAP( import_brd_file_xpm )
-EXTERN_BITMAP( import_document_xpm )
-EXTERN_BITMAP( import_footprint_names_xpm )
-EXTERN_BITMAP( import_hierarchical_label_xpm )
-EXTERN_BITMAP( import_module_xpm )
-EXTERN_BITMAP( import_part_xpm )
-EXTERN_BITMAP( import_project_xpm )
-EXTERN_BITMAP( import_setup_xpm )
-EXTERN_BITMAP( import_xpm )
-EXTERN_BITMAP( import3d_xpm )
-EXTERN_BITMAP( info_xpm )
-EXTERN_BITMAP( insert_module_board_xpm )
-EXTERN_BITMAP( invisible_text_xpm )
-EXTERN_BITMAP( kicad_icon_small_xpm )
-EXTERN_BITMAP( label2glabel_xpm )
-EXTERN_BITMAP( label2text_xpm )
-EXTERN_BITMAP( label_xpm )
-EXTERN_BITMAP( lang_bg_xpm )
-EXTERN_BITMAP( lang_ca_xpm )
-EXTERN_BITMAP( lang_zh_xpm )
-EXTERN_BITMAP( lang_cs_xpm )
-EXTERN_BITMAP( lang_def_xpm )
-EXTERN_BITMAP( lang_de_xpm )
-EXTERN_BITMAP( lang_en_xpm )
-EXTERN_BITMAP( lang_es_xpm )
-EXTERN_BITMAP( lang_fr_xpm )
-EXTERN_BITMAP( lang_fi_xpm )
-EXTERN_BITMAP( lang_gr_xpm )
-EXTERN_BITMAP( lang_hu_xpm )
-EXTERN_BITMAP( lang_it_xpm )
-EXTERN_BITMAP( lang_jp_xpm )
-EXTERN_BITMAP( lang_ko_xpm )
-EXTERN_BITMAP( lang_lt_xpm )
-EXTERN_BITMAP( lang_nl_xpm )
-EXTERN_BITMAP( lang_pl_xpm )
-EXTERN_BITMAP( lang_pt_xpm )
-EXTERN_BITMAP( lang_ru_xpm )
-EXTERN_BITMAP( lang_sk_xpm )
-EXTERN_BITMAP( lang_sl_xpm )
-EXTERN_BITMAP( language_xpm )
-EXTERN_BITMAP( layers_manager_xpm )
-EXTERN_BITMAP( leave_sheet_xpm )
-EXTERN_BITMAP( left_xpm )
-EXTERN_BITMAP( libedit_xpm )
-EXTERN_BITMAP( lib_next_xpm )
-EXTERN_BITMAP( lib_previous_xpm )
-EXTERN_BITMAP( library_browse_xpm )
-EXTERN_BITMAP( library_archive_xpm )
-EXTERN_BITMAP( library_archive_as_xpm )
-EXTERN_BITMAP( library_xpm )
-EXTERN_BITMAP( library_table_xpm )
-EXTERN_BITMAP( lines90_xpm )
-EXTERN_BITMAP( list_nets_xpm )
-EXTERN_BITMAP( load_gerber_xpm )
-EXTERN_BITMAP( load_module_board_xpm )
-EXTERN_BITMAP( load_module_lib_xpm )
-EXTERN_BITMAP( local_ratsnest_xpm )
-EXTERN_BITMAP( locked_xpm )
-EXTERN_BITMAP( lock_unlock_xpm )
-EXTERN_BITMAP( measurement_xpm )
-EXTERN_BITMAP( minus_xpm )
-EXTERN_BITMAP( mirror_h_xpm )
-EXTERN_BITMAP( mirror_v_xpm )
-EXTERN_BITMAP( mode_module_xpm )
-EXTERN_BITMAP( mode_track_xpm )
-EXTERN_BITMAP( modratsnest_xpm )
-EXTERN_BITMAP( module_check_xpm )
-EXTERN_BITMAP( module_editor_xpm )
-EXTERN_BITMAP( module_wizard_xpm )
-EXTERN_BITMAP( module_filtered_list_xpm )
-EXTERN_BITMAP( module_pin_filtered_list_xpm )
-EXTERN_BITMAP( module_library_list_xpm )
-EXTERN_BITMAP( module_name_filtered_list_xpm )
-EXTERN_BITMAP( module_full_list_xpm )
-EXTERN_BITMAP( module_options_xpm )
-EXTERN_BITMAP( module_ratsnest_xpm )
-EXTERN_BITMAP( module_xpm )
-EXTERN_BITMAP( modview_icon_xpm )
-EXTERN_BITMAP( morgan1_xpm )
-EXTERN_BITMAP( morgan2_xpm )
-EXTERN_BITMAP( move_glabel_xpm )
-EXTERN_BITMAP( move_exactly_xpm )
-EXTERN_BITMAP( move_relative_xpm )
-EXTERN_BITMAP( move_pad_xpm )
-EXTERN_BITMAP( move_polygon_xpm )
-EXTERN_BITMAP( move_rectangle_xpm )
-EXTERN_BITMAP( move_sheet_xpm )
-EXTERN_BITMAP( move_target_xpm )
-EXTERN_BITMAP( move_xpm )
-EXTERN_BITMAP( mw_add_gap_xpm )
-EXTERN_BITMAP( mw_add_line_xpm )
-EXTERN_BITMAP( mw_add_shape_xpm )
-EXTERN_BITMAP( mw_add_stub_arc_xpm )
-EXTERN_BITMAP( mw_add_stub_xpm )
-EXTERN_BITMAP( mw_toolbar_xpm )
-EXTERN_BITMAP( net_highlight_xpm )
-EXTERN_BITMAP( net_highlight_schematic_xpm )
-EXTERN_BITMAP( netlist_xpm )
-EXTERN_BITMAP( net_locked_xpm )
-EXTERN_BITMAP( net_unlocked_xpm )
-EXTERN_BITMAP( new_board_xpm )
-EXTERN_BITMAP( new_component_xpm )
-EXTERN_BITMAP( new_cvpcb_xpm )
-EXTERN_BITMAP( new_document_xpm )
-EXTERN_BITMAP( new_footprint_xpm )
-EXTERN_BITMAP( new_gerb_xpm )
-EXTERN_BITMAP( new_library_xpm )
-EXTERN_BITMAP( new_generic_xpm )
-EXTERN_BITMAP( new_page_layout_xpm )
-EXTERN_BITMAP( new_project_xpm )
-EXTERN_BITMAP( new_project_with_template_xpm )
-EXTERN_BITMAP( new_python_xpm )
-EXTERN_BITMAP( noconn_xpm )
-EXTERN_BITMAP( normal_xpm )
-EXTERN_BITMAP( online_help_xpm )
-EXTERN_BITMAP( open_brd_file_xpm )
-EXTERN_BITMAP( open_document_xpm )
-EXTERN_BITMAP( open_library_xpm )
-EXTERN_BITMAP( open_page_layout_xpm )
-EXTERN_BITMAP( open_project_xpm )
-EXTERN_BITMAP( options_3drender_xpm )
-EXTERN_BITMAP( options_all_tracks_and_vias_xpm )
-EXTERN_BITMAP( options_all_tracks_xpm )
-EXTERN_BITMAP( options_all_vias_xpm )
-EXTERN_BITMAP( options_arc_xpm )
-EXTERN_BITMAP( options_board_xpm )
-EXTERN_BITMAP( options_circle_xpm )
-EXTERN_BITMAP( options_generic_xpm )
-EXTERN_BITMAP( options_module_xpm )
-EXTERN_BITMAP( options_pad_xpm )
-EXTERN_BITMAP( options_pinsheet_xpm )
-EXTERN_BITMAP( options_pin_xpm )
-EXTERN_BITMAP( options_rectangle_xpm )
-EXTERN_BITMAP( options_segment_xpm )
-EXTERN_BITMAP( options_tracks_xpm )
-EXTERN_BITMAP( options_track_xpm )
-EXTERN_BITMAP( options_vias_xpm )
-EXTERN_BITMAP( opt_show_polygon_xpm )
-EXTERN_BITMAP( orient_xpm )
-EXTERN_BITMAP( pad_sketch_xpm )
-EXTERN_BITMAP( pad_xpm )
-EXTERN_BITMAP( pad_dimensions_xpm )
-EXTERN_BITMAP( pad_enumerate_xpm )
-EXTERN_BITMAP( pads_mask_layers_xpm )
-EXTERN_BITMAP( pagelayout_load_xpm )
-EXTERN_BITMAP( pagelayout_normal_view_mode_xpm )
-EXTERN_BITMAP( pagelayout_special_view_mode_xpm )
-EXTERN_BITMAP( palette_xpm )
-EXTERN_BITMAP( part_properties_xpm )
-EXTERN_BITMAP( paste_xpm )
-EXTERN_BITMAP( path_xpm )
-EXTERN_BITMAP( pcb_target_xpm )
-EXTERN_BITMAP( pcbnew_xpm )
-EXTERN_BITMAP( pcbcalculator_xpm )
-EXTERN_BITMAP( pcb_offset_xpm )
-EXTERN_BITMAP( pin2pin_xpm )
-EXTERN_BITMAP( pin_name_to_xpm )
-EXTERN_BITMAP( pin_number_to_xpm )
-EXTERN_BITMAP( pin_size_to_xpm )
-EXTERN_BITMAP( pin_show_etype_xpm )
-EXTERN_BITMAP( pin_table_xpm )
-EXTERN_BITMAP( pinorient_right_xpm )
-EXTERN_BITMAP( pinorient_left_xpm )
-EXTERN_BITMAP( pinorient_up_xpm )
-EXTERN_BITMAP( pinorient_down_xpm )
-EXTERN_BITMAP( pinshape_nonlogic_xpm )
-EXTERN_BITMAP( pinshape_normal_xpm )
-EXTERN_BITMAP( pinshape_invert_xpm )
-EXTERN_BITMAP( pinshape_clock_fall_xpm )
-EXTERN_BITMAP( pinshape_clock_normal_xpm )
-EXTERN_BITMAP( pinshape_clock_invert_xpm )
-EXTERN_BITMAP( pinshape_active_low_input_xpm )
-EXTERN_BITMAP( pinshape_clock_active_low_xpm )
-EXTERN_BITMAP( pinshape_active_low_output_xpm )
-EXTERN_BITMAP( pintype_input_xpm )
-EXTERN_BITMAP( pintype_output_xpm )
-EXTERN_BITMAP( pintype_bidi_xpm )
-EXTERN_BITMAP( pintype_3states_xpm )
-EXTERN_BITMAP( pintype_passive_xpm )
-EXTERN_BITMAP( pintype_notspecif_xpm )
-EXTERN_BITMAP( pintype_powerinput_xpm )
-EXTERN_BITMAP( pintype_poweroutput_xpm )
-EXTERN_BITMAP( pintype_opencoll_xpm )
-EXTERN_BITMAP( pintype_openemit_xpm )
-EXTERN_BITMAP( pintype_noconnect_xpm )
-EXTERN_BITMAP( pin_to_xpm )
-EXTERN_BITMAP( pin_xpm )
-EXTERN_BITMAP( plot_xpm )
-EXTERN_BITMAP( plot_dxf_xpm )
-EXTERN_BITMAP( plot_hpg_xpm )
-EXTERN_BITMAP( plot_pdf_xpm )
-EXTERN_BITMAP( plot_ps_xpm )
-EXTERN_BITMAP( plot_svg_xpm )
-EXTERN_BITMAP( plus_xpm )
-EXTERN_BITMAP( polar_coord_xpm )
-EXTERN_BITMAP( post_compo_xpm )
-EXTERN_BITMAP( post_drill_xpm )
-EXTERN_BITMAP( post_module_xpm )
-EXTERN_BITMAP( push_pad_settings_xpm )
-EXTERN_BITMAP( preference_xpm )
-EXTERN_BITMAP( primitives_to_custom_pad_xpm )
-EXTERN_BITMAP( print_button_xpm )
-EXTERN_BITMAP( ps_router_xpm )
-EXTERN_BITMAP( ps_diff_pair_xpm )
-EXTERN_BITMAP( ps_diff_pair_gap_xpm )
-EXTERN_BITMAP( ps_diff_pair_tune_length_xpm )
-EXTERN_BITMAP( ps_diff_pair_tune_phase_xpm )
-EXTERN_BITMAP( ps_diff_pair_via_gap_xpm )
-EXTERN_BITMAP( ps_tune_length_xpm )
-EXTERN_BITMAP( py_script_xpm )
-EXTERN_BITMAP( ratsnest_xpm )
-EXTERN_BITMAP( read_setup_xpm )
-EXTERN_BITMAP( recent_xpm )
-EXTERN_BITMAP( redo_xpm )
-EXTERN_BITMAP( red_xpm )
-EXTERN_BITMAP( refresh_xpm )
-EXTERN_BITMAP( render_mode_xpm )
-EXTERN_BITMAP( reload2_xpm )
-EXTERN_BITMAP( reload_xpm )
-EXTERN_BITMAP( repaint_xpm )
-EXTERN_BITMAP( reset_text_xpm )
-EXTERN_BITMAP( resize_sheet_xpm )
-EXTERN_BITMAP( rescue_xpm )
-EXTERN_BITMAP( right_xpm )
-EXTERN_BITMAP( router_len_tuner_xpm )
-EXTERN_BITMAP( router_len_tuner_setup_xpm )
-EXTERN_BITMAP( router_len_tuner_amplitude_decr_xpm )
-EXTERN_BITMAP( router_len_tuner_amplitude_incr_xpm )
-EXTERN_BITMAP( router_len_tuner_dist_decr_xpm )
-EXTERN_BITMAP( router_len_tuner_dist_incr_xpm )
-EXTERN_BITMAP( rotate_cw_xpm )
-EXTERN_BITMAP( rotate_ccw_xpm )
-EXTERN_BITMAP( rotate_neg_x_xpm )
-EXTERN_BITMAP( rotate_pos_x_xpm )
-EXTERN_BITMAP( rotate_neg_y_xpm )
-EXTERN_BITMAP( rotate_pos_y_xpm )
-EXTERN_BITMAP( rotate_neg_z_xpm )
-EXTERN_BITMAP( rotate_pos_z_xpm )
-EXTERN_BITMAP( save_as_xpm )
-EXTERN_BITMAP( save_gerber_xpm )
-EXTERN_BITMAP( save_fp_to_board_xpm )
-EXTERN_BITMAP( save_library_xpm )
-EXTERN_BITMAP( save_project_xpm )
-EXTERN_BITMAP( save_setup_xpm )
-EXTERN_BITMAP( save_xpm )
-EXTERN_BITMAP( search_tree_xpm )
-EXTERN_BITMAP( select_grid_xpm )
-EXTERN_BITMAP( select_layer_pair_xpm )
-EXTERN_BITMAP( select_w_layer_xpm )
-EXTERN_BITMAP( select_same_sheet_xpm )
-EXTERN_BITMAP( sheetset_xpm )
-EXTERN_BITMAP( setcolor_3d_bg_xpm )
-EXTERN_BITMAP( setcolor_silkscreen_xpm )
-EXTERN_BITMAP( setcolor_soldermask_xpm )
-EXTERN_BITMAP( setcolor_solderpaste_xpm )
-EXTERN_BITMAP( setcolor_copper_xpm )
-EXTERN_BITMAP( setcolor_board_body_xpm )
-EXTERN_BITMAP( shape_3d_xpm )
-EXTERN_BITMAP( show_dcodenumber_xpm )
-EXTERN_BITMAP( show_footprint_xpm )
-EXTERN_BITMAP( show_mod_edge_xpm )
-EXTERN_BITMAP( show_all_layers_xpm )
-EXTERN_BITMAP( show_no_layers_xpm )
-EXTERN_BITMAP( show_no_copper_layers_xpm )
-EXTERN_BITMAP( show_all_copper_layers_xpm )
-EXTERN_BITMAP( showtrack_xpm )
-EXTERN_BITMAP( show_zone_xpm )
-EXTERN_BITMAP( show_zone_disable_xpm )
-EXTERN_BITMAP( show_zone_outline_only_xpm )
-EXTERN_BITMAP( small_down_xpm )
-EXTERN_BITMAP( small_edit_xpm )
-EXTERN_BITMAP( small_library_xpm )
-EXTERN_BITMAP( small_plus_xpm )
-EXTERN_BITMAP( small_up_xpm )
-EXTERN_BITMAP( spreadsheet_xpm )
-EXTERN_BITMAP( svg_file_xpm )
-EXTERN_BITMAP( swap_layer_xpm )
-EXTERN_BITMAP( text_xpm )
-EXTERN_BITMAP( text_sketch_xpm )
-EXTERN_BITMAP( three_d_xpm )
-EXTERN_BITMAP( tool_ratsnest_xpm )
-EXTERN_BITMAP( tools_xpm )
-EXTERN_BITMAP( track_locked_xpm )
-EXTERN_BITMAP( track_sketch_xpm )
-EXTERN_BITMAP( track_unlocked_xpm )
-EXTERN_BITMAP( transistor_xpm )
-EXTERN_BITMAP( trash_xpm )
-EXTERN_BITMAP( tree_nosel_xpm )
-EXTERN_BITMAP( tree_sel_xpm )
-EXTERN_BITMAP( undelete_xpm )
-EXTERN_BITMAP( undo_xpm )
-EXTERN_BITMAP( unit_inch_xpm )
-EXTERN_BITMAP( unit_mm_xpm )
-EXTERN_BITMAP( unknown_xpm )
-EXTERN_BITMAP( unlocked_xpm )
-EXTERN_BITMAP( unzip_xpm )
-EXTERN_BITMAP( up_xpm )
-EXTERN_BITMAP( update_fields_xpm )
-EXTERN_BITMAP( update_module_board_xpm )
-EXTERN_BITMAP( update_pcb_from_sch_xpm )
-EXTERN_BITMAP( use_3D_copper_thickness_xpm )
-EXTERN_BITMAP( via_xpm )
-EXTERN_BITMAP( via_microvia_xpm )
-EXTERN_BITMAP( via_buried_xpm )
-EXTERN_BITMAP( via_sketch_xpm )
-EXTERN_BITMAP( viewlibs_icon_xpm )
-EXTERN_BITMAP( warning_xpm )
-EXTERN_BITMAP( web_support_xpm )
-EXTERN_BITMAP( width_net_xpm )
-EXTERN_BITMAP( width_segment_xpm )
-EXTERN_BITMAP( width_track_via_xpm )
-EXTERN_BITMAP( width_track_xpm )
-EXTERN_BITMAP( width_vias_xpm )
-EXTERN_BITMAP( wizard_add_fplib_icon_xpm )
-EXTERN_BITMAP( wizard_add_fplib_small_xpm )
-EXTERN_BITMAP( www_xpm )
-EXTERN_BITMAP( zip_tool_xpm )
-EXTERN_BITMAP( zip_xpm )
-EXTERN_BITMAP( zone_duplicate_xpm )
-EXTERN_BITMAP( zone_unfill_xpm )
-EXTERN_BITMAP( zoom_area_xpm )
-EXTERN_BITMAP( zoom_center_on_screen_xpm )
-EXTERN_BITMAP( zoom_redraw_xpm )
-EXTERN_BITMAP( zoom_fit_in_page_xpm )
-EXTERN_BITMAP( zoom_in_xpm )
-EXTERN_BITMAP( zoom_out_xpm )
-EXTERN_BITMAP( zoom_page_xpm )
-EXTERN_BITMAP( zoom_selection_xpm )
-EXTERN_BITMAP( zoom_xpm )
-EXTERN_BITMAP( tune_diff_pair_length_legend_xpm )
-EXTERN_BITMAP( tune_diff_pair_skew_legend_xpm )
-EXTERN_BITMAP( tune_single_track_length_legend_xpm )
-EXTERN_BITMAP( simulator_xpm )
-EXTERN_BITMAP( sim_run_xpm )
-EXTERN_BITMAP( sim_stop_xpm )
-EXTERN_BITMAP( sim_tune_xpm )
-EXTERN_BITMAP( sim_probe_xpm )
-EXTERN_BITMAP( sim_add_signal_xpm )
-EXTERN_BITMAP( sim_settings_xpm )
-
 #endif  // BITMAPS_H_
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index 0c001a31e..06ae3853c 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -71,14 +71,12 @@ if( APPLE )
         )
     target_link_libraries( kicad
         common
-        bitmaps
         polygon
         ${wxWidgets_LIBRARIES}
         )
 else()
     target_link_libraries( kicad
         common
-        bitmaps
         polygon
         gal
         ${wxWidgets_LIBRARIES}
diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt
index 4e82fab7d..59bb248b8 100644
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@@ -81,19 +81,15 @@ target_link_libraries( pl_editor
     #singletop  # replaces common, giving us restrictive control and link warnings.
     # There's way too much crap coming in from common yet.
     common
-    bitmaps
     gal
     legacy_wx
     common
-    bitmaps
     gal
     legacy_wx
     common
-    bitmaps
     gal
     legacy_wx
     common
-    bitmaps
     gal
     legacy_wx
     ${wxWidgets_LIBRARIES}
@@ -114,17 +110,14 @@ add_library( pl_editor_kiface MODULE
 target_link_libraries( pl_editor_kiface
     common
     polygon
-    bitmaps
     gal
     legacy_wx
     common
     polygon
-    bitmaps
     gal
     legacy_wx
     common
     polygon
-    bitmaps
     gal
     legacy_wx
     ${wxWidgets_LIBRARIES}
diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt
index 94d6ce469..ad01dbb03 100644
--- a/pcb_calculator/CMakeLists.txt
+++ b/pcb_calculator/CMakeLists.txt
@@ -67,7 +67,6 @@ target_link_libraries( pcb_calculator
     #singletop  # replaces common, giving us restrictive control and link warnings.
     # There's way too much crap coming in from common yet.
     common
-    bitmaps
     gal
     ${wxWidgets_LIBRARIES}
     )
@@ -89,7 +88,6 @@ set_target_properties( pcb_calculator_kiface PROPERTIES
     )
 target_link_libraries( pcb_calculator_kiface
     common
-    bitmaps
     polygon
     ${wxWidgets_LIBRARIES}
     )
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index d16c61d01..a0c929691 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -626,7 +626,6 @@ target_link_libraries( pcbnew
     #singletop  # replaces common, giving us restrictive control and link warnings.
     # There's way too much crap coming in from common yet.
     common
-    bitmaps
     gal
     ${wxWidgets_LIBRARIES}
     )
@@ -644,6 +643,10 @@ add_library( pcbnew_kiface_objects OBJECT
     ${PCBNEW_SCRIPTING_SRCS}
     )
 
+target_link_libraries( pcbnew_kiface_objects PRIVATE
+    bitmaps
+)
+
 add_library( pcbnew_kiface MODULE $<TARGET_OBJECTS:pcbnew_kiface_objects> )
 
 set_target_properties( pcbnew_kiface PROPERTIES
@@ -675,7 +678,6 @@ set( PCBNEW_KIFACE_LIBRARIES
     legacy_wx
     common
     polygon
-    bitmaps
     gal
     lib_dxf
     idf3
diff --git a/pcbnew/connectivity/CMakeLists.txt b/pcbnew/connectivity/CMakeLists.txt
index fd7676bd7..2932ed8ba 100644
--- a/pcbnew/connectivity/CMakeLists.txt
+++ b/pcbnew/connectivity/CMakeLists.txt
@@ -15,3 +15,7 @@ set( PCBNEW_CONN_SRCS
 )
 
 add_library( connectivity STATIC ${PCBNEW_CONN_SRCS} )
+
+target_link_libraries( connectivity PRIVATE
+    common
+)
\ No newline at end of file
diff --git a/pcbnew/pcad2kicadpcb_plugin/CMakeLists.txt b/pcbnew/pcad2kicadpcb_plugin/CMakeLists.txt
index 11e60de22..bb8a5b4b0 100644
--- a/pcbnew/pcad2kicadpcb_plugin/CMakeLists.txt
+++ b/pcbnew/pcad2kicadpcb_plugin/CMakeLists.txt
@@ -29,4 +29,5 @@ set( PCAD2PCBNEW_SRCS
     )
 
 add_library( pcad2kicadpcb STATIC ${PCAD2PCBNEW_SRCS} )
-add_dependencies( pcad2kicadpcb pcbcommon )
+
+target_link_libraries( pcad2kicadpcb pcbcommon )
diff --git a/pcbnew/router/CMakeLists.txt b/pcbnew/router/CMakeLists.txt
index be9b7c386..44a945644 100644
--- a/pcbnew/router/CMakeLists.txt
+++ b/pcbnew/router/CMakeLists.txt
@@ -46,3 +46,7 @@ set( PCBNEW_PNS_SRCS
 )
 
 add_library( pnsrouter STATIC ${PCBNEW_PNS_SRCS} )
+
+target_link_libraries( pnsrouter PRIVATE
+    common
+)
diff --git a/qa/common/CMakeLists.txt b/qa/common/CMakeLists.txt
index e2e754da0..55d8d8f89 100644
--- a/qa/common/CMakeLists.txt
+++ b/qa/common/CMakeLists.txt
@@ -63,7 +63,6 @@ set( common_libs
     common
     legacy_gal
     polygon
-    bitmaps
     gal
     qa_utils
     unit_test_utils
diff --git a/qa/common_tools/CMakeLists.txt b/qa/common_tools/CMakeLists.txt
index 2842cd2b3..9267bfe7d 100644
--- a/qa/common_tools/CMakeLists.txt
+++ b/qa/common_tools/CMakeLists.txt
@@ -49,7 +49,6 @@ target_link_libraries( qa_common_tools
     common
     legacy_gal
     polygon
-    bitmaps
     gal
     qa_utils
     ${wxWidgets_LIBRARIES}
diff --git a/qa/pcb_test_window/CMakeLists.txt b/qa/pcb_test_window/CMakeLists.txt
index af9f01f81..7e8eed0c0 100644
--- a/qa/pcb_test_window/CMakeLists.txt
+++ b/qa/pcb_test_window/CMakeLists.txt
@@ -67,23 +67,19 @@ target_link_libraries( test_window
     pnsrouter
     common
     pcbcommon
-    bitmaps
     polygon
     pnsrouter
     common
     pcbcommon
-    bitmaps
     polygon
     pnsrouter
     common
     pcbcommon
-    bitmaps
     polygon
     pnsrouter
     common
     pcbcommon
     3d-viewer
-    bitmaps
     gal
     pcad2kicadpcb
     common
diff --git a/qa/pcbnew/CMakeLists.txt b/qa/pcbnew/CMakeLists.txt
index 08b3a1fff..a3645cbc0 100644
--- a/qa/pcbnew/CMakeLists.txt
+++ b/qa/pcbnew/CMakeLists.txt
@@ -61,12 +61,10 @@ target_link_libraries( qa_pcbnew
     pcbcommon
     pnsrouter
     pcad2kicadpcb
-    bitmaps
     common
     pcbcommon
     legacy_wx
     polygon
-    bitmaps
     gal
     qa_utils
     lib_dxf
diff --git a/qa/pcbnew_tools/CMakeLists.txt b/qa/pcbnew_tools/CMakeLists.txt
index 372946ee4..2b9550e2f 100644
--- a/qa/pcbnew_tools/CMakeLists.txt
+++ b/qa/pcbnew_tools/CMakeLists.txt
@@ -49,12 +49,10 @@ target_link_libraries( qa_pcbnew_tools
     pcbcommon
     pnsrouter
     pcad2kicadpcb
-    bitmaps
     common
     pcbcommon
     legacy_wx
     polygon
-    bitmaps
     gal
     qa_utils
     lib_dxf
diff --git a/qa/pcbnew_utils/CMakeLists.txt b/qa/pcbnew_utils/CMakeLists.txt
index e2316d2ef..a6c46130f 100644
--- a/qa/pcbnew_utils/CMakeLists.txt
+++ b/qa/pcbnew_utils/CMakeLists.txt
@@ -62,12 +62,10 @@ target_link_libraries( qa_pcbnew_utils PUBLIC
 #     pcbcommon
 #     pnsrouter
 #     pcad2kicadpcb
-#     bitmaps
 #     common
 #     pcbcommon
 #     legacy_wx
 #     polygon
-#     bitmaps
 #     gal
 #     qa_utils
 #     lib_dxf
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 46c9744fa..40602e92d 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -15,7 +15,6 @@ add_executable( container_test
 target_link_libraries( container_test
     common
     polygon
-    bitmaps
     ${wxWidgets_LIBRARIES}
     )
 
diff --git a/utils/kicad-ogltest/CMakeLists.txt b/utils/kicad-ogltest/CMakeLists.txt
index cc629152b..0d8eaa9bb 100644
--- a/utils/kicad-ogltest/CMakeLists.txt
+++ b/utils/kicad-ogltest/CMakeLists.txt
@@ -23,7 +23,6 @@ add_executable( kicad-ogltest WIN32
 target_link_libraries( kicad-ogltest
     gal
     common
-    bitmaps
     polygon
     ${wxWidgets_LIBRARIES} )
 
-- 
2.20.1


Follow ups