app/graphics/NxWidgets: Fix-up paths in idempotence definitions of header files.

2018-09-15 16:50:46 -06:00 · 2018-09-15 16:50:46 -06:00 · 52ac68da04
commit 52ac68da04
parent cb20ed53f3
86 changed files with 257 additions and 257 deletions
--- a/graphics/NxWidgets/libnxwidgets/include/cbgwindow.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cbgwindow.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CBGWINDOW_HXX
-#define __INCLUDE_CBGWINDOW_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECBGWINDOW_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECBGWINDOW_HXX

 /****************************************************************************
 * Included Files
@ -342,5 +342,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CBGWINDOW_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECBGWINDOW_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/cbitmap.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cbitmap.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CBITMAP_HXX
-#define __INCLUDE_CBITMAP_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECBITMAP_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECBITMAP_HXX

 /****************************************************************************
 * Included Files
@ -210,4 +210,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CBITMAP_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECBITMAP_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cbutton.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cbutton.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CBUTTON_HXX
-#define __INCLUDE_CBUTTON_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECBUTTON_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECBUTTON_HXX

 /****************************************************************************
 * Included Files
@ -241,4 +241,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CBUTTON_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECBUTTON_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cbuttonarray.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cbuttonarray.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CBUTTONARRAY_HXX
-#define __INCLUDE_CBUTTONARRAY_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECBUTTONARRAY_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECBUTTONARRAY_HXX

 /****************************************************************************
 * Included Files
@ -323,4 +323,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CBUTTONARRAY_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECBUTTONARRAY_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/ccallback.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/ccallback.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CCALLBACK_HXX
-#define __INCLUDE_CCALLBACK_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECCALLBACK_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECCALLBACK_HXX

 /****************************************************************************
 * Included Files
@ -266,5 +266,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CCALLBACK_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECCALLBACK_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/ccheckbox.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/ccheckbox.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CCHECKBOX_HXX
-#define __INCLUDE_CCHECKBOX_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECCHECKBOX_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECCHECKBOX_HXX

 /****************************************************************************
 * Included Files
@ -206,5 +206,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CCHECKBOX_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECCHECKBOX_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/ccyclebutton.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/ccyclebutton.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CCYLEBUTTON_HXX
-#define __INCLUDE_CCYLEBUTTON_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECCYLEBUTTON_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECCYLEBUTTON_HXX

 /****************************************************************************
 * Included Files
@ -353,4 +353,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CCYLEBUTTON_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECCYLEBUTTON_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cglyphbutton.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cglyphbutton.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CGLYPHBUTTON_HXX
-#define __INCLUDE_CGLYPHBUTTON_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHBUTTON_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHBUTTON_HXX

 /****************************************************************************
 * Included Files
@ -235,4 +235,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CGLYPHBUTTON_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHBUTTON_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CGLYPHSLIDERHORIZONTAL_HXX
-#define __INCLUDE_CGLYPHSLIDERHORIZONTAL_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHSLIDERHORIZONTAL_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHSLIDERHORIZONTAL_HXX

 /****************************************************************************
 * Included Files
@ -337,5 +337,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CGLYPHSLIDERHORIZONTAL_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHSLIDERHORIZONTAL_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CGLYPHSLIDERHORIZONTALGRIP_HXX
-#define __INCLUDE_CGLYPHSLIDERHORIZONTALGRIP_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHSLIDERHORIZONTALGRIP_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHSLIDERHORIZONTALGRIP_HXX

 /****************************************************************************
 * Included Files
@ -202,5 +202,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CGLYPHSLIDERHORIZONTALGRIP_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECGLYPHSLIDERHORIZONTALGRIP_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/cgraphicsport.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cgraphicsport.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CGRAPHICSPORT_HXX
-#define __INCLUDE_CGRAPHICSPORT_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECGRAPHICSPORT_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECGRAPHICSPORT_HXX

 /****************************************************************************
 * Included Files
@ -486,4 +486,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CGRAPHICSPORT_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECGRAPHICSPORT_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cimage.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cimage.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CIMAGE_HXX
-#define __INCLUDE_CIMAGE_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECIMAGE_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECIMAGE_HXX

 /****************************************************************************
 * Included Files
@ -343,4 +343,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CIMAGE_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECIMAGE_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/ckeypad.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/ckeypad.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CKEYPAD_HXX
-#define __INCLUDE_CKEYPAD_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECKEYPAD_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECKEYPAD_HXX

 /****************************************************************************
 * Included Files
@ -153,4 +153,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CKEYPAD_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECKEYPAD_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/clabel.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/clabel.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CLABEL_HXX
-#define __INCLUDE_CLABEL_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLABEL_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLABEL_HXX

 /****************************************************************************
 * Included Files
@ -354,4 +354,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CLABEL_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLABEL_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/clatchbutton.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/clatchbutton.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CLATCHBUTTON_HXX
-#define __INCLUDE_CLATCHBUTTON_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLATCHBUTTON_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLATCHBUTTON_HXX

 /****************************************************************************
 * Included Files
@ -170,4 +170,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CLATCHBUTTON_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLATCHBUTTON_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/clatchbuttonarray.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/clatchbuttonarray.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CLATCHBUTTONARRAY_HXX
-#define __INCLUDE_CLATCHBUTTONARRAY_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLATCHBUTTONARRAY_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLATCHBUTTONARRAY_HXX

 /****************************************************************************
 * Included Files
@ -167,4 +167,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CLATCHBUTTONARRAY_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLATCHBUTTONARRAY_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/clistbox.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/clistbox.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CLISTBOX_HXX
-#define __INCLUDE_CLISTBOX_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTBOX_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTBOX_HXX

 /****************************************************************************
 * Included Files
@ -427,5 +427,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CLISTBOX_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTBOX_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/clistboxdataitem.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/clistboxdataitem.hxx
@ -68,8 +68,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CLISTBOXDATAITEM_HXX
-#define __INCLUDE_CLISTBOXDATAITEM_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTBOXDATAITEM_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTBOXDATAITEM_HXX

 /****************************************************************************
 * Included Files
@ -176,5 +176,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CLISTBOXDATAITEM_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTBOXDATAITEM_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/clistdata.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/clistdata.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CLISTDATA_HXX
-#define __INCLUDE_CLISTDATA_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATA_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATA_HXX

 /****************************************************************************
 * Included Files
@ -355,4 +355,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CLISTDATA_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATA_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/clistdataeventargs.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/clistdataeventargs.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CLISTDATAEVENTARGS_HXX
-#define __INCLUDE_CLISTDATAEVENTARGS_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATAEVENTARGS_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATAEVENTARGS_HXX

 /****************************************************************************
 * Included Files
@ -118,4 +118,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CLISTDATAEVENTARGS_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATAEVENTARGS_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/clistdataitem.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/clistdataitem.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CLISTDATAITEM_HXX
-#define __INCLUDE_CLISTDATAITEM_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATAITEM_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATAITEM_HXX

 /****************************************************************************
 * Included Files
@ -186,4 +186,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CLISTDATAITEM_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLISTDATAITEM_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cmultilinetextbox.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cmultilinetextbox.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CMULTILINETEXTBOX_HXX
-#define __INCLUDE_CMULTILINETEXTBOX_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECMULTILINETEXTBOX_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECMULTILINETEXTBOX_HXX

 /****************************************************************************
 * Included Files
@ -629,4 +629,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CMULTILINETEXTBOX_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECMULTILINETEXTBOX_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cnumericedit.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cnumericedit.hxx
@ -68,8 +68,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CNUMERICEDIT_HXX
-#define __INCLUDE_CNUMERICEDIT_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNUMERICEDIT_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNUMERICEDIT_HXX

 /****************************************************************************
 * Included Files
@ -210,4 +210,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CLABEL_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECLABEL_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cnxfont.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cnxfont.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CNXFONT_HXX
-#define __INCLUDE_CNXFONT_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXFONT_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXFONT_HXX

 /****************************************************************************
 * Included Files
@ -235,4 +235,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CNXFONT_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXFONT_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cnxserver.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cnxserver.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CNXSERVER_HXX
-#define __INCLUDE_CNXSERVER_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXSERVER_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXSERVER_HXX

 /****************************************************************************
 * Included Files
@ -186,4 +186,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CNXSERVER_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXSERVER_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cnxstring.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cnxstring.hxx
@ -68,8 +68,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CNXSTRING_HXX
-#define __INCLUDE_CNXSTRING_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXSTRING_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXSTRING_HXX

 /****************************************************************************
 * Included Files
@ -493,4 +493,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CNXSTRING_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXSTRING_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cnxtimer.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cnxtimer.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CNXTIMER_HXX
-#define __INCLUDE_CNXTIMER_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTIMER_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTIMER_HXX

 /****************************************************************************
 * Included Files
@ -204,4 +204,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CNXTIMER_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTIMER_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CNXTKWINDOW_HXX
-#define __INCLUDE_CNXTKWINDOW_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTKWINDOW_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTKWINDOW_HXX

 /****************************************************************************
 * Included Files
@ -363,5 +363,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CNXTKWINDOW_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTKWINDOW_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CNXTOOLBAR_HXX
-#define __INCLUDE_CNXTOOLBAR_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTOOLBAR_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTOOLBAR_HXX

 /****************************************************************************
 * Included Files
@ -332,5 +332,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CNXTOOLBAR_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXTOOLBAR_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/cnxwidget.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cnxwidget.hxx
@ -68,8 +68,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CNXWIDGET_HXX
-#define __INCLUDE_CNXWIDGET_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXWIDGET_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXWIDGET_HXX

 /****************************************************************************
 * Included Files
@ -1352,5 +1352,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CNXWIDGET_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXWIDGET_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/cnxwindow.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cnxwindow.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CNXWINDOW_HXX
-#define __INCLUDE_CNXWINDOW_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXWINDOW_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXWINDOW_HXX

 /****************************************************************************
 * Included Files
@ -336,5 +336,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CNXWINDOW_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECNXWINDOW_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/cprogressbar.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cprogressbar.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CPROGRESSBAR_HXX
-#define __INCLUDE_CPROGRESSBAR_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECPROGRESSBAR_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECPROGRESSBAR_HXX

 /****************************************************************************
 * Included Files
@ -248,4 +248,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CPROGRESSBAR_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECPROGRESSBAR_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cradiobutton.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cradiobutton.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CRADIOBUTTON_HXX
-#define __INCLUDE_CRADIOBUTTON_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECRADIOBUTTON_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECRADIOBUTTON_HXX

 /****************************************************************************
 * Included Files
@ -204,4 +204,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CRADIOBUTTON_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECRADIOBUTTON_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cradiobuttongroup.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cradiobuttongroup.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CRADIOBUTTONGROUP_HXX
-#define __INCLUDE_CRADIOBUTTONGROUP_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECRADIOBUTTONGROUP_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECRADIOBUTTONGROUP_HXX

 /****************************************************************************
 * Included Files
@ -250,4 +250,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CRADIOBUTTONGROUP_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECRADIOBUTTONGROUP_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/crect.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/crect.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CRECT_HXX
-#define __INCLUDE_CRECT_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECRECT_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECRECT_HXX

 /****************************************************************************
 * Included Files
@ -433,4 +433,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CRECT_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECRECT_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx
@ -34,8 +34,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CRLEPALETTBITMAP_HXX
-#define __INCLUDE_CRLEPALETTBITMAP_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECRLEPALETTBITMAP_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECRLEPALETTBITMAP_HXX

 /****************************************************************************
 * Included Files
@ -266,4 +266,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CRLEPALETTBITMAP_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECRLEPALETTBITMAP_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSCALEDBITMAP_HXX
-#define __INCLUDE_CSCALEDBITMAP_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCALEDBITMAP_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCALEDBITMAP_HXX

 /****************************************************************************
 * Included Files
@ -206,4 +206,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSCALEDBITMAP_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCALEDBITMAP_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSCROLLBARHORIZONTAL_HXX
-#define __INCLUDE_CSCROLLBARHORIZONTAL_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARHORIZONTAL_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARHORIZONTAL_HXX

 /****************************************************************************
 * Included Files
@ -289,5 +289,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSCROLLBARHORIZONTAL_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARHORIZONTAL_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/cscrollbarpanel.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cscrollbarpanel.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSCROLLBARPANEL_HXX
-#define __INCLUDE_CSCROLLBARPANEL_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARPANEL_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARPANEL_HXX

 /****************************************************************************
 * Included Files
@ -305,5 +305,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSCROLLBARPANEL_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARPANEL_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSCROLLBARVERTICAL_HXX
-#define __INCLUDE_CSCROLLBARVERTICAL_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARVERTICAL_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARVERTICAL_HXX

 /****************************************************************************
 * Included Files
@ -288,4 +288,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSCROLLBARVERTICAL_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLBARVERTICAL_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cscrollinglistbox.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cscrollinglistbox.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSCROLLINGLISTBOX_HXX
-#define __INCLUDE_CSCROLLINGLISTBOX_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGLISTBOX_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGLISTBOX_HXX

 /****************************************************************************
 * Included Files
@ -477,4 +477,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSCROLLINGLISTBOX_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGLISTBOX_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cscrollingpanel.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cscrollingpanel.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSCROLLINGPANEL_HXX
-#define __INCLUDE_CSCROLLINGPANEL_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGPANEL_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGPANEL_HXX

 /****************************************************************************
 * Included Files
@ -369,5 +369,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSCROLLINGPANEL_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGPANEL_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/cscrollingtextbox.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cscrollingtextbox.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSCROLLINGTEXTBOX_HXX
-#define __INCLUDE_CSCROLLINGTEXTBOX_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGTEXTBOX_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGTEXTBOX_HXX

 /****************************************************************************
 * Included Files
@ -463,5 +463,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSCROLLINGTEXTBOX_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSCROLLINGTEXTBOX_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSLIDERHORIZONTAL_HXX
-#define __INCLUDE_CSLIDERHORIZONTAL_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERHORIZONTAL_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERHORIZONTAL_HXX

 /****************************************************************************
 * Included Files
@ -340,5 +340,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSLIDERHORIZONTAL_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERHORIZONTAL_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/csliderhorizontalgrip.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/csliderhorizontalgrip.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSLIDERHORIZONTALGRIP_HXX
-#define __INCLUDE_CSLIDERHORIZONTALGRIP_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERHORIZONTALGRIP_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERHORIZONTALGRIP_HXX

 /****************************************************************************
 * Included Files
@ -199,5 +199,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSLIDERHORIZONTALGRIP_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERHORIZONTALGRIP_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/cslidervertical.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cslidervertical.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSLIDERVERTICAL_HXX
-#define __INCLUDE_CSLIDERVERTICAL_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERVERTICAL_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERVERTICAL_HXX

 /****************************************************************************
 * Included Files
@ -340,5 +340,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSLIDERVERTICAL_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERVERTICAL_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/csliderverticalgrip.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/csliderverticalgrip.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSLIDERVERTICALGRIP_HXX
-#define __INCLUDE_CSLIDERVERTICALGRIP_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERVERTICALGRIP_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERVERTICALGRIP_HXX

 /****************************************************************************
 * Included Files
@ -198,5 +198,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSLIDERVERTICALGRIP_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSLIDERVERTICALGRIP_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/cstickybutton.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cstickybutton.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSTICKYBUTTON_HXX
-#define __INCLUDE_CSTICKYBUTTON_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKYBUTTON_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKYBUTTON_HXX

 /****************************************************************************
 * Included Files
@ -234,4 +234,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSTICKYBUTTON_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKYBUTTON_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cstickybuttonarray.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cstickybuttonarray.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSTICKYBUTTONARRAY_HXX
-#define __INCLUDE_CSTICKYBUTTONARRAY_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKYBUTTONARRAY_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKYBUTTONARRAY_HXX

 /****************************************************************************
 * Included Files
@ -171,4 +171,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSTICKYBUTTONARRAY_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKYBUTTONARRAY_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cstickyimage.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cstickyimage.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSTICKIMAGE_HXX
-#define __INCLUDE_CSTICKIMAGE_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKIMAGE_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKIMAGE_HXX

 /****************************************************************************
 * Included Files
@ -187,4 +187,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSTICKIMAGE_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTICKIMAGE_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cstringiterator.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cstringiterator.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSTRINGITERATOR_HXX
-#define __INCLUDE_CSTRINGITERATOR_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTRINGITERATOR_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTRINGITERATOR_HXX

 /****************************************************************************
 * Included Files
@ -189,4 +189,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CSTRINGITERATOR_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECSTRINGITERATOR_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/ctabpanel.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/ctabpanel.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CTABPANEL_HXX
-#define __INCLUDE_CTABPANEL_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECTABPANEL_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECTABPANEL_HXX

 /****************************************************************************
 * Included Files
--- a/graphics/NxWidgets/libnxwidgets/include/ctext.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/ctext.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CTEXT_HXX
-#define __INCLUDE_CTEXT_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECTEXT_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECTEXT_HXX

 /****************************************************************************
 * Included Files
@ -388,5 +388,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CTEXT_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECTEXT_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/ctextbox.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/ctextbox.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CTEXTBOX_HXX
-#define __INCLUDE_CTEXTBOX_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECTEXTBOX_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECTEXTBOX_HXX

 /****************************************************************************
 * Included Files
@ -372,4 +372,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CTEXTBOX_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECTEXTBOX_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CWIDGETCONTROLT_HXX
-#define __INCLUDE_CWIDGETCONTROLT_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETCONTROLT_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETCONTROLT_HXX

 /****************************************************************************
 * Included Files
@ -798,4 +798,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CWIDGETCONTROLT_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETCONTROLT_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cwidgeteventargs.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cwidgeteventargs.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CWIDGETEVENTARGS_HXX
-#define __INCLUDE_CWIDGETEVENTARGS_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTARGS_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTARGS_HXX

 /****************************************************************************
 * Included Files
@ -234,4 +234,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CWIDGETEVENTARGS_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTARGS_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CWIDGETEVENTHANDLER_HXX
-#define __INCLUDE_CWIDGETEVENTHANDLER_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTHANDLER_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTHANDLER_HXX

 /****************************************************************************
 * Included Files
@ -281,4 +281,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CWIDGETEVENTHANDLER_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTHANDLER_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CWIDGETEVENTHANDLERLIST_HXX
-#define __INCLUDE_CWIDGETEVENTHANDLERLIST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTHANDLERLIST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTHANDLERLIST_HXX

 /****************************************************************************
 * Included Files
@ -355,4 +355,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CWIDGETEVENTHANDLERLIST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETEVENTHANDLERLIST_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cwidgetstyle.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cwidgetstyle.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CWIDGETSTYLE_HXX
-#define __INCLUDE_CWIDGETSTYLE_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETSTYLE_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETSTYLE_HXX

 /****************************************************************************
 * Included Files
@ -132,4 +132,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CWIDGETSTYLE_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWIDGETSTYLE_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CWINDOWEVENTHANDLER_HXX
-#define __INCLUDE_CWINDOWEVENTHANDLER_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWINDOWEVENTHANDLER_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWINDOWEVENTHANDLER_HXX

 /****************************************************************************
 * Included Files
@ -118,4 +118,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CWINDOWEVENTHANDLER_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWINDOWEVENTHANDLER_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CWINDOWEVENTHANDLERLIST_HXX
-#define __INCLUDE_CWINDOWEVENTHANDLERLIST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDECWINDOWEVENTHANDLERLIST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDECWINDOWEVENTHANDLERLIST_HXX

 /****************************************************************************
 * Included Files
@ -173,4 +173,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_CWINDOWEVENTHANDLERLIST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDECWINDOWEVENTHANDLERLIST_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/glyphs.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/glyphs.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_GLYPHS_HXX
-#define __INCLUDE_GLYPHS_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEGLYPHS_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEGLYPHS_HXX

 /****************************************************************************
 * Included Files
@ -129,4 +129,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_GLYPHS_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEGLYPHS_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/ibitmap.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/ibitmap.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_IBITMAP_HXX
-#define __INCLUDE_IBITMAP_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEIBITMAP_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEIBITMAP_HXX

 /****************************************************************************
 * Included Files
@ -181,4 +181,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_IBITMAP_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEIBITMAP_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/ilistbox.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/ilistbox.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_ILISTBOX_HXX
-#define __INCLUDE_ILISTBOX_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEILISTBOX_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEILISTBOX_HXX

 /****************************************************************************
 * Included Files
@ -277,5 +277,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_ILISTBOX_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEILISTBOX_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/ilistdataeventhandler.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/ilistdataeventhandler.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_ILISTDATAEVENTHANDLERR_HXX
-#define __INCLUDE_ILISTDATAEVENTHANDLERR_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEILISTDATAEVENTHANDLERR_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEILISTDATAEVENTHANDLERR_HXX

 /****************************************************************************
 * Included Files
@ -133,4 +133,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_ILISTDATAEVENTHANDLERR_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEILISTDATAEVENTHANDLERR_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/inxwindow.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/inxwindow.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_INXWINDOW_HXX
-#define __INCLUDE_INXWINDOW_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEINXWINDOW_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEINXWINDOW_HXX

 /****************************************************************************
 * Included Files
@ -314,5 +314,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_INXWINDOW_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEINXWINDOW_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/iscrollable.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/iscrollable.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_ISCROLLABLE_HXX
-#define __INCLUDE_ISCROLLABLE_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEISCROLLABLE_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEISCROLLABLE_HXX

 /****************************************************************************
 * Included Files
@ -213,5 +213,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_ISCROLLABLE_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEISCROLLABLE_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/islider.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/islider.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_ISLIDER_HXX
-#define __INCLUDE_ISLIDER_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEISLIDER_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEISLIDER_HXX

 /****************************************************************************
 * Included Files
@ -192,5 +192,5 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_ISLIDER_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEISLIDER_HXX

--- a/graphics/NxWidgets/libnxwidgets/include/itextbox.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/itextbox.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_ITEXTBOX_HXX
-#define __INCLUDE_ITEXTBOX_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDEITEXTBOX_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDEITEXTBOX_HXX

 /****************************************************************************
 * Included Files
@ -214,4 +214,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_ITEXTBOX_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDEITEXTBOX_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/nxconfig.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/nxconfig.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_NXCONFIG_HXX
-#define __INCLUDE_NXCONFIG_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDENXCONFIG_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDENXCONFIG_HXX

 /****************************************************************************
 * Included Files
@ -463,4 +463,4 @@ namespace NXWidgets
 * Implementation Classes
 ****************************************************************************/

-#endif // __INCLUDE_NXCONFIG_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDENXCONFIG_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/singletons.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/singletons.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_SINGLETONS_HXX
-#define __INCLUDE_SINGLETONS_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDESINGLETONS_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDESINGLETONS_HXX

 /****************************************************************************
 * Included Files
@ -133,4 +133,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_SINGLETONS_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDESINGLETONS_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/teventargs.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/teventargs.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_TEVENTARGS_HXX
-#define __INCLUDE_TEVENTARGS_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDETEVENTARGS_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDETEVENTARGS_HXX

 /****************************************************************************
 * Included Files
@ -133,4 +133,4 @@ namespace NXWidgets

 #endif // __cplusplus

-#endif // __INCLUDE_TEVENTARGS_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDETEVENTARGS_HXX
--- a/graphics/NxWidgets/libnxwidgets/include/tnxarray.hxx
+++ b/graphics/NxWidgets/libnxwidgets/include/tnxarray.hxx
@ -67,8 +67,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_TNXARRAY_HXX
-#define __INCLUDE_TNXARRAY_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_INCLUDETNXARRAY_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_INCLUDETNXARRAY_HXX

 /****************************************************************************
 * Included Files
@ -434,4 +434,4 @@ void TNxArray<T>::clear()

 #endif // __cplusplus

-#endif // __INCLUDE_TNXARRAY_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_INCLUDETNXARRAY_HXX
--- a/graphics/NxWidgets/nxwm/include/capplicationwindow.hxx
+++ b/graphics/NxWidgets/nxwm/include/capplicationwindow.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CAPPLICATIONWINDOW_NXX
-#define __INCLUDE_CAPPLICATIONWINDOW_NXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDECAPPLICATIONWINDOW_NXX
+#define __APPS_GRAPHICS_NXWM_INCLUDECAPPLICATIONWINDOW_NXX

 /****************************************************************************
 * Included Files
@ -230,4 +230,4 @@ namespace NxWM

 #endif // __cplusplus

-#endif // __INCLUDE_CAPPLICATIONWINDOW_NXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDECAPPLICATIONWINDOW_NXX
--- a/graphics/NxWidgets/nxwm/include/ccalibration.hxx
+++ b/graphics/NxWidgets/nxwm/include/ccalibration.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CCALIBRATION_HXX
-#define __INCLUDE_CCALIBRATION_HXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDECCALIBRATION_HXX
+#define __APPS_GRAPHICS_NXWM_INCLUDECCALIBRATION_HXX

 /****************************************************************************
 * Included Files
@ -449,4 +449,4 @@ namespace NxWM
  };
 }

-#endif // __INCLUDE_CCALIBRATION_HXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDECCALIBRATION_HXX
--- a/graphics/NxWidgets/nxwm/include/cfullscreenwindow.hxx
+++ b/graphics/NxWidgets/nxwm/include/cfullscreenwindow.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CFULLSCREENWINDOW_NXX
-#define __INCLUDE_CFULLSCREENWINDOW_NXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDECFULLSCREENWINDOW_NXX
+#define __APPS_GRAPHICS_NXWM_INCLUDECFULLSCREENWINDOW_NXX

 /****************************************************************************
 * Included Files
@ -182,4 +182,4 @@ namespace NxWM

 #endif // __cplusplus

-#endif // __INCLUDE_CFULLSCREENWINDOW_NXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDECFULLSCREENWINDOW_NXX
--- a/graphics/NxWidgets/nxwm/include/chexcalculator.hxx
+++ b/graphics/NxWidgets/nxwm/include/chexcalculator.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CHEXCALCULATOR_HXX
-#define __INCLUDE_CHEXCALCULATOR_HXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDECHEXCALCULATOR_HXX
+#define __APPS_GRAPHICS_NXWM_INCLUDECHEXCALCULATOR_HXX

 /****************************************************************************
 * Included Files
@ -327,4 +327,4 @@ namespace NxWM
 }
 #endif // __cplusplus

-#endif // __INCLUDE_CHEXCALCULATOR_HXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDECHEXCALCULATOR_HXX
--- a/graphics/NxWidgets/nxwm/include/cmediaplayer.hxx
+++ b/graphics/NxWidgets/nxwm/include/cmediaplayer.hxx
@ -35,8 +35,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CMEDIAPLAYER_HXX
-#define __INCLUDE_CMEDIAPLAYER_HXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDECMEDIAPLAYER_HXX
+#define __APPS_GRAPHICS_NXWM_INCLUDECMEDIAPLAYER_HXX

 /****************************************************************************
 * Included Files
@ -477,4 +477,4 @@ namespace NxWM
 }
 #endif // __cplusplus

-#endif // __INCLUDE_CMEDIAPLAYER_HXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDECMEDIAPLAYER_HXX
--- a/graphics/NxWidgets/nxwm/include/cnxterm.hxx
+++ b/graphics/NxWidgets/nxwm/include/cnxterm.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CNXTERM_HXX
-#define __INCLUDE_CNXTERM_HXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDECNXTERM_HXX
+#define __APPS_GRAPHICS_NXWM_INCLUDECNXTERM_HXX

 /****************************************************************************
 * Included Files
@ -242,4 +242,4 @@ namespace NxWM
 }
 #endif // __cplusplus

-#endif // __INCLUDE_CNXTERM_HXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDECNXTERM_HXX
--- a/graphics/NxWidgets/nxwm/include/cstartwindow.hxx
+++ b/graphics/NxWidgets/nxwm/include/cstartwindow.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CSTARTWINDOW_NXX
-#define __INCLUDE_CSTARTWINDOW_NXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDECSTARTWINDOW_NXX
+#define __APPS_GRAPHICS_NXWM_INCLUDECSTARTWINDOW_NXX

 /****************************************************************************
 * Included Files
@ -301,4 +301,4 @@ namespace NxWM

 #endif // __cplusplus

-#endif // __INCLUDE_CSTARTWINDOW_NXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDECSTARTWINDOW_NXX
--- a/graphics/NxWidgets/nxwm/include/ctouchscreen.hxx
+++ b/graphics/NxWidgets/nxwm/include/ctouchscreen.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CTOUCHSCREEN_HXX
-#define __INCLUDE_CTOUCHSCREEN_HXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDECTOUCHSCREEN_HXX
+#define __APPS_GRAPHICS_NXWM_INCLUDECTOUCHSCREEN_HXX

 /****************************************************************************
 * Included Files
@ -218,4 +218,4 @@ namespace NxWM
  };
 }

-#endif // __INCLUDE_CTOUCHSCREEN_HXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDECTOUCHSCREEN_HXX
--- a/graphics/NxWidgets/nxwm/include/cwindowmessenger.hxx
+++ b/graphics/NxWidgets/nxwm/include/cwindowmessenger.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CWINDOWMESSENGER_HXX
-#define __INCLUDE_CWINDOWMESSENGER_HXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDECWINDOWMESSENGER_HXX
+#define __APPS_GRAPHICS_NXWM_INCLUDECWINDOWMESSENGER_HXX

 /****************************************************************************
 * Included Files
@ -146,4 +146,4 @@ namespace NxWM
 }
 #endif // __cplusplus

-#endif // __INCLUDE_CWINDOWMESSENGER_HXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDECWINDOWMESSENGER_HXX
--- a/graphics/NxWidgets/nxwm/include/iapplication.hxx
+++ b/graphics/NxWidgets/nxwm/include/iapplication.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_IAPPLICATION_NXX
-#define __INCLUDE_IAPPLICATION_NXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDEIAPPLICATION_NXX
+#define __APPS_GRAPHICS_NXWM_INCLUDEIAPPLICATION_NXX

 /****************************************************************************
 * Included Files
@ -247,4 +247,4 @@ namespace NxWM

 #endif // __cplusplus

-#endif // __INCLUDE_IAPPLICATION_NXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDEIAPPLICATION_NXX
--- a/graphics/NxWidgets/nxwm/include/iapplicationwindow.hxx
+++ b/graphics/NxWidgets/nxwm/include/iapplicationwindow.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_IAPPLICATIONWINDOW_NXX
-#define __INCLUDE_IAPPLICATIONWINDOW_NXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDEIAPPLICATIONWINDOW_NXX
+#define __APPS_GRAPHICS_NXWM_INCLUDEIAPPLICATIONWINDOW_NXX

 /****************************************************************************
 * Included Files
@ -201,4 +201,4 @@ namespace NxWM

 #endif // __cplusplus

-#endif // __INCLUDE_IAPPLICATIONWINDOW_NXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDEIAPPLICATIONWINDOW_NXX
--- a/graphics/NxWidgets/nxwm/include/nxwmconfig.hxx
+++ b/graphics/NxWidgets/nxwm/include/nxwmconfig.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_NXWMCONFIG_HXX
-#define __INCLUDE_NXWMCONFIG_HXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDENXWMCONFIG_HXX
+#define __APPS_GRAPHICS_NXWM_INCLUDENXWMCONFIG_HXX

 /****************************************************************************
 * Included Files
@ -706,4 +706,4 @@ void showTestStepMemory(FAR const char *msg);
 #  define showTestStepMemory(msg)
 #endif

-#endif // __INCLUDE_NXWMCONFIG_HXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDENXWMCONFIG_HXX
--- a/graphics/NxWidgets/nxwm/include/nxwmglyphs.hxx
+++ b/graphics/NxWidgets/nxwm/include/nxwmglyphs.hxx
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_NXWMGLYPHS_HXX
-#define __INCLUDE_NXWMGLYPHS_HXX
+#ifndef __APPS_GRAPHICS_NXWM_INCLUDENXWMGLYPHS_HXX
+#define __APPS_GRAPHICS_NXWM_INCLUDENXWMGLYPHS_HXX

 /****************************************************************************
 * Included Files
@ -74,4 +74,4 @@ namespace NxWM
 }

 #endif // __cplusplus
-#endif // __INCLUDE_NXWMGLYPHS_HXX
+#endif // __APPS_GRAPHICS_NXWM_INCLUDENXWMGLYPHS_HXX