diff --git a/CMakeModules/PNG2cpp.cmake b/CMakeModules/PNG2cpp.cmake
index 986f534d4f..655c66e3f0 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 3aeafd98f4..f0c624aebb 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 fa57403fdc..5a95af6e05 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 04f1c97541..a4c3a2298b 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 ae7b1b8fb5..10385cf90f 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 6d26d1a651..a9985ed0d3 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 1a31a37c42..4a2d697b2a 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 33256dab5c..5f6c24680b 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 de7bd9491f..c6e8ac2f43 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 6f66616c80..b5a75241cc 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 13c0b8d066..4d200f5248 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 729af65970..b7b1e338af 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 a7a3b1535b..709d9fab08 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 f76330430f..7172e0c882 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 0f105ec55e..aafd0c0f84 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 c7c61ea944..49618ff444 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 636a314c8b..86efadb2f4 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 fc58edfaa4..070d865f40 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 0b6e4863ea..8fe2aaf333 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 e2c5ff341d..ff0fe88669 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 94dc5c90ce..55208d7509 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 59a55af951..97a08346a0 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 487107ddff..99531c0383 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 226ff10fb9..3ce13da284 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 81bfc4623a..f8b3d9e33e 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 c91a48ec43..578f1e9488 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 2eeee148a1..31e38d3843 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 7a50ee1be3..83b1f05c1f 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 e9d516ab2b..b23420cc82 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 5d0bd6bf98..64620cf73a 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 31dcd6b3c2..3c21bacbd1 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 0837e1306f..034eff0983 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 381690f7ba..b35cc28f87 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 08f3dceed5..a6c54e71d6 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 d9da852bf5..4fdb735375 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 2304a7d5c0..f8bf0318f5 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 f0531060a5..36aa5b3409 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 f1cad35f62..74159f0ff0 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 6638154e8d..f98bd5757d 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 88db8f05e4..721dd4a30f 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 82ab6edde5..15deeafa2d 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 fdadfeafe7..0222817cb0 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 0484fb5eda..4e4e6c6bd0 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 127b4e2fa1..575037f420 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 af6080e0c7..18b55d6906 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 a88c19e13b..d18ebe7792 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 2ef823da01..1285810845 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 70b55fb0ee..316e705e69 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 1f4f4e79e2..01d835606b 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 b84e1676eb..b047a28af8 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 4b6b2b3c76..ad6598ff3d 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 0e98790248..a15011fadb 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 1207ed0875..3b3b678dba 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 5308c69fc3..0c6d7bec3f 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 970e2155e9..c69f07d5b2 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 6424714299..8a13a1f385 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 62d1e47fbb..b09d18c524 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 ca8ae058e9..ceeaf77653 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 ea0f10f85f..8f5b0a21a9 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 7fa0b8c1c6..6e3ff625d7 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 0813cb1dd4..ec4763e49f 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 8757be4b14..3fb6371ae4 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 df94c6466a..78a33b2eaf 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 a8909d2925..377a1b6095 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 a521403f20..89e32853d3 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 592e3903d2..ab087e4b6b 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 d5ee2c9e65..c51d1b03e7 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 5a732c6bfc..32a4008dd7 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 4a17b5fc7f..992d54a3c4 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 d3201390d0..bafb7da4e3 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 04642e2cb3..23c1dcfc71 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 618b3d7413..2a9309f5c5 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 87f52fe70a..57ec59303d 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 8bcbaf7efb..12c41e6157 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 1ed8cc0390..95d5b37c88 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 33184fbb39..594ba09ce1 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 aa6816d52e..bbac74eb3b 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 275f6bb214..2cd512016b 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 5cd5366245..a4ba1613d2 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 f3c2ac9bba..4c4bd2f38c 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 caddaaa0e4..fe35a6a18a 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 6721648947..9482afe1e3 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 56761238a7..47bda4308e 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 a345ac2316..193be2a482 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 90c5e74ccf..cf6b2ec504 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 982e76ef36..73f17805e5 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 61ec3c7cf4..8c0db556c5 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 3e0e3ddc25..9be1772e19 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 d996ee57b8..5bb264ddaa 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 d6d7c2386b..276382ce4c 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 c70a5470b3..58e791341e 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 2184237af7..829130f6b3 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 16609862d2..29875c41c0 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 2af0ef793d..e9a08007e0 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 bcaafebccc..b379356b28 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 5214824132..d09c2e2aaa 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 4f2960f28e..3823858204 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 8971858051..9b69093a0d 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 2fbf415f17..1a8469a77c 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 b840332103..3820bef679 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 10e2135ee7..a10d266df9 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 bd160e117b..2a077cd788 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 a8c6550c8c..c33d357aa3 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 b905ce54af..0dbcab331d 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 3beb180db6..6c60cf886f 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 2fdf915429..ba3c4be571 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 3fe763e0a0..c23c155fef 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 80e2d83c22..e1c8123b3c 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 e97caf0940..f6e476ddf5 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 85e6a2833e..71ad7ef250 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 56b3b9bf07..010192c334 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 c6ddabe2b4..d794a9c7c3 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 8d3607ad2a..6c1b82bd14 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 76edfc0735..680c2cdccf 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 a7d71c346c..f979c5a1b7 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 202e2129a5..73a205e7d1 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 b52ef01979..fb3944c973 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 0c91be8a1e..f11aeff05c 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 f3d7f9824d..4962634201 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 8e82b91497..1701d0cd99 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 a8244ff71a..3222497d71 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 99007a9afc..3203186299 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 d1e82a9ed1..6ce5085451 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 9cf963f11c..17dcc12679 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 2bdfc55a58..b1961fccd1 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 85208d4524..b1c7a2ab63 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 93ec453830..d1a7620e7d 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 576f3a5a53..6b9647df9a 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 45d34c840c..79d2bdbdcf 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 46d5eba2ff..b6dfce12a4 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 5f4d89a97a..627dc57000 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 e78178e57c..af6078b042 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 e41f0fc238..822c39fb5a 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 b6c66ff52e..a781d8cc8a 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 541954a7e0..1853385af5 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 56a60d2dd1..93449ad40a 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 89d2bc4bb8..0ea1d3944c 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 bc5cdca4e8..74f044c433 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 a0f0353a3b..2a05aecd1f 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 edb6ae2931..bbd635aadf 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 d6735aea76..a4eb088096 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 a69fb9bc12..78ecf8dcd6 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 1b5d77c6a0..7c14dbf2aa 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 82311214b3..ad96becf05 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 ecdd76478f..cb794773c7 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 cce6d20ec1..2c2d98285b 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 e5f549b9ae..eaebc78990 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 7b028c7d41..201e57113c 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 825fca8bf9..d66bee9f78 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 b315caed75..ed01a45369 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 7365ff27b5..d1768775f6 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 604c6c064c..c742ddab18 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 b55e0fba64..3c1ec62600 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 57f48df8d2..4ce437c599 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 4ae30ffca8..f8dd3d17b4 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 6f15482bec..6b06e1023f 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 b02555288f..7ad67c2821 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 1a8025a673..62619631be 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 efbbb943b2..c1c81d1852 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 e196ac8114..e81cad12dc 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 f5ead3db1e..6fb8ae1c05 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 5e0abc3c0a..1005ae27b2 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 7473fda0dc..dedf1cd5d0 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 1526caa0a8..b1bb73692b 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 f5339de290..e833641b91 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 9f7d3ff654..cc3ba66b50 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 76f061c87f..addf60792f 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 6f113c8446..6bbae598ef 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 6d8620ad4e..540000ca2d 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 7a9f26980e..3e054fb701 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 013bb99be3..582263c706 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 3a99a7c12c..655117aa68 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 dc830d9121..81216ede8d 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 261ddac956..61f5fba5ef 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 2ff2d64fbd..201b743c37 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 8bf9a4d07b..84596f6ae6 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 c4560c9c63..9198fd072c 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 4a187c9a06..8083e27c06 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 ef77635c41..4d32500feb 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 db33784037..d5523e2074 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 3148ccfeab..b39fb1ef81 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 fc5973465f..ebab46b00a 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 e1038ded5d..358e4015da 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 080bd13340..bbd860fd7d 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 9b27ef8623..d832e1517a 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 b515280064..a4effe1edb 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 a1eb876c45..a9f9c68b26 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 eb14339964..8b7a89cf7f 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 521ba2ab49..357ec385c1 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 51d4474d3c..4f5e51462e 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 40fef3a8ca..3f4cb951af 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 807def9757..3cd575e780 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 a751d724c8..7b9886d0d7 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 cf118a0b73..0255c293ad 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 d6a52efe48..932c46985a 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 3373f93b1e..827dafd7ef 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 0414f2c950..01dc0ccb47 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 001fca55d4..bda9b6ce33 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 13cc7238af..ad9985e9a1 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 9370506c7c..5d6d749bd6 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 25860b81a5..14f7b78f66 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 ae071f86c3..85f37f8fce 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 9e53a7c28e..4b4e3cc00c 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 b21395bb44..1098aa66cc 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 9beabec954..7e2633edff 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 f89994e1a9..775bd1e1e4 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 2edf57bcfc..25ea883263 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 5c60190509..1de45992ce 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 070008d1e2..d1947e150e 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 4a58d6bf5d..6f1ceb4d3d 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 51fc30a829..3f8619c8c6 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 9d9e40a26d..6aeaa437f6 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 5feb1abba4..9518fdad42 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 9dd9d6d2b8..e384f45cb7 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 69581dd4a8..6c4ed50c53 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 827e19b8dd..205a44d14f 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 e999386429..d2a7d0eba1 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 47a4628c31..e37795ae19 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 988ecd95cf..7ff51bfd8d 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 6d41d1d9e2..d93545110d 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 439c0ff49c..21acfe193d 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 613c7db772..fd9ea80ced 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 9c0e7b81e2..42cd58bee4 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 105741f4c9..be2e609450 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 7f875988c6..d8dac977ee 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 37c608f25a..9bd6655fcb 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 277fb1df49..dbc3c76611 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 964b7f8f2f..f0f8c5b9ac 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 170e8bfba7..de04719dad 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 31b12efb38..37209ca82e 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 6ad7507669..77c389258e 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 3b39884135..bd01c57b01 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 6e2614c9f4..3bc7685fd4 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 3d79682acc..03c01c8743 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 8157e0a93e..4c1eabe798 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 71e72fb21d..347bcb5e3d 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 3fdc7e458f..adbb3421bd 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 d49e0944bf..ff23d3bbfe 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 81654985bd..2e34e45536 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 0f15e53b07..7be7c63dab 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 8b94d493cb..5e03107e6e 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 e6d9e4034d..974a4dd75d 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 498e4d6f56..52fdca2796 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 4bf50eaef4..82259a0890 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 019c22328c..0fa51f7952 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 36c36a70d0..083a4eeabd 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 5076ddb257..79c5272784 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 c6fb702c32..7654c955e1 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 95b452b4cc..893d95a1de 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 2d8629a528..282482338c 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 a353a2dddb..493058b937 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 97885a85ae..b525eb82b4 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 188c619755..611017c028 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 0367e2558b..30e7f1c821 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 24de5ff744..f5c74a577f 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 e423ce8510..7245b6963e 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 f549b5a9d0..b9f929bdb8 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 b9e7816003..29910132fb 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 c7c4057373..143434d37d 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 84e75c0ad3..d07ae2eead 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 d7a90fb9bc..2fd3afaf78 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 58455e1687..4d7a7375a8 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 57fec2a422..17f6390773 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 d13067e232..9832530e08 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 7bb483ce1a..26d2036813 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 89cbcaedcb..19009a81a4 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 faa9a2c633..c330c9f056 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 8e90fbf187..e3adc5ab38 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 9753c0bd52..cde666c2d2 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 ab6f17fc76..73c0e2b93f 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 4304c9b893..519393c80b 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 93fb4e72e5..14f586baa9 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 0dbd479aae..f0ff603208 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 4f241b5041..37bf5ed8a3 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 a75b839cfe..39a79fbe13 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 89695add67..8e48da1924 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 941260a11d..2614df9aa7 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 6e7ac39e0a..7897b476a3 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 d348f64d9e..f421eacef9 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 f541bd79c0..2b2a116bf3 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 34f8e68227..7e62eeb107 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 731c45b58d..6934e91dfb 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 5d71a3397f..a4ad3ee1c3 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 f5a644c02c..377da4c96a 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 2182154fb8..4aeccaaf26 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 c1a3ac1e6a..e5dd620262 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 38cb97dcbe..9c546f6b65 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 c594524f0e..f6b3b01ed5 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 9670879835..40a72710f1 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 552abd2c63..3e60b95086 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 ca61eb2625..2fdd47a6c2 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 fb0dd7d30a..aaf5a57d3a 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 8a8520c5de..03c52fcc7b 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 37fb7f7acb..de3d6180f9 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 ab8e94a3ab..d7dcf32c63 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 f41aa7fc89..80dfa42ca0 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 a5550aa311..1cad1fc93a 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 5efca60909..8c7e4ceea3 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 a53b13440a..e547ceaede 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 8340be7fb1..8a559d59b0 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 472febba0b..3b526782ed 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 482e71538a..2d79f5e516 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 840a75f10b..bdd94ace5e 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 5619d4331c..c820b2c06c 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 0fb8d40daf..6a5f9a5f61 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 ac77b148a9..fedc7dbc42 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 4de66e18d0..81948a7312 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 bee25c46d0..26a391025b 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 0ff0f74eb7..f0a933f08b 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 e78ea0b0d4..412cb007f6 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 5423149163..79c78b9e70 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 4d0f1e7e03..0d7174fd8a 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 c1e57374a9..859267c91b 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 82be171679..9d7b4424d3 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 df5d73bb2f..6faa162e29 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 569d15b7aa..8b9f4a000e 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 81e2c08408..73fd454986 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 1fe3628048..6936dd2519 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 e30d6b1623..e0fd2edfaf 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 6ee39f4217..8a44306ead 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 5c8c94d954..60a5835b7f 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 c1c516f77e..c690f1bc23 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 4b7b31587f..1913d61105 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 fa2bd91dd6..da45381f65 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 566447c2c9..0cbaef0ed2 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 410160f37e..3ae7e772ab 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 63b0bccfbe..0e4c61c605 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 17722bc818..b396551799 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 0a7b0d4a9d..c038e2671f 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 ed42ff6b44..4058058806 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 0f26daf679..102d7a8d9b 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 7328b0d546..06c6819a13 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 11a5e283fd..fc8dea4cac 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 a3e1cdf3a4..1d0f431a15 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 2ca5303e49..417a30a2f7 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 8ab7931eb1..9094a3a023 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 453530af7f..5b589691cd 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 c49bc69afc..2382c3e6ae 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 74b94fbf3e..cdec9ed1dc 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 34cdb62bf9..1e81645141 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 9d1f8637f9..4b05164e88 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 1de43ea7e8..b90c79ea7c 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 7e02513fa0..9235f157dc 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 308a3e0c8f..1bdc875768 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 f0683d9305..c6bf3a2aea 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 9e69d8cc8e..a0a886b4ba 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 aed18f2106..f714e8654f 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 5369ec0f77..5255f508e1 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 6b93c2eb2d..696a08a7f7 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 a3a08dd7cc..715c32cbe6 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 6b4a07a290..736387eadc 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 7cd43b9891..2e1c4ac8a8 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 8ee91d57b5..224e800dc1 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 4e1eb779a4..c6a4d78427 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 6c397f996f..a34fe7020e 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 66dfbaaba4..305d909b55 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 3783dd0979..55fc8cf5b0 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 9cbe81384a..026da48b2d 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 ec130a3d38..5e4534da6d 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 06553c3514..44f5e026a7 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 ce59ae9caa..31e65740ef 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 805ba6445b..435d4e6c80 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 f511a50edf..19df992c44 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 ef26e59d72..0296453845 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 48850553c8..e89b94ce28 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 54a97d4f3f..07679596d2 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 6283df085a..3b17485fd2 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 7eb3179854..5068de1e37 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 ea1bf95157..0bb9444cf9 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 ef43a4fcf8..cab49a8c16 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 7a4bc4c174..1f7bac88a7 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 0e48965cd5..efd898468c 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 0379e07fde..76bb60567a 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 80a5d24b00..5e65a4da06 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 b1c77e93f2..dd5b3ceecf 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 b69c77f9f3..0853a5721a 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 ee69130569..6915ae94e2 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 d2c942d8d5..b6f6c471bb 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 84dd97ee96..bd6e8f1a1b 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 622f4c7fff..07d8f9b10c 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 cb6a0361cb..8d6cef3d1c 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 c2b14d6313..d562d33e58 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 d8a888dfa6..612c916a78 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 3aca0a6685..879b8e9b5f 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 2d76dfcacd..6cd4a38f6a 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 42d4cccd26..8d0a73d09b 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 b3432bbe1a..a7226ffaf0 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 fe3881bc69..3735734617 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 cd9a202a34..4aacfd62a9 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 ab39999163..20404967bb 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 d234aff8a3..1c332ce64d 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 a7c6f10e2b..cad3b65f29 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 0af47486d8..b8092b1a0e 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 97f33ebc63..173b6269d6 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 713f56cf4b..26b9f930f2 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 b0e7cc8f95..9bd8424ed9 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 7078692d46..d628e85c06 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 aa450eed51..a2f159464f 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 aa0d64fcb4..5caa87dfc6 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 e48fcdac8f..ecd5f8b29d 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 95cde9f33e..ca6c522eab 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 fc975125e8..dc1904cec1 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 93815ccae0..e09c8f2f26 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 44e865e148..14640c4e8a 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 cab3515046..7cd6056001 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 57ff2674cc..7ad644fe90 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 df0db4b95f..686908e412 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 9bfcca47a0..2bb139a6d8 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 ec4ed266f0..f4a1c935cc 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 3dc4aa1405..4f316113f8 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 a99ee780a3..31a4911ec6 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 00a370f31a..115afc2e65 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 87dbc74ce9..6a4572b06c 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 1cf8373c81..91060449ae 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 796f701622..d9c5a7878a 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 47878ef577..10ab3f33e7 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 01396a266b..42b1909e4b 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 1950418935..8234cd0472 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 493d4a1b5b..7c93b4dc99 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 ade643845c..b731984908 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 4982ef422d..133b632e6a 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 4abdeda458..be8e700e37 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 df6130367a..a4b043aae0 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 3db07af868..67a2d44150 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 44c5dc1d04..34b625bcc1 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 97614d5176..13977a2061 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 1af36dfb10..98ab7e49b5 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 2ccb63dcde..9d4c7ae043 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 ba7c53d03f..c2b2705349 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 c9109c8552..b2d36f6cd8 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 ac3124a443..a3189c1f60 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 9b89a8957b..fe5efd2d41 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 476259d22b..4e560dd64b 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 76dccc2542..eff12e84e6 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 cfbd26c440..6d5b188ae0 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 ad399c771a..d15a411427 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 8529d063ff..9629a4f195 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 18e2fceadf..c1b0bd2257 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 4d6c983628..4770c99c0b 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 0e0827c6a7..a6bc690f1c 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 7a85783083..18cc0c8747 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 27a6b14b64..20afd4223a 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 68f5e812ba..78d4b4fba8 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 584fe2abb4..6a81783898 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 c0b019d226..3aa97f9f47 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 56a7122445..565fd3fa79 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 690d758075..2e0eb7772a 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 7a755b7ee2..21153ae69e 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 a5505863f0..8eca909753 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 38ee421bb3..6c8199bb41 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 cda1972085..b4376059a9 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 a15f8edef1..5a7c115507 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 eddd53ab5d..317c3f714b 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 d7b253de81..c1f97aa5e1 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 2736857e26..ae80954f0e 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 725ccc05b2..81ba2b34da 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 56dd226ac2..701b580ec7 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 22bd66232b..aa0c09c666 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 7bf113c71e..b2d7dee03b 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 5c33235a01..e1354c25ac 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 e4c8e45f0c..898d1a9e70 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 d036d56c18..c3cd358d27 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 c945914361..0b3410438f 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 048aa6150e..4f8c0e411e 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 c688fc9813..3fa5eb4c6a 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 aec2f87b70..503f6dc913 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 5cf2c44980..284df18624 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 096541d5ae..cce6be35cc 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 5475247538..790a5dc8ef 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 1313ef1049..167afb1b0a 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 4a8b1ddcc3..624a472e04 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 d479e829ec..6d7797c611 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 fc145f6dd8..316e4df5c7 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 f8f9088252..0594584afd 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 fd84b66bea..542bd49393 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 d33245d9cb..98d1ab0a84 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 573cef9562..87985283a8 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 a1aed48167..0268be02a5 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 075de70b99..c9a138f7d3 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 dc9efc2051..63cbe5b1ec 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 d08661969e..b214eddad7 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 962a8a9861..913b71f9be 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 40b21bd167..df9dbdbca7 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 d41f5947c5..f0d4ef707e 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 062928dc6b..61559b31b0 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 c66103fe0e..180895b53b 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 4c12875e19..36b1871b23 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 c3261ee9b3..664dd9c0f2 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 2180d38db1..19ded66a83 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 b087f8647e..4c3b3fcdd8 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 582e2d8fb2..a467b57150 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 9d6514d942..baf0f55f2f 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 3fe7ee725f..720ed47076 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 a2246b28f4..606569125e 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 dcef32bcf1..1f1c06c9a8 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 6fbbb47859..d9d9f0190e 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 f36ffc9c71..67fbdefb82 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 3366c9fdd5..60c2a5b04a 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 f8fab57e2c..9a65b5bd3f 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 79813fff95..76d5a06317 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 6fe378ee54..9a0a60ecd9 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 9893d7166b..c7abc1252a 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 37333eccde..6d3032e2ab 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 4d3bbc34ff..9e32c6f4fb 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 5362b79349..416385679e 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 9252b96996..47717f6afe 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 49bf3f3c20..23042668d6 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 d464026456..9a6c86eed4 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 d76027aa7a..355d5d59c0 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 cf274c7032..38c613e951 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 2bb4d39af9..a1981547c4 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 c0c1e104bb..dd4513d889 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 0de6d64df1..0a751ed585 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 2cf9458de6..c783d54292 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 3d3c524e7a..03d2fc4f01 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 6a26520715..4ce9c71ce9 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 c09599f6d5..a230744030 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 21e911830d..a928cf8328 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 00504c616b..ff0bffbeb4 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 517d56fd35..7cece05fe8 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 9215813df6..b1fedb02c7 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 5ba927bc3a..fd78e16ad6 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 f6f8a915ef..39fee612da 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 2cdaeebb18..8e400d3139 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 f1547bffb8..52bd49ce90 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 8e646978fe..d9695e641a 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 71d7e0c7d2..1346fd4cf8 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 b981d74bdf..4b1330165c 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 0612fd65da..cabc9cdeaf 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 58dee697ba..b7751e2e00 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 212be2465f..ebe427b202 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 4c6cf7a2e5..1d6a599ade 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 0000000000..af0b491472
--- /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 0000000000..af94229d4a
--- /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 3c95045f07..2c37df527e 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 eb77f6b682..42acb5b6a0 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 d79f95c60f..f6708cb6ba 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 0cc5fd2488..e455d64e91 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 98b3eb7374..c3855b9538 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 a4238ac2a0..7b2ab3988f 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 0c001a31e8..06ae3853c9 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 4e82fab7dd..59bb248b80 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 94d6ce4694..ad01dbb032 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 d16c61d018..babfb13d57 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,12 @@ add_library( pcbnew_kiface_objects OBJECT
     ${PCBNEW_SCRIPTING_SRCS}
     )
 
+# CMake <3.9 can't link anything to object libraries,
+# but we only need include directories, as we will link the kiface MODULE
+target_include_directories( pcbnew_kiface_objects PRIVATE
+   $<TARGET_PROPERTY:common,INCLUDE_DIRECTORIES>
+)
+
 add_library( pcbnew_kiface MODULE $<TARGET_OBJECTS:pcbnew_kiface_objects> )
 
 set_target_properties( pcbnew_kiface PROPERTIES
@@ -675,7 +680,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 fd7676bd7a..2932ed8ba0 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 11e60de223..bb8a5b4b01 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 be9b7c386a..44a945644a 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 e2e754da03..55d8d8f89e 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 2842cd2b33..9267bfe7d4 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 af9f01f81e..7e8eed0c07 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 08b3a1fff0..a3645cbc0d 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 372946ee4d..2b9550e2f7 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 e2316d2efe..a6c46130f4 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 46c9744faf..40602e92d2 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 cc629152b1..0d8eaa9bb6 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} )