From ed1a8c6d957f13a4b5b3598755cb8f62e3e87af9 Mon Sep 17 00:00:00 2001
From: Alin Jerpelea <alin.jerpelea@sony.com>
Date: Thu, 19 Dec 2024 04:23:30 +0100
Subject: [PATCH] graphics: migrate to SPDX identifier

Most tools used for compliance and SBOM generation use SPDX identifiers
This change brings us a step closer to an easy SBOM generation.

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
---
 graphics/CMakeLists.txt                                        | 2 ++
 graphics/Make.defs                                             | 2 ++
 graphics/Makefile                                              | 2 ++
 graphics/ft80x/Make.defs                                       | 2 ++
 graphics/ft80x/Makefile                                        | 2 ++
 graphics/ft80x/ft80x.h                                         | 2 ++
 graphics/ft80x/ft80x_audio.c                                   | 2 ++
 graphics/ft80x/ft80x_backlight.c                               | 2 ++
 graphics/ft80x/ft80x_coproc.c                                  | 2 ++
 graphics/ft80x/ft80x_dl.c                                      | 2 ++
 graphics/ft80x/ft80x_gpio.c                                    | 2 ++
 graphics/ft80x/ft80x_ramcmd.c                                  | 2 ++
 graphics/ft80x/ft80x_ramdl.c                                   | 2 ++
 graphics/ft80x/ft80x_ramg.c                                    | 2 ++
 graphics/ft80x/ft80x_regs.c                                    | 2 ++
 graphics/ft80x/ft80x_touch.c                                   | 2 ++
 graphics/libjpeg/Make.defs                                     | 2 ++
 graphics/libjpeg/Makefile                                      | 2 ++
 graphics/libyuv/CMakeLists.txt                                 | 2 ++
 graphics/libyuv/Make.defs                                      | 2 ++
 graphics/libyuv/Makefile                                       | 2 ++
 graphics/lvgl/CMakeLists.txt                                   | 2 ++
 graphics/lvgl/Make.defs                                        | 2 ++
 graphics/lvgl/Makefile                                         | 2 ++
 graphics/nxglyphs/Make.defs                                    | 2 ++
 graphics/nxglyphs/Makefile                                     | 2 ++
 graphics/nxglyphs/include/cursor-arrow1-16x16.h                | 2 ++
 graphics/nxglyphs/include/cursor-arrow1-30x30.h                | 2 ++
 graphics/nxglyphs/include/cursor-arrow2-16x16.h                | 2 ++
 graphics/nxglyphs/include/cursor-arrow2-30x30.h                | 2 ++
 graphics/nxglyphs/include/cursor-grab-14x16.h                  | 2 ++
 graphics/nxglyphs/include/cursor-grab-25x30.h                  | 2 ++
 graphics/nxglyphs/include/cursor-resize-16x16.h                | 2 ++
 graphics/nxglyphs/include/cursor-resize-30x30.h                | 2 ++
 graphics/nxglyphs/include/cursor-resize-61x62.h                | 2 ++
 graphics/nxglyphs/include/cursor-wait-13x16.h                  | 2 ++
 graphics/nxglyphs/include/cursor-wait-23x30.h                  | 2 ++
 graphics/nxglyphs/include/cursor-zoomin-16x16.h                | 2 ++
 graphics/nxglyphs/include/cursor-zoomin-30x30.h                | 2 ++
 graphics/nxglyphs/include/cursor-zoomout-16x16.h               | 2 ++
 graphics/nxglyphs/include/cursor-zoomout-30x30.h               | 2 ++
 graphics/nxglyphs/include/mkcursor.c                           | 2 ++
 graphics/nxglyphs/include/mkcursor.sh                          | 2 ++
 graphics/nxglyphs/src/glpyh_menu2-21x21.cxx                    | 2 ++
 graphics/nxglyphs/src/glpyh_menu2-42x42.cxx                    | 2 ++
 graphics/nxglyphs/src/glpyh_minimize2-21x21.cxx                | 2 ++
 graphics/nxglyphs/src/glpyh_minimize2-42x42.cxx                | 2 ++
 graphics/nxglyphs/src/glpyh_resize2-21x21.cxx                  | 2 ++
 graphics/nxglyphs/src/glpyh_resize2-42x42.cxx                  | 2 ++
 graphics/nxglyphs/src/glpyh_stop2-21x21.cxx                    | 2 ++
 graphics/nxglyphs/src/glyph_arrowdown.cxx                      | 2 ++
 graphics/nxglyphs/src/glyph_arrowleft.cxx                      | 2 ++
 graphics/nxglyphs/src/glyph_arrowright.cxx                     | 2 ++
 graphics/nxglyphs/src/glyph_arrowup.cxx                        | 2 ++
 graphics/nxglyphs/src/glyph_backspace.cxx                      | 2 ++
 graphics/nxglyphs/src/glyph_calculator24x25.cxx                | 2 ++
 graphics/nxglyphs/src/glyph_calculator47x49.cxx                | 2 ++
 graphics/nxglyphs/src/glyph_calibration24x21.cxx               | 2 ++
 graphics/nxglyphs/src/glyph_calibration48x42.cxx               | 2 ++
 graphics/nxglyphs/src/glyph_capslock.cxx                       | 2 ++
 graphics/nxglyphs/src/glyph_checkboxmu.cxx                     | 2 ++
 graphics/nxglyphs/src/glyph_checkboxoff.cxx                    | 2 ++
 graphics/nxglyphs/src/glyph_checkboxon.cxx                     | 2 ++
 graphics/nxglyphs/src/glyph_cmd25x22.cxx                       | 2 ++
 graphics/nxglyphs/src/glyph_cmd49x43.cxx                       | 2 ++
 graphics/nxglyphs/src/glyph_control.cxx                        | 2 ++
 graphics/nxglyphs/src/glyph_cycle.cxx                          | 2 ++
 graphics/nxglyphs/src/glyph_lcdclock102x48.cxx                 | 2 ++
 graphics/nxglyphs/src/glyph_lcdclock136x64.cxx                 | 2 ++
 graphics/nxglyphs/src/glyph_lcdclock51x24.cxx                  | 2 ++
 graphics/nxglyphs/src/glyph_mediagrip60x30.cxx                 | 2 ++
 graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx               | 2 ++
 graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx               | 2 ++
 graphics/nxglyphs/src/glyph_menu21x21.cxx                      | 2 ++
 graphics/nxglyphs/src/glyph_menu42x42.cxx                      | 2 ++
 graphics/nxglyphs/src/glyph_minimize21x21.cxx                  | 2 ++
 graphics/nxglyphs/src/glyph_minimize42x42.cxx                  | 2 ++
 graphics/nxglyphs/src/glyph_mplayer_controls32x32.cxx          | 2 ++
 graphics/nxglyphs/src/glyph_mplayer_controls43x41.cxx          | 2 ++
 graphics/nxglyphs/src/glyph_nxicon21x21.cxx                    | 2 ++
 graphics/nxglyphs/src/glyph_nxicon42x42.cxx                    | 2 ++
 graphics/nxglyphs/src/glyph_nxlogo160x160.cxx                  | 2 ++
 graphics/nxglyphs/src/glyph_nxlogo320x320.cxx                  | 2 ++
 graphics/nxglyphs/src/glyph_play24x24.cxx                      | 2 ++
 graphics/nxglyphs/src/glyph_play48x48.cxx                      | 2 ++
 graphics/nxglyphs/src/glyph_radiobuttonmu.cxx                  | 2 ++
 graphics/nxglyphs/src/glyph_radiobuttonoff.cxx                 | 2 ++
 graphics/nxglyphs/src/glyph_radiobuttonon.cxx                  | 2 ++
 graphics/nxglyphs/src/glyph_resize21x21.cxx                    | 2 ++
 graphics/nxglyphs/src/glyph_resize42x42.cxx                    | 2 ++
 graphics/nxglyphs/src/glyph_return.cxx                         | 2 ++
 graphics/nxglyphs/src/glyph_screendepthdown.cxx                | 2 ++
 graphics/nxglyphs/src/glyph_screendepthup.cxx                  | 2 ++
 graphics/nxglyphs/src/glyph_screenflipdown.cxx                 | 2 ++
 graphics/nxglyphs/src/glyph_screenflipup.cxx                   | 2 ++
 graphics/nxglyphs/src/glyph_shift.cxx                          | 2 ++
 graphics/nxglyphs/src/glyph_stop2-42x42.cxx                    | 2 ++
 graphics/nxglyphs/src/glyph_stop21x21.cxx                      | 2 ++
 graphics/nxglyphs/src/glyph_stop42x42.cxx                      | 2 ++
 graphics/nxglyphs/src/glyph_windowclose.cxx                    | 2 ++
 graphics/nxglyphs/src/glyph_windowdepthdown.cxx                | 2 ++
 graphics/nxglyphs/src/glyph_windowdepthup.cxx                  | 2 ++
 graphics/nxglyphs/src/mksrle.c                                 | 2 ++
 graphics/nxglyphs/src/mksrle.sh                                | 2 ++
 graphics/nxwidgets/Doxygen/gendoc.sh                           | 2 ++
 graphics/nxwidgets/Make.defs                                   | 2 ++
 graphics/nxwidgets/Makefile                                    | 2 ++
 graphics/nxwidgets/UnitTests/CButton/Make.defs                 | 2 ++
 graphics/nxwidgets/UnitTests/CButton/Makefile                  | 2 ++
 graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx          | 2 ++
 graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx           | 2 ++
 graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx           | 2 ++
 graphics/nxwidgets/UnitTests/CButtonArray/Make.defs            | 2 ++
 graphics/nxwidgets/UnitTests/CButtonArray/Makefile             | 2 ++
 .../nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx     | 2 ++
 graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx | 2 ++
 graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx | 2 ++
 graphics/nxwidgets/UnitTests/CCheckBox/Make.defs               | 2 ++
 graphics/nxwidgets/UnitTests/CCheckBox/Makefile                | 2 ++
 graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx      | 2 ++
 graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx       | 2 ++
 graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx       | 2 ++
 graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs            | 2 ++
 graphics/nxwidgets/UnitTests/CGlyphButton/Makefile             | 2 ++
 .../nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx     | 2 ++
 graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx | 2 ++
 graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx | 2 ++
 graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs  | 2 ++
 graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile   | 2 ++
 .../CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx     | 2 ++
 .../CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx      | 2 ++
 .../CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx      | 2 ++
 graphics/nxwidgets/UnitTests/CImage/Make.defs                  | 2 ++
 graphics/nxwidgets/UnitTests/CImage/Makefile                   | 2 ++
 graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx            | 2 ++
 graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx             | 2 ++
 graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx             | 2 ++
 graphics/nxwidgets/UnitTests/CKeypad/Make.defs                 | 2 ++
 graphics/nxwidgets/UnitTests/CKeypad/Makefile                  | 2 ++
 graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx          | 2 ++
 graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx           | 2 ++
 graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx           | 2 ++
 graphics/nxwidgets/UnitTests/CLabel/Make.defs                  | 2 ++
 graphics/nxwidgets/UnitTests/CLabel/Makefile                   | 2 ++
 graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx            | 2 ++
 graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx             | 2 ++
 graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx             | 2 ++
 graphics/nxwidgets/UnitTests/CLatchButton/Make.defs            | 2 ++
 graphics/nxwidgets/UnitTests/CLatchButton/Makefile             | 2 ++
 .../nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx     | 2 ++
 graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx | 2 ++
 graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx | 2 ++
 graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs       | 2 ++
 graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile        | 2 ++
 .../UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx     | 2 ++
 .../UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx      | 2 ++
 .../UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx      | 2 ++
 graphics/nxwidgets/UnitTests/CListBox/Make.defs                | 2 ++
 graphics/nxwidgets/UnitTests/CListBox/Makefile                 | 2 ++
 graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx        | 2 ++
 graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx         | 2 ++
 graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx         | 2 ++
 graphics/nxwidgets/UnitTests/CProgressBar/Make.defs            | 2 ++
 graphics/nxwidgets/UnitTests/CProgressBar/Makefile             | 2 ++
 .../nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx     | 2 ++
 graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx | 2 ++
 graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx | 2 ++
 graphics/nxwidgets/UnitTests/CRadioButton/Make.defs            | 2 ++
 graphics/nxwidgets/UnitTests/CRadioButton/Makefile             | 2 ++
 .../nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx     | 2 ++
 graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx | 2 ++
 graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx | 2 ++
 graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs    | 2 ++
 graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile     | 2 ++
 .../CScrollbarHorizontal/cscrollbarhorizontal_main.cxx         | 2 ++
 .../CScrollbarHorizontal/cscrollbarhorizontaltest.cxx          | 2 ++
 .../CScrollbarHorizontal/cscrollbarhorizontaltest.hxx          | 2 ++
 graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs      | 2 ++
 graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile       | 2 ++
 .../UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx   | 2 ++
 .../UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx    | 2 ++
 .../UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx    | 2 ++
 graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs        | 2 ++
 graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile         | 2 ++
 .../UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx      | 2 ++
 .../UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx       | 2 ++
 .../UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx       | 2 ++
 graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs         | 2 ++
 graphics/nxwidgets/UnitTests/CSliderVertical/Makefile          | 2 ++
 .../UnitTests/CSliderVertical/cslidervertical_main.cxx         | 2 ++
 .../UnitTests/CSliderVertical/csliderverticaltest.cxx          | 2 ++
 .../UnitTests/CSliderVertical/csliderverticaltest.hxx          | 2 ++
 graphics/nxwidgets/UnitTests/CTextBox/Make.defs                | 2 ++
 graphics/nxwidgets/UnitTests/CTextBox/Makefile                 | 2 ++
 graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx        | 2 ++
 graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx         | 2 ++
 graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx         | 2 ++
 graphics/nxwidgets/UnitTests/Make.defs                         | 2 ++
 graphics/nxwidgets/UnitTests/Makefile                          | 2 ++
 graphics/nxwidgets/src/cbgwindow.cxx                           | 2 ++
 graphics/nxwidgets/src/cbitmap.cxx                             | 2 ++
 graphics/nxwidgets/src/cbutton.cxx                             | 2 ++
 graphics/nxwidgets/src/cbuttonarray.cxx                        | 2 ++
 graphics/nxwidgets/src/ccallback.cxx                           | 2 ++
 graphics/nxwidgets/src/ccheckbox.cxx                           | 2 ++
 graphics/nxwidgets/src/ccyclebutton.cxx                        | 2 ++
 graphics/nxwidgets/src/cglyphbutton.cxx                        | 2 ++
 graphics/nxwidgets/src/cglyphsliderhorizontal.cxx              | 2 ++
 graphics/nxwidgets/src/cglyphsliderhorizontalgrip.cxx          | 2 ++
 graphics/nxwidgets/src/cgraphicsport.cxx                       | 2 ++
 graphics/nxwidgets/src/cimage.cxx                              | 2 ++
 graphics/nxwidgets/src/ckeypad.cxx                             | 2 ++
 graphics/nxwidgets/src/clabel.cxx                              | 2 ++
 graphics/nxwidgets/src/clabelgrid.cxx                          | 2 ++
 graphics/nxwidgets/src/clatchbutton.cxx                        | 2 ++
 graphics/nxwidgets/src/clatchbuttonarray.cxx                   | 2 ++
 graphics/nxwidgets/src/clistbox.cxx                            | 2 ++
 graphics/nxwidgets/src/clistboxdataitem.cxx                    | 2 ++
 graphics/nxwidgets/src/clistdata.cxx                           | 2 ++
 graphics/nxwidgets/src/clistdataitem.cxx                       | 2 ++
 graphics/nxwidgets/src/cmultilinetextbox.cxx                   | 2 ++
 graphics/nxwidgets/src/cnumericedit.cxx                        | 2 ++
 graphics/nxwidgets/src/cnxfont.cxx                             | 2 ++
 graphics/nxwidgets/src/cnxserver.cxx                           | 2 ++
 graphics/nxwidgets/src/cnxstring.cxx                           | 2 ++
 graphics/nxwidgets/src/cnxtimer.cxx                            | 2 ++
 graphics/nxwidgets/src/cnxtkwindow.cxx                         | 2 ++
 graphics/nxwidgets/src/cnxtoolbar.cxx                          | 2 ++
 graphics/nxwidgets/src/cnxwidget.cxx                           | 2 ++
 graphics/nxwidgets/src/cnxwindow.cxx                           | 2 ++
 graphics/nxwidgets/src/cprogressbar.cxx                        | 2 ++
 graphics/nxwidgets/src/cradiobutton.cxx                        | 2 ++
 graphics/nxwidgets/src/cradiobuttongroup.cxx                   | 2 ++
 graphics/nxwidgets/src/crect.cxx                               | 2 ++
 graphics/nxwidgets/src/crlepalettebitmap.cxx                   | 2 ++
 graphics/nxwidgets/src/cscaledbitmap.cxx                       | 2 ++
 graphics/nxwidgets/src/cscrollbarhorizontal.cxx                | 2 ++
 graphics/nxwidgets/src/cscrollbarpanel.cxx                     | 2 ++
 graphics/nxwidgets/src/cscrollbarvertical.cxx                  | 2 ++
 graphics/nxwidgets/src/cscrollinglistbox.cxx                   | 2 ++
 graphics/nxwidgets/src/cscrollingpanel.cxx                     | 2 ++
 graphics/nxwidgets/src/cscrollingtextbox.cxx                   | 2 ++
 graphics/nxwidgets/src/csliderhorizontal.cxx                   | 2 ++
 graphics/nxwidgets/src/csliderhorizontalgrip.cxx               | 2 ++
 graphics/nxwidgets/src/cslidervertical.cxx                     | 2 ++
 graphics/nxwidgets/src/csliderverticalgrip.cxx                 | 2 ++
 graphics/nxwidgets/src/cstickybutton.cxx                       | 2 ++
 graphics/nxwidgets/src/cstickybuttonarray.cxx                  | 2 ++
 graphics/nxwidgets/src/cstickyimage.cxx                        | 2 ++
 graphics/nxwidgets/src/cstringiterator.cxx                     | 2 ++
 graphics/nxwidgets/src/ctabpanel.cxx                           | 2 ++
 graphics/nxwidgets/src/ctext.cxx                               | 2 ++
 graphics/nxwidgets/src/ctextbox.cxx                            | 2 ++
 graphics/nxwidgets/src/cwidgetcontrol.cxx                      | 2 ++
 graphics/nxwidgets/src/cwidgeteventhandlerlist.cxx             | 2 ++
 graphics/nxwidgets/src/cwindoweventhandlerlist.cxx             | 2 ++
 graphics/nxwidgets/src/singletons.cxx                          | 2 ++
 graphics/nxwm/Doxygen/gendoc.sh                                | 2 ++
 graphics/nxwm/Make.defs                                        | 2 ++
 graphics/nxwm/Makefile                                         | 2 ++
 graphics/nxwm/src/capplicationwindow.cxx                       | 2 ++
 graphics/nxwm/src/ccalibration.cxx                             | 2 ++
 graphics/nxwm/src/cfullscreenwindow.cxx                        | 2 ++
 graphics/nxwm/src/chexcalculator.cxx                           | 2 ++
 graphics/nxwm/src/ckeyboard.cxx                                | 2 ++
 graphics/nxwm/src/cmediaplayer.cxx                             | 2 ++
 graphics/nxwm/src/cnxterm.cxx                                  | 2 ++
 graphics/nxwm/src/cstartwindow.cxx                             | 2 ++
 graphics/nxwm/src/ctaskbar.cxx                                 | 2 ++
 graphics/nxwm/src/ctouchscreen.cxx                             | 2 ++
 graphics/nxwm/src/cwindowmessenger.cxx                         | 2 ++
 graphics/nxwm/src/nxwm_main.cxx                                | 2 ++
 graphics/pdcurs34/Make.defs                                    | 2 ++
 graphics/pdcurs34/Makefile                                     | 2 ++
 graphics/pdcurs34/include/curspriv.h                           | 2 ++
 graphics/pdcurs34/include/term.h                               | 2 ++
 graphics/pdcurs34/nuttx/Make.defs                              | 2 ++
 graphics/pdcurs34/nuttx/pdcclip.c                              | 2 ++
 graphics/pdcurs34/nuttx/pdcdisp.c                              | 2 ++
 graphics/pdcurs34/nuttx/pdcgetsc.c                             | 2 ++
 graphics/pdcurs34/nuttx/pdckbd.c                               | 2 ++
 graphics/pdcurs34/nuttx/pdcnuttx.h                             | 2 ++
 graphics/pdcurs34/nuttx/pdcscrn.c                              | 2 ++
 graphics/pdcurs34/nuttx/pdcsetsc.c                             | 2 ++
 graphics/pdcurs34/nuttx/pdcthread.c                            | 2 ++
 graphics/pdcurs34/nuttx/pdcutil.c                              | 2 ++
 graphics/pdcurs34/pdcurses/Make.defs                           | 2 ++
 graphics/pdcurs34/pdcurses/pdc_addch.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_addchstr.c                      | 2 ++
 graphics/pdcurs34/pdcurses/pdc_addstr.c                        | 2 ++
 graphics/pdcurs34/pdcurses/pdc_attr.c                          | 2 ++
 graphics/pdcurs34/pdcurses/pdc_beep.c                          | 2 ++
 graphics/pdcurs34/pdcurses/pdc_bkgd.c                          | 2 ++
 graphics/pdcurs34/pdcurses/pdc_border.c                        | 2 ++
 graphics/pdcurs34/pdcurses/pdc_clear.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_color.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_debug.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_delch.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_deleteln.c                      | 2 ++
 graphics/pdcurs34/pdcurses/pdc_getch.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_getstr.c                        | 2 ++
 graphics/pdcurs34/pdcurses/pdc_getyx.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_inch.c                          | 2 ++
 graphics/pdcurs34/pdcurses/pdc_inchstr.c                       | 2 ++
 graphics/pdcurs34/pdcurses/pdc_initscr.c                       | 2 ++
 graphics/pdcurs34/pdcurses/pdc_inopts.c                        | 2 ++
 graphics/pdcurs34/pdcurses/pdc_insch.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_insstr.c                        | 2 ++
 graphics/pdcurs34/pdcurses/pdc_instr.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_kernel.c                        | 2 ++
 graphics/pdcurs34/pdcurses/pdc_keyname.c                       | 2 ++
 graphics/pdcurs34/pdcurses/pdc_mouse.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_move.c                          | 2 ++
 graphics/pdcurs34/pdcurses/pdc_outopts.c                       | 2 ++
 graphics/pdcurs34/pdcurses/pdc_overlay.c                       | 2 ++
 graphics/pdcurs34/pdcurses/pdc_pad.c                           | 2 ++
 graphics/pdcurs34/pdcurses/pdc_panel.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_printw.c                        | 2 ++
 graphics/pdcurs34/pdcurses/pdc_refresh.c                       | 2 ++
 graphics/pdcurs34/pdcurses/pdc_scanw.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_scrdump.c                       | 2 ++
 graphics/pdcurs34/pdcurses/pdc_scroll.c                        | 2 ++
 graphics/pdcurs34/pdcurses/pdc_slk.c                           | 2 ++
 graphics/pdcurs34/pdcurses/pdc_termattr.c                      | 2 ++
 graphics/pdcurs34/pdcurses/pdc_terminfo.c                      | 2 ++
 graphics/pdcurs34/pdcurses/pdc_touch.c                         | 2 ++
 graphics/pdcurs34/pdcurses/pdc_util.c                          | 3 ++-
 graphics/pdcurs34/pdcurses/pdc_window.c                        | 2 ++
 graphics/screenshot/Make.defs                                  | 2 ++
 graphics/screenshot/Makefile                                   | 2 ++
 graphics/screenshot/screenshot_main.c                          | 2 ++
 graphics/slcd/Make.defs                                        | 2 ++
 graphics/slcd/Makefile                                         | 2 ++
 graphics/slcd/cslcd.cxx                                        | 2 ++
 graphics/slcd/slcd.hxx                                         | 2 ++
 graphics/slcd/slcd_mapping.cxx                                 | 2 ++
 graphics/slcd/slcd_trapezoids.cxx                              | 2 ++
 graphics/tiff/Make.defs                                        | 2 ++
 graphics/tiff/Makefile                                         | 2 ++
 graphics/tiff/tiff_addstrip.c                                  | 2 ++
 graphics/tiff/tiff_finalize.c                                  | 2 ++
 graphics/tiff/tiff_initialize.c                                | 2 ++
 graphics/tiff/tiff_internal.h                                  | 2 ++
 graphics/tiff/tiff_utils.c                                     | 2 ++
 graphics/twm4nx/Make.defs                                      | 2 ++
 graphics/twm4nx/Makefile                                       | 2 ++
 graphics/twm4nx/apps/ccalibration.cxx                          | 2 ++
 graphics/twm4nx/apps/cclock.cxx                                | 2 ++
 graphics/twm4nx/apps/cnxterm.cxx                               | 2 ++
 graphics/twm4nx/src/cbackground.cxx                            | 2 ++
 graphics/twm4nx/src/cfonts.cxx                                 | 2 ++
 graphics/twm4nx/src/ciconmgr.cxx                               | 2 ++
 graphics/twm4nx/src/ciconwidget.cxx                            | 2 ++
 graphics/twm4nx/src/cinput.cxx                                 | 2 ++
 graphics/twm4nx/src/cmainmenu.cxx                              | 2 ++
 graphics/twm4nx/src/cmenus.cxx                                 | 2 ++
 graphics/twm4nx/src/cresize.cxx                                | 2 ++
 graphics/twm4nx/src/ctwm4nx.cxx                                | 2 ++
 graphics/twm4nx/src/cwindow.cxx                                | 2 ++
 graphics/twm4nx/src/cwindowevent.cxx                           | 2 ++
 graphics/twm4nx/src/cwindowfactory.cxx                         | 2 ++
 graphics/twm4nx/src/twm4nx_cursor.cxx                          | 2 ++
 graphics/twm4nx/src/twm4nx_main.cxx                            | 2 ++
 363 files changed, 726 insertions(+), 1 deletion(-)

diff --git a/graphics/CMakeLists.txt b/graphics/CMakeLists.txt
index 442324b7e..15e14c695 100644
--- a/graphics/CMakeLists.txt
+++ b/graphics/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/graphics/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/graphics/Make.defs b/graphics/Make.defs
index 2630b6d7c..43d73c068 100644
--- a/graphics/Make.defs
+++ b/graphics/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/Makefile b/graphics/Makefile
index f9b719cf6..0e11d2d83 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/Make.defs b/graphics/ft80x/Make.defs
index 6e8f37c24..3c78e6a11 100644
--- a/graphics/ft80x/Make.defs
+++ b/graphics/ft80x/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/ft80x/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/Makefile b/graphics/ft80x/Makefile
index 6da02b4de..c0a5622f2 100644
--- a/graphics/ft80x/Makefile
+++ b/graphics/ft80x/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/ft80x/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/ft80x.h b/graphics/ft80x/ft80x.h
index d29978f94..6462f1ce1 100644
--- a/graphics/ft80x/ft80x.h
+++ b/graphics/ft80x/ft80x.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/ft80x/ft80x.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/ft80x_audio.c b/graphics/ft80x/ft80x_audio.c
index 2cb342793..455cc13f5 100644
--- a/graphics/ft80x/ft80x_audio.c
+++ b/graphics/ft80x/ft80x_audio.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/ft80x/ft80x_audio.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/ft80x_backlight.c b/graphics/ft80x/ft80x_backlight.c
index 973f159ca..c2f07196a 100644
--- a/graphics/ft80x/ft80x_backlight.c
+++ b/graphics/ft80x/ft80x_backlight.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/ft80x/ft80x_backlight.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/ft80x_coproc.c b/graphics/ft80x/ft80x_coproc.c
index 8958eb08c..cde264331 100644
--- a/graphics/ft80x/ft80x_coproc.c
+++ b/graphics/ft80x/ft80x_coproc.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/ft80x/ft80x_coproc.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/ft80x_dl.c b/graphics/ft80x/ft80x_dl.c
index 34b924c2d..60624b4ca 100644
--- a/graphics/ft80x/ft80x_dl.c
+++ b/graphics/ft80x/ft80x_dl.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/ft80x/ft80x_dl.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/ft80x_gpio.c b/graphics/ft80x/ft80x_gpio.c
index b04072222..de5a6bbbf 100644
--- a/graphics/ft80x/ft80x_gpio.c
+++ b/graphics/ft80x/ft80x_gpio.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/ft80x/ft80x_gpio.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/ft80x_ramcmd.c b/graphics/ft80x/ft80x_ramcmd.c
index c65afae76..69c13f7e3 100644
--- a/graphics/ft80x/ft80x_ramcmd.c
+++ b/graphics/ft80x/ft80x_ramcmd.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/ft80x/ft80x_ramcmd.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/ft80x_ramdl.c b/graphics/ft80x/ft80x_ramdl.c
index 5d10550f6..c2fc201b4 100644
--- a/graphics/ft80x/ft80x_ramdl.c
+++ b/graphics/ft80x/ft80x_ramdl.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/ft80x/ft80x_ramdl.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/ft80x_ramg.c b/graphics/ft80x/ft80x_ramg.c
index 891c40b14..3505c8eb0 100644
--- a/graphics/ft80x/ft80x_ramg.c
+++ b/graphics/ft80x/ft80x_ramg.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/ft80x/ft80x_ramg.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/ft80x_regs.c b/graphics/ft80x/ft80x_regs.c
index 1e78e9ea3..bb3f68fa0 100644
--- a/graphics/ft80x/ft80x_regs.c
+++ b/graphics/ft80x/ft80x_regs.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/ft80x/ft80x_regs.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/ft80x/ft80x_touch.c b/graphics/ft80x/ft80x_touch.c
index b3ca8c670..fac5d2013 100644
--- a/graphics/ft80x/ft80x_touch.c
+++ b/graphics/ft80x/ft80x_touch.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/ft80x/ft80x_touch.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/libjpeg/Make.defs b/graphics/libjpeg/Make.defs
index 52c1f45d5..57ac03076 100644
--- a/graphics/libjpeg/Make.defs
+++ b/graphics/libjpeg/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/libjpeg/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/libjpeg/Makefile b/graphics/libjpeg/Makefile
index 3f8dbb716..4512c34a5 100644
--- a/graphics/libjpeg/Makefile
+++ b/graphics/libjpeg/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/libjpeg/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/libyuv/CMakeLists.txt b/graphics/libyuv/CMakeLists.txt
index 8b56d5108..6060e4f34 100644
--- a/graphics/libyuv/CMakeLists.txt
+++ b/graphics/libyuv/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/graphics/libyuv/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/graphics/libyuv/Make.defs b/graphics/libyuv/Make.defs
index d22f2ab11..37bacb443 100644
--- a/graphics/libyuv/Make.defs
+++ b/graphics/libyuv/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/libyuv/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/libyuv/Makefile b/graphics/libyuv/Makefile
index 2076cdb3e..d15033fd1 100644
--- a/graphics/libyuv/Makefile
+++ b/graphics/libyuv/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/libyuv/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/lvgl/CMakeLists.txt b/graphics/lvgl/CMakeLists.txt
index a6f4ce43a..a1d1c5123 100644
--- a/graphics/lvgl/CMakeLists.txt
+++ b/graphics/lvgl/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/graphics/lvgl/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/graphics/lvgl/Make.defs b/graphics/lvgl/Make.defs
index 0caf681f3..041bcf61e 100644
--- a/graphics/lvgl/Make.defs
+++ b/graphics/lvgl/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/lvgl/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/lvgl/Makefile b/graphics/lvgl/Makefile
index 9102f28ef..a81fac1eb 100644
--- a/graphics/lvgl/Makefile
+++ b/graphics/lvgl/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/lvgl/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/Make.defs b/graphics/nxglyphs/Make.defs
index 0a6af2dbd..12404e5c6 100644
--- a/graphics/nxglyphs/Make.defs
+++ b/graphics/nxglyphs/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxglyphs/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/Makefile b/graphics/nxglyphs/Makefile
index 7d6de1dc5..7b0d5e688 100644
--- a/graphics/nxglyphs/Makefile
+++ b/graphics/nxglyphs/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxglyphs/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-arrow1-16x16.h b/graphics/nxglyphs/include/cursor-arrow1-16x16.h
index 480cb971c..5cffe5e7b 100644
--- a/graphics/nxglyphs/include/cursor-arrow1-16x16.h
+++ b/graphics/nxglyphs/include/cursor-arrow1-16x16.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-arrow1-16x16.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-arrow1-30x30.h b/graphics/nxglyphs/include/cursor-arrow1-30x30.h
index 65f2e6df0..4de8ba1dd 100644
--- a/graphics/nxglyphs/include/cursor-arrow1-30x30.h
+++ b/graphics/nxglyphs/include/cursor-arrow1-30x30.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-arrow1-30x30.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-arrow2-16x16.h b/graphics/nxglyphs/include/cursor-arrow2-16x16.h
index 773cc2938..25f157486 100644
--- a/graphics/nxglyphs/include/cursor-arrow2-16x16.h
+++ b/graphics/nxglyphs/include/cursor-arrow2-16x16.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-arrow2-16x16.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-arrow2-30x30.h b/graphics/nxglyphs/include/cursor-arrow2-30x30.h
index 7cbf62371..94057fb45 100644
--- a/graphics/nxglyphs/include/cursor-arrow2-30x30.h
+++ b/graphics/nxglyphs/include/cursor-arrow2-30x30.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-arrow2-30x30.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-grab-14x16.h b/graphics/nxglyphs/include/cursor-grab-14x16.h
index e3dc2e216..cf588bb5c 100644
--- a/graphics/nxglyphs/include/cursor-grab-14x16.h
+++ b/graphics/nxglyphs/include/cursor-grab-14x16.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-grab-14x16.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-grab-25x30.h b/graphics/nxglyphs/include/cursor-grab-25x30.h
index 6c7e41402..944b8a0f5 100644
--- a/graphics/nxglyphs/include/cursor-grab-25x30.h
+++ b/graphics/nxglyphs/include/cursor-grab-25x30.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-grab-25x30.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-resize-16x16.h b/graphics/nxglyphs/include/cursor-resize-16x16.h
index 54b8e750e..1acf8e187 100644
--- a/graphics/nxglyphs/include/cursor-resize-16x16.h
+++ b/graphics/nxglyphs/include/cursor-resize-16x16.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-resize-16x16.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-resize-30x30.h b/graphics/nxglyphs/include/cursor-resize-30x30.h
index 4795bffd8..5a214cd5e 100644
--- a/graphics/nxglyphs/include/cursor-resize-30x30.h
+++ b/graphics/nxglyphs/include/cursor-resize-30x30.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-resize-30x30.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-resize-61x62.h b/graphics/nxglyphs/include/cursor-resize-61x62.h
index 048c05339..e78dbfc95 100644
--- a/graphics/nxglyphs/include/cursor-resize-61x62.h
+++ b/graphics/nxglyphs/include/cursor-resize-61x62.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-resize-61x62.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-wait-13x16.h b/graphics/nxglyphs/include/cursor-wait-13x16.h
index bafdf8ec9..062d278d4 100644
--- a/graphics/nxglyphs/include/cursor-wait-13x16.h
+++ b/graphics/nxglyphs/include/cursor-wait-13x16.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-wait-13x16.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-wait-23x30.h b/graphics/nxglyphs/include/cursor-wait-23x30.h
index f705dcdfa..fcf1f3081 100644
--- a/graphics/nxglyphs/include/cursor-wait-23x30.h
+++ b/graphics/nxglyphs/include/cursor-wait-23x30.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-wait-23x30.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-zoomin-16x16.h b/graphics/nxglyphs/include/cursor-zoomin-16x16.h
index ca3e02826..ec3fa8a31 100644
--- a/graphics/nxglyphs/include/cursor-zoomin-16x16.h
+++ b/graphics/nxglyphs/include/cursor-zoomin-16x16.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-zoomin-16x16.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-zoomin-30x30.h b/graphics/nxglyphs/include/cursor-zoomin-30x30.h
index d4bc25c92..c92e3c265 100644
--- a/graphics/nxglyphs/include/cursor-zoomin-30x30.h
+++ b/graphics/nxglyphs/include/cursor-zoomin-30x30.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-zoomin-30x30.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-zoomout-16x16.h b/graphics/nxglyphs/include/cursor-zoomout-16x16.h
index d75709c87..97fb72dae 100644
--- a/graphics/nxglyphs/include/cursor-zoomout-16x16.h
+++ b/graphics/nxglyphs/include/cursor-zoomout-16x16.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-zoomout-16x16.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/cursor-zoomout-30x30.h b/graphics/nxglyphs/include/cursor-zoomout-30x30.h
index 6217946df..9a21f61ab 100644
--- a/graphics/nxglyphs/include/cursor-zoomout-30x30.h
+++ b/graphics/nxglyphs/include/cursor-zoomout-30x30.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/graphics/nxglyphs/include/cursor-zoomout-30x30.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/mkcursor.c b/graphics/nxglyphs/include/mkcursor.c
index 4e8b3b105..b7d8fa8f0 100644
--- a/graphics/nxglyphs/include/mkcursor.c
+++ b/graphics/nxglyphs/include/mkcursor.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/include/mkcursor.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/include/mkcursor.sh b/graphics/nxglyphs/include/mkcursor.sh
index 277855d0e..cb7594a59 100644
--- a/graphics/nxglyphs/include/mkcursor.sh
+++ b/graphics/nxglyphs/include/mkcursor.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 # apps/graphics/nxglyphs/inlclude/mkcursor.sh
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glpyh_menu2-21x21.cxx b/graphics/nxglyphs/src/glpyh_menu2-21x21.cxx
index 2ea077a5a..6adf09c3f 100644
--- a/graphics/nxglyphs/src/glpyh_menu2-21x21.cxx
+++ b/graphics/nxglyphs/src/glpyh_menu2-21x21.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_xxxxxx.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glpyh_menu2-42x42.cxx b/graphics/nxglyphs/src/glpyh_menu2-42x42.cxx
index fa57ab1cb..947bef692 100644
--- a/graphics/nxglyphs/src/glpyh_menu2-42x42.cxx
+++ b/graphics/nxglyphs/src/glpyh_menu2-42x42.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_xxxxxx.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glpyh_minimize2-21x21.cxx b/graphics/nxglyphs/src/glpyh_minimize2-21x21.cxx
index 36f2b0d11..7f891c913 100644
--- a/graphics/nxglyphs/src/glpyh_minimize2-21x21.cxx
+++ b/graphics/nxglyphs/src/glpyh_minimize2-21x21.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_xxxxxx.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glpyh_minimize2-42x42.cxx b/graphics/nxglyphs/src/glpyh_minimize2-42x42.cxx
index 1f729cc01..582d86fd4 100644
--- a/graphics/nxglyphs/src/glpyh_minimize2-42x42.cxx
+++ b/graphics/nxglyphs/src/glpyh_minimize2-42x42.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_xxxxxx.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glpyh_resize2-21x21.cxx b/graphics/nxglyphs/src/glpyh_resize2-21x21.cxx
index 3d32b4464..1e05ce18d 100644
--- a/graphics/nxglyphs/src/glpyh_resize2-21x21.cxx
+++ b/graphics/nxglyphs/src/glpyh_resize2-21x21.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_xxxxxx.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glpyh_resize2-42x42.cxx b/graphics/nxglyphs/src/glpyh_resize2-42x42.cxx
index e138226dc..c733a08ba 100644
--- a/graphics/nxglyphs/src/glpyh_resize2-42x42.cxx
+++ b/graphics/nxglyphs/src/glpyh_resize2-42x42.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_xxxxxx.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glpyh_stop2-21x21.cxx b/graphics/nxglyphs/src/glpyh_stop2-21x21.cxx
index 511c750f1..d1da539dc 100644
--- a/graphics/nxglyphs/src/glpyh_stop2-21x21.cxx
+++ b/graphics/nxglyphs/src/glpyh_stop2-21x21.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_xxxxxx.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_arrowdown.cxx b/graphics/nxglyphs/src/glyph_arrowdown.cxx
index 71745731e..84bdf55aa 100644
--- a/graphics/nxglyphs/src/glyph_arrowdown.cxx
+++ b/graphics/nxglyphs/src/glyph_arrowdown.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_arrowdown.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_arrowleft.cxx b/graphics/nxglyphs/src/glyph_arrowleft.cxx
index 3cc0067a0..a493713cd 100644
--- a/graphics/nxglyphs/src/glyph_arrowleft.cxx
+++ b/graphics/nxglyphs/src/glyph_arrowleft.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_glypharrowleft.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_arrowright.cxx b/graphics/nxglyphs/src/glyph_arrowright.cxx
index 6662af8e1..f7bacc7d2 100644
--- a/graphics/nxglyphs/src/glyph_arrowright.cxx
+++ b/graphics/nxglyphs/src/glyph_arrowright.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_arrowright.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_arrowup.cxx b/graphics/nxglyphs/src/glyph_arrowup.cxx
index 9d367dec1..75455b88d 100644
--- a/graphics/nxglyphs/src/glyph_arrowup.cxx
+++ b/graphics/nxglyphs/src/glyph_arrowup.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_arrowup.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_backspace.cxx b/graphics/nxglyphs/src/glyph_backspace.cxx
index 5512008fa..66acf1d78 100644
--- a/graphics/nxglyphs/src/glyph_backspace.cxx
+++ b/graphics/nxglyphs/src/glyph_backspace.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_backspace.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_calculator24x25.cxx b/graphics/nxglyphs/src/glyph_calculator24x25.cxx
index 105f9ae7c..640e63092 100644
--- a/graphics/nxglyphs/src/glyph_calculator24x25.cxx
+++ b/graphics/nxglyphs/src/glyph_calculator24x25.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_calculator24x25.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_calculator47x49.cxx b/graphics/nxglyphs/src/glyph_calculator47x49.cxx
index 6ea5fb550..ddafba86d 100644
--- a/graphics/nxglyphs/src/glyph_calculator47x49.cxx
+++ b/graphics/nxglyphs/src/glyph_calculator47x49.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_calculator47x47.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_calibration24x21.cxx b/graphics/nxglyphs/src/glyph_calibration24x21.cxx
index cc510d4f3..4f3bbad00 100644
--- a/graphics/nxglyphs/src/glyph_calibration24x21.cxx
+++ b/graphics/nxglyphs/src/glyph_calibration24x21.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_calibration24x21.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_calibration48x42.cxx b/graphics/nxglyphs/src/glyph_calibration48x42.cxx
index 10af4f128..a7518c187 100644
--- a/graphics/nxglyphs/src/glyph_calibration48x42.cxx
+++ b/graphics/nxglyphs/src/glyph_calibration48x42.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_calibration48x42.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_capslock.cxx b/graphics/nxglyphs/src/glyph_capslock.cxx
index c62bfa435..fcb55123b 100644
--- a/graphics/nxglyphs/src/glyph_capslock.cxx
+++ b/graphics/nxglyphs/src/glyph_capslock.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_capslock.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_checkboxmu.cxx b/graphics/nxglyphs/src/glyph_checkboxmu.cxx
index 33bf8020c..50aeb0cb6 100644
--- a/graphics/nxglyphs/src/glyph_checkboxmu.cxx
+++ b/graphics/nxglyphs/src/glyph_checkboxmu.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_checkboxmu.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_checkboxoff.cxx b/graphics/nxglyphs/src/glyph_checkboxoff.cxx
index f16471bee..6f6525fbc 100644
--- a/graphics/nxglyphs/src/glyph_checkboxoff.cxx
+++ b/graphics/nxglyphs/src/glyph_checkboxoff.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_checkboxoff.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_checkboxon.cxx b/graphics/nxglyphs/src/glyph_checkboxon.cxx
index 18d87c083..444ea5926 100644
--- a/graphics/nxglyphs/src/glyph_checkboxon.cxx
+++ b/graphics/nxglyphs/src/glyph_checkboxon.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_checkboxon.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_cmd25x22.cxx b/graphics/nxglyphs/src/glyph_cmd25x22.cxx
index 8e75c8893..7f676f5fa 100644
--- a/graphics/nxglyphs/src/glyph_cmd25x22.cxx
+++ b/graphics/nxglyphs/src/glyph_cmd25x22.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_cmd24x22.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_cmd49x43.cxx b/graphics/nxglyphs/src/glyph_cmd49x43.cxx
index 25a5049e9..62c1a038a 100644
--- a/graphics/nxglyphs/src/glyph_cmd49x43.cxx
+++ b/graphics/nxglyphs/src/glyph_cmd49x43.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_cmd49x43.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_control.cxx b/graphics/nxglyphs/src/glyph_control.cxx
index 7abb17c1f..53ce66707 100644
--- a/graphics/nxglyphs/src/glyph_control.cxx
+++ b/graphics/nxglyphs/src/glyph_control.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_control.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_cycle.cxx b/graphics/nxglyphs/src/glyph_cycle.cxx
index ef93caebf..fe861d591 100644
--- a/graphics/nxglyphs/src/glyph_cycle.cxx
+++ b/graphics/nxglyphs/src/glyph_cycle.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_cycle.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_lcdclock102x48.cxx b/graphics/nxglyphs/src/glyph_lcdclock102x48.cxx
index d3a05ee4a..02557fe83 100644
--- a/graphics/nxglyphs/src/glyph_lcdclock102x48.cxx
+++ b/graphics/nxglyphs/src/glyph_lcdclock102x48.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_lcdclock102x48.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_lcdclock136x64.cxx b/graphics/nxglyphs/src/glyph_lcdclock136x64.cxx
index dd5a90801..9aa371329 100644
--- a/graphics/nxglyphs/src/glyph_lcdclock136x64.cxx
+++ b/graphics/nxglyphs/src/glyph_lcdclock136x64.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_lcdclock136x64.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_lcdclock51x24.cxx b/graphics/nxglyphs/src/glyph_lcdclock51x24.cxx
index 673bf5cc0..aac6c329a 100644
--- a/graphics/nxglyphs/src/glyph_lcdclock51x24.cxx
+++ b/graphics/nxglyphs/src/glyph_lcdclock51x24.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_lcdclock51x24.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_mediagrip60x30.cxx b/graphics/nxglyphs/src/glyph_mediagrip60x30.cxx
index feb051412..8ba1d5c7e 100644
--- a/graphics/nxglyphs/src/glyph_mediagrip60x30.cxx
+++ b/graphics/nxglyphs/src/glyph_mediagrip60x30.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/mediagrip60x30.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx b/graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx
index eb76a4095..aa2ed236a 100644
--- a/graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx
+++ b/graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx b/graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx
index 52a705b14..d5784d342 100644
--- a/graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx
+++ b/graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_menu21x21.cxx b/graphics/nxglyphs/src/glyph_menu21x21.cxx
index 4141387b3..0e8d99b2a 100644
--- a/graphics/nxglyphs/src/glyph_menu21x21.cxx
+++ b/graphics/nxglyphs/src/glyph_menu21x21.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_menu21x21.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_menu42x42.cxx b/graphics/nxglyphs/src/glyph_menu42x42.cxx
index 0371c7ba2..314229519 100644
--- a/graphics/nxglyphs/src/glyph_menu42x42.cxx
+++ b/graphics/nxglyphs/src/glyph_menu42x42.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_men42x42.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_minimize21x21.cxx b/graphics/nxglyphs/src/glyph_minimize21x21.cxx
index 18e3b27da..534fd4096 100644
--- a/graphics/nxglyphs/src/glyph_minimize21x21.cxx
+++ b/graphics/nxglyphs/src/glyph_minimize21x21.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_minimize21x21.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_minimize42x42.cxx b/graphics/nxglyphs/src/glyph_minimize42x42.cxx
index 454266364..d0d9065ff 100644
--- a/graphics/nxglyphs/src/glyph_minimize42x42.cxx
+++ b/graphics/nxglyphs/src/glyph_minimize42x42.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_minimize42x42.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_mplayer_controls32x32.cxx b/graphics/nxglyphs/src/glyph_mplayer_controls32x32.cxx
index 12c9b4476..1c4cb7479 100644
--- a/graphics/nxglyphs/src/glyph_mplayer_controls32x32.cxx
+++ b/graphics/nxglyphs/src/glyph_mplayer_controls32x32.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_mediaplayer32x32.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_mplayer_controls43x41.cxx b/graphics/nxglyphs/src/glyph_mplayer_controls43x41.cxx
index 256415d69..b37283404 100644
--- a/graphics/nxglyphs/src/glyph_mplayer_controls43x41.cxx
+++ b/graphics/nxglyphs/src/glyph_mplayer_controls43x41.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_mediaplayer43x41.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_nxicon21x21.cxx b/graphics/nxglyphs/src/glyph_nxicon21x21.cxx
index 605ee81ee..721d03bdb 100644
--- a/graphics/nxglyphs/src/glyph_nxicon21x21.cxx
+++ b/graphics/nxglyphs/src/glyph_nxicon21x21.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_nxicon21x21.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_nxicon42x42.cxx b/graphics/nxglyphs/src/glyph_nxicon42x42.cxx
index 0b0f9589e..e36e0650d 100644
--- a/graphics/nxglyphs/src/glyph_nxicon42x42.cxx
+++ b/graphics/nxglyphs/src/glyph_nxicon42x42.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_nxicon42x42.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_nxlogo160x160.cxx b/graphics/nxglyphs/src/glyph_nxlogo160x160.cxx
index 2f67d2f2c..f2b2f94ab 100644
--- a/graphics/nxglyphs/src/glyph_nxlogo160x160.cxx
+++ b/graphics/nxglyphs/src/glyph_nxlogo160x160.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_nxlogo160x160.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_nxlogo320x320.cxx b/graphics/nxglyphs/src/glyph_nxlogo320x320.cxx
index 95e335943..8d13da52f 100644
--- a/graphics/nxglyphs/src/glyph_nxlogo320x320.cxx
+++ b/graphics/nxglyphs/src/glyph_nxlogo320x320.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_nxlogo320x320.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_play24x24.cxx b/graphics/nxglyphs/src/glyph_play24x24.cxx
index 37f74e937..406f619a2 100644
--- a/graphics/nxglyphs/src/glyph_play24x24.cxx
+++ b/graphics/nxglyphs/src/glyph_play24x24.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_play24x24.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_play48x48.cxx b/graphics/nxglyphs/src/glyph_play48x48.cxx
index 45d7bdf09..13edfe0be 100644
--- a/graphics/nxglyphs/src/glyph_play48x48.cxx
+++ b/graphics/nxglyphs/src/glyph_play48x48.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_play24x24.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_radiobuttonmu.cxx b/graphics/nxglyphs/src/glyph_radiobuttonmu.cxx
index ac0230af9..beb97dc6c 100644
--- a/graphics/nxglyphs/src/glyph_radiobuttonmu.cxx
+++ b/graphics/nxglyphs/src/glyph_radiobuttonmu.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_radiobuttonmu.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_radiobuttonoff.cxx b/graphics/nxglyphs/src/glyph_radiobuttonoff.cxx
index aaa761a0c..ef523b7d7 100644
--- a/graphics/nxglyphs/src/glyph_radiobuttonoff.cxx
+++ b/graphics/nxglyphs/src/glyph_radiobuttonoff.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_radiobuttonoff.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_radiobuttonon.cxx b/graphics/nxglyphs/src/glyph_radiobuttonon.cxx
index 5d5a68b7e..3e16968e5 100644
--- a/graphics/nxglyphs/src/glyph_radiobuttonon.cxx
+++ b/graphics/nxglyphs/src/glyph_radiobuttonon.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_radiobuttonon.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_resize21x21.cxx b/graphics/nxglyphs/src/glyph_resize21x21.cxx
index 72def4dcf..ac36adf04 100644
--- a/graphics/nxglyphs/src/glyph_resize21x21.cxx
+++ b/graphics/nxglyphs/src/glyph_resize21x21.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_resize21x21.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_resize42x42.cxx b/graphics/nxglyphs/src/glyph_resize42x42.cxx
index 1984993a3..e040eaf49 100644
--- a/graphics/nxglyphs/src/glyph_resize42x42.cxx
+++ b/graphics/nxglyphs/src/glyph_resize42x42.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_resize42x42.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_return.cxx b/graphics/nxglyphs/src/glyph_return.cxx
index 7021fccc5..ce3da683e 100644
--- a/graphics/nxglyphs/src/glyph_return.cxx
+++ b/graphics/nxglyphs/src/glyph_return.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_return.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_screendepthdown.cxx b/graphics/nxglyphs/src/glyph_screendepthdown.cxx
index 566ec4800..f945a6887 100644
--- a/graphics/nxglyphs/src/glyph_screendepthdown.cxx
+++ b/graphics/nxglyphs/src/glyph_screendepthdown.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_screendepthdown.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_screendepthup.cxx b/graphics/nxglyphs/src/glyph_screendepthup.cxx
index a07fb7ba8..b4c1c0055 100644
--- a/graphics/nxglyphs/src/glyph_screendepthup.cxx
+++ b/graphics/nxglyphs/src/glyph_screendepthup.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_screendepthup.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_screenflipdown.cxx b/graphics/nxglyphs/src/glyph_screenflipdown.cxx
index 5efa1e234..db8913fe1 100644
--- a/graphics/nxglyphs/src/glyph_screenflipdown.cxx
+++ b/graphics/nxglyphs/src/glyph_screenflipdown.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_screenflipdown.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_screenflipup.cxx b/graphics/nxglyphs/src/glyph_screenflipup.cxx
index 00b1dc159..7e7d05375 100644
--- a/graphics/nxglyphs/src/glyph_screenflipup.cxx
+++ b/graphics/nxglyphs/src/glyph_screenflipup.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_screenflipup.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_shift.cxx b/graphics/nxglyphs/src/glyph_shift.cxx
index 3dae7ba81..2ac26cbec 100644
--- a/graphics/nxglyphs/src/glyph_shift.cxx
+++ b/graphics/nxglyphs/src/glyph_shift.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_shift.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_stop2-42x42.cxx b/graphics/nxglyphs/src/glyph_stop2-42x42.cxx
index 540cea78f..bca0789fa 100644
--- a/graphics/nxglyphs/src/glyph_stop2-42x42.cxx
+++ b/graphics/nxglyphs/src/glyph_stop2-42x42.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_xxxxxx.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_stop21x21.cxx b/graphics/nxglyphs/src/glyph_stop21x21.cxx
index 459ab9fe6..24253f741 100644
--- a/graphics/nxglyphs/src/glyph_stop21x21.cxx
+++ b/graphics/nxglyphs/src/glyph_stop21x21.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_stop21x21.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_stop42x42.cxx b/graphics/nxglyphs/src/glyph_stop42x42.cxx
index 39ea5b959..df00f324e 100644
--- a/graphics/nxglyphs/src/glyph_stop42x42.cxx
+++ b/graphics/nxglyphs/src/glyph_stop42x42.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxglyphs/src/glyph_stop42x42.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_windowclose.cxx b/graphics/nxglyphs/src/glyph_windowclose.cxx
index a15a86dbc..ed5aae68a 100644
--- a/graphics/nxglyphs/src/glyph_windowclose.cxx
+++ b/graphics/nxglyphs/src/glyph_windowclose.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_windowclose.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_windowdepthdown.cxx b/graphics/nxglyphs/src/glyph_windowdepthdown.cxx
index 3caab7a28..57a7fa0b5 100644
--- a/graphics/nxglyphs/src/glyph_windowdepthdown.cxx
+++ b/graphics/nxglyphs/src/glyph_windowdepthdown.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_windowdepthdown.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/glyph_windowdepthup.cxx b/graphics/nxglyphs/src/glyph_windowdepthup.cxx
index 0da66903e..85982122c 100644
--- a/graphics/nxglyphs/src/glyph_windowdepthup.cxx
+++ b/graphics/nxglyphs/src/glyph_windowdepthup.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/glyph_windowdepthup.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/mksrle.c b/graphics/nxglyphs/src/mksrle.c
index 14000fdbd..7c3cc849e 100644
--- a/graphics/nxglyphs/src/mksrle.c
+++ b/graphics/nxglyphs/src/mksrle.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxglyphs/src/mksrle.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxglyphs/src/mksrle.sh b/graphics/nxglyphs/src/mksrle.sh
index e0f5abd57..0394a7421 100644
--- a/graphics/nxglyphs/src/mksrle.sh
+++ b/graphics/nxglyphs/src/mksrle.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 # apps/graphics/nxglyphs/src/mksrle.sh
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/Doxygen/gendoc.sh b/graphics/nxwidgets/Doxygen/gendoc.sh
index b52649943..915833650 100755
--- a/graphics/nxwidgets/Doxygen/gendoc.sh
+++ b/graphics/nxwidgets/Doxygen/gendoc.sh
@@ -2,6 +2,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/Doxygen/gendoc.sh
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/Make.defs b/graphics/nxwidgets/Make.defs
index 3f131c59b..68977c4e2 100644
--- a/graphics/nxwidgets/Make.defs
+++ b/graphics/nxwidgets/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/Makefile b/graphics/nxwidgets/Makefile
index 1b9a1112d..26ab16c42 100644
--- a/graphics/nxwidgets/Makefile
+++ b/graphics/nxwidgets/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CButton/Make.defs b/graphics/nxwidgets/UnitTests/CButton/Make.defs
index a3dfda908..1c2885584 100644
--- a/graphics/nxwidgets/UnitTests/CButton/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CButton/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CButton/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CButton/Makefile b/graphics/nxwidgets/UnitTests/CButton/Makefile
index 54695133e..6db8eb923 100644
--- a/graphics/nxwidgets/UnitTests/CButton/Makefile
+++ b/graphics/nxwidgets/UnitTests/CButton/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CButton/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx b/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx
index cf14ec969..472348ba5 100644
--- a/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx
index a7bf092ad..773f0435e 100644
--- a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx
+++ b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
index 214274df2..8b1749d88 100644
--- a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/Make.defs b/graphics/nxwidgets/UnitTests/CButtonArray/Make.defs
index c1d6130ae..a08aa2842 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CButtonArray/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/Makefile b/graphics/nxwidgets/UnitTests/CButtonArray/Makefile
index 1fe25c656..b8870c51f 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/Makefile
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CButtonArray/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
index 13692fa70..8af3de7d1 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
index 4de68ade0..a19c6f880 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
index ccd027755..a13783bd5 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/Make.defs b/graphics/nxwidgets/UnitTests/CCheckBox/Make.defs
index f79a8e198..be552f0a7 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CCheckBox/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/Makefile b/graphics/nxwidgets/UnitTests/CCheckBox/Makefile
index 0c244e7be..bbc55255e 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/Makefile
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CCheckBox/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
index a4dd417c4..8719611ba 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
index 7fa2371a3..1ff5a0a53 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
index eb708b372..1bd72dba5 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs b/graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs
index 09d2c8583..bbc695233 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CGlyphButton/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile b/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile
index d1668f163..409fdff79 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
index f08da13e0..ec673c5f2 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
index b46d4de47..f46468626 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
index 9960277e4..d7593734f 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs
index a9bf1b3e9..36bdeb7b2 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile
index 349e18d5d..19426bb02 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
index c3bfa04c9..e40c78be7 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
index 6687923cf..2809bfb26 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
index 30e1afb49..c3fd43ecc 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CImage/Make.defs b/graphics/nxwidgets/UnitTests/CImage/Make.defs
index 44488e48f..a17112fab 100644
--- a/graphics/nxwidgets/UnitTests/CImage/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CImage/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CImage/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CImage/Makefile b/graphics/nxwidgets/UnitTests/CImage/Makefile
index 2f4ee9fe7..af2250543 100644
--- a/graphics/nxwidgets/UnitTests/CImage/Makefile
+++ b/graphics/nxwidgets/UnitTests/CImage/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CImage/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
index fc5e29b15..3423d6e74 100644
--- a/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx b/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx
index a4a315f12..2472f19f2 100644
--- a/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx
+++ b/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx b/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
index d76abe4a9..34568a5f4 100644
--- a/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
+++ b/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/Make.defs b/graphics/nxwidgets/UnitTests/CKeypad/Make.defs
index 3896547c6..fa0175319 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CKeypad/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CKeypad/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/Makefile b/graphics/nxwidgets/UnitTests/CKeypad/Makefile
index df283728f..44796a4c3 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/Makefile
+++ b/graphics/nxwidgets/UnitTests/CKeypad/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CKeypad/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
index a20fca694..bfd5dfd2c 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx
index 2d6d6ff80..64cf7c366 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx
+++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
index 97504a59e..f566d8bcd 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLabel/Make.defs b/graphics/nxwidgets/UnitTests/CLabel/Make.defs
index e0c348020..be0a9e9c6 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CLabel/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CLabel/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLabel/Makefile b/graphics/nxwidgets/UnitTests/CLabel/Makefile
index 377744eaa..3e9dd9111 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/Makefile
+++ b/graphics/nxwidgets/UnitTests/CLabel/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CLabel/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx b/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx
index 833eae154..bed815541 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx
index d4658d8d6..1851674ad 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
index 9d4b55d76..57ccc1f0d 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/Make.defs b/graphics/nxwidgets/UnitTests/CLatchButton/Make.defs
index 727e09575..a7a894228 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CLatchButton/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/Makefile b/graphics/nxwidgets/UnitTests/CLatchButton/Makefile
index 1022ce33b..be605df19 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/Makefile
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CLatchButton/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
index 80401c6dc..ca0310ae2 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
index f87004d3b..58fe9b6a1 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
index 5faac6afe..71946d325 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs
index 9fdb923f6..7e6705dc2 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CLatchButtonArray/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile
index 12b896268..2909a9e2a 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
index 209b6cd09..fd6dcbeb0 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarry_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
index c6141cdb8..3da02db99 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
index e142769e1..212d512a7 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CListBox/Make.defs b/graphics/nxwidgets/UnitTests/CListBox/Make.defs
index 7288cc08a..d17218d00 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CListBox/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CListBox/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CListBox/Makefile b/graphics/nxwidgets/UnitTests/CListBox/Makefile
index 56e5e0ea0..961ec066e 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/Makefile
+++ b/graphics/nxwidgets/UnitTests/CListBox/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CListBox/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
index 07a67312a..45864f1e5 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx
index cfd184f8d..7bd3836de 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx
+++ b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
index 8f7e11349..452240dc9 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/Make.defs b/graphics/nxwidgets/UnitTests/CProgressBar/Make.defs
index 1b15c62d5..e77ec2ceb 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CProgressBar/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/Makefile b/graphics/nxwidgets/UnitTests/CProgressBar/Makefile
index 21cd0199a..3697e365f 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/Makefile
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CProgressBar/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
index 74ab8b91c..d5c5d4b9f 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx
index 504486641..11ad6bb07 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/ProgressBar/cprogressbartest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
index 2cc0f4571..dd8dcf103 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/Make.defs b/graphics/nxwidgets/UnitTests/CRadioButton/Make.defs
index b98084d70..dbcd4e559 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CRadioButton/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/Makefile b/graphics/nxwidgets/UnitTests/CRadioButton/Makefile
index 683c940b8..af324f188 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/Makefile
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CRadioButton/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
index 0953e3441..fd0c13b40 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
index e42ec761f..683dc02dc 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
index 577b8a1e7..fc8d7ee29 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs
index 0fca7b68a..68fb2e45d 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile
index 03bb81490..8a1b989b1 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
index 344e84cca..51ea0e6e2 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
index 4fb7505cc..e59f0fe3b 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
index 190d6243c..c8b31b392 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs
index 051a7d49b..f5c251149 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CScrollbarVertical/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile
index fb63717ae..439675520 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
index 01b957a20..04664b08b 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
index 58db03988..bbf21f2c2 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
index 78dca2edb..159fb3bf2 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs
index a7c3afe42..1a5144f3c 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CSliderHorizonal/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile
index 6d5ba91e4..893f1942c 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CSliderHorizontal/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
index 33c19c668..9b8f21b54 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CSliderHorizontal/csliderhorizontal_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
index de7f875b0..8a9e19496 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CSliderHorizontal/csliderhorizontaltest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
index 3eb6ee7ff..538af2daf 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CSliderHorizontal/csliderhorizontaltest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs b/graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs
index 7cd8c5fb0..ef0a92bcc 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CSliderVertical/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile b/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile
index d989b56c2..d4a972525 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
index 621c30739..40872745c 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
index adacb9962..efad3275e 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
index cc2bc5d8f..7bad5e81d 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/Make.defs b/graphics/nxwidgets/UnitTests/CTextBox/Make.defs
index 9f262f68e..e98f713ff 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/Make.defs
+++ b/graphics/nxwidgets/UnitTests/CTextBox/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/CTextBox/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/Makefile b/graphics/nxwidgets/UnitTests/CTextBox/Makefile
index acdc88def..9144e1bd4 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/Makefile
+++ b/graphics/nxwidgets/UnitTests/CTextBox/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwidgets/UnitTests/CTextBox/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx
index 33a8d48e1..92de3dd85 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx
index d18955f02..4d0fad790 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx
+++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
index 4dd0cbac1..427824422 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/Make.defs b/graphics/nxwidgets/UnitTests/Make.defs
index bbb563433..9eaef1369 100644
--- a/graphics/nxwidgets/UnitTests/Make.defs
+++ b/graphics/nxwidgets/UnitTests/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/UnitTests/Makefile b/graphics/nxwidgets/UnitTests/Makefile
index 85e6e2e82..1a2d49f26 100644
--- a/graphics/nxwidgets/UnitTests/Makefile
+++ b/graphics/nxwidgets/UnitTests/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwidgets/UnitTests/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cbgwindow.cxx b/graphics/nxwidgets/src/cbgwindow.cxx
index 90da9cf6e..a18dfa2b2 100644
--- a/graphics/nxwidgets/src/cbgwindow.cxx
+++ b/graphics/nxwidgets/src/cbgwindow.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cbgwindow.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cbitmap.cxx b/graphics/nxwidgets/src/cbitmap.cxx
index f8178f711..542e505b9 100644
--- a/graphics/nxwidgets/src/cbitmap.cxx
+++ b/graphics/nxwidgets/src/cbitmap.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cbitmap.hxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cbutton.cxx b/graphics/nxwidgets/src/cbutton.cxx
index 192cc5fed..4c3f1e842 100644
--- a/graphics/nxwidgets/src/cbutton.cxx
+++ b/graphics/nxwidgets/src/cbutton.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cbutton.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cbuttonarray.cxx b/graphics/nxwidgets/src/cbuttonarray.cxx
index c5072efc0..3de7bf165 100644
--- a/graphics/nxwidgets/src/cbuttonarray.cxx
+++ b/graphics/nxwidgets/src/cbuttonarray.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/include/cbuttonarray.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/ccallback.cxx b/graphics/nxwidgets/src/ccallback.cxx
index a04d88687..510f55161 100644
--- a/graphics/nxwidgets/src/ccallback.cxx
+++ b/graphics/nxwidgets/src/ccallback.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/ccallback.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/ccheckbox.cxx b/graphics/nxwidgets/src/ccheckbox.cxx
index 3e4bb298d..ada8430da 100644
--- a/graphics/nxwidgets/src/ccheckbox.cxx
+++ b/graphics/nxwidgets/src/ccheckbox.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/ccheckbox.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/ccyclebutton.cxx b/graphics/nxwidgets/src/ccyclebutton.cxx
index ac47ce234..15f139c55 100644
--- a/graphics/nxwidgets/src/ccyclebutton.cxx
+++ b/graphics/nxwidgets/src/ccyclebutton.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/ccyclebutton.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cglyphbutton.cxx b/graphics/nxwidgets/src/cglyphbutton.cxx
index 9cda22933..4d1107a4e 100644
--- a/graphics/nxwidgets/src/cglyphbutton.cxx
+++ b/graphics/nxwidgets/src/cglyphbutton.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cglyphbutton.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cglyphsliderhorizontal.cxx b/graphics/nxwidgets/src/cglyphsliderhorizontal.cxx
index ff60f01e6..d6d2567e3 100644
--- a/graphics/nxwidgets/src/cglyphsliderhorizontal.cxx
+++ b/graphics/nxwidgets/src/cglyphsliderhorizontal.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cglyphsliderhorizontal.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cglyphsliderhorizontalgrip.cxx b/graphics/nxwidgets/src/cglyphsliderhorizontalgrip.cxx
index 2be7e6d71..11540c654 100644
--- a/graphics/nxwidgets/src/cglyphsliderhorizontalgrip.cxx
+++ b/graphics/nxwidgets/src/cglyphsliderhorizontalgrip.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cglyphsliderhorizontalgrip.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cgraphicsport.cxx b/graphics/nxwidgets/src/cgraphicsport.cxx
index 0b72d0f61..2e299162d 100644
--- a/graphics/nxwidgets/src/cgraphicsport.cxx
+++ b/graphics/nxwidgets/src/cgraphicsport.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cgraphicsport.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cimage.cxx b/graphics/nxwidgets/src/cimage.cxx
index 4b02a8bd9..a500c3b4e 100644
--- a/graphics/nxwidgets/src/cimage.cxx
+++ b/graphics/nxwidgets/src/cimage.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/include/cimage.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/ckeypad.cxx b/graphics/nxwidgets/src/ckeypad.cxx
index 5b9a3ab8e..460c9540b 100644
--- a/graphics/nxwidgets/src/ckeypad.cxx
+++ b/graphics/nxwidgets/src/ckeypad.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/ckeypad.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/clabel.cxx b/graphics/nxwidgets/src/clabel.cxx
index f07a69b7b..88fbba917 100644
--- a/graphics/nxwidgets/src/clabel.cxx
+++ b/graphics/nxwidgets/src/clabel.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/clabel.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/clabelgrid.cxx b/graphics/nxwidgets/src/clabelgrid.cxx
index efd19e71e..6302f4c6a 100644
--- a/graphics/nxwidgets/src/clabelgrid.cxx
+++ b/graphics/nxwidgets/src/clabelgrid.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/NxWkidgets/nwidgets/src/clabelgrid.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/clatchbutton.cxx b/graphics/nxwidgets/src/clatchbutton.cxx
index d9fa235df..37dc6b035 100644
--- a/graphics/nxwidgets/src/clatchbutton.cxx
+++ b/graphics/nxwidgets/src/clatchbutton.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/clatchbutton.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/clatchbuttonarray.cxx b/graphics/nxwidgets/src/clatchbuttonarray.cxx
index 02ae3c84d..7de83e2a8 100644
--- a/graphics/nxwidgets/src/clatchbuttonarray.cxx
+++ b/graphics/nxwidgets/src/clatchbuttonarray.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/clatchbuttonarray.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/clistbox.cxx b/graphics/nxwidgets/src/clistbox.cxx
index 058f95075..8647d4aa9 100644
--- a/graphics/nxwidgets/src/clistbox.cxx
+++ b/graphics/nxwidgets/src/clistbox.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/clistbox.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/clistboxdataitem.cxx b/graphics/nxwidgets/src/clistboxdataitem.cxx
index 6f65e0d0e..571ad507e 100644
--- a/graphics/nxwidgets/src/clistboxdataitem.cxx
+++ b/graphics/nxwidgets/src/clistboxdataitem.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/clistboxdataitem.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/clistdata.cxx b/graphics/nxwidgets/src/clistdata.cxx
index c6aa24ce6..272b20eb2 100644
--- a/graphics/nxwidgets/src/clistdata.cxx
+++ b/graphics/nxwidgets/src/clistdata.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/clistdata.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/clistdataitem.cxx b/graphics/nxwidgets/src/clistdataitem.cxx
index 9cca7c6f7..bfe19682d 100644
--- a/graphics/nxwidgets/src/clistdataitem.cxx
+++ b/graphics/nxwidgets/src/clistdataitem.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/clistdataitem.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cmultilinetextbox.cxx b/graphics/nxwidgets/src/cmultilinetextbox.cxx
index 6668db645..3253db274 100644
--- a/graphics/nxwidgets/src/cmultilinetextbox.cxx
+++ b/graphics/nxwidgets/src/cmultilinetextbox.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cmultilinetextbox.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cnumericedit.cxx b/graphics/nxwidgets/src/cnumericedit.cxx
index 8d4169db6..770f727c7 100644
--- a/graphics/nxwidgets/src/cnumericedit.cxx
+++ b/graphics/nxwidgets/src/cnumericedit.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/include/cnumericedit.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cnxfont.cxx b/graphics/nxwidgets/src/cnxfont.cxx
index d7a122676..639de608f 100644
--- a/graphics/nxwidgets/src/cnxfont.cxx
+++ b/graphics/nxwidgets/src/cnxfont.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cnxfont.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cnxserver.cxx b/graphics/nxwidgets/src/cnxserver.cxx
index 7296fe620..67ad93332 100644
--- a/graphics/nxwidgets/src/cnxserver.cxx
+++ b/graphics/nxwidgets/src/cnxserver.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cnxserver.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cnxstring.cxx b/graphics/nxwidgets/src/cnxstring.cxx
index c9da1f896..6cd7ac13e 100644
--- a/graphics/nxwidgets/src/cnxstring.cxx
+++ b/graphics/nxwidgets/src/cnxstring.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cnxstring.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cnxtimer.cxx b/graphics/nxwidgets/src/cnxtimer.cxx
index d826e3ebe..81ba0da64 100644
--- a/graphics/nxwidgets/src/cnxtimer.cxx
+++ b/graphics/nxwidgets/src/cnxtimer.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cnxtimer.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cnxtkwindow.cxx b/graphics/nxwidgets/src/cnxtkwindow.cxx
index 6b819f3f0..5f56f07af 100644
--- a/graphics/nxwidgets/src/cnxtkwindow.cxx
+++ b/graphics/nxwidgets/src/cnxtkwindow.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cnxtkwindow.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cnxtoolbar.cxx b/graphics/nxwidgets/src/cnxtoolbar.cxx
index dc876032f..8ae26490d 100644
--- a/graphics/nxwidgets/src/cnxtoolbar.cxx
+++ b/graphics/nxwidgets/src/cnxtoolbar.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cnxtoolbar.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cnxwidget.cxx b/graphics/nxwidgets/src/cnxwidget.cxx
index 58272a3af..e6b93863c 100644
--- a/graphics/nxwidgets/src/cnxwidget.cxx
+++ b/graphics/nxwidgets/src/cnxwidget.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cnxwidget.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cnxwindow.cxx b/graphics/nxwidgets/src/cnxwindow.cxx
index ee7d40e91..cceef5794 100644
--- a/graphics/nxwidgets/src/cnxwindow.cxx
+++ b/graphics/nxwidgets/src/cnxwindow.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cnxwindow.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cprogressbar.cxx b/graphics/nxwidgets/src/cprogressbar.cxx
index 740793663..88543daee 100644
--- a/graphics/nxwidgets/src/cprogressbar.cxx
+++ b/graphics/nxwidgets/src/cprogressbar.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cprogressbar.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cradiobutton.cxx b/graphics/nxwidgets/src/cradiobutton.cxx
index c41cc6e2f..8fde8c58f 100644
--- a/graphics/nxwidgets/src/cradiobutton.cxx
+++ b/graphics/nxwidgets/src/cradiobutton.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cradiobutton.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cradiobuttongroup.cxx b/graphics/nxwidgets/src/cradiobuttongroup.cxx
index 35c9ebb3b..72b024bd3 100644
--- a/graphics/nxwidgets/src/cradiobuttongroup.cxx
+++ b/graphics/nxwidgets/src/cradiobuttongroup.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cradiobutton.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/crect.cxx b/graphics/nxwidgets/src/crect.cxx
index afd64311f..2883dda30 100644
--- a/graphics/nxwidgets/src/crect.cxx
+++ b/graphics/nxwidgets/src/crect.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cbgwindow.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/crlepalettebitmap.cxx b/graphics/nxwidgets/src/crlepalettebitmap.cxx
index 4e4aee3cd..752faf011 100644
--- a/graphics/nxwidgets/src/crlepalettebitmap.cxx
+++ b/graphics/nxwidgets/src/crlepalettebitmap.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/crlepalettebitmap.hxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cscaledbitmap.cxx b/graphics/nxwidgets/src/cscaledbitmap.cxx
index 351575843..ec46ca5c4 100644
--- a/graphics/nxwidgets/src/cscaledbitmap.cxx
+++ b/graphics/nxwidgets/src/cscaledbitmap.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cscaledbitmap.hxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cscrollbarhorizontal.cxx b/graphics/nxwidgets/src/cscrollbarhorizontal.cxx
index 05cf642a9..0a546af46 100644
--- a/graphics/nxwidgets/src/cscrollbarhorizontal.cxx
+++ b/graphics/nxwidgets/src/cscrollbarhorizontal.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/include/cscrollbarhorizontal.hxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cscrollbarpanel.cxx b/graphics/nxwidgets/src/cscrollbarpanel.cxx
index 7ad8a14d1..b90d55cbf 100644
--- a/graphics/nxwidgets/src/cscrollbarpanel.cxx
+++ b/graphics/nxwidgets/src/cscrollbarpanel.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cscrollbarpanel.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cscrollbarvertical.cxx b/graphics/nxwidgets/src/cscrollbarvertical.cxx
index 0ff40ad0b..5b6670ba7 100644
--- a/graphics/nxwidgets/src/cscrollbarvertical.cxx
+++ b/graphics/nxwidgets/src/cscrollbarvertical.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/include/cscrollbarhorizontal.hxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cscrollinglistbox.cxx b/graphics/nxwidgets/src/cscrollinglistbox.cxx
index 710dbb286..2667b8fc9 100644
--- a/graphics/nxwidgets/src/cscrollinglistbox.cxx
+++ b/graphics/nxwidgets/src/cscrollinglistbox.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cscrollinglistbox.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cscrollingpanel.cxx b/graphics/nxwidgets/src/cscrollingpanel.cxx
index e470e0233..d369d42fc 100644
--- a/graphics/nxwidgets/src/cscrollingpanel.cxx
+++ b/graphics/nxwidgets/src/cscrollingpanel.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cscrollingpanel.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cscrollingtextbox.cxx b/graphics/nxwidgets/src/cscrollingtextbox.cxx
index 658831b16..3ea6a51d4 100644
--- a/graphics/nxwidgets/src/cscrollingtextbox.cxx
+++ b/graphics/nxwidgets/src/cscrollingtextbox.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cscrollingtextbox.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/csliderhorizontal.cxx b/graphics/nxwidgets/src/csliderhorizontal.cxx
index 377887088..f2072493a 100644
--- a/graphics/nxwidgets/src/csliderhorizontal.cxx
+++ b/graphics/nxwidgets/src/csliderhorizontal.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/csliderhorizontal.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/csliderhorizontalgrip.cxx b/graphics/nxwidgets/src/csliderhorizontalgrip.cxx
index 4bfa8f4bc..28fd1276a 100644
--- a/graphics/nxwidgets/src/csliderhorizontalgrip.cxx
+++ b/graphics/nxwidgets/src/csliderhorizontalgrip.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/csliderhorizontalgrip.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cslidervertical.cxx b/graphics/nxwidgets/src/cslidervertical.cxx
index c3666fc53..4dee4274b 100644
--- a/graphics/nxwidgets/src/cslidervertical.cxx
+++ b/graphics/nxwidgets/src/cslidervertical.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cslidervertical.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/csliderverticalgrip.cxx b/graphics/nxwidgets/src/csliderverticalgrip.cxx
index 11967d76b..6fda9d8fd 100644
--- a/graphics/nxwidgets/src/csliderverticalgrip.cxx
+++ b/graphics/nxwidgets/src/csliderverticalgrip.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cslidervertical.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cstickybutton.cxx b/graphics/nxwidgets/src/cstickybutton.cxx
index 5a96690b0..2509c1db8 100644
--- a/graphics/nxwidgets/src/cstickybutton.cxx
+++ b/graphics/nxwidgets/src/cstickybutton.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cstickybutton.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cstickybuttonarray.cxx b/graphics/nxwidgets/src/cstickybuttonarray.cxx
index 1799153fd..b52c2bf94 100644
--- a/graphics/nxwidgets/src/cstickybuttonarray.cxx
+++ b/graphics/nxwidgets/src/cstickybuttonarray.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/include/cstickybuttonarray.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cstickyimage.cxx b/graphics/nxwidgets/src/cstickyimage.cxx
index b1edb59d7..346694c8c 100644
--- a/graphics/nxwidgets/src/cstickyimage.cxx
+++ b/graphics/nxwidgets/src/cstickyimage.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cstickyimage.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cstringiterator.cxx b/graphics/nxwidgets/src/cstringiterator.cxx
index 98831419b..301b3966d 100644
--- a/graphics/nxwidgets/src/cstringiterator.cxx
+++ b/graphics/nxwidgets/src/cstringiterator.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cgraphicsport.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/ctabpanel.cxx b/graphics/nxwidgets/src/ctabpanel.cxx
index 5c698425e..ea0b943a0 100644
--- a/graphics/nxwidgets/src/ctabpanel.cxx
+++ b/graphics/nxwidgets/src/ctabpanel.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/ctabpanel.hxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/ctext.cxx b/graphics/nxwidgets/src/ctext.cxx
index e68e9da21..0da00793d 100644
--- a/graphics/nxwidgets/src/ctext.cxx
+++ b/graphics/nxwidgets/src/ctext.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/ctext.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/ctextbox.cxx b/graphics/nxwidgets/src/ctextbox.cxx
index a8ede069a..9e04650cc 100644
--- a/graphics/nxwidgets/src/ctextbox.cxx
+++ b/graphics/nxwidgets/src/ctextbox.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/ctextbox.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cwidgetcontrol.cxx b/graphics/nxwidgets/src/cwidgetcontrol.cxx
index 13f8a94df..921b05412 100644
--- a/graphics/nxwidgets/src/cwidgetcontrol.cxx
+++ b/graphics/nxwidgets/src/cwidgetcontrol.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cwidgetcontrol.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cwidgeteventhandlerlist.cxx b/graphics/nxwidgets/src/cwidgeteventhandlerlist.cxx
index 293872c55..c96d7d28f 100644
--- a/graphics/nxwidgets/src/cwidgeteventhandlerlist.cxx
+++ b/graphics/nxwidgets/src/cwidgeteventhandlerlist.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cwidgeteventhandlerlist.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/cwindoweventhandlerlist.cxx b/graphics/nxwidgets/src/cwindoweventhandlerlist.cxx
index 1286c6b40..253f08f3a 100644
--- a/graphics/nxwidgets/src/cwindoweventhandlerlist.cxx
+++ b/graphics/nxwidgets/src/cwindoweventhandlerlist.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/cwindoweventhandlerlist.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwidgets/src/singletons.cxx b/graphics/nxwidgets/src/singletons.cxx
index fc4f3689f..e6c4da73e 100644
--- a/graphics/nxwidgets/src/singletons.cxx
+++ b/graphics/nxwidgets/src/singletons.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwidgets/src/singletons.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/Doxygen/gendoc.sh b/graphics/nxwm/Doxygen/gendoc.sh
index e3dcdb7e8..5fe931e91 100644
--- a/graphics/nxwm/Doxygen/gendoc.sh
+++ b/graphics/nxwm/Doxygen/gendoc.sh
@@ -2,6 +2,8 @@
 #################################################################################
 # apps/graphics/nxwm/Doxygen/gendoc.sh
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/Make.defs b/graphics/nxwm/Make.defs
index 68e492a23..6161418d0 100644
--- a/graphics/nxwm/Make.defs
+++ b/graphics/nxwm/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/nxwm/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/Makefile b/graphics/nxwm/Makefile
index b643ee02a..4b1028c2e 100644
--- a/graphics/nxwm/Makefile
+++ b/graphics/nxwm/Makefile
@@ -1,6 +1,8 @@
 #################################################################################
 # apps/graphics/nxwm/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/src/capplicationwindow.cxx b/graphics/nxwm/src/capplicationwindow.cxx
index d3b5ba131..659db97ad 100644
--- a/graphics/nxwm/src/capplicationwindow.cxx
+++ b/graphics/nxwm/src/capplicationwindow.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxwm/src/capplicationwindow.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/src/ccalibration.cxx b/graphics/nxwm/src/ccalibration.cxx
index 1c8f5cd8d..21adb2183 100644
--- a/graphics/nxwm/src/ccalibration.cxx
+++ b/graphics/nxwm/src/ccalibration.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nxwm/src/ccalibration.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/src/cfullscreenwindow.cxx b/graphics/nxwm/src/cfullscreenwindow.cxx
index 4873d633f..ccaf6300d 100644
--- a/graphics/nxwm/src/cfullscreenwindow.cxx
+++ b/graphics/nxwm/src/cfullscreenwindow.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxwm/src/cfullscreenwindow.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/src/chexcalculator.cxx b/graphics/nxwm/src/chexcalculator.cxx
index ed4105991..e5ab0d9e8 100644
--- a/graphics/nxwm/src/chexcalculator.cxx
+++ b/graphics/nxwm/src/chexcalculator.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxwm/src/chexcalculator.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/src/ckeyboard.cxx b/graphics/nxwm/src/ckeyboard.cxx
index 826ed9b1e..20dcc44cc 100644
--- a/graphics/nxwm/src/ckeyboard.cxx
+++ b/graphics/nxwm/src/ckeyboard.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxwm/src/ckeyboard.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/src/cmediaplayer.cxx b/graphics/nxwm/src/cmediaplayer.cxx
index 72c1895cc..bcfb95718 100644
--- a/graphics/nxwm/src/cmediaplayer.cxx
+++ b/graphics/nxwm/src/cmediaplayer.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxwm/src/cmediaplayer.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/src/cnxterm.cxx b/graphics/nxwm/src/cnxterm.cxx
index 2df27c36e..0c4d20455 100644
--- a/graphics/nxwm/src/cnxterm.cxx
+++ b/graphics/nxwm/src/cnxterm.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxwm/src/cnxterm.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/src/cstartwindow.cxx b/graphics/nxwm/src/cstartwindow.cxx
index b19a7ae58..8ee409e27 100644
--- a/graphics/nxwm/src/cstartwindow.cxx
+++ b/graphics/nxwm/src/cstartwindow.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxwm/src/cstartwindow.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/src/ctaskbar.cxx b/graphics/nxwm/src/ctaskbar.cxx
index f30c8758d..d66d36850 100644
--- a/graphics/nxwm/src/ctaskbar.cxx
+++ b/graphics/nxwm/src/ctaskbar.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxwm/src/ctaskbar.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/src/ctouchscreen.cxx b/graphics/nxwm/src/ctouchscreen.cxx
index fbb751700..bbebc0f7a 100644
--- a/graphics/nxwm/src/ctouchscreen.cxx
+++ b/graphics/nxwm/src/ctouchscreen.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxwm/src/ctouchscreen.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/src/cwindowmessenger.cxx b/graphics/nxwm/src/cwindowmessenger.cxx
index 9a33086b3..8761e4799 100644
--- a/graphics/nxwm/src/cwindowmessenger.cxx
+++ b/graphics/nxwm/src/cwindowmessenger.cxx
@@ -1,6 +1,8 @@
 /********************************************************************************************
  * apps/graphics/nxwm/src/cwindowmessenger.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/nxwm/src/nxwm_main.cxx b/graphics/nxwm/src/nxwm_main.cxx
index f1255729b..98feabbf6 100644
--- a/graphics/nxwm/src/nxwm_main.cxx
+++ b/graphics/nxwm/src/nxwm_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/nxwm/src/nxwm_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/Make.defs b/graphics/pdcurs34/Make.defs
index 43fa97847..6db199357 100644
--- a/graphics/pdcurs34/Make.defs
+++ b/graphics/pdcurs34/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/pdcurs34/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/Makefile b/graphics/pdcurs34/Makefile
index a97e00499..e07f2fc1e 100644
--- a/graphics/pdcurs34/Makefile
+++ b/graphics/pdcurs34/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/pdcurs34/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/include/curspriv.h b/graphics/pdcurs34/include/curspriv.h
index 2b6a49bd6..68e702bf4 100644
--- a/graphics/pdcurs34/include/curspriv.h
+++ b/graphics/pdcurs34/include/curspriv.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/curspriv.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/include/term.h b/graphics/pdcurs34/include/term.h
index 2298f1def..06230d368 100644
--- a/graphics/pdcurs34/include/term.h
+++ b/graphics/pdcurs34/include/term.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/term.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/nuttx/Make.defs b/graphics/pdcurs34/nuttx/Make.defs
index e079be2d3..5ed3728be 100644
--- a/graphics/pdcurs34/nuttx/Make.defs
+++ b/graphics/pdcurs34/nuttx/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/pdcurs34/nuttx/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/nuttx/pdcclip.c b/graphics/pdcurs34/nuttx/pdcclip.c
index 476db525d..a938d7c63 100644
--- a/graphics/pdcurs34/nuttx/pdcclip.c
+++ b/graphics/pdcurs34/nuttx/pdcclip.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nuttx/pdclip.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/nuttx/pdcdisp.c b/graphics/pdcurs34/nuttx/pdcdisp.c
index 8a91c11c9..428d24b70 100644
--- a/graphics/pdcurs34/nuttx/pdcdisp.c
+++ b/graphics/pdcurs34/nuttx/pdcdisp.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/nuttx/pdcdisp.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/nuttx/pdcgetsc.c b/graphics/pdcurs34/nuttx/pdcgetsc.c
index ce7ad1d88..8bbda5885 100644
--- a/graphics/pdcurs34/nuttx/pdcgetsc.c
+++ b/graphics/pdcurs34/nuttx/pdcgetsc.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nuttx/pdcgetsc.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/nuttx/pdckbd.c b/graphics/pdcurs34/nuttx/pdckbd.c
index f11280fe0..eeac7245f 100644
--- a/graphics/pdcurs34/nuttx/pdckbd.c
+++ b/graphics/pdcurs34/nuttx/pdckbd.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nuttx/pdckbd.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/nuttx/pdcnuttx.h b/graphics/pdcurs34/nuttx/pdcnuttx.h
index 00760278e..40c085848 100644
--- a/graphics/pdcurs34/nuttx/pdcnuttx.h
+++ b/graphics/pdcurs34/nuttx/pdcnuttx.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nuttx/pdcnuttx.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/nuttx/pdcscrn.c b/graphics/pdcurs34/nuttx/pdcscrn.c
index 0082dca7c..762041243 100644
--- a/graphics/pdcurs34/nuttx/pdcscrn.c
+++ b/graphics/pdcurs34/nuttx/pdcscrn.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/nuttx/pdcscrn.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/nuttx/pdcsetsc.c b/graphics/pdcurs34/nuttx/pdcsetsc.c
index 3e5cd99cb..af413f32c 100644
--- a/graphics/pdcurs34/nuttx/pdcsetsc.c
+++ b/graphics/pdcurs34/nuttx/pdcsetsc.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nuttx/pdcsetsc.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/nuttx/pdcthread.c b/graphics/pdcurs34/nuttx/pdcthread.c
index e1295f04a..ca19d7f76 100644
--- a/graphics/pdcurs34/nuttx/pdcthread.c
+++ b/graphics/pdcurs34/nuttx/pdcthread.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/nuttx/pdcthread.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/nuttx/pdcutil.c b/graphics/pdcurs34/nuttx/pdcutil.c
index 21957eb62..c22b88ad9 100644
--- a/graphics/pdcurs34/nuttx/pdcutil.c
+++ b/graphics/pdcurs34/nuttx/pdcutil.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/nuttx/pdcutil.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/Make.defs b/graphics/pdcurs34/pdcurses/Make.defs
index 5d6a8ccf5..0632a550f 100644
--- a/graphics/pdcurs34/pdcurses/Make.defs
+++ b/graphics/pdcurs34/pdcurses/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/pdcurs34/pdcurses/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_addch.c b/graphics/pdcurs34/pdcurses/pdc_addch.c
index dc0e332ce..b070b15ed 100644
--- a/graphics/pdcurs34/pdcurses/pdc_addch.c
+++ b/graphics/pdcurs34/pdcurses/pdc_addch.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_addch.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_addchstr.c b/graphics/pdcurs34/pdcurses/pdc_addchstr.c
index 90cb59174..9287d7cc5 100644
--- a/graphics/pdcurs34/pdcurses/pdc_addchstr.c
+++ b/graphics/pdcurs34/pdcurses/pdc_addchstr.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_addchstr.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_addstr.c b/graphics/pdcurs34/pdcurses/pdc_addstr.c
index 2073427c7..458e8a3c9 100644
--- a/graphics/pdcurs34/pdcurses/pdc_addstr.c
+++ b/graphics/pdcurs34/pdcurses/pdc_addstr.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_addstr.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_attr.c b/graphics/pdcurs34/pdcurses/pdc_attr.c
index efbd7aaab..87256b00c 100644
--- a/graphics/pdcurs34/pdcurses/pdc_attr.c
+++ b/graphics/pdcurs34/pdcurses/pdc_attr.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_attr.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_beep.c b/graphics/pdcurs34/pdcurses/pdc_beep.c
index 787db6840..a318d0d82 100644
--- a/graphics/pdcurs34/pdcurses/pdc_beep.c
+++ b/graphics/pdcurs34/pdcurses/pdc_beep.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_beep.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_bkgd.c b/graphics/pdcurs34/pdcurses/pdc_bkgd.c
index 89cfc25b5..48bc8b415 100644
--- a/graphics/pdcurs34/pdcurses/pdc_bkgd.c
+++ b/graphics/pdcurs34/pdcurses/pdc_bkgd.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_bkgd.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_border.c b/graphics/pdcurs34/pdcurses/pdc_border.c
index cd7c2520c..5bb5462ff 100644
--- a/graphics/pdcurs34/pdcurses/pdc_border.c
+++ b/graphics/pdcurs34/pdcurses/pdc_border.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/pdcurses/pdc_border.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_clear.c b/graphics/pdcurs34/pdcurses/pdc_clear.c
index 2ac20b6b0..ff8ff04c0 100644
--- a/graphics/pdcurs34/pdcurses/pdc_clear.c
+++ b/graphics/pdcurs34/pdcurses/pdc_clear.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_clear.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_color.c b/graphics/pdcurs34/pdcurses/pdc_color.c
index fc9ddf59c..bebb19f7f 100644
--- a/graphics/pdcurs34/pdcurses/pdc_color.c
+++ b/graphics/pdcurs34/pdcurses/pdc_color.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_color.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_debug.c b/graphics/pdcurs34/pdcurses/pdc_debug.c
index 08edd540f..e7431c25e 100644
--- a/graphics/pdcurs34/pdcurses/pdc_debug.c
+++ b/graphics/pdcurs34/pdcurses/pdc_debug.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_debug.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_delch.c b/graphics/pdcurs34/pdcurses/pdc_delch.c
index 63aa82b76..d9969d313 100644
--- a/graphics/pdcurs34/pdcurses/pdc_delch.c
+++ b/graphics/pdcurs34/pdcurses/pdc_delch.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_delch.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_deleteln.c b/graphics/pdcurs34/pdcurses/pdc_deleteln.c
index 962a01c59..7af909f24 100644
--- a/graphics/pdcurs34/pdcurses/pdc_deleteln.c
+++ b/graphics/pdcurs34/pdcurses/pdc_deleteln.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_deleteln.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_getch.c b/graphics/pdcurs34/pdcurses/pdc_getch.c
index bfdb6aaad..f787e14f6 100644
--- a/graphics/pdcurs34/pdcurses/pdc_getch.c
+++ b/graphics/pdcurs34/pdcurses/pdc_getch.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_getch.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_getstr.c b/graphics/pdcurs34/pdcurses/pdc_getstr.c
index 8cd24178e..17bed774b 100644
--- a/graphics/pdcurs34/pdcurses/pdc_getstr.c
+++ b/graphics/pdcurs34/pdcurses/pdc_getstr.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_getstr.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_getyx.c b/graphics/pdcurs34/pdcurses/pdc_getyx.c
index d6c5358ad..b205984f4 100644
--- a/graphics/pdcurs34/pdcurses/pdc_getyx.c
+++ b/graphics/pdcurs34/pdcurses/pdc_getyx.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_getyx.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_inch.c b/graphics/pdcurs34/pdcurses/pdc_inch.c
index cda749729..29e00ae91 100644
--- a/graphics/pdcurs34/pdcurses/pdc_inch.c
+++ b/graphics/pdcurs34/pdcurses/pdc_inch.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_inch.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_inchstr.c b/graphics/pdcurs34/pdcurses/pdc_inchstr.c
index 9bc595a36..8c7620394 100644
--- a/graphics/pdcurs34/pdcurses/pdc_inchstr.c
+++ b/graphics/pdcurs34/pdcurses/pdc_inchstr.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_inchstr.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_initscr.c b/graphics/pdcurs34/pdcurses/pdc_initscr.c
index 52a685250..f643526ff 100644
--- a/graphics/pdcurs34/pdcurses/pdc_initscr.c
+++ b/graphics/pdcurs34/pdcurses/pdc_initscr.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/pdcurses/pdc_initscr.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_inopts.c b/graphics/pdcurs34/pdcurses/pdc_inopts.c
index d4fd5a5ad..089100c80 100644
--- a/graphics/pdcurs34/pdcurses/pdc_inopts.c
+++ b/graphics/pdcurs34/pdcurses/pdc_inopts.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_inopts.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_insch.c b/graphics/pdcurs34/pdcurses/pdc_insch.c
index deb9f74c2..cc351edde 100644
--- a/graphics/pdcurs34/pdcurses/pdc_insch.c
+++ b/graphics/pdcurs34/pdcurses/pdc_insch.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_insch.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_insstr.c b/graphics/pdcurs34/pdcurses/pdc_insstr.c
index c62e50781..d945226e5 100644
--- a/graphics/pdcurs34/pdcurses/pdc_insstr.c
+++ b/graphics/pdcurs34/pdcurses/pdc_insstr.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_insstr.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_instr.c b/graphics/pdcurs34/pdcurses/pdc_instr.c
index ac5b0a18b..a32e48013 100644
--- a/graphics/pdcurs34/pdcurses/pdc_instr.c
+++ b/graphics/pdcurs34/pdcurses/pdc_instr.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_instr.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_kernel.c b/graphics/pdcurs34/pdcurses/pdc_kernel.c
index ec706e865..0e3bf42ef 100644
--- a/graphics/pdcurs34/pdcurses/pdc_kernel.c
+++ b/graphics/pdcurs34/pdcurses/pdc_kernel.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_kernel.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_keyname.c b/graphics/pdcurs34/pdcurses/pdc_keyname.c
index c5a492173..8a23ddb46 100644
--- a/graphics/pdcurs34/pdcurses/pdc_keyname.c
+++ b/graphics/pdcurs34/pdcurses/pdc_keyname.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/pdcurses/pdc_keyname.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_mouse.c b/graphics/pdcurs34/pdcurses/pdc_mouse.c
index 54bdc66c7..62f47dc2d 100644
--- a/graphics/pdcurs34/pdcurses/pdc_mouse.c
+++ b/graphics/pdcurs34/pdcurses/pdc_mouse.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_mouse.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_move.c b/graphics/pdcurs34/pdcurses/pdc_move.c
index f1729ed29..87268fd2a 100644
--- a/graphics/pdcurs34/pdcurses/pdc_move.c
+++ b/graphics/pdcurs34/pdcurses/pdc_move.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_move.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_outopts.c b/graphics/pdcurs34/pdcurses/pdc_outopts.c
index 81c1eaf9f..0f9808952 100644
--- a/graphics/pdcurs34/pdcurses/pdc_outopts.c
+++ b/graphics/pdcurs34/pdcurses/pdc_outopts.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_outopts.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_overlay.c b/graphics/pdcurs34/pdcurses/pdc_overlay.c
index d692851df..e5fea025c 100644
--- a/graphics/pdcurs34/pdcurses/pdc_overlay.c
+++ b/graphics/pdcurs34/pdcurses/pdc_overlay.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_overlay.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_pad.c b/graphics/pdcurs34/pdcurses/pdc_pad.c
index fbc8ba3c2..6d250829f 100644
--- a/graphics/pdcurs34/pdcurses/pdc_pad.c
+++ b/graphics/pdcurs34/pdcurses/pdc_pad.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/pdcurses/pdc_pad.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_panel.c b/graphics/pdcurs34/pdcurses/pdc_panel.c
index e8648368d..28f191765 100644
--- a/graphics/pdcurs34/pdcurses/pdc_panel.c
+++ b/graphics/pdcurs34/pdcurses/pdc_panel.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/pdcurses/pdc_panel.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_printw.c b/graphics/pdcurs34/pdcurses/pdc_printw.c
index 09ccacdf7..6864ddbab 100644
--- a/graphics/pdcurs34/pdcurses/pdc_printw.c
+++ b/graphics/pdcurs34/pdcurses/pdc_printw.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_printw.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_refresh.c b/graphics/pdcurs34/pdcurses/pdc_refresh.c
index dc69552c7..33a82d256 100644
--- a/graphics/pdcurs34/pdcurses/pdc_refresh.c
+++ b/graphics/pdcurs34/pdcurses/pdc_refresh.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_refresh.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_scanw.c b/graphics/pdcurs34/pdcurses/pdc_scanw.c
index 5a6e6c6d9..0f9e94652 100644
--- a/graphics/pdcurs34/pdcurses/pdc_scanw.c
+++ b/graphics/pdcurs34/pdcurses/pdc_scanw.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_scanw.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_scrdump.c b/graphics/pdcurs34/pdcurses/pdc_scrdump.c
index cf7737bc2..e06b3c463 100644
--- a/graphics/pdcurs34/pdcurses/pdc_scrdump.c
+++ b/graphics/pdcurs34/pdcurses/pdc_scrdump.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/pdcurses/pdc_scrdump.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_scroll.c b/graphics/pdcurs34/pdcurses/pdc_scroll.c
index 835fd7463..1b87471e1 100644
--- a/graphics/pdcurs34/pdcurses/pdc_scroll.c
+++ b/graphics/pdcurs34/pdcurses/pdc_scroll.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_scroll.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_slk.c b/graphics/pdcurs34/pdcurses/pdc_slk.c
index 3d02a005e..b53d530e1 100644
--- a/graphics/pdcurs34/pdcurses/pdc_slk.c
+++ b/graphics/pdcurs34/pdcurses/pdc_slk.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/pdcurses/pdc_slk.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_termattr.c b/graphics/pdcurs34/pdcurses/pdc_termattr.c
index a95e8b75b..9c25f7b3b 100644
--- a/graphics/pdcurs34/pdcurses/pdc_termattr.c
+++ b/graphics/pdcurs34/pdcurses/pdc_termattr.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurses/pdc_termattr.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_terminfo.c b/graphics/pdcurs34/pdcurses/pdc_terminfo.c
index 099314b4a..e65112604 100644
--- a/graphics/pdcurs34/pdcurses/pdc_terminfo.c
+++ b/graphics/pdcurs34/pdcurses/pdc_terminfo.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/pdcurses/pdc_terminfo.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_touch.c b/graphics/pdcurs34/pdcurses/pdc_touch.c
index 5eda71905..5562df1a6 100644
--- a/graphics/pdcurs34/pdcurses/pdc_touch.c
+++ b/graphics/pdcurs34/pdcurses/pdc_touch.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/pdcurses/pdc_touch.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_util.c b/graphics/pdcurs34/pdcurses/pdc_util.c
index 4b4b369f8..979543efd 100644
--- a/graphics/pdcurs34/pdcurses/pdc_util.c
+++ b/graphics/pdcurs34/pdcurses/pdc_util.c
@@ -1,7 +1,8 @@
-
 /****************************************************************************
  * apps/graphics/pdcurses/util.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/pdcurs34/pdcurses/pdc_window.c b/graphics/pdcurs34/pdcurses/pdc_window.c
index 47ce25a45..0a0ef7e7e 100644
--- a/graphics/pdcurs34/pdcurses/pdc_window.c
+++ b/graphics/pdcurs34/pdcurses/pdc_window.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/pdcurs34/pdcurses/pdc_window.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/screenshot/Make.defs b/graphics/screenshot/Make.defs
index 5901dcc4a..28f0d1fa1 100644
--- a/graphics/screenshot/Make.defs
+++ b/graphics/screenshot/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/screenshot/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/screenshot/Makefile b/graphics/screenshot/Makefile
index 9847dd22f..0a315fc56 100644
--- a/graphics/screenshot/Makefile
+++ b/graphics/screenshot/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/screenshot/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/screenshot/screenshot_main.c b/graphics/screenshot/screenshot_main.c
index 7ed580932..5025c67d8 100644
--- a/graphics/screenshot/screenshot_main.c
+++ b/graphics/screenshot/screenshot_main.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/screenshot/screenshot_main.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/slcd/Make.defs b/graphics/slcd/Make.defs
index 781348ec4..4378ff132 100644
--- a/graphics/slcd/Make.defs
+++ b/graphics/slcd/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/slcd/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/slcd/Makefile b/graphics/slcd/Makefile
index d45edf7e5..bc1c151e3 100644
--- a/graphics/slcd/Makefile
+++ b/graphics/slcd/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/slcd/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/slcd/cslcd.cxx b/graphics/slcd/cslcd.cxx
index bba30faf5..8f7320e1e 100644
--- a/graphics/slcd/cslcd.cxx
+++ b/graphics/slcd/cslcd.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/slcd/cslcd.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/slcd/slcd.hxx b/graphics/slcd/slcd.hxx
index 97619f8ab..a28279440 100644
--- a/graphics/slcd/slcd.hxx
+++ b/graphics/slcd/slcd.hxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/slcd/slcd.hxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/slcd/slcd_mapping.cxx b/graphics/slcd/slcd_mapping.cxx
index b5d7315e4..086145f7e 100644
--- a/graphics/slcd/slcd_mapping.cxx
+++ b/graphics/slcd/slcd_mapping.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/slcd/slcd_mapping.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/slcd/slcd_trapezoids.cxx b/graphics/slcd/slcd_trapezoids.cxx
index 51cfabb75..5c9689e4a 100644
--- a/graphics/slcd/slcd_trapezoids.cxx
+++ b/graphics/slcd/slcd_trapezoids.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/slcd/slcd_trapezoids.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/tiff/Make.defs b/graphics/tiff/Make.defs
index 9ea1e6d00..a376e36a9 100644
--- a/graphics/tiff/Make.defs
+++ b/graphics/tiff/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/tiff/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 542376749..10c51fc88 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/tiff/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/tiff/tiff_addstrip.c b/graphics/tiff/tiff_addstrip.c
index e0a4bdfe0..ff4a9d598 100644
--- a/graphics/tiff/tiff_addstrip.c
+++ b/graphics/tiff/tiff_addstrip.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/tiff/tiff_addstrip.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/tiff/tiff_finalize.c b/graphics/tiff/tiff_finalize.c
index 7c8d5d6dd..2ad01a06e 100644
--- a/graphics/tiff/tiff_finalize.c
+++ b/graphics/tiff/tiff_finalize.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/tiff/tiff_finalize.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/tiff/tiff_initialize.c b/graphics/tiff/tiff_initialize.c
index 8198333ef..b6de8408d 100644
--- a/graphics/tiff/tiff_initialize.c
+++ b/graphics/tiff/tiff_initialize.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/tiff/tiff_initialize.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/tiff/tiff_internal.h b/graphics/tiff/tiff_internal.h
index 00bc6515b..b76615145 100644
--- a/graphics/tiff/tiff_internal.h
+++ b/graphics/tiff/tiff_internal.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/tiff/tiff_internal.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/tiff/tiff_utils.c b/graphics/tiff/tiff_utils.c
index 70de92925..c16f7b3e3 100644
--- a/graphics/tiff/tiff_utils.c
+++ b/graphics/tiff/tiff_utils.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/tiff/tiff_utils.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/Make.defs b/graphics/twm4nx/Make.defs
index e724004e7..6d992ec5f 100644
--- a/graphics/twm4nx/Make.defs
+++ b/graphics/twm4nx/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/twm4nx/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/Makefile b/graphics/twm4nx/Makefile
index 0ec2f883a..6156b2da2 100644
--- a/graphics/twm4nx/Makefile
+++ b/graphics/twm4nx/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/graphics/twm4nx/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/apps/ccalibration.cxx b/graphics/twm4nx/apps/ccalibration.cxx
index 336b64777..7eab8067a 100644
--- a/graphics/twm4nx/apps/ccalibration.cxx
+++ b/graphics/twm4nx/apps/ccalibration.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/ccalibration.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/apps/cclock.cxx b/graphics/twm4nx/apps/cclock.cxx
index a5559577d..55c6c3e34 100644
--- a/graphics/twm4nx/apps/cclock.cxx
+++ b/graphics/twm4nx/apps/cclock.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/cnxterm.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/apps/cnxterm.cxx b/graphics/twm4nx/apps/cnxterm.cxx
index 67a964c43..1918775a8 100644
--- a/graphics/twm4nx/apps/cnxterm.cxx
+++ b/graphics/twm4nx/apps/cnxterm.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/cnxterm.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/cbackground.cxx b/graphics/twm4nx/src/cbackground.cxx
index ef1f0ae31..664913e00 100644
--- a/graphics/twm4nx/src/cbackground.cxx
+++ b/graphics/twm4nx/src/cbackground.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/include/cbackground.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/cfonts.cxx b/graphics/twm4nx/src/cfonts.cxx
index b46baafbd..03fcbee57 100644
--- a/graphics/twm4nx/src/cfonts.cxx
+++ b/graphics/twm4nx/src/cfonts.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/cfonts.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/ciconmgr.cxx b/graphics/twm4nx/src/ciconmgr.cxx
index 72c7c56fe..24150a701 100644
--- a/graphics/twm4nx/src/ciconmgr.cxx
+++ b/graphics/twm4nx/src/ciconmgr.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/ciconmgr.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/ciconwidget.cxx b/graphics/twm4nx/src/ciconwidget.cxx
index ec4e66d38..0f2153030 100644
--- a/graphics/twm4nx/src/ciconwidget.cxx
+++ b/graphics/twm4nx/src/ciconwidget.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/ciconwidget.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/cinput.cxx b/graphics/twm4nx/src/cinput.cxx
index 47a8dbb30..a6486de07 100644
--- a/graphics/twm4nx/src/cinput.cxx
+++ b/graphics/twm4nx/src/cinput.cxx
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/graphics/NxWidgets/nxwm/src/cinput.cxx
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/cmainmenu.cxx b/graphics/twm4nx/src/cmainmenu.cxx
index 6282a9e7f..2c2034f3b 100644
--- a/graphics/twm4nx/src/cmainmenu.cxx
+++ b/graphics/twm4nx/src/cmainmenu.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/include/cmainmenu.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/cmenus.cxx b/graphics/twm4nx/src/cmenus.cxx
index 9c6d1f3bd..701fc1a79 100644
--- a/graphics/twm4nx/src/cmenus.cxx
+++ b/graphics/twm4nx/src/cmenus.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/cmenus.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/cresize.cxx b/graphics/twm4nx/src/cresize.cxx
index 9558f5d6c..0e39cea53 100644
--- a/graphics/twm4nx/src/cresize.cxx
+++ b/graphics/twm4nx/src/cresize.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/cresize.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/ctwm4nx.cxx b/graphics/twm4nx/src/ctwm4nx.cxx
index 8b9e9ca32..eaa07bc1a 100644
--- a/graphics/twm4nx/src/ctwm4nx.cxx
+++ b/graphics/twm4nx/src/ctwm4nx.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/ctwm4nx.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/cwindow.cxx b/graphics/twm4nx/src/cwindow.cxx
index 172d5fde5..5d71d7990 100644
--- a/graphics/twm4nx/src/cwindow.cxx
+++ b/graphics/twm4nx/src/cwindow.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/cwindow.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/cwindowevent.cxx b/graphics/twm4nx/src/cwindowevent.cxx
index 4ec9e3013..b29268b84 100644
--- a/graphics/twm4nx/src/cwindowevent.cxx
+++ b/graphics/twm4nx/src/cwindowevent.cxx
@@ -1,5 +1,7 @@
 // apps/graphics/twm4nx/src/cwindowevent.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/cwindowfactory.cxx b/graphics/twm4nx/src/cwindowfactory.cxx
index 35a7373e1..bfda3f2c6 100644
--- a/graphics/twm4nx/src/cwindowfactory.cxx
+++ b/graphics/twm4nx/src/cwindowfactory.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/cwindowfactory.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/twm4nx_cursor.cxx b/graphics/twm4nx/src/twm4nx_cursor.cxx
index efea39c47..f9778d06e 100644
--- a/graphics/twm4nx/src/twm4nx_cursor.cxx
+++ b/graphics/twm4nx/src/twm4nx_cursor.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/twm4nx_cursor.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The
diff --git a/graphics/twm4nx/src/twm4nx_main.cxx b/graphics/twm4nx/src/twm4nx_main.cxx
index c3de5e23a..30185ad07 100644
--- a/graphics/twm4nx/src/twm4nx_main.cxx
+++ b/graphics/twm4nx/src/twm4nx_main.cxx
@@ -1,6 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // apps/graphics/twm4nx/src/twm4nx_main.cxx
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // Licensed to the Apache Software Foundation (ASF) under one or more
 // contributor license agreements.  See the NOTICE file distributed with
 // this work for additional information regarding copyright ownership.  The