You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/05/21 16:43:49 UTC

[incubator-nuttx-apps] branch master updated (b64d353 -> ea135b8)

This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.


    from b64d353  Application.mk: fix generated empty Make.dep for SRCS with VPATH
     new ead498a  build: Remove the workaround for the inexistence of .config/Make.defs
     new ea135b8  build: Replace all -I to INCDIR

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Directory.mk                                             |  2 +-
 Make.defs                                                |  2 --
 Makefile                                                 |  4 ++--
 builtin/Makefile                                         |  2 +-
 canutils/canlib/Makefile                                 |  2 +-
 canutils/libcanard/Makefile                              |  5 +++--
 canutils/libobd2/Makefile                                |  2 +-
 examples/abntcodi/Makefile                               |  2 +-
 examples/adc/Makefile                                    |  2 +-
 examples/adxl372_test/Makefile                           |  2 +-
 examples/ajoystick/Makefile                              |  2 +-
 examples/alarm/Makefile                                  |  2 +-
 examples/apa102/Makefile                                 |  2 +-
 examples/apds9960/Makefile                               |  2 +-
 examples/audio_rttl/Makefile                             |  4 +---
 examples/bastest/Makefile                                |  2 +-
 examples/battery/Makefile                                |  2 +-
 examples/bmi160/Makefile                                 |  2 +-
 examples/bmp180/Makefile                                 |  2 +-
 examples/bridge/Makefile                                 |  2 +-
 examples/buttons/Makefile                                |  2 +-
 examples/calib_udelay/Makefile                           |  2 +-
 examples/can/Makefile                                    |  2 +-
 examples/canard/Makefile                                 |  4 ++--
 examples/cctype/Makefile                                 |  2 +-
 examples/charger/Makefile                                |  2 +-
 examples/chat/Makefile                                   |  2 +-
 examples/chrono/Makefile                                 |  2 +-
 examples/configdata/Makefile                             |  2 +-
 examples/cpuhog/Makefile                                 |  2 +-
 examples/cromfs/Makefile                                 |  2 +-
 examples/dac/Makefile                                    |  2 +-
 examples/dhcpd/Makefile                                  |  2 +-
 examples/dhtxx/Makefile                                  |  2 +-
 examples/discover/Makefile                               |  2 +-
 examples/djoystick/Makefile                              |  2 +-
 examples/dsptest/Makefile                                |  2 +-
 examples/elf/Makefile                                    |  2 +-
 examples/elf/tests/Makefile                              |  2 +-
 examples/elf/tests/errno/Makefile                        |  5 +----
 examples/elf/tests/hello/Makefile                        |  5 +----
 examples/elf/tests/helloxx/Makefile                      |  5 +----
 examples/elf/tests/longjmp/Makefile                      |  5 +----
 examples/elf/tests/mutex/Makefile                        |  5 +----
 examples/elf/tests/pthread/Makefile                      |  5 +----
 examples/elf/tests/signal/Makefile                       |  5 +----
 examples/elf/tests/struct/Makefile                       |  7 +------
 examples/elf/tests/task/Makefile                         |  5 +----
 examples/embedlog/Makefile                               |  3 +--
 examples/embedlog/embedlog_main.c                        | 16 ++++++++--------
 examples/fb/Makefile                                     |  2 +-
 examples/fboverlay/Makefile                              |  2 +-
 examples/flash_test/Makefile                             |  2 +-
 examples/flowc/Makefile                                  |  2 +-
 examples/ft80x/Makefile                                  |  2 +-
 examples/ftpc/Makefile                                   |  2 +-
 examples/ftpd/Makefile                                   |  2 +-
 examples/gpio/Makefile                                   |  2 +-
 examples/gps/Makefile                                    |  2 +-
 examples/hdc1008_demo/Makefile                           |  2 +-
 examples/hello/Makefile                                  |  2 +-
 examples/helloxx/Makefile                                |  2 +-
 examples/hidkbd/Makefile                                 |  2 +-
 examples/hts221_reader/Makefile                          |  2 +-
 examples/i2schar/Makefile                                |  2 +-
 examples/i2sloop/Makefile                                |  2 +-
 examples/igmp/Makefile                                   |  2 +-
 examples/ina219/Makefile                                 |  2 +-
 examples/ina226/Makefile                                 |  2 +-
 examples/ini_dumper/Makefile                             |  3 +--
 examples/ini_dumper/ini_dumper_main.c                    |  8 ++++----
 examples/ipforward/Makefile                              |  2 +-
 examples/json/Makefile                                   |  2 +-
 examples/leds/Makefile                                   |  2 +-
 examples/lis3dsh_reader/Makefile                         |  2 +-
 examples/lsm303_reader/Makefile                          |  2 +-
 examples/lsm330spi_test/Makefile                         |  2 +-
 examples/lsm6dsl_reader/Makefile                         |  2 +-
 examples/lvgldemo/Makefile                               |  2 +-
 examples/max31855/Makefile                               |  2 +-
 examples/media/Makefile                                  |  2 +-
 examples/mld/Makefile                                    |  2 +-
 examples/mlx90614/Makefile                               |  2 +-
 examples/modbus/Makefile                                 |  2 +-
 examples/modbusmaster/Makefile                           |  2 +-
 examples/module/Makefile                                 |  2 +-
 examples/module/drivers/Makefile                         |  2 +-
 examples/module/drivers/chardev/Makefile                 |  5 +----
 examples/mount/Makefile                                  |  2 +-
 examples/mtdpart/Makefile                                |  2 +-
 examples/mtdrwb/Makefile                                 |  2 +-
 examples/netlink_route/Makefile                          |  2 +-
 examples/netloop/Makefile                                |  2 +-
 examples/netpkt/Makefile                                 |  2 +-
 examples/nettest/Makefile                                |  2 +-
 examples/nrf24l01_term/Makefile                          |  2 +-
 examples/null/Makefile                                   |  2 +-
 examples/nunchuck/Makefile                               |  2 +-
 examples/nx/Makefile                                     |  2 +-
 examples/nxdemo/Makefile                                 |  2 +-
 examples/nxflat/Makefile                                 |  2 +-
 examples/nxflat/tests/errno/Makefile                     |  2 +-
 examples/nxflat/tests/hello++/Makefile                   |  2 +-
 examples/nxflat/tests/hello/Makefile                     |  2 +-
 examples/nxflat/tests/longjmp/Makefile                   |  2 +-
 examples/nxflat/tests/mutex/Makefile                     |  2 +-
 examples/nxflat/tests/pthread/Makefile                   |  2 +-
 examples/nxflat/tests/signal/Makefile                    |  2 +-
 examples/nxflat/tests/struct/Makefile                    |  4 +---
 examples/nxflat/tests/task/Makefile                      |  2 +-
 examples/nxhello/Makefile                                |  2 +-
 examples/nximage/Makefile                                |  2 +-
 examples/nxlines/Makefile                                |  2 +-
 examples/nxterm/Makefile                                 |  2 +-
 examples/nxtext/Makefile                                 |  2 +-
 examples/obd2/Makefile                                   |  2 +-
 examples/oneshot/Makefile                                |  2 +-
 examples/pca9635/Makefile                                |  2 +-
 examples/pdcurses/Makefile                               |  2 +-
 examples/pf_ieee802154/Makefile                          |  2 +-
 examples/pipe/Makefile                                   |  2 +-
 examples/poll/Makefile                                   |  2 +-
 examples/popen/Makefile                                  |  2 +-
 examples/posix_spawn/Makefile                            |  2 +-
 examples/posix_spawn/filesystem/Makefile                 |  2 +-
 examples/posix_spawn/filesystem/hello/Makefile           |  2 +-
 examples/posix_spawn/filesystem/redirect/Makefile        |  2 +-
 examples/powerled/Makefile                               |  2 +-
 examples/powermonitor/Makefile                           |  4 +---
 examples/pppd/Makefile                                   |  2 +-
 examples/pty_test/Makefile                               |  3 +--
 examples/pwfb/Makefile                                   |  2 +-
 examples/pwlines/Makefile                                |  2 +-
 examples/pwm/Makefile                                    |  2 +-
 examples/qencoder/Makefile                               |  2 +-
 examples/random/Makefile                                 |  2 +-
 examples/relays/Makefile                                 |  2 +-
 examples/rfid_readuid/Makefile                           |  2 +-
 examples/rgbled/Makefile                                 |  2 +-
 examples/romfs/Makefile                                  |  2 +-
 examples/sendmail/Makefile                               |  2 +-
 examples/serialblaster/Makefile                          |  2 +-
 examples/serialrx/Makefile                               |  2 +-
 examples/serloop/Makefile                                |  2 +-
 examples/slcd/Makefile                                   |  2 +-
 examples/smps/Makefile                                   |  2 +-
 examples/sotest/Makefile                                 |  5 +----
 examples/sotest/lib/Makefile                             |  2 +-
 examples/sotest/lib/modprint/Makefile                    |  5 +----
 examples/sotest/lib/sotest/Makefile                      |  5 +----
 examples/stat/Makefile                                   |  2 +-
 examples/sx127x_demo/Makefile                            |  2 +-
 examples/system/Makefile                                 |  2 +-
 examples/tcpblaster/Makefile                             |  2 +-
 examples/tcpecho/Makefile                                |  2 +-
 examples/telnetd/Makefile                                |  2 +-
 examples/thttpd/Makefile                                 |  2 +-
 examples/thttpd/content/Makefile.binfs                   |  2 +-
 examples/thttpd/content/hello/Makefile                   |  2 +-
 examples/thttpd/content/tasks/Makefile                   |  5 +----
 examples/tiff/Makefile                                   |  2 +-
 examples/timer/Makefile                                  |  2 +-
 examples/touchscreen/Makefile                            |  2 +-
 examples/udgram/Makefile                                 |  2 +-
 examples/udp/Makefile                                    |  2 +-
 examples/udpblaster/Makefile                             |  2 +-
 examples/uid/Makefile                                    |  2 +-
 examples/unionfs/Makefile                                |  2 +-
 examples/usbserial/Makefile                              |  2 +-
 examples/usbserial/Makefile.host                         |  2 +-
 examples/userfs/Makefile                                 |  2 +-
 examples/usrsocktest/Makefile                            |  2 +-
 examples/ustream/Makefile                                |  2 +-
 examples/veml6070/Makefile                               |  2 +-
 examples/watchdog/Makefile                               |  2 +-
 examples/webserver/Makefile                              |  2 +-
 examples/wget/Makefile                                   |  2 +-
 examples/wgetjson/Makefile                               |  2 +-
 examples/xbc_test/Makefile                               |  2 +-
 examples/xmlrpc/Makefile                                 |  2 +-
 examples/zerocross/Makefile                              |  2 +-
 fsutils/flash_eraseall/Makefile                          |  2 +-
 fsutils/inifile/Makefile                                 |  2 +-
 fsutils/inih/Makefile                                    |  2 +-
 fsutils/mkfatfs/Makefile                                 |  2 +-
 fsutils/mksmartfs/Makefile                               |  2 +-
 fsutils/passwd/Makefile                                  |  2 +-
 gpsutils/minmea/Makefile                                 |  2 +-
 graphics/ft80x/Makefile                                  |  2 +-
 graphics/littlevgl/Makefile                              |  2 +-
 graphics/nxglyphs/Makefile                               |  2 +-
 graphics/nxwidgets/Makefile                              |  2 +-
 graphics/nxwidgets/UnitTests/CButton/Makefile            |  2 +-
 graphics/nxwidgets/UnitTests/CButtonArray/Makefile       |  2 +-
 graphics/nxwidgets/UnitTests/CCheckBox/Makefile          |  2 +-
 graphics/nxwidgets/UnitTests/CGlyphButton/Makefile       |  2 +-
 .../nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile  |  2 +-
 graphics/nxwidgets/UnitTests/CImage/Makefile             |  2 +-
 graphics/nxwidgets/UnitTests/CKeypad/Makefile            |  2 +-
 graphics/nxwidgets/UnitTests/CLabel/Makefile             |  2 +-
 graphics/nxwidgets/UnitTests/CLatchButton/Makefile       |  2 +-
 graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile  |  2 +-
 graphics/nxwidgets/UnitTests/CListBox/Makefile           |  2 +-
 graphics/nxwidgets/UnitTests/CProgressBar/Makefile       |  2 +-
 graphics/nxwidgets/UnitTests/CRadioButton/Makefile       |  2 +-
 .../nxwidgets/UnitTests/CScrollbarHorizontal/Makefile    |  2 +-
 graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile |  2 +-
 graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile   |  2 +-
 graphics/nxwidgets/UnitTests/CSliderVertical/Makefile    |  2 +-
 graphics/nxwidgets/UnitTests/CTextBox/Makefile           |  2 +-
 graphics/nxwm/Makefile                                   |  2 +-
 graphics/pdcurs34/Makefile                               |  2 +-
 graphics/screenshot/Makefile                             |  2 +-
 graphics/slcd/Makefile                                   |  2 +-
 graphics/tiff/Makefile                                   |  2 +-
 graphics/twm4nx/Makefile                                 |  2 +-
 import/Make.defs                                         | 11 +++++------
 import/Makefile                                          |  2 +-
 industry/abnt_codi/Makefile                              |  2 +-
 interpreters/bas/Makefile                                |  2 +-
 interpreters/ficl/Makefile                               |  2 +-
 interpreters/minibasic/Makefile                          |  2 +-
 modbus/Makefile                                          |  2 +-
 netutils/chat/Makefile                                   |  2 +-
 netutils/cjson/Makefile                                  |  5 +++--
 netutils/codecs/Makefile                                 |  2 +-
 netutils/dhcpc/Makefile                                  |  2 +-
 netutils/dhcpd/Makefile                                  |  2 +-
 netutils/discover/Makefile                               |  2 +-
 netutils/esp8266/Makefile                                |  2 +-
 netutils/ftpc/Makefile                                   |  2 +-
 netutils/ftpd/Makefile                                   |  2 +-
 netutils/libcurl4nx/Makefile                             |  2 +-
 netutils/netinit/Makefile                                |  2 +-
 netutils/netlib/Makefile                                 |  2 +-
 netutils/ntpclient/Makefile                              |  2 +-
 netutils/ping/Makefile                                   |  2 +-
 netutils/pppd/Makefile                                   |  2 +-
 netutils/smtp/Makefile                                   |  2 +-
 netutils/telnetc/Makefile                                |  2 +-
 netutils/telnetd/Makefile                                |  2 +-
 netutils/tftpc/Makefile                                  |  2 +-
 netutils/thttpd/Makefile                                 |  2 +-
 netutils/thttpd/cgi-src/Makefile                         |  2 +-
 netutils/usrsock_rpmsg/Makefile                          |  2 +-
 netutils/webclient/Makefile                              |  2 +-
 netutils/webserver/Makefile                              |  2 +-
 netutils/xmlrpc/Makefile                                 |  2 +-
 nshlib/Makefile                                          |  2 +-
 platform/Makefile                                        |  4 ++--
 platform/bin/Makefile                                    |  2 +-
 system/cdcacm/Makefile                                   |  2 +-
 system/cfgdata/Makefile                                  |  2 +-
 system/cle/Makefile                                      |  2 +-
 system/composite/Makefile                                |  2 +-
 system/critmon/Makefile                                  |  2 +-
 system/cu/Makefile                                       |  2 +-
 system/dhcpc/Makefile                                    |  2 +-
 system/embedlog/Makefile                                 |  4 ++--
 system/flash_eraseall/Makefile                           |  2 +-
 system/hex2bin/Makefile                                  |  2 +-
 system/hexed/Makefile                                    |  2 +-
 system/i2c/Makefile                                      |  2 +-
 system/lm75/Makefile                                     |  2 +-
 system/lzf/Makefile                                      |  2 +-
 system/mdio/Makefile                                     |  2 +-
 system/netdb/Makefile                                    |  2 +-
 system/nsh/Makefile                                      |  2 +-
 system/ntpc/Makefile                                     |  2 +-
 system/nxplayer/Makefile                                 |  2 +-
 system/nxrecorder/Makefile                               |  2 +-
 system/ping/Makefile                                     |  2 +-
 system/ping6/Makefile                                    |  2 +-
 system/popen/Makefile                                    |  2 +-
 system/psmq/Makefile                                     |  6 +++---
 system/ramtest/Makefile                                  |  2 +-
 system/readline/Makefile                                 |  2 +-
 system/sched_note/Makefile                               |  2 +-
 system/setlogmask/Makefile                               |  2 +-
 system/spi/Makefile                                      |  2 +-
 system/stackmonitor/Makefile                             |  2 +-
 system/system/Makefile                                   |  2 +-
 system/taskset/Makefile                                  |  2 +-
 system/tee/Makefile                                      |  2 +-
 system/telnet/Makefile                                   |  2 +-
 system/termcurses/Makefile                               |  2 +-
 system/ubloxmodem/Makefile                               |  2 +-
 system/usbmsc/Makefile                                   |  2 +-
 system/vi/Makefile                                       |  2 +-
 system/zmodem/Makefile                                   |  2 +-
 system/zmodem/Makefile.host                              |  2 +-
 testing/cxxtest/Makefile                                 |  2 +-
 testing/fstest/Makefile                                  |  2 +-
 testing/getprime/Makefile                                |  2 +-
 testing/mm/Makefile                                      |  2 +-
 testing/nxffs/Makefile                                   |  2 +-
 testing/ostest/Makefile                                  |  2 +-
 testing/scanftest/Makefile                               |  2 +-
 testing/smart/Makefile                                   |  2 +-
 testing/smart_test/Makefile                              |  2 +-
 testing/smp/Makefile                                     |  2 +-
 testing/unity/Makefile                                   |  5 +++--
 wireless/bluetooth/btsak/Makefile                        |  2 +-
 wireless/gs2200m/Makefile                                |  2 +-
 wireless/ieee802154/i8sak/Makefile                       |  2 +-
 wireless/ieee802154/i8shark/Makefile                     |  2 +-
 wireless/ieee802154/libmac/Makefile                      |  2 +-
 wireless/ieee802154/libutils/Makefile                    |  2 +-
 wireless/iwpan/Makefile                                  |  2 +-
 wireless/wapi/Makefile                                   |  2 +-
 310 files changed, 335 insertions(+), 388 deletions(-)


[incubator-nuttx-apps] 01/02: build: Remove the workaround for the inexistence of .config/Make.defs

Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git

commit ead498a7883a654b1d542da94a5fab3ce163361e
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue May 19 03:53:27 2020 +0800

    build: Remove the workaround for the inexistence of .config/Make.defs
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 Directory.mk                                                 | 2 +-
 Make.defs                                                    | 2 --
 Makefile                                                     | 4 ++--
 builtin/Makefile                                             | 2 +-
 canutils/canlib/Makefile                                     | 2 +-
 canutils/libcanard/Makefile                                  | 2 +-
 canutils/libobd2/Makefile                                    | 2 +-
 examples/abntcodi/Makefile                                   | 2 +-
 examples/adc/Makefile                                        | 2 +-
 examples/adxl372_test/Makefile                               | 2 +-
 examples/ajoystick/Makefile                                  | 2 +-
 examples/alarm/Makefile                                      | 2 +-
 examples/apa102/Makefile                                     | 2 +-
 examples/apds9960/Makefile                                   | 2 +-
 examples/audio_rttl/Makefile                                 | 4 +---
 examples/bastest/Makefile                                    | 2 +-
 examples/battery/Makefile                                    | 2 +-
 examples/bmi160/Makefile                                     | 2 +-
 examples/bmp180/Makefile                                     | 2 +-
 examples/bridge/Makefile                                     | 2 +-
 examples/buttons/Makefile                                    | 2 +-
 examples/calib_udelay/Makefile                               | 2 +-
 examples/can/Makefile                                        | 2 +-
 examples/canard/Makefile                                     | 2 +-
 examples/cctype/Makefile                                     | 2 +-
 examples/charger/Makefile                                    | 2 +-
 examples/chat/Makefile                                       | 2 +-
 examples/chrono/Makefile                                     | 2 +-
 examples/configdata/Makefile                                 | 2 +-
 examples/cpuhog/Makefile                                     | 2 +-
 examples/cromfs/Makefile                                     | 2 +-
 examples/dac/Makefile                                        | 2 +-
 examples/dhcpd/Makefile                                      | 2 +-
 examples/dhtxx/Makefile                                      | 2 +-
 examples/discover/Makefile                                   | 2 +-
 examples/djoystick/Makefile                                  | 2 +-
 examples/dsptest/Makefile                                    | 2 +-
 examples/elf/Makefile                                        | 2 +-
 examples/elf/tests/Makefile                                  | 2 +-
 examples/elf/tests/errno/Makefile                            | 5 +----
 examples/elf/tests/hello/Makefile                            | 5 +----
 examples/elf/tests/helloxx/Makefile                          | 5 +----
 examples/elf/tests/longjmp/Makefile                          | 5 +----
 examples/elf/tests/mutex/Makefile                            | 5 +----
 examples/elf/tests/pthread/Makefile                          | 5 +----
 examples/elf/tests/signal/Makefile                           | 5 +----
 examples/elf/tests/struct/Makefile                           | 5 +----
 examples/elf/tests/task/Makefile                             | 5 +----
 examples/embedlog/Makefile                                   | 2 +-
 examples/fb/Makefile                                         | 2 +-
 examples/fboverlay/Makefile                                  | 2 +-
 examples/flash_test/Makefile                                 | 2 +-
 examples/flowc/Makefile                                      | 2 +-
 examples/ft80x/Makefile                                      | 2 +-
 examples/ftpc/Makefile                                       | 2 +-
 examples/ftpd/Makefile                                       | 2 +-
 examples/gpio/Makefile                                       | 2 +-
 examples/gps/Makefile                                        | 2 +-
 examples/hdc1008_demo/Makefile                               | 2 +-
 examples/hello/Makefile                                      | 2 +-
 examples/helloxx/Makefile                                    | 2 +-
 examples/hidkbd/Makefile                                     | 2 +-
 examples/hts221_reader/Makefile                              | 2 +-
 examples/i2schar/Makefile                                    | 2 +-
 examples/i2sloop/Makefile                                    | 2 +-
 examples/igmp/Makefile                                       | 2 +-
 examples/ina219/Makefile                                     | 2 +-
 examples/ina226/Makefile                                     | 2 +-
 examples/ini_dumper/Makefile                                 | 2 +-
 examples/ipforward/Makefile                                  | 2 +-
 examples/json/Makefile                                       | 2 +-
 examples/leds/Makefile                                       | 2 +-
 examples/lis3dsh_reader/Makefile                             | 2 +-
 examples/lsm303_reader/Makefile                              | 2 +-
 examples/lsm330spi_test/Makefile                             | 2 +-
 examples/lsm6dsl_reader/Makefile                             | 2 +-
 examples/lvgldemo/Makefile                                   | 2 +-
 examples/max31855/Makefile                                   | 2 +-
 examples/media/Makefile                                      | 2 +-
 examples/mld/Makefile                                        | 2 +-
 examples/mlx90614/Makefile                                   | 2 +-
 examples/modbus/Makefile                                     | 2 +-
 examples/modbusmaster/Makefile                               | 2 +-
 examples/module/Makefile                                     | 2 +-
 examples/module/drivers/Makefile                             | 2 +-
 examples/module/drivers/chardev/Makefile                     | 5 +----
 examples/mount/Makefile                                      | 2 +-
 examples/mtdpart/Makefile                                    | 2 +-
 examples/mtdrwb/Makefile                                     | 2 +-
 examples/netlink_route/Makefile                              | 2 +-
 examples/netloop/Makefile                                    | 2 +-
 examples/netpkt/Makefile                                     | 2 +-
 examples/nettest/Makefile                                    | 2 +-
 examples/nrf24l01_term/Makefile                              | 2 +-
 examples/null/Makefile                                       | 2 +-
 examples/nunchuck/Makefile                                   | 2 +-
 examples/nx/Makefile                                         | 2 +-
 examples/nxdemo/Makefile                                     | 2 +-
 examples/nxflat/Makefile                                     | 2 +-
 examples/nxflat/tests/errno/Makefile                         | 2 +-
 examples/nxflat/tests/hello++/Makefile                       | 2 +-
 examples/nxflat/tests/hello/Makefile                         | 2 +-
 examples/nxflat/tests/longjmp/Makefile                       | 2 +-
 examples/nxflat/tests/mutex/Makefile                         | 2 +-
 examples/nxflat/tests/pthread/Makefile                       | 2 +-
 examples/nxflat/tests/signal/Makefile                        | 2 +-
 examples/nxflat/tests/struct/Makefile                        | 2 +-
 examples/nxflat/tests/task/Makefile                          | 2 +-
 examples/nxhello/Makefile                                    | 2 +-
 examples/nximage/Makefile                                    | 2 +-
 examples/nxlines/Makefile                                    | 2 +-
 examples/nxterm/Makefile                                     | 2 +-
 examples/nxtext/Makefile                                     | 2 +-
 examples/obd2/Makefile                                       | 2 +-
 examples/oneshot/Makefile                                    | 2 +-
 examples/pca9635/Makefile                                    | 2 +-
 examples/pdcurses/Makefile                                   | 2 +-
 examples/pf_ieee802154/Makefile                              | 2 +-
 examples/pipe/Makefile                                       | 2 +-
 examples/poll/Makefile                                       | 2 +-
 examples/popen/Makefile                                      | 2 +-
 examples/posix_spawn/Makefile                                | 2 +-
 examples/posix_spawn/filesystem/Makefile                     | 2 +-
 examples/posix_spawn/filesystem/hello/Makefile               | 2 +-
 examples/posix_spawn/filesystem/redirect/Makefile            | 2 +-
 examples/powerled/Makefile                                   | 2 +-
 examples/powermonitor/Makefile                               | 2 +-
 examples/pppd/Makefile                                       | 2 +-
 examples/pty_test/Makefile                                   | 2 +-
 examples/pwfb/Makefile                                       | 2 +-
 examples/pwlines/Makefile                                    | 2 +-
 examples/pwm/Makefile                                        | 2 +-
 examples/qencoder/Makefile                                   | 2 +-
 examples/random/Makefile                                     | 2 +-
 examples/relays/Makefile                                     | 2 +-
 examples/rfid_readuid/Makefile                               | 2 +-
 examples/rgbled/Makefile                                     | 2 +-
 examples/romfs/Makefile                                      | 2 +-
 examples/sendmail/Makefile                                   | 2 +-
 examples/serialblaster/Makefile                              | 2 +-
 examples/serialrx/Makefile                                   | 2 +-
 examples/serloop/Makefile                                    | 2 +-
 examples/slcd/Makefile                                       | 2 +-
 examples/smps/Makefile                                       | 2 +-
 examples/sotest/Makefile                                     | 5 +----
 examples/sotest/lib/Makefile                                 | 2 +-
 examples/sotest/lib/modprint/Makefile                        | 5 +----
 examples/sotest/lib/sotest/Makefile                          | 5 +----
 examples/stat/Makefile                                       | 2 +-
 examples/sx127x_demo/Makefile                                | 2 +-
 examples/system/Makefile                                     | 2 +-
 examples/tcpblaster/Makefile                                 | 2 +-
 examples/tcpecho/Makefile                                    | 2 +-
 examples/telnetd/Makefile                                    | 2 +-
 examples/thttpd/Makefile                                     | 2 +-
 examples/thttpd/content/Makefile.binfs                       | 2 +-
 examples/thttpd/content/hello/Makefile                       | 2 +-
 examples/thttpd/content/tasks/Makefile                       | 5 +----
 examples/tiff/Makefile                                       | 2 +-
 examples/timer/Makefile                                      | 2 +-
 examples/touchscreen/Makefile                                | 2 +-
 examples/udgram/Makefile                                     | 2 +-
 examples/udp/Makefile                                        | 2 +-
 examples/udpblaster/Makefile                                 | 2 +-
 examples/uid/Makefile                                        | 2 +-
 examples/unionfs/Makefile                                    | 2 +-
 examples/usbserial/Makefile                                  | 2 +-
 examples/usbserial/Makefile.host                             | 2 +-
 examples/userfs/Makefile                                     | 2 +-
 examples/usrsocktest/Makefile                                | 2 +-
 examples/ustream/Makefile                                    | 2 +-
 examples/veml6070/Makefile                                   | 2 +-
 examples/watchdog/Makefile                                   | 2 +-
 examples/webserver/Makefile                                  | 2 +-
 examples/wget/Makefile                                       | 2 +-
 examples/wgetjson/Makefile                                   | 2 +-
 examples/xbc_test/Makefile                                   | 2 +-
 examples/xmlrpc/Makefile                                     | 2 +-
 examples/zerocross/Makefile                                  | 2 +-
 fsutils/flash_eraseall/Makefile                              | 2 +-
 fsutils/inifile/Makefile                                     | 2 +-
 fsutils/inih/Makefile                                        | 2 +-
 fsutils/mkfatfs/Makefile                                     | 2 +-
 fsutils/mksmartfs/Makefile                                   | 2 +-
 fsutils/passwd/Makefile                                      | 2 +-
 gpsutils/minmea/Makefile                                     | 2 +-
 graphics/ft80x/Makefile                                      | 2 +-
 graphics/littlevgl/Makefile                                  | 2 +-
 graphics/nxglyphs/Makefile                                   | 2 +-
 graphics/nxwidgets/Makefile                                  | 2 +-
 graphics/nxwidgets/UnitTests/CButton/Makefile                | 2 +-
 graphics/nxwidgets/UnitTests/CButtonArray/Makefile           | 2 +-
 graphics/nxwidgets/UnitTests/CCheckBox/Makefile              | 2 +-
 graphics/nxwidgets/UnitTests/CGlyphButton/Makefile           | 2 +-
 graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile | 2 +-
 graphics/nxwidgets/UnitTests/CImage/Makefile                 | 2 +-
 graphics/nxwidgets/UnitTests/CKeypad/Makefile                | 2 +-
 graphics/nxwidgets/UnitTests/CLabel/Makefile                 | 2 +-
 graphics/nxwidgets/UnitTests/CLatchButton/Makefile           | 2 +-
 graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile      | 2 +-
 graphics/nxwidgets/UnitTests/CListBox/Makefile               | 2 +-
 graphics/nxwidgets/UnitTests/CProgressBar/Makefile           | 2 +-
 graphics/nxwidgets/UnitTests/CRadioButton/Makefile           | 2 +-
 graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile   | 2 +-
 graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile     | 2 +-
 graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile       | 2 +-
 graphics/nxwidgets/UnitTests/CSliderVertical/Makefile        | 2 +-
 graphics/nxwidgets/UnitTests/CTextBox/Makefile               | 2 +-
 graphics/nxwm/Makefile                                       | 2 +-
 graphics/pdcurs34/Makefile                                   | 2 +-
 graphics/screenshot/Makefile                                 | 2 +-
 graphics/slcd/Makefile                                       | 2 +-
 graphics/tiff/Makefile                                       | 2 +-
 graphics/twm4nx/Makefile                                     | 2 +-
 import/Makefile                                              | 2 +-
 industry/abnt_codi/Makefile                                  | 2 +-
 interpreters/bas/Makefile                                    | 2 +-
 interpreters/ficl/Makefile                                   | 2 +-
 interpreters/minibasic/Makefile                              | 2 +-
 modbus/Makefile                                              | 2 +-
 netutils/chat/Makefile                                       | 2 +-
 netutils/cjson/Makefile                                      | 2 +-
 netutils/codecs/Makefile                                     | 2 +-
 netutils/dhcpc/Makefile                                      | 2 +-
 netutils/dhcpd/Makefile                                      | 2 +-
 netutils/discover/Makefile                                   | 2 +-
 netutils/esp8266/Makefile                                    | 2 +-
 netutils/ftpc/Makefile                                       | 2 +-
 netutils/ftpd/Makefile                                       | 2 +-
 netutils/libcurl4nx/Makefile                                 | 2 +-
 netutils/netinit/Makefile                                    | 2 +-
 netutils/netlib/Makefile                                     | 2 +-
 netutils/ntpclient/Makefile                                  | 2 +-
 netutils/ping/Makefile                                       | 2 +-
 netutils/pppd/Makefile                                       | 2 +-
 netutils/smtp/Makefile                                       | 2 +-
 netutils/telnetc/Makefile                                    | 2 +-
 netutils/telnetd/Makefile                                    | 2 +-
 netutils/tftpc/Makefile                                      | 2 +-
 netutils/thttpd/Makefile                                     | 2 +-
 netutils/thttpd/cgi-src/Makefile                             | 2 +-
 netutils/usrsock_rpmsg/Makefile                              | 2 +-
 netutils/webclient/Makefile                                  | 2 +-
 netutils/webserver/Makefile                                  | 2 +-
 netutils/xmlrpc/Makefile                                     | 2 +-
 nshlib/Makefile                                              | 2 +-
 platform/Makefile                                            | 4 ++--
 platform/bin/Makefile                                        | 2 +-
 system/cdcacm/Makefile                                       | 2 +-
 system/cfgdata/Makefile                                      | 2 +-
 system/cle/Makefile                                          | 2 +-
 system/composite/Makefile                                    | 2 +-
 system/critmon/Makefile                                      | 2 +-
 system/cu/Makefile                                           | 2 +-
 system/dhcpc/Makefile                                        | 2 +-
 system/embedlog/Makefile                                     | 2 +-
 system/flash_eraseall/Makefile                               | 2 +-
 system/hex2bin/Makefile                                      | 2 +-
 system/hexed/Makefile                                        | 2 +-
 system/i2c/Makefile                                          | 2 +-
 system/lm75/Makefile                                         | 2 +-
 system/lzf/Makefile                                          | 2 +-
 system/mdio/Makefile                                         | 2 +-
 system/netdb/Makefile                                        | 2 +-
 system/nsh/Makefile                                          | 2 +-
 system/ntpc/Makefile                                         | 2 +-
 system/nxplayer/Makefile                                     | 2 +-
 system/nxrecorder/Makefile                                   | 2 +-
 system/ping/Makefile                                         | 2 +-
 system/ping6/Makefile                                        | 2 +-
 system/popen/Makefile                                        | 2 +-
 system/psmq/Makefile                                         | 2 +-
 system/ramtest/Makefile                                      | 2 +-
 system/readline/Makefile                                     | 2 +-
 system/sched_note/Makefile                                   | 2 +-
 system/setlogmask/Makefile                                   | 2 +-
 system/spi/Makefile                                          | 2 +-
 system/stackmonitor/Makefile                                 | 2 +-
 system/system/Makefile                                       | 2 +-
 system/taskset/Makefile                                      | 2 +-
 system/tee/Makefile                                          | 2 +-
 system/telnet/Makefile                                       | 2 +-
 system/termcurses/Makefile                                   | 2 +-
 system/ubloxmodem/Makefile                                   | 2 +-
 system/usbmsc/Makefile                                       | 2 +-
 system/vi/Makefile                                           | 2 +-
 system/zmodem/Makefile                                       | 2 +-
 system/zmodem/Makefile.host                                  | 2 +-
 testing/cxxtest/Makefile                                     | 2 +-
 testing/fstest/Makefile                                      | 2 +-
 testing/getprime/Makefile                                    | 2 +-
 testing/mm/Makefile                                          | 2 +-
 testing/nxffs/Makefile                                       | 2 +-
 testing/ostest/Makefile                                      | 2 +-
 testing/scanftest/Makefile                                   | 2 +-
 testing/smart/Makefile                                       | 2 +-
 testing/smart_test/Makefile                                  | 2 +-
 testing/smp/Makefile                                         | 2 +-
 testing/unity/Makefile                                       | 2 +-
 wireless/bluetooth/btsak/Makefile                            | 2 +-
 wireless/gs2200m/Makefile                                    | 2 +-
 wireless/ieee802154/i8sak/Makefile                           | 2 +-
 wireless/ieee802154/i8shark/Makefile                         | 2 +-
 wireless/ieee802154/libmac/Makefile                          | 2 +-
 wireless/ieee802154/libutils/Makefile                        | 2 +-
 wireless/iwpan/Makefile                                      | 2 +-
 wireless/wapi/Makefile                                       | 2 +-
 307 files changed, 308 insertions(+), 354 deletions(-)

diff --git a/Directory.mk b/Directory.mk
index bd65707..3a148af 100644
--- a/Directory.mk
+++ b/Directory.mk
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
 # Sub-directories
diff --git a/Make.defs b/Make.defs
index 82e2b7f..a17e0a9 100644
--- a/Make.defs
+++ b/Make.defs
@@ -34,8 +34,6 @@
 #
 ############################################################################
 
-DELIM ?= $(strip /)
-
 # Application Directories
 
 # BUILDIRS is the list of top-level directories containing Make.defs files
diff --git a/Makefile b/Makefile
index 4cd47d5..dbcc4b6 100644
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,8 @@
 
 APPDIR = $(CURDIR)
 TOPDIR ?= $(APPDIR)/import
--include $(TOPDIR)/Make.defs
--include $(APPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
 
 # The GNU make CURDIR will always be a POSIX-like path with forward slashes
 # as path segment separators.  This is fine for the above inclusions but
diff --git a/builtin/Makefile b/builtin/Makefile
index f64e0b3..6ca3a30 100644
--- a/builtin/Makefile
+++ b/builtin/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Source and object files
 
diff --git a/canutils/canlib/Makefile b/canutils/canlib/Makefile
index 6b272e9..232a9d4 100644
--- a/canutils/canlib/Makefile
+++ b/canutils/canlib/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CAN utility library
 
diff --git a/canutils/libcanard/Makefile b/canutils/libcanard/Makefile
index 1b1579e..40ab403 100644
--- a/canutils/libcanard/Makefile
+++ b/canutils/libcanard/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 WGET = wget
 UNPACK = unzip
diff --git a/canutils/libobd2/Makefile b/canutils/libobd2/Makefile
index 4511103..828325b 100644
--- a/canutils/libobd2/Makefile
+++ b/canutils/libobd2/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CAN utility library
 
diff --git a/examples/abntcodi/Makefile b/examples/abntcodi/Makefile
index 1de661a..4bad230 100644
--- a/examples/abntcodi/Makefile
+++ b/examples/abntcodi/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # ABNTCODI built-in application info
 
diff --git a/examples/adc/Makefile b/examples/adc/Makefile
index 5c07675..842a929 100644
--- a/examples/adc/Makefile
+++ b/examples/adc/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # ADC example
 
diff --git a/examples/adxl372_test/Makefile b/examples/adxl372_test/Makefile
index 5039a0c..a63bcad 100644
--- a/examples/adxl372_test/Makefile
+++ b/examples/adxl372_test/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 PROGNAME = $(CONFIG_EXAMPLES_ADXL372_TEST_PROGNAME)
 PRIORITY = $(CONFIG_EXAMPLES_ADXL372_TEST_PRIORITY)
diff --git a/examples/ajoystick/Makefile b/examples/ajoystick/Makefile
index e98fbd8..f110a21 100644
--- a/examples/ajoystick/Makefile
+++ b/examples/ajoystick/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Hello, World! Example
 
diff --git a/examples/alarm/Makefile b/examples/alarm/Makefile
index 74f3716..1716fe5 100644
--- a/examples/alarm/Makefile
+++ b/examples/alarm/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # RTC driver alarm test built-in application info
 
diff --git a/examples/apa102/Makefile b/examples/apa102/Makefile
index 2c1e40d..d5b2ef2 100644
--- a/examples/apa102/Makefile
+++ b/examples/apa102/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # APA102 built-in application info
 
diff --git a/examples/apds9960/Makefile b/examples/apds9960/Makefile
index 5dfcba2..87abb03 100644
--- a/examples/apds9960/Makefile
+++ b/examples/apds9960/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Hello, World! built-in application info
 
diff --git a/examples/audio_rttl/Makefile b/examples/audio_rttl/Makefile
index 580d651..cd0bd24 100644
--- a/examples/audio_rttl/Makefile
+++ b/examples/audio_rttl/Makefile
@@ -33,10 +33,8 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 -include $(SDKDIR)/Make.defs
-include $(APPDIR)/Make.defs
 
 # Audio application info
 
diff --git a/examples/bastest/Makefile b/examples/bastest/Makefile
index 3e20105..1aebadb 100644
--- a/examples/bastest/Makefile
+++ b/examples/bastest/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # BAS test volume mounter
 
diff --git a/examples/battery/Makefile b/examples/battery/Makefile
index 114c56e..2b169d3 100644
--- a/examples/battery/Makefile
+++ b/examples/battery/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Battery built-in application info
 
diff --git a/examples/bmi160/Makefile b/examples/bmi160/Makefile
index 6bda693..47462c3 100644
--- a/examples/bmi160/Makefile
+++ b/examples/bmi160/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 -include $(SDKDIR)/Make.defs
 
 # sixaxis built-in application info
diff --git a/examples/bmp180/Makefile b/examples/bmp180/Makefile
index a14ef1f..fe5e785 100644
--- a/examples/bmp180/Makefile
+++ b/examples/bmp180/Makefile
@@ -35,7 +35,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # BMP180 Barometer sensor example built-in application info
 
diff --git a/examples/bridge/Makefile b/examples/bridge/Makefile
index f13e4f0..91ac9d2 100644
--- a/examples/bridge/Makefile
+++ b/examples/bridge/Makefile
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Discover built-in application info
 
diff --git a/examples/buttons/Makefile b/examples/buttons/Makefile
index 06bea50..7c97b1d 100644
--- a/examples/buttons/Makefile
+++ b/examples/buttons/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # LED driver test built-in application info
 
diff --git a/examples/calib_udelay/Makefile b/examples/calib_udelay/Makefile
index 96c8783..8e98805 100644
--- a/examples/calib_udelay/Makefile
+++ b/examples/calib_udelay/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # built-in application info
 
diff --git a/examples/can/Makefile b/examples/can/Makefile
index 22ec5c6..85d571c 100644
--- a/examples/can/Makefile
+++ b/examples/can/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX NX Graphics Example.
 
diff --git a/examples/canard/Makefile b/examples/canard/Makefile
index 3e8efc6..d46a85f 100644
--- a/examples/canard/Makefile
+++ b/examples/canard/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 PROGNAME = canard
 PRIORITY = SCHED_PRIORITY_DEFAULT
diff --git a/examples/cctype/Makefile b/examples/cctype/Makefile
index ff16d11..1ac7488 100644
--- a/examples/cctype/Makefile
+++ b/examples/cctype/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # cctype verification
 
diff --git a/examples/charger/Makefile b/examples/charger/Makefile
index 31e9fba..e0295b3 100644
--- a/examples/charger/Makefile
+++ b/examples/charger/Makefile
@@ -1,5 +1,5 @@
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 -include $(SDKDIR)/Make.defs
 
 PROGNAME = $(CONFIG_EXAMPLES_CHARGER_PROGNAME)
diff --git a/examples/chat/Makefile b/examples/chat/Makefile
index cd81bbc..52bdc7d 100644
--- a/examples/chat/Makefile
+++ b/examples/chat/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 MAINSRC = chat_main.c
 
diff --git a/examples/chrono/Makefile b/examples/chrono/Makefile
index 080ccc6..a975902 100644
--- a/examples/chrono/Makefile
+++ b/examples/chrono/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Chronometer built-in application info
 
diff --git a/examples/configdata/Makefile b/examples/configdata/Makefile
index 5ec97a4..9b89872 100644
--- a/examples/configdata/Makefile
+++ b/examples/configdata/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CONFIGDATA Unit Test
 
diff --git a/examples/cpuhog/Makefile b/examples/cpuhog/Makefile
index 871f499..aae6359 100644
--- a/examples/cpuhog/Makefile
+++ b/examples/cpuhog/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # do nothing loop to use up cpu time
 
diff --git a/examples/cromfs/Makefile b/examples/cromfs/Makefile
index fb3a192..a365b61 100644
--- a/examples/cromfs/Makefile
+++ b/examples/cromfs/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CROMFS Example
 
diff --git a/examples/dac/Makefile b/examples/dac/Makefile
index f04b366..5ee1434 100644
--- a/examples/dac/Makefile
+++ b/examples/dac/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # DAC tool
 
diff --git a/examples/dhcpd/Makefile b/examples/dhcpd/Makefile
index e1fcdbe..a628fbb 100644
--- a/examples/dhcpd/Makefile
+++ b/examples/dhcpd/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # DHCP Daemon Example
 
diff --git a/examples/dhtxx/Makefile b/examples/dhtxx/Makefile
index de67ccc..76094cf 100644
--- a/examples/dhtxx/Makefile
+++ b/examples/dhtxx/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Dhtxx, World! built-in application info
 
diff --git a/examples/discover/Makefile b/examples/discover/Makefile
index ee60b88..5c86863 100644
--- a/examples/discover/Makefile
+++ b/examples/discover/Makefile
@@ -36,7 +36,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Discover built-in application info
 
diff --git a/examples/djoystick/Makefile b/examples/djoystick/Makefile
index 3740111..4be1020 100644
--- a/examples/djoystick/Makefile
+++ b/examples/djoystick/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Hello, World! Example
 
diff --git a/examples/dsptest/Makefile b/examples/dsptest/Makefile
index 9beb663..f6aa0d5 100644
--- a/examples/dsptest/Makefile
+++ b/examples/dsptest/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # dsptest built-in application info
 
diff --git a/examples/elf/Makefile b/examples/elf/Makefile
index 5bb7a5b..91946de 100644
--- a/examples/elf/Makefile
+++ b/examples/elf/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # ELF Example
 
diff --git a/examples/elf/tests/Makefile b/examples/elf/tests/Makefile
index 4a3e673..20230d8 100644
--- a/examples/elf/tests/Makefile
+++ b/examples/elf/tests/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 ALL_SUBDIRS = errno hello helloxx longjmp mutex pthread signal task struct
 BUILD_SUBDIRS = errno hello struct signal
diff --git a/examples/elf/tests/errno/Makefile b/examples/elf/tests/errno/Makefile
index 0141ca7..cb2b754 100644
--- a/examples/elf/tests/errno/Makefile
+++ b/examples/elf/tests/errno/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
 NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
diff --git a/examples/elf/tests/hello/Makefile b/examples/elf/tests/hello/Makefile
index 7f71bd2..106663a 100644
--- a/examples/elf/tests/hello/Makefile
+++ b/examples/elf/tests/hello/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
 NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
diff --git a/examples/elf/tests/helloxx/Makefile b/examples/elf/tests/helloxx/Makefile
index d94b5aa..4fea478 100644
--- a/examples/elf/tests/helloxx/Makefile
+++ b/examples/elf/tests/helloxx/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
 NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
diff --git a/examples/elf/tests/longjmp/Makefile b/examples/elf/tests/longjmp/Makefile
index 1c6834c..08e2429 100644
--- a/examples/elf/tests/longjmp/Makefile
+++ b/examples/elf/tests/longjmp/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
 NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
diff --git a/examples/elf/tests/mutex/Makefile b/examples/elf/tests/mutex/Makefile
index 9538259..9089b73 100644
--- a/examples/elf/tests/mutex/Makefile
+++ b/examples/elf/tests/mutex/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
 NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
diff --git a/examples/elf/tests/pthread/Makefile b/examples/elf/tests/pthread/Makefile
index c161a16..7cb9399 100644
--- a/examples/elf/tests/pthread/Makefile
+++ b/examples/elf/tests/pthread/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
 NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
diff --git a/examples/elf/tests/signal/Makefile b/examples/elf/tests/signal/Makefile
index 7024151..7c5ab59 100644
--- a/examples/elf/tests/signal/Makefile
+++ b/examples/elf/tests/signal/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
 NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
diff --git a/examples/elf/tests/struct/Makefile b/examples/elf/tests/struct/Makefile
index 7e1bd5e..3d398c5 100644
--- a/examples/elf/tests/struct/Makefile
+++ b/examples/elf/tests/struct/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 CELFFLAGS += -I.
 
diff --git a/examples/elf/tests/task/Makefile b/examples/elf/tests/task/Makefile
index c80f7da..ee64f3d 100644
--- a/examples/elf/tests/task/Makefile
+++ b/examples/elf/tests/task/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
 NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
diff --git a/examples/embedlog/Makefile b/examples/embedlog/Makefile
index cb75d7a..c9a4123 100644
--- a/examples/embedlog/Makefile
+++ b/examples/embedlog/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # embedlog example built-in application info
 
diff --git a/examples/fb/Makefile b/examples/fb/Makefile
index 7ea6b60..d0e9f72 100644
--- a/examples/fb/Makefile
+++ b/examples/fb/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # FB, World! built-in application info
 
diff --git a/examples/fboverlay/Makefile b/examples/fboverlay/Makefile
index 2c0efbb..6a490b0 100644
--- a/examples/fboverlay/Makefile
+++ b/examples/fboverlay/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # fboverlay built-in application info
 
diff --git a/examples/flash_test/Makefile b/examples/flash_test/Makefile
index bfabfa1..51c71d5 100644
--- a/examples/flash_test/Makefile
+++ b/examples/flash_test/Makefile
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # SMART FLASH block device test
 
diff --git a/examples/flowc/Makefile b/examples/flowc/Makefile
index a787e1b..3a9aa9f 100644
--- a/examples/flowc/Makefile
+++ b/examples/flowc/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # FLOWC Test
 
diff --git a/examples/ft80x/Makefile b/examples/ft80x/Makefile
index e82f509..82bc27e 100644
--- a/examples/ft80x/Makefile
+++ b/examples/ft80x/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # FT80X example built-in application info
 
diff --git a/examples/ftpc/Makefile b/examples/ftpc/Makefile
index 7c76189..7ef7087 100644
--- a/examples/ftpc/Makefile
+++ b/examples/ftpc/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # FTPC Client Application
 
diff --git a/examples/ftpd/Makefile b/examples/ftpd/Makefile
index ca93341..d529a13 100644
--- a/examples/ftpd/Makefile
+++ b/examples/ftpd/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 MAINSRC = ftpd_main.c
 
diff --git a/examples/gpio/Makefile b/examples/gpio/Makefile
index 03d0f76..572fd53 100644
--- a/examples/gpio/Makefile
+++ b/examples/gpio/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # GPIO, World! built-in application info
 
diff --git a/examples/gps/Makefile b/examples/gps/Makefile
index 287567a..882d711 100644
--- a/examples/gps/Makefile
+++ b/examples/gps/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # GPS built-in application info
 
diff --git a/examples/hdc1008_demo/Makefile b/examples/hdc1008_demo/Makefile
index 1921ca6..9067ac8 100644
--- a/examples/hdc1008_demo/Makefile
+++ b/examples/hdc1008_demo/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################/
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # hdc1008 example built-in application info
 
diff --git a/examples/hello/Makefile b/examples/hello/Makefile
index ea5c043..96ba358 100644
--- a/examples/hello/Makefile
+++ b/examples/hello/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Hello, World! built-in application info
 
diff --git a/examples/helloxx/Makefile b/examples/helloxx/Makefile
index e821a4c..649dec5 100644
--- a/examples/helloxx/Makefile
+++ b/examples/helloxx/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Hello, World! C++ Example
 
diff --git a/examples/hidkbd/Makefile b/examples/hidkbd/Makefile
index 0c92fed..b9c1457 100644
--- a/examples/hidkbd/Makefile
+++ b/examples/hidkbd/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # USB Host HID keyboard Example
 
diff --git a/examples/hts221_reader/Makefile b/examples/hts221_reader/Makefile
index ba75960..74da41e 100644
--- a/examples/hts221_reader/Makefile
+++ b/examples/hts221_reader/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # hts221_reader example
 
diff --git a/examples/i2schar/Makefile b/examples/i2schar/Makefile
index 29bd14e..e108e0e 100644
--- a/examples/i2schar/Makefile
+++ b/examples/i2schar/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # I2S character driver test
 
diff --git a/examples/i2sloop/Makefile b/examples/i2sloop/Makefile
index a142fe1..e57d4bf 100644
--- a/examples/i2sloop/Makefile
+++ b/examples/i2sloop/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # I2S character driver test
 
diff --git a/examples/igmp/Makefile b/examples/igmp/Makefile
index 4c9460a..d4e455d 100644
--- a/examples/igmp/Makefile
+++ b/examples/igmp/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 PROGNAME = igmp
 PRIORITY = SCHED_PRIORITY_DEFAULT
diff --git a/examples/ina219/Makefile b/examples/ina219/Makefile
index 8d08173..67b142f 100644
--- a/examples/ina219/Makefile
+++ b/examples/ina219/Makefile
@@ -35,7 +35,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Hello, World! built-in application info
 
diff --git a/examples/ina226/Makefile b/examples/ina226/Makefile
index b0368f7..9ef60d0 100644
--- a/examples/ina226/Makefile
+++ b/examples/ina226/Makefile
@@ -35,7 +35,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # INA226 built-in application info
 
diff --git a/examples/ini_dumper/Makefile b/examples/ini_dumper/Makefile
index b8c8100..877feff 100644
--- a/examples/ini_dumper/Makefile
+++ b/examples/ini_dumper/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # ini_dumper example built-in application info
 
diff --git a/examples/ipforward/Makefile b/examples/ipforward/Makefile
index 3f1dbd8..b816105 100644
--- a/examples/ipforward/Makefile
+++ b/examples/ipforward/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Hello, World! built-in application info
 
diff --git a/examples/json/Makefile b/examples/json/Makefile
index 7d9e4c2..d5c4cd2 100644
--- a/examples/json/Makefile
+++ b/examples/json/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # cJSON built-in application info
 
diff --git a/examples/leds/Makefile b/examples/leds/Makefile
index e5c669b..72ae721 100644
--- a/examples/leds/Makefile
+++ b/examples/leds/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # LED driver test built-in application info
 
diff --git a/examples/lis3dsh_reader/Makefile b/examples/lis3dsh_reader/Makefile
index be68b08..a8f1200 100644
--- a/examples/lis3dsh_reader/Makefile
+++ b/examples/lis3dsh_reader/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 PROGNAME = $(CONFIG_EXAMPLES_LIS3DSH_READER_PROGNAME)
 PRIORITY = SCHED_PRIORITY_DEFAULT
diff --git a/examples/lsm303_reader/Makefile b/examples/lsm303_reader/Makefile
index cc116e6..cec31d7 100644
--- a/examples/lsm303_reader/Makefile
+++ b/examples/lsm303_reader/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # lsm303_reader example
 
diff --git a/examples/lsm330spi_test/Makefile b/examples/lsm330spi_test/Makefile
index 3c56e45..42bcbb5 100644
--- a/examples/lsm330spi_test/Makefile
+++ b/examples/lsm330spi_test/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 PROGNAME = $(CONFIG_EXAMPLES_LSM330SPI_TEST_PROGNAME)
 PRIORITY = $(CONFIG_EXAMPLES_LSM330SPI_TEST_PRIORITY)
diff --git a/examples/lsm6dsl_reader/Makefile b/examples/lsm6dsl_reader/Makefile
index ebe4f34..ecdb8b1 100644
--- a/examples/lsm6dsl_reader/Makefile
+++ b/examples/lsm6dsl_reader/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # lsm6dsl_reader example
 
diff --git a/examples/lvgldemo/Makefile b/examples/lvgldemo/Makefile
index 9de1164..f570f59 100644
--- a/examples/lvgldemo/Makefile
+++ b/examples/lvgldemo/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # LittleVGL demo built-in application info
 
diff --git a/examples/max31855/Makefile b/examples/max31855/Makefile
index 30ee8ec..2843887 100644
--- a/examples/max31855/Makefile
+++ b/examples/max31855/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # max31855 built-in application info
 
diff --git a/examples/media/Makefile b/examples/media/Makefile
index 8a80959..4911824 100644
--- a/examples/media/Makefile
+++ b/examples/media/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Media test application info
 
diff --git a/examples/mld/Makefile b/examples/mld/Makefile
index c702954..de7f126 100644
--- a/examples/mld/Makefile
+++ b/examples/mld/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # MLD Networking Example
 
diff --git a/examples/mlx90614/Makefile b/examples/mlx90614/Makefile
index 8347879..5573ec6 100644
--- a/examples/mlx90614/Makefile
+++ b/examples/mlx90614/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # MLX90614 built-in application info
 
diff --git a/examples/modbus/Makefile b/examples/modbus/Makefile
index 7069296..f6cc454 100644
--- a/examples/modbus/Makefile
+++ b/examples/modbus/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # FreeModBus demo built-in application info
 
diff --git a/examples/modbusmaster/Makefile b/examples/modbusmaster/Makefile
index 2bb050d..d9d7df6 100644
--- a/examples/modbusmaster/Makefile
+++ b/examples/modbusmaster/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Modbus Master built-in application info
 
diff --git a/examples/module/Makefile b/examples/module/Makefile
index e7cb349..ad1e2e8 100644
--- a/examples/module/Makefile
+++ b/examples/module/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Module example built-in application info
 
diff --git a/examples/module/drivers/Makefile b/examples/module/drivers/Makefile
index b76f7e4..5e20eaf 100644
--- a/examples/module/drivers/Makefile
+++ b/examples/module/drivers/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 ALL_SUBDIRS = chardev
 BUILD_SUBDIRS = chardev
diff --git a/examples/module/drivers/chardev/Makefile b/examples/module/drivers/chardev/Makefile
index 6e111ea..faba8f7 100644
--- a/examples/module/drivers/chardev/Makefile
+++ b/examples/module/drivers/chardev/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
 NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
diff --git a/examples/mount/Makefile b/examples/mount/Makefile
index 65e1f71..365c9e9 100644
--- a/examples/mount/Makefile
+++ b/examples/mount/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # mount() test
 
diff --git a/examples/mtdpart/Makefile b/examples/mtdpart/Makefile
index d01f4b8..b41e0e5 100644
--- a/examples/mtdpart/Makefile
+++ b/examples/mtdpart/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # MTD Partition Example
 
diff --git a/examples/mtdrwb/Makefile b/examples/mtdrwb/Makefile
index baaf74d..d83782a 100644
--- a/examples/mtdrwb/Makefile
+++ b/examples/mtdrwb/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # MTD R/W buffer test Example
 
diff --git a/examples/netlink_route/Makefile b/examples/netlink_route/Makefile
index 5a68c96..6e217c5 100644
--- a/examples/netlink_route/Makefile
+++ b/examples/netlink_route/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Netlink NETLINK_ROUTE built-in application info
 
diff --git a/examples/netloop/Makefile b/examples/netloop/Makefile
index 2cbe012..70c191b 100644
--- a/examples/netloop/Makefile
+++ b/examples/netloop/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Network loopback Example
 
diff --git a/examples/netpkt/Makefile b/examples/netpkt/Makefile
index d0b0490..56de89a 100644
--- a/examples/netpkt/Makefile
+++ b/examples/netpkt/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Network packet socket example
 
diff --git a/examples/nettest/Makefile b/examples/nettest/Makefile
index ae9862c..22471f1 100644
--- a/examples/nettest/Makefile
+++ b/examples/nettest/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Basic TCP networking test
 
diff --git a/examples/nrf24l01_term/Makefile b/examples/nrf24l01_term/Makefile
index 0ddf663..b73c00a 100644
--- a/examples/nrf24l01_term/Makefile
+++ b/examples/nrf24l01_term/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Basic nRF24L01+ terminal demonstration
 
diff --git a/examples/null/Makefile b/examples/null/Makefile
index dcd6830..46ceb8b 100644
--- a/examples/null/Makefile
+++ b/examples/null/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # The NULL example built-in application info
 
diff --git a/examples/nunchuck/Makefile b/examples/nunchuck/Makefile
index cfd8ffe..68f8c39 100644
--- a/examples/nunchuck/Makefile
+++ b/examples/nunchuck/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Nunchuck Example
 
diff --git a/examples/nx/Makefile b/examples/nx/Makefile
index 98a720e..a5d7aa7 100644
--- a/examples/nx/Makefile
+++ b/examples/nx/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX NX Graphics Example.
 
diff --git a/examples/nxdemo/Makefile b/examples/nxdemo/Makefile
index 3fd7a95..59663c4 100644
--- a/examples/nxdemo/Makefile
+++ b/examples/nxdemo/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX NX Graphics Example.
 
diff --git a/examples/nxflat/Makefile b/examples/nxflat/Makefile
index 16fcb55..b852740 100644
--- a/examples/nxflat/Makefile
+++ b/examples/nxflat/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NXFLAT Example
 
diff --git a/examples/nxflat/tests/errno/Makefile b/examples/nxflat/tests/errno/Makefile
index 0014e66..aae1ef2 100644
--- a/examples/nxflat/tests/errno/Makefile
+++ b/examples/nxflat/tests/errno/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 BIN			= errno
 
diff --git a/examples/nxflat/tests/hello++/Makefile b/examples/nxflat/tests/hello++/Makefile
index ea2b8eb..9a1992a 100644
--- a/examples/nxflat/tests/hello++/Makefile
+++ b/examples/nxflat/tests/hello++/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 BIN1			= hello++1
 BIN2			= hello++2
diff --git a/examples/nxflat/tests/hello/Makefile b/examples/nxflat/tests/hello/Makefile
index eb60dd6..f78ebff 100644
--- a/examples/nxflat/tests/hello/Makefile
+++ b/examples/nxflat/tests/hello/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 BIN			= hello
 
diff --git a/examples/nxflat/tests/longjmp/Makefile b/examples/nxflat/tests/longjmp/Makefile
index 8a98467..4e94401 100644
--- a/examples/nxflat/tests/longjmp/Makefile
+++ b/examples/nxflat/tests/longjmp/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 BIN			= longjmp
 
diff --git a/examples/nxflat/tests/mutex/Makefile b/examples/nxflat/tests/mutex/Makefile
index b53a499..63163ac 100644
--- a/examples/nxflat/tests/mutex/Makefile
+++ b/examples/nxflat/tests/mutex/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 BIN			= mutex
 
diff --git a/examples/nxflat/tests/pthread/Makefile b/examples/nxflat/tests/pthread/Makefile
index 1649410..08f6140 100644
--- a/examples/nxflat/tests/pthread/Makefile
+++ b/examples/nxflat/tests/pthread/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs	# Basic make _info
+include $(TOPDIR)/Make.defs	# Basic make _info
 
 BIN			= pthread
 
diff --git a/examples/nxflat/tests/signal/Makefile b/examples/nxflat/tests/signal/Makefile
index 2211747..8273be7 100644
--- a/examples/nxflat/tests/signal/Makefile
+++ b/examples/nxflat/tests/signal/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 BIN			= signal
 
diff --git a/examples/nxflat/tests/struct/Makefile b/examples/nxflat/tests/struct/Makefile
index 77cd7e7..8188af7 100644
--- a/examples/nxflat/tests/struct/Makefile
+++ b/examples/nxflat/tests/struct/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 CFLAGS			+= -I.
 
diff --git a/examples/nxflat/tests/task/Makefile b/examples/nxflat/tests/task/Makefile
index e532be4..8dfb2e1 100644
--- a/examples/nxflat/tests/task/Makefile
+++ b/examples/nxflat/tests/task/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 BIN			= task
 
diff --git a/examples/nxhello/Makefile b/examples/nxhello/Makefile
index b9addfc..8a69456 100644
--- a/examples/nxhello/Makefile
+++ b/examples/nxhello/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX NX Graphics Example.
 
diff --git a/examples/nximage/Makefile b/examples/nximage/Makefile
index c433df8..b51a268 100644
--- a/examples/nximage/Makefile
+++ b/examples/nximage/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX NX Graphics Example.
 
diff --git a/examples/nxlines/Makefile b/examples/nxlines/Makefile
index 07eb28f..69e69ca 100644
--- a/examples/nxlines/Makefile
+++ b/examples/nxlines/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX NX Graphics Example.
 
diff --git a/examples/nxterm/Makefile b/examples/nxterm/Makefile
index 6b675bc..a0325bc 100644
--- a/examples/nxterm/Makefile
+++ b/examples/nxterm/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX NX Console Example.
 
diff --git a/examples/nxtext/Makefile b/examples/nxtext/Makefile
index 2c01f7b..c26dad2 100644
--- a/examples/nxtext/Makefile
+++ b/examples/nxtext/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX NX Graphics Example.
 
diff --git a/examples/obd2/Makefile b/examples/obd2/Makefile
index ad0ce31..deaf0f7 100644
--- a/examples/obd2/Makefile
+++ b/examples/obd2/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # OBD2 application info
 
diff --git a/examples/oneshot/Makefile b/examples/oneshot/Makefile
index 9bd21e4..008a6a4 100644
--- a/examples/oneshot/Makefile
+++ b/examples/oneshot/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Oneshot timer built-in application info
 
diff --git a/examples/pca9635/Makefile b/examples/pca9635/Makefile
index 6e675ba..047399d 100644
--- a/examples/pca9635/Makefile
+++ b/examples/pca9635/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # PCA9635 built-in application info
 
diff --git a/examples/pdcurses/Makefile b/examples/pdcurses/Makefile
index e19ea02..e3f2ce1 100644
--- a/examples/pdcurses/Makefile
+++ b/examples/pdcurses/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # pdcurses demo programs
 
diff --git a/examples/pf_ieee802154/Makefile b/examples/pf_ieee802154/Makefile
index 1ef8664..c1e6a1d 100644
--- a/examples/pf_ieee802154/Makefile
+++ b/examples/pf_ieee802154/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # PF_IEEE802154 Socket Test
 
diff --git a/examples/pipe/Makefile b/examples/pipe/Makefile
index d3f8f3d..4c3b73e 100644
--- a/examples/pipe/Makefile
+++ b/examples/pipe/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Pipe Example
 
diff --git a/examples/poll/Makefile b/examples/poll/Makefile
index 6816782..11057a9 100644
--- a/examples/poll/Makefile
+++ b/examples/poll/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 CSRCS = poll_listener.c select_listener.c net_listener.c net_reader.c
 MAINSRC = poll_main.c
diff --git a/examples/popen/Makefile b/examples/popen/Makefile
index b80a034..935a3a7 100644
--- a/examples/popen/Makefile
+++ b/examples/popen/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # popen() built-in application info
 
diff --git a/examples/posix_spawn/Makefile b/examples/posix_spawn/Makefile
index 18174d8..f69d874 100644
--- a/examples/posix_spawn/Makefile
+++ b/examples/posix_spawn/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # ELF Example
 
diff --git a/examples/posix_spawn/filesystem/Makefile b/examples/posix_spawn/filesystem/Makefile
index 24b8e58..ae13c96 100644
--- a/examples/posix_spawn/filesystem/Makefile
+++ b/examples/posix_spawn/filesystem/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 SPAWN_DIR = $(APPDIR)$(DELIM)examples$(DELIM)posix_spawn
 FILESYSTEM_DIR = $(SPAWN_DIR)$(DELIM)filesystem
diff --git a/examples/posix_spawn/filesystem/hello/Makefile b/examples/posix_spawn/filesystem/hello/Makefile
index e17a1c1..2a01bdb 100644
--- a/examples/posix_spawn/filesystem/hello/Makefile
+++ b/examples/posix_spawn/filesystem/hello/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 BIN = hello
 
diff --git a/examples/posix_spawn/filesystem/redirect/Makefile b/examples/posix_spawn/filesystem/redirect/Makefile
index f689318..9862c23 100644
--- a/examples/posix_spawn/filesystem/redirect/Makefile
+++ b/examples/posix_spawn/filesystem/redirect/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 BIN = redirect
 
diff --git a/examples/powerled/Makefile b/examples/powerled/Makefile
index 6e5e25c..475094d 100644
--- a/examples/powerled/Makefile
+++ b/examples/powerled/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Powerled Example
 
diff --git a/examples/powermonitor/Makefile b/examples/powermonitor/Makefile
index 8bc2d00..68dc417 100644
--- a/examples/powermonitor/Makefile
+++ b/examples/powermonitor/Makefile
@@ -32,7 +32,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 PROGNAME = powermonitor
 PRIORITY = SCHED_PRIORITY_DEFAULT
diff --git a/examples/pppd/Makefile b/examples/pppd/Makefile
index 4cee53a..8d29476 100644
--- a/examples/pppd/Makefile
+++ b/examples/pppd/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # pppd Example
 
diff --git a/examples/pty_test/Makefile b/examples/pty_test/Makefile
index 7ea8c7a..a0e5a2f 100644
--- a/examples/pty_test/Makefile
+++ b/examples/pty_test/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Hello, World! built-in application info
 
diff --git a/examples/pwfb/Makefile b/examples/pwfb/Makefile
index 590fe4d..53b47c6 100644
--- a/examples/pwfb/Makefile
+++ b/examples/pwfb/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX per-window frame buffer graphics example.
 
diff --git a/examples/pwlines/Makefile b/examples/pwlines/Makefile
index 688001d..ff7b4c4 100644
--- a/examples/pwlines/Makefile
+++ b/examples/pwlines/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX NX Graphics Example.
 
diff --git a/examples/pwm/Makefile b/examples/pwm/Makefile
index 68a1433..9da2da6 100644
--- a/examples/pwm/Makefile
+++ b/examples/pwm/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # PWM Example.
 
diff --git a/examples/qencoder/Makefile b/examples/qencoder/Makefile
index 7cbc231..1575ef3 100644
--- a/examples/qencoder/Makefile
+++ b/examples/qencoder/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX NX Graphics Example.
 
diff --git a/examples/random/Makefile b/examples/random/Makefile
index 155ef77..16888de 100644
--- a/examples/random/Makefile
+++ b/examples/random/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # /dev/random test
 
diff --git a/examples/relays/Makefile b/examples/relays/Makefile
index f0fd334..ada6d49 100644
--- a/examples/relays/Makefile
+++ b/examples/relays/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # relays Example
 
diff --git a/examples/rfid_readuid/Makefile b/examples/rfid_readuid/Makefile
index a7aa9e5..069e6c4 100644
--- a/examples/rfid_readuid/Makefile
+++ b/examples/rfid_readuid/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # RFID Read UID built-in application info
 
diff --git a/examples/rgbled/Makefile b/examples/rgbled/Makefile
index bdb5f3e..95c3cf3 100644
--- a/examples/rgbled/Makefile
+++ b/examples/rgbled/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # RGBLED built-in application info
 
diff --git a/examples/romfs/Makefile b/examples/romfs/Makefile
index c25b0de..b534ae1 100644
--- a/examples/romfs/Makefile
+++ b/examples/romfs/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # ROMFS built-in application info
 
diff --git a/examples/sendmail/Makefile b/examples/sendmail/Makefile
index 8ebc4c2..a3513c1 100644
--- a/examples/sendmail/Makefile
+++ b/examples/sendmail/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Sendmail SMTP Example
 
diff --git a/examples/serialblaster/Makefile b/examples/serialblaster/Makefile
index 6595e22..a4c2a8b 100644
--- a/examples/serialblaster/Makefile
+++ b/examples/serialblaster/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # For testing: Blast canned characters at a designated serial port
 
diff --git a/examples/serialrx/Makefile b/examples/serialrx/Makefile
index b297577..a332b54 100644
--- a/examples/serialrx/Makefile
+++ b/examples/serialrx/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # For testing: Blast canned characters at a designated serial port
 
diff --git a/examples/serloop/Makefile b/examples/serloop/Makefile
index e58a1c2..121074f 100644
--- a/examples/serloop/Makefile
+++ b/examples/serloop/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Mindlessly simple console loopack test
 
diff --git a/examples/slcd/Makefile b/examples/slcd/Makefile
index e9298bf..98a6b60 100644
--- a/examples/slcd/Makefile
+++ b/examples/slcd/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Hello, World! built-in application info
 
diff --git a/examples/smps/Makefile b/examples/smps/Makefile
index a513ab0..30ed0e5 100644
--- a/examples/smps/Makefile
+++ b/examples/smps/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Smps Example
 
diff --git a/examples/sotest/Makefile b/examples/sotest/Makefile
index 58d4844..cdb46fa 100644
--- a/examples/sotest/Makefile
+++ b/examples/sotest/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 # Shared library example built-in application info
 
diff --git a/examples/sotest/lib/Makefile b/examples/sotest/lib/Makefile
index 27adbcf..795a95e 100644
--- a/examples/sotest/lib/Makefile
+++ b/examples/sotest/lib/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 ALL_SUBDIRS = sotest
 BUILD_SUBDIRS = sotest
diff --git a/examples/sotest/lib/modprint/Makefile b/examples/sotest/lib/modprint/Makefile
index 016fefa..000faa0 100644
--- a/examples/sotest/lib/modprint/Makefile
+++ b/examples/sotest/lib/modprint/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
 NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
diff --git a/examples/sotest/lib/sotest/Makefile b/examples/sotest/lib/sotest/Makefile
index 8ee951b..d41e14b 100644
--- a/examples/sotest/lib/sotest/Makefile
+++ b/examples/sotest/lib/sotest/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
 NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
diff --git a/examples/stat/Makefile b/examples/stat/Makefile
index 01cc13b..3101302 100644
--- a/examples/stat/Makefile
+++ b/examples/stat/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Stat built-in application info
 
diff --git a/examples/sx127x_demo/Makefile b/examples/sx127x_demo/Makefile
index 2835c6c..43bf5a1 100644
--- a/examples/sx127x_demo/Makefile
+++ b/examples/sx127x_demo/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Basic sx127x+  demonstration
 
diff --git a/examples/system/Makefile b/examples/system/Makefile
index 34c4907..b8737eb 100644
--- a/examples/system/Makefile
+++ b/examples/system/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # system() built-in application info
 
diff --git a/examples/tcpblaster/Makefile b/examples/tcpblaster/Makefile
index a58c5e6..4929838 100644
--- a/examples/tcpblaster/Makefile
+++ b/examples/tcpblaster/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Basic TCP networking test
 
diff --git a/examples/tcpecho/Makefile b/examples/tcpecho/Makefile
index 451d80c..ccf83da 100644
--- a/examples/tcpecho/Makefile
+++ b/examples/tcpecho/Makefile
@@ -36,7 +36,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Discover built-in application info
 
diff --git a/examples/telnetd/Makefile b/examples/telnetd/Makefile
index 194c99c..d868780 100644
--- a/examples/telnetd/Makefile
+++ b/examples/telnetd/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Telnetd Example
 
diff --git a/examples/thttpd/Makefile b/examples/thttpd/Makefile
index 2b5228c..46bef17 100644
--- a/examples/thttpd/Makefile
+++ b/examples/thttpd/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # THTTPD Web Server Example
 
diff --git a/examples/thttpd/content/Makefile.binfs b/examples/thttpd/content/Makefile.binfs
index 504b824..7c3d9cd 100644
--- a/examples/thttpd/content/Makefile.binfs
+++ b/examples/thttpd/content/Makefile.binfs
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 PROGNAME = hello tasks
 PRIORITY = $(CONFIG_THTTPD_CGI_PRIORITY)
diff --git a/examples/thttpd/content/hello/Makefile b/examples/thttpd/content/hello/Makefile
index d1f8ec3..163b5fa 100644
--- a/examples/thttpd/content/hello/Makefile
+++ b/examples/thttpd/content/hello/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 BIN = hello
 
diff --git a/examples/thttpd/content/tasks/Makefile b/examples/thttpd/content/tasks/Makefile
index e6a9ab4..b7c7caf 100644
--- a/examples/thttpd/content/tasks/Makefile
+++ b/examples/thttpd/content/tasks/Makefile
@@ -33,10 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
-
-OBJEXT ?= .o
-DELIM ?= /
+include $(TOPDIR)/Make.defs
 
 BIN = tasks
 
diff --git a/examples/tiff/Makefile b/examples/tiff/Makefile
index 87c5700..6f2ac3e 100644
--- a/examples/tiff/Makefile
+++ b/examples/tiff/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # TIFF Unit Test
 
diff --git a/examples/timer/Makefile b/examples/timer/Makefile
index 46e17b9..a161ff0 100644
--- a/examples/timer/Makefile
+++ b/examples/timer/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Timer built-in application info
 
diff --git a/examples/touchscreen/Makefile b/examples/touchscreen/Makefile
index 8526d5f..60ea21c 100644
--- a/examples/touchscreen/Makefile
+++ b/examples/touchscreen/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX NX Graphics Example.
 
diff --git a/examples/udgram/Makefile b/examples/udgram/Makefile
index b6831bc..5b97fcc 100644
--- a/examples/udgram/Makefile
+++ b/examples/udgram/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Basic Unix domain networking test
 
diff --git a/examples/udp/Makefile b/examples/udp/Makefile
index 350b1a4..e52b1c4 100644
--- a/examples/udp/Makefile
+++ b/examples/udp/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # UDP Test
 
diff --git a/examples/udpblaster/Makefile b/examples/udpblaster/Makefile
index c65e790..4f66aff 100644
--- a/examples/udpblaster/Makefile
+++ b/examples/udpblaster/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Basic TCP networking test
 
diff --git a/examples/uid/Makefile b/examples/uid/Makefile
index 3738ffa..e50e8a0 100644
--- a/examples/uid/Makefile
+++ b/examples/uid/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # UID/GID built-in application info
 
diff --git a/examples/unionfs/Makefile b/examples/unionfs/Makefile
index 97d4af5..7a62886 100644
--- a/examples/unionfs/Makefile
+++ b/examples/unionfs/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # UNIONFS built-in application info
 
diff --git a/examples/usbserial/Makefile b/examples/usbserial/Makefile
index 01979c3..cbc89bf 100644
--- a/examples/usbserial/Makefile
+++ b/examples/usbserial/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # USB serial device example
 # Built-in application info
diff --git a/examples/usbserial/Makefile.host b/examples/usbserial/Makefile.host
index e29c317..f1603d8 100644
--- a/examples/usbserial/Makefile.host
+++ b/examples/usbserial/Makefile.host
@@ -35,7 +35,7 @@
 
 # TOPDIR must be defined on the make command line
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 SRC = host.c
 BIN = host$(HOSTEXEEXT)
diff --git a/examples/userfs/Makefile b/examples/userfs/Makefile
index 3801df6..d7e5baf 100644
--- a/examples/userfs/Makefile
+++ b/examples/userfs/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # UserFS test application info
 
diff --git a/examples/usrsocktest/Makefile b/examples/usrsocktest/Makefile
index 981e5cf..4aed0d0 100644
--- a/examples/usrsocktest/Makefile
+++ b/examples/usrsocktest/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # USRSOCK Test built-in application info
 
diff --git a/examples/ustream/Makefile b/examples/ustream/Makefile
index f0615aa..eeb2957 100644
--- a/examples/ustream/Makefile
+++ b/examples/ustream/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Basic Unix domain networking test
 
diff --git a/examples/veml6070/Makefile b/examples/veml6070/Makefile
index 11e3fb2..7d02749 100644
--- a/examples/veml6070/Makefile
+++ b/examples/veml6070/Makefile
@@ -35,7 +35,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # VEML6070 UltraViolet sensor example built-in application info
 
diff --git a/examples/watchdog/Makefile b/examples/watchdog/Makefile
index d48dc58..75ff4ed 100644
--- a/examples/watchdog/Makefile
+++ b/examples/watchdog/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Watchdog Timer Example.
 
diff --git a/examples/webserver/Makefile b/examples/webserver/Makefile
index f6da913..ab26d1e 100644
--- a/examples/webserver/Makefile
+++ b/examples/webserver/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # uIP very tiny web server example
 
diff --git a/examples/wget/Makefile b/examples/wget/Makefile
index 4698d47..bfd33b0 100644
--- a/examples/wget/Makefile
+++ b/examples/wget/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # wget webclient example
 
diff --git a/examples/wgetjson/Makefile b/examples/wgetjson/Makefile
index a548c86..b9e5dff 100644
--- a/examples/wgetjson/Makefile
+++ b/examples/wgetjson/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Hello, World! Example
 
diff --git a/examples/xbc_test/Makefile b/examples/xbc_test/Makefile
index 13650fc..035f4fa 100644
--- a/examples/xbc_test/Makefile
+++ b/examples/xbc_test/Makefile
@@ -36,7 +36,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # XBox controller driver test built-in application info
 
diff --git a/examples/xmlrpc/Makefile b/examples/xmlrpc/Makefile
index 8e3e939..4fcc008 100644
--- a/examples/xmlrpc/Makefile
+++ b/examples/xmlrpc/Makefile
@@ -36,7 +36,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # XML RPC built-in application info
 
diff --git a/examples/zerocross/Makefile b/examples/zerocross/Makefile
index 779524b..c95dacc 100644
--- a/examples/zerocross/Makefile
+++ b/examples/zerocross/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Zero Cross Example
 
diff --git a/fsutils/flash_eraseall/Makefile b/fsutils/flash_eraseall/Makefile
index d0439eb..693b6da 100644
--- a/fsutils/flash_eraseall/Makefile
+++ b/fsutils/flash_eraseall/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Password file access library
 
diff --git a/fsutils/inifile/Makefile b/fsutils/inifile/Makefile
index ae61334..ee55e6d 100644
--- a/fsutils/inifile/Makefile
+++ b/fsutils/inifile/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # I2C tool
 CSRCS = inifile.c
diff --git a/fsutils/inih/Makefile b/fsutils/inih/Makefile
index 36088ab..51ddbfa 100644
--- a/fsutils/inih/Makefile
+++ b/fsutils/inih/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 WGET = wget
 CP = cp -R
diff --git a/fsutils/mkfatfs/Makefile b/fsutils/mkfatfs/Makefile
index ff9eefc..1f5e5a1 100644
--- a/fsutils/mkfatfs/Makefile
+++ b/fsutils/mkfatfs/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # mkfatfs utility
 
diff --git a/fsutils/mksmartfs/Makefile b/fsutils/mksmartfs/Makefile
index 99d000a..aec927f 100644
--- a/fsutils/mksmartfs/Makefile
+++ b/fsutils/mksmartfs/Makefile
@@ -35,7 +35,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # SmartFS file utility
 
diff --git a/fsutils/passwd/Makefile b/fsutils/passwd/Makefile
index eee6623..358ea7e 100644
--- a/fsutils/passwd/Makefile
+++ b/fsutils/passwd/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Password file access library
 
diff --git a/gpsutils/minmea/Makefile b/gpsutils/minmea/Makefile
index ea3aced..db71a2b 100644
--- a/gpsutils/minmea/Makefile
+++ b/gpsutils/minmea/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NSH Library
 
diff --git a/graphics/ft80x/Makefile b/graphics/ft80x/Makefile
index 4d0e950..45a37b8 100644
--- a/graphics/ft80x/Makefile
+++ b/graphics/ft80x/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # FTDI/BridgeTek FT80x library
 CSRCS  = ft80x_dl.c ft80x_ramg.c ft80x_ramdl.c ft80x_ramcmd.c
diff --git a/graphics/littlevgl/Makefile b/graphics/littlevgl/Makefile
index d179a58..b3e9654 100644
--- a/graphics/littlevgl/Makefile
+++ b/graphics/littlevgl/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # LVGL graphic library
 
diff --git a/graphics/nxglyphs/Makefile b/graphics/nxglyphs/Makefile
index 19e0d3e..67c7a98 100644
--- a/graphics/nxglyphs/Makefile
+++ b/graphics/nxglyphs/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_NXWIDGETS),y)
 # Glyphs used by NxWidgets
diff --git a/graphics/nxwidgets/Makefile b/graphics/nxwidgets/Makefile
index 3eecd08..6df3bbe 100644
--- a/graphics/nxwidgets/Makefile
+++ b/graphics/nxwidgets/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Infrastructure
 
diff --git a/graphics/nxwidgets/UnitTests/CButton/Makefile b/graphics/nxwidgets/UnitTests/CButton/Makefile
index 310ff91..7a41d6c 100644
--- a/graphics/nxwidgets/UnitTests/CButton/Makefile
+++ b/graphics/nxwidgets/UnitTests/CButton/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CButton unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/Makefile b/graphics/nxwidgets/UnitTests/CButtonArray/Makefile
index ecfd7c0..1a78282 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/Makefile
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CButtonArray unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/Makefile b/graphics/nxwidgets/UnitTests/CCheckBox/Makefile
index c1ddc33..feaacd4 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/Makefile
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CCheckBox unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile b/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile
index 17ace8d..18bb25b 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CGlyphButton unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile
index 9f3afc9..c7d8519 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CGlyphSliderHorizontal unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CImage/Makefile b/graphics/nxwidgets/UnitTests/CImage/Makefile
index 922813a..df33b49 100644
--- a/graphics/nxwidgets/UnitTests/CImage/Makefile
+++ b/graphics/nxwidgets/UnitTests/CImage/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CImage unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/Makefile b/graphics/nxwidgets/UnitTests/CKeypad/Makefile
index 710d5ae..65dc71f 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/Makefile
+++ b/graphics/nxwidgets/UnitTests/CKeypad/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CKeyPad unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CLabel/Makefile b/graphics/nxwidgets/UnitTests/CLabel/Makefile
index d5bc324..9e3192a 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/Makefile
+++ b/graphics/nxwidgets/UnitTests/CLabel/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CLabel unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/Makefile b/graphics/nxwidgets/UnitTests/CLatchButton/Makefile
index 2efdfe1..2dbffc6 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/Makefile
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CLatchButton unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile
index f012bcb..e03da54 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CLatchButtonArray unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CListBox/Makefile b/graphics/nxwidgets/UnitTests/CListBox/Makefile
index afa03c2..bd9cb32 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/Makefile
+++ b/graphics/nxwidgets/UnitTests/CListBox/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CListBox unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/Makefile b/graphics/nxwidgets/UnitTests/CProgressBar/Makefile
index 561b7ab..e60eee1 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/Makefile
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CProgressBar unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/Makefile b/graphics/nxwidgets/UnitTests/CRadioButton/Makefile
index d5b8a7d..bff0308 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/Makefile
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CRadioButton unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile
index 1808fea..8e1d6c4 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CScrollbarHorizontal unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile
index 882e4f9..3b32da8 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CScrollbarVertical unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile
index 0aa2981..f89c08e 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CSliderHorizontal unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile b/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile
index dc1bde4..f440718 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CSliderVertical unit test
 
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/Makefile b/graphics/nxwidgets/UnitTests/CTextBox/Makefile
index 187ceb9..b643260 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/Makefile
+++ b/graphics/nxwidgets/UnitTests/CTextBox/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CTextBox unit test
 
diff --git a/graphics/nxwm/Makefile b/graphics/nxwm/Makefile
index 86ec8aa..8826452 100644
--- a/graphics/nxwm/Makefile
+++ b/graphics/nxwm/Makefile
@@ -33,7 +33,7 @@
 #
 #################################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 PROGNAME = nxwm
 PRIORITY = SCHED_PRIORITY_DEFAULT
diff --git a/graphics/pdcurs34/Makefile b/graphics/pdcurs34/Makefile
index 6290841..7088c03 100644
--- a/graphics/pdcurs34/Makefile
+++ b/graphics/pdcurs34/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # pdcurses Text User Interface
 include pdcurses/Make.defs
diff --git a/graphics/screenshot/Makefile b/graphics/screenshot/Makefile
index e173675..bdd7c0e 100644
--- a/graphics/screenshot/Makefile
+++ b/graphics/screenshot/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # TIFF Screenshot utility
 
diff --git a/graphics/slcd/Makefile b/graphics/slcd/Makefile
index c1d265f..47d688e 100644
--- a/graphics/slcd/Makefile
+++ b/graphics/slcd/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # SLcd
 
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 057d3d0..8a45a59 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttX TIFF Creation Tool
 CSRCS = tiff_addstrip.c tiff_finalize.c tiff_initialize.c tiff_utils.c
diff --git a/graphics/twm4nx/Makefile b/graphics/twm4nx/Makefile
index efcf268..8458db1 100644
--- a/graphics/twm4nx/Makefile
+++ b/graphics/twm4nx/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Add path to cursor images to CXXFLAGS
 
diff --git a/import/Makefile b/import/Makefile
index 8b1cc8e..63eb4be 100644
--- a/import/Makefile
+++ b/import/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Sub-directories from the NuttX export package
 
diff --git a/industry/abnt_codi/Makefile b/industry/abnt_codi/Makefile
index 2fcafdb..8b3a42b 100644
--- a/industry/abnt_codi/Makefile
+++ b/industry/abnt_codi/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NSH Library
 
diff --git a/interpreters/bas/Makefile b/interpreters/bas/Makefile
index a8625bc..2f65019 100644
--- a/interpreters/bas/Makefile
+++ b/interpreters/bas/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # BAS Library
 
diff --git a/interpreters/ficl/Makefile b/interpreters/ficl/Makefile
index 3099d49..e9b7926 100644
--- a/interpreters/ficl/Makefile
+++ b/interpreters/ficl/Makefile
@@ -35,7 +35,7 @@
 
 BUILDDIR := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Tools
 
diff --git a/interpreters/minibasic/Makefile b/interpreters/minibasic/Makefile
index 7ef485c..13c721e 100644
--- a/interpreters/minibasic/Makefile
+++ b/interpreters/minibasic/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Mini Basic Library
 
diff --git a/modbus/Makefile b/modbus/Makefile
index 491a764..85e47d9 100644
--- a/modbus/Makefile
+++ b/modbus/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # FreeModBus Library
 
diff --git a/netutils/chat/Makefile b/netutils/chat/Makefile
index 2e3f884..c58ff5c 100644
--- a/netutils/chat/Makefile
+++ b/netutils/chat/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 CSRCS = chat.c
 
diff --git a/netutils/cjson/Makefile b/netutils/cjson/Makefile
index b95966f..9f68f46 100644
--- a/netutils/cjson/Makefile
+++ b/netutils/cjson/Makefile
@@ -35,7 +35,7 @@
 
 # Standard includes
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Set up build configuration and environment
 
diff --git a/netutils/codecs/Makefile b/netutils/codecs/Makefile
index d1363ae..551b5b6 100644
--- a/netutils/codecs/Makefile
+++ b/netutils/codecs/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 CSRCS = urldecode.c base64.c md5.c
 
diff --git a/netutils/dhcpc/Makefile b/netutils/dhcpc/Makefile
index 4f863f8..675e068 100644
--- a/netutils/dhcpc/Makefile
+++ b/netutils/dhcpc/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # DHCP Client Library
 
diff --git a/netutils/dhcpd/Makefile b/netutils/dhcpd/Makefile
index 71d0910..d88e8d2 100644
--- a/netutils/dhcpd/Makefile
+++ b/netutils/dhcpd/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # DHCP Daemn Library
 
diff --git a/netutils/discover/Makefile b/netutils/discover/Makefile
index 632f3f4..ccc7a5b 100644
--- a/netutils/discover/Makefile
+++ b/netutils/discover/Makefile
@@ -36,7 +36,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Telnet daemon
 
diff --git a/netutils/esp8266/Makefile b/netutils/esp8266/Makefile
index 46a5c2b..2a61fd5 100644
--- a/netutils/esp8266/Makefile
+++ b/netutils/esp8266/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # ESP8266 Library
 CSRCS = esp8266.c
diff --git a/netutils/ftpc/Makefile b/netutils/ftpc/Makefile
index 4822021..90cf333 100644
--- a/netutils/ftpc/Makefile
+++ b/netutils/ftpc/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # DHCP Daemn Library
 
diff --git a/netutils/ftpd/Makefile b/netutils/ftpd/Makefile
index 1a0acf1..a9e1163 100644
--- a/netutils/ftpd/Makefile
+++ b/netutils/ftpd/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Telnet daemon
 
diff --git a/netutils/libcurl4nx/Makefile b/netutils/libcurl4nx/Makefile
index d43fa31..a508e54 100644
--- a/netutils/libcurl4nx/Makefile
+++ b/netutils/libcurl4nx/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Web client library
 
diff --git a/netutils/netinit/Makefile b/netutils/netinit/Makefile
index 876b832..7735e7e 100644
--- a/netutils/netinit/Makefile
+++ b/netutils/netinit/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 CSRCS = netinit.c
 
diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile
index 396cdf0..ee7770d 100644
--- a/netutils/netlib/Makefile
+++ b/netutils/netlib/Makefile
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Network Library
 
diff --git a/netutils/ntpclient/Makefile b/netutils/ntpclient/Makefile
index 2f50104..72055a7 100644
--- a/netutils/ntpclient/Makefile
+++ b/netutils/ntpclient/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NTP client daemon Library
 
diff --git a/netutils/ping/Makefile b/netutils/ping/Makefile
index bc7a639..d3d1d25 100644
--- a/netutils/ping/Makefile
+++ b/netutils/ping/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_NETUTILS_PING),y)
   CSRCS += icmp_ping.c
diff --git a/netutils/pppd/Makefile b/netutils/pppd/Makefile
index fd7d2f2..1c93948 100644
--- a/netutils/pppd/Makefile
+++ b/netutils/pppd/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 CSRCS = pppd.c ppp.c ahdlc.c lcp.c ipcp.c
 ifeq ($(CONFIG_NETUTILS_PPPD_PAP),y)
diff --git a/netutils/smtp/Makefile b/netutils/smtp/Makefile
index 862efd3..2a3119f 100644
--- a/netutils/smtp/Makefile
+++ b/netutils/smtp/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # SMTP Library
 
diff --git a/netutils/telnetc/Makefile b/netutils/telnetc/Makefile
index c0299e5..b22709d 100644
--- a/netutils/telnetc/Makefile
+++ b/netutils/telnetc/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Telnet daemon
 
diff --git a/netutils/telnetd/Makefile b/netutils/telnetd/Makefile
index f3ff45b..93aaf8a 100644
--- a/netutils/telnetd/Makefile
+++ b/netutils/telnetd/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Telnet daemon
 
diff --git a/netutils/tftpc/Makefile b/netutils/tftpc/Makefile
index 250abbd..cf5c209 100644
--- a/netutils/tftpc/Makefile
+++ b/netutils/tftpc/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # TFTP Client Library
 
diff --git a/netutils/thttpd/Makefile b/netutils/thttpd/Makefile
index de7a6b9..c950650 100644
--- a/netutils/thttpd/Makefile
+++ b/netutils/thttpd/Makefile
@@ -33,7 +33,7 @@
 #
 #############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # THTTPD Library
 
diff --git a/netutils/thttpd/cgi-src/Makefile b/netutils/thttpd/cgi-src/Makefile
index 5a785cf..1bb0736 100644
--- a/netutils/thttpd/cgi-src/Makefile
+++ b/netutils/thttpd/cgi-src/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 CFLAGS		+= ${shell $(INCDIR) "$(CC)" "$(APPDIR)/netutils/thttpd" "$(APPDIR)/netutils/thttpd/cgi-src"}
 CGIBINDIR	= $(APPDIR)/netutils/thttpd/cgi-bin
diff --git a/netutils/usrsock_rpmsg/Makefile b/netutils/usrsock_rpmsg/Makefile
index 42dc56b..c9d6325 100644
--- a/netutils/usrsock_rpmsg/Makefile
+++ b/netutils/usrsock_rpmsg/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 PROGNAME = usrsock
 PRIORITY = CONFIG_NETUTILS_USRSOCK_RPMSG_PRIORITY
diff --git a/netutils/webclient/Makefile b/netutils/webclient/Makefile
index b6e1a33..38af45d 100644
--- a/netutils/webclient/Makefile
+++ b/netutils/webclient/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Web client library
 
diff --git a/netutils/webserver/Makefile b/netutils/webserver/Makefile
index a52736d..00ca847 100644
--- a/netutils/webserver/Makefile
+++ b/netutils/webserver/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Web server library
 
diff --git a/netutils/xmlrpc/Makefile b/netutils/xmlrpc/Makefile
index 1a28a31..3a2af53 100644
--- a/netutils/xmlrpc/Makefile
+++ b/netutils/xmlrpc/Makefile
@@ -36,7 +36,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 ifeq ($(CONFIG_NET_TCP),y)
 CSRCS = xmlparser.c response.c
diff --git a/nshlib/Makefile b/nshlib/Makefile
index b66ecd4..d310650 100644
--- a/nshlib/Makefile
+++ b/nshlib/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NSH Library
 
diff --git a/platform/Makefile b/platform/Makefile
index abdf0e5..35732a8 100644
--- a/platform/Makefile
+++ b/platform/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 CONFIG_ARCH_BOARD ?= dummy
 
@@ -41,7 +41,7 @@ CONFIG_ARCH_BOARD ?= dummy
 
 GNUDIR      = gnu
 PLATFORMDIR = board
-DUMMYDIR    = $(APPDIR)$(DELIM)platform$(DELIM)dummy
+DUMMYDIR    = $(APPDIR)/platform/dummy
 
 ifeq ($(CONFIG_ARCH_BOARD_CUSTOM),y)
   LINKDIR   = $(DUMMYDIR)
diff --git a/platform/bin/Makefile b/platform/bin/Makefile
index 3f8b21f..79114a0 100644
--- a/platform/bin/Makefile
+++ b/platform/bin/Makefile
@@ -33,7 +33,7 @@
 #
 ###########################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 all:
 .PHONY: clean distclean
diff --git a/system/cdcacm/Makefile b/system/cdcacm/Makefile
index fa6da53..ee5a894 100644
--- a/system/cdcacm/Makefile
+++ b/system/cdcacm/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # USB CDC/ACM serial mass storage add-on
 
diff --git a/system/cfgdata/Makefile b/system/cfgdata/Makefile
index 367d7c6..37ab3d8 100644
--- a/system/cfgdata/Makefile
+++ b/system/cfgdata/Makefile
@@ -38,7 +38,7 @@
 # TODO, this makefile should run make under the app dirs, instead of
 # sourcing the Make.defs!
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # config Application
 
diff --git a/system/cle/Makefile b/system/cle/Makefile
index 65457ed..6558e26 100644
--- a/system/cle/Makefile
+++ b/system/cle/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # EMACS-like Command Line Editor (CLE)
 CSRCS = cle.c
diff --git a/system/composite/Makefile b/system/composite/Makefile
index 2ffd723..d622cf7 100644
--- a/system/composite/Makefile
+++ b/system/composite/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # USB device mass storage add-on
 
diff --git a/system/critmon/Makefile b/system/critmon/Makefile
index 702b51b..f6eac26 100644
--- a/system/critmon/Makefile
+++ b/system/critmon/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Stack Monitor Application
 
diff --git a/system/cu/Makefile b/system/cu/Makefile
index 89dbe85..6a88cfe 100644
--- a/system/cu/Makefile
+++ b/system/cu/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 MAINSRC = cu_main.c
 
diff --git a/system/dhcpc/Makefile b/system/dhcpc/Makefile
index af21faa..6281f63 100644
--- a/system/dhcpc/Makefile
+++ b/system/dhcpc/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # DHCPC address renewal built-in application info
 
diff --git a/system/embedlog/Makefile b/system/embedlog/Makefile
index 49c197a..b2aae52 100644
--- a/system/embedlog/Makefile
+++ b/system/embedlog/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 WGET = wget
 CP = cp -R
diff --git a/system/flash_eraseall/Makefile b/system/flash_eraseall/Makefile
index 7a16758..3d969b1 100644
--- a/system/flash_eraseall/Makefile
+++ b/system/flash_eraseall/Makefile
@@ -35,7 +35,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # flash_eraseall Application
 
diff --git a/system/hex2bin/Makefile b/system/hex2bin/Makefile
index b43be77..05a91bb 100644
--- a/system/hex2bin/Makefile
+++ b/system/hex2bin/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Hex2bin utility
 
diff --git a/system/hexed/Makefile b/system/hexed/Makefile
index 2df0f7d..539fb7d 100644
--- a/system/hexed/Makefile
+++ b/system/hexed/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # hexed Application
 
diff --git a/system/i2c/Makefile b/system/i2c/Makefile
index 66b0444..34cf4b0 100644
--- a/system/i2c/Makefile
+++ b/system/i2c/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # I2C tool
 CSRCS   = i2c_bus.c i2c_common.c i2c_dev.c i2c_get.c i2c_set.c i2c_verf.c
diff --git a/system/lm75/Makefile b/system/lm75/Makefile
index 4e3761f..14138f2 100644
--- a/system/lm75/Makefile
+++ b/system/lm75/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # LM-75 Temperature Sensor Application
 
diff --git a/system/lzf/Makefile b/system/lzf/Makefile
index f40a6cf..296a459 100644
--- a/system/lzf/Makefile
+++ b/system/lzf/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # LZF built-in application info
 
diff --git a/system/mdio/Makefile b/system/mdio/Makefile
index 1079d48..b4954a4 100644
--- a/system/mdio/Makefile
+++ b/system/mdio/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # MDIO tool built-in application info
 
diff --git a/system/netdb/Makefile b/system/netdb/Makefile
index 3d8ebc4..8507a79 100644
--- a/system/netdb/Makefile
+++ b/system/netdb/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # netdb Application
 
diff --git a/system/nsh/Makefile b/system/nsh/Makefile
index 166ca6a..3279b3c 100644
--- a/system/nsh/Makefile
+++ b/system/nsh/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NuttShell (NSH) Example
 
diff --git a/system/ntpc/Makefile b/system/ntpc/Makefile
index 354ad12..c64123a 100644
--- a/system/ntpc/Makefile
+++ b/system/ntpc/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NTPC address renewal built-in application info
 
diff --git a/system/nxplayer/Makefile b/system/nxplayer/Makefile
index db6e704..1e4f753 100644
--- a/system/nxplayer/Makefile
+++ b/system/nxplayer/Makefile
@@ -35,7 +35,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NxPlayer Library
 
diff --git a/system/nxrecorder/Makefile b/system/nxrecorder/Makefile
index 8aae5a7..5988e66 100644
--- a/system/nxrecorder/Makefile
+++ b/system/nxrecorder/Makefile
@@ -32,7 +32,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NxRecorder Library
 
diff --git a/system/ping/Makefile b/system/ping/Makefile
index a4b1b5b..3009b73 100644
--- a/system/ping/Makefile
+++ b/system/ping/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # ICMP ping command
 
diff --git a/system/ping6/Makefile b/system/ping6/Makefile
index b6df217..448b56d 100644
--- a/system/ping6/Makefile
+++ b/system/ping6/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # ICMP ping6 command
 
diff --git a/system/popen/Makefile b/system/popen/Makefile
index 6812a54..4b185d6 100644
--- a/system/popen/Makefile
+++ b/system/popen/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # popen()/pclose functions
 
diff --git a/system/psmq/Makefile b/system/psmq/Makefile
index 1fb9a8d..2804439 100644
--- a/system/psmq/Makefile
+++ b/system/psmq/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 WGET = wget
 CP = cp -R
diff --git a/system/ramtest/Makefile b/system/ramtest/Makefile
index 8ac7e8f..002d6b2 100644
--- a/system/ramtest/Makefile
+++ b/system/ramtest/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # RAM test
 
diff --git a/system/readline/Makefile b/system/readline/Makefile
index 0535394..824b4aa 100644
--- a/system/readline/Makefile
+++ b/system/readline/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # The Readline Library
 
diff --git a/system/sched_note/Makefile b/system/sched_note/Makefile
index d28027d..680f24d 100644
--- a/system/sched_note/Makefile
+++ b/system/sched_note/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # LED driver test built-in application info
 
diff --git a/system/setlogmask/Makefile b/system/setlogmask/Makefile
index 34e34de..f8eba32 100644
--- a/system/setlogmask/Makefile
+++ b/system/setlogmask/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # setlogmask command
 
diff --git a/system/spi/Makefile b/system/spi/Makefile
index cfb7d7e..c352e80 100644
--- a/system/spi/Makefile
+++ b/system/spi/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # SPI tool
 
diff --git a/system/stackmonitor/Makefile b/system/stackmonitor/Makefile
index ad93df9..599aeb1 100644
--- a/system/stackmonitor/Makefile
+++ b/system/stackmonitor/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Stack Monitor Application
 
diff --git a/system/system/Makefile b/system/system/Makefile
index fda17e6..53e0185 100644
--- a/system/system/Makefile
+++ b/system/system/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # system command
 
diff --git a/system/taskset/Makefile b/system/taskset/Makefile
index 65e4d50..94d5ff0 100644
--- a/system/taskset/Makefile
+++ b/system/taskset/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # taskset command
 
diff --git a/system/tee/Makefile b/system/tee/Makefile
index 68baead..d03099d 100644
--- a/system/tee/Makefile
+++ b/system/tee/Makefile
@@ -35,7 +35,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # tee command
 
diff --git a/system/telnet/Makefile b/system/telnet/Makefile
index da1d561..57398fa 100644
--- a/system/telnet/Makefile
+++ b/system/telnet/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 ifneq ($(CONFIG_SYSTEM_TELNET_CHATD),)
 
diff --git a/system/termcurses/Makefile b/system/termcurses/Makefile
index 664867e..ed2d61c 100644
--- a/system/termcurses/Makefile
+++ b/system/termcurses/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Termcurses terminal emulation library
 
diff --git a/system/ubloxmodem/Makefile b/system/ubloxmodem/Makefile
index 4d3c5b2..1ae77d6 100644
--- a/system/ubloxmodem/Makefile
+++ b/system/ubloxmodem/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # u-blox modem tool
 
diff --git a/system/usbmsc/Makefile b/system/usbmsc/Makefile
index d3aa23d..e24966e 100644
--- a/system/usbmsc/Makefile
+++ b/system/usbmsc/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 PROGNAME = msconn msdis
 PRIORITY = $(CONFIG_SYSTEM_USBMSC_CMD_PRIORITY)
diff --git a/system/vi/Makefile b/system/vi/Makefile
index f8cfb75..d9d036a 100644
--- a/system/vi/Makefile
+++ b/system/vi/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # VI-Workalike Editor
 
diff --git a/system/zmodem/Makefile b/system/zmodem/Makefile
index 214d8c1..88abdd9 100644
--- a/system/zmodem/Makefile
+++ b/system/zmodem/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 PROGNAME = sz rz
 PRIORITY = $(CONFIG_SYSTEM_ZMODEM_PRIORITY)
diff --git a/system/zmodem/Makefile.host b/system/zmodem/Makefile.host
index 3565ac7..c2474ed 100644
--- a/system/zmodem/Makefile.host
+++ b/system/zmodem/Makefile.host
@@ -49,7 +49,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
 NUTTXINC = $(TOPDIR)/include
diff --git a/testing/cxxtest/Makefile b/testing/cxxtest/Makefile
index 2f1f251..a4ebf64 100644
--- a/testing/cxxtest/Makefile
+++ b/testing/cxxtest/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # CXX test program
 
diff --git a/testing/fstest/Makefile b/testing/fstest/Makefile
index a7153e4..cd805e9 100644
--- a/testing/fstest/Makefile
+++ b/testing/fstest/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Generic file system stress test application info
 
diff --git a/testing/getprime/Makefile b/testing/getprime/Makefile
index 5af2700..0d0a519 100644
--- a/testing/getprime/Makefile
+++ b/testing/getprime/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # getprime built-in application info
 
diff --git a/testing/mm/Makefile b/testing/mm/Makefile
index 6c5640f..c416bea 100644
--- a/testing/mm/Makefile
+++ b/testing/mm/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Memory Management Test
 
diff --git a/testing/nxffs/Makefile b/testing/nxffs/Makefile
index 7bcd699..72ecbed 100644
--- a/testing/nxffs/Makefile
+++ b/testing/nxffs/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # NXFFS file system example
 
diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index a8d2953..8fc1349 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # ostest built-in application info
 
diff --git a/testing/scanftest/Makefile b/testing/scanftest/Makefile
index dea2953..744e5f9 100644
--- a/testing/scanftest/Makefile
+++ b/testing/scanftest/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # scanf() test built-in application info
 
diff --git a/testing/smart/Makefile b/testing/smart/Makefile
index f090ae9..0bb6928 100644
--- a/testing/smart/Makefile
+++ b/testing/smart/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # SMART file system stress test
 
diff --git a/testing/smart_test/Makefile b/testing/smart_test/Makefile
index 3817f30..f13fd21 100644
--- a/testing/smart_test/Makefile
+++ b/testing/smart_test/Makefile
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # SMART filesystem test tool
 
diff --git a/testing/smp/Makefile b/testing/smp/Makefile
index fdb873e..58232c3 100644
--- a/testing/smp/Makefile
+++ b/testing/smp/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # SMP built-in application info
 
diff --git a/testing/unity/Makefile b/testing/unity/Makefile
index a8bc936..2bd0d2d 100644
--- a/testing/unity/Makefile
+++ b/testing/unity/Makefile
@@ -35,7 +35,7 @@
 
 # Standard includes
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Set up build configuration and environment
 
diff --git a/wireless/bluetooth/btsak/Makefile b/wireless/bluetooth/btsak/Makefile
index c0f7005..302685b 100644
--- a/wireless/bluetooth/btsak/Makefile
+++ b/wireless/bluetooth/btsak/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # Bluetooth SAK (swiss army knife )
 
diff --git a/wireless/gs2200m/Makefile b/wireless/gs2200m/Makefile
index 62989af..07b515e 100644
--- a/wireless/gs2200m/Makefile
+++ b/wireless/gs2200m/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # gs2200m command
 
diff --git a/wireless/ieee802154/i8sak/Makefile b/wireless/ieee802154/i8sak/Makefile
index 37799ca..e8a9e5d 100644
--- a/wireless/ieee802154/i8sak/Makefile
+++ b/wireless/ieee802154/i8sak/Makefile
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # IEEE 802.15.4  SAK (swiss army knife )
 
diff --git a/wireless/ieee802154/i8shark/Makefile b/wireless/ieee802154/i8shark/Makefile
index 9df95ba..8e6036b 100644
--- a/wireless/ieee802154/i8shark/Makefile
+++ b/wireless/ieee802154/i8shark/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 MAINSRC = i8shark_main.c
 
diff --git a/wireless/ieee802154/libmac/Makefile b/wireless/ieee802154/libmac/Makefile
index 845cdf7..63c6e1c 100644
--- a/wireless/ieee802154/libmac/Makefile
+++ b/wireless/ieee802154/libmac/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # libmac source files
 
diff --git a/wireless/ieee802154/libutils/Makefile b/wireless/ieee802154/libutils/Makefile
index ab59574..3ac7baf 100644
--- a/wireless/ieee802154/libutils/Makefile
+++ b/wireless/ieee802154/libutils/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # libutils source files
 CSRCS += ieee802154_addrtostr.c
diff --git a/wireless/iwpan/Makefile b/wireless/iwpan/Makefile
index f2a1ba4..e25c211 100644
--- a/wireless/iwpan/Makefile
+++ b/wireless/iwpan/Makefile
@@ -34,7 +34,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # IEEE802.11 Wapi Application
 
diff --git a/wireless/wapi/Makefile b/wireless/wapi/Makefile
index d6bbf80..cc2210e 100644
--- a/wireless/wapi/Makefile
+++ b/wireless/wapi/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/Make.defs
 
 # IEEE802.11 Wapi Application
 


[incubator-nuttx-apps] 02/02: build: Replace all -I to INCDIR

Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git

commit ea135b89c69b083dd5fa39e71938a8809c263f2c
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed May 20 16:29:35 2020 +0800

    build: Replace all -I to INCDIR
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 canutils/libcanard/Makefile           |  3 ++-
 examples/canard/Makefile              |  2 +-
 examples/elf/tests/struct/Makefile    |  2 --
 examples/embedlog/Makefile            |  1 -
 examples/embedlog/embedlog_main.c     | 16 ++++++++--------
 examples/ini_dumper/Makefile          |  1 -
 examples/ini_dumper/ini_dumper_main.c |  8 ++++----
 examples/nxflat/tests/struct/Makefile |  2 --
 examples/powermonitor/Makefile        |  2 --
 examples/pty_test/Makefile            |  1 -
 import/Make.defs                      | 11 +++++------
 netutils/cjson/Makefile               |  3 ++-
 system/embedlog/Makefile              |  2 +-
 system/psmq/Makefile                  |  4 ++--
 testing/unity/Makefile                |  3 ++-
 15 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/canutils/libcanard/Makefile b/canutils/libcanard/Makefile
index 40ab403..984015a 100644
--- a/canutils/libcanard/Makefile
+++ b/canutils/libcanard/Makefile
@@ -48,7 +48,8 @@ LIBCANARD_DRVDIR = $(LIBCANARD_SRCDIR)$(DELIM)drivers$(DELIM)nuttx
 
 APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)canutils
 
-CFLAGS += -std=c99 -I$(APPS_INCDIR) -DCANARD_ASSERT=DEBUGASSERT
+CFLAGS += -std=c99 -DCANARD_ASSERT=DEBUGASSERT
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPS_INCDIR)}
 
 CSRCS = $(LIBCANARD_SRCDIR)$(DELIM)canard.c $(LIBCANARD_DRVDIR)$(DELIM)canard_nuttx.c
 
diff --git a/examples/canard/Makefile b/examples/canard/Makefile
index d46a85f..cdee49d 100644
--- a/examples/canard/Makefile
+++ b/examples/canard/Makefile
@@ -40,7 +40,7 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
 STACKSIZE = $(CONFIG_EXAMPLES_LIBCANARD_STACKSIZE)
 MODULE = $(CONFIG_EXAMPLES_LIBCANARD)
 
-CFLAGS += -I$(APPDIR)/include/canutils
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)/include/canutils}
 MAINSRC = canard_main.c
 
 include $(APPDIR)/Application.mk
diff --git a/examples/elf/tests/struct/Makefile b/examples/elf/tests/struct/Makefile
index 3d398c5..d90e927 100644
--- a/examples/elf/tests/struct/Makefile
+++ b/examples/elf/tests/struct/Makefile
@@ -35,8 +35,6 @@
 
 include $(TOPDIR)/Make.defs
 
-CELFFLAGS += -I.
-
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
 NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
 else
diff --git a/examples/embedlog/Makefile b/examples/embedlog/Makefile
index c9a4123..027c574 100644
--- a/examples/embedlog/Makefile
+++ b/examples/embedlog/Makefile
@@ -45,6 +45,5 @@ MODULE = $(CONFIG_EXAMPLES_EMBEDLOG)
 # embedlog Example
 
 MAINSRC = embedlog_main.c
-CFLAGS += -I$(APPDIR)/include/system
 
 include $(APPDIR)/Application.mk
diff --git a/examples/embedlog/embedlog_main.c b/examples/embedlog/embedlog_main.c
index 53d730a..2851151 100644
--- a/examples/embedlog/embedlog_main.c
+++ b/examples/embedlog/embedlog_main.c
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <embedlog.h>
+#include <system/embedlog.h>
 #include <errno.h>
 #include <nuttx/config.h>
 #include <stdio.h>
@@ -80,7 +80,7 @@ static struct el_options g_el;
  *
  * Description:
  *   Presents how to use options and how it's rendered. This assumes all
- *   options are enabled in compile time. If any of the options is not enabled
+ *   options are enabled in compile time. If any of the options isn't enabled
  *   in compile time, setting it will have no effect and logs will vary.
  *
  * Input Parameters:
@@ -284,7 +284,7 @@ static void el_print_file(const char *workdir)
     {
       if (errno == ENAMETOOLONG || errno == EINVAL)
         {
-          /* These are the only unrecoverable errors that embedlog may return,
+          /* These are the only unrecoverable errors embedlog may return,
            * any other error it actually a warning, telling user that file
            * could not have been opened now, but every el_print function with
            * output to file enabled, will try to reopen file. This of course
@@ -305,9 +305,9 @@ static void el_print_file(const char *workdir)
 
   el_oprint(OELI, "Now we enabled log rotation");
   el_oprint(OELI, "If log cannot fit in current file");
-  el_oprint(OELI, "it will be stored in new file");
-  el_oprint(OELI, "and if library creates EL_FROTATE_NUMBER files");
-  el_oprint(OELI, "oldest file will be deleted and new file will be created");
+  el_oprint(OELI, "it will be stored in new file and");
+  el_oprint(OELI, "if library creates EL_FROTATE_NUMBER files oldest");
+  el_oprint(OELI, "file will be deleted and new file will be created");
   el_oprint(OELI, "run this program multiple times and see how it works");
 }
 
@@ -331,8 +331,8 @@ int main(int argc, FAR char *argv[])
 
   el_oinit(&g_el);
 
-  el_oprint(OELI, "Right after init, embedlog will print to stderr with just "
-      "log level information - these are default settings.");
+  el_oprint(OELI, "Right after init, embedlog will print to stderr with "
+      "just log level information - these are default settings.");
 
   el_print_options();
   el_print_memory();
diff --git a/examples/ini_dumper/Makefile b/examples/ini_dumper/Makefile
index 877feff..b95c223 100644
--- a/examples/ini_dumper/Makefile
+++ b/examples/ini_dumper/Makefile
@@ -45,7 +45,6 @@ MODULE = $(CONFIG_EXAMPLES_INI_DUMPER)
 # ini_dumper Example
 
 MAINSRC = ini_dumper_main.c
-CFLAGS += -I$(APPDIR)/include/fsutils
 
 # needed to make compiler happy about wrong function pointers
 # different function pointer is used depending on that define
diff --git a/examples/ini_dumper/ini_dumper_main.c b/examples/ini_dumper/ini_dumper_main.c
index db90100..b1e9fc5 100644
--- a/examples/ini_dumper/ini_dumper_main.c
+++ b/examples/ini_dumper/ini_dumper_main.c
@@ -41,7 +41,7 @@
 
 #include <stdio.h>
 
-#include "fsutils/ini.h"
+#include <fsutils/ini.h>
 
 /****************************************************************************
  * Private Functions
@@ -83,12 +83,12 @@ int main(int argc, FAR char *argv[])
       return 1;
     }
 
-  printf("\n------ --------------- ------------- ---------------------------\n");
+  printf("------ --------------- ------------- -------------------------\n");
   printf(" line      section          key                 value\n");
-  printf("------ --------------- ------------- ---------------------------\n");
+  printf("------ --------------- ------------- -------------------------\n");
 
   ret = ini_parse(argv[1], ini_dump, NULL);
-  printf("------ --------------- ------------- ---------------------------\n");
+  printf("------ --------------- ------------- -------------------------\n");
   fprintf(stderr, "ini_parse() exited with %d\n", ret);
   return 0;
 }
diff --git a/examples/nxflat/tests/struct/Makefile b/examples/nxflat/tests/struct/Makefile
index 8188af7..b657cff 100644
--- a/examples/nxflat/tests/struct/Makefile
+++ b/examples/nxflat/tests/struct/Makefile
@@ -35,8 +35,6 @@
 
 include $(TOPDIR)/Make.defs
 
-CFLAGS			+= -I.
-
 BIN			= struct
 
 R1SRCS			= struct_main.c struct_dummy.c
diff --git a/examples/powermonitor/Makefile b/examples/powermonitor/Makefile
index 68dc417..9203430 100644
--- a/examples/powermonitor/Makefile
+++ b/examples/powermonitor/Makefile
@@ -41,6 +41,4 @@ MODULE = $(CONFIG_EXAMPLES_POWERMONITOR)
 
 MAINSRC = powermonitor_main.c
 
-CFLAGS += -I../../../nuttx/arch/arm/src -I../../../nuttx/arch/arm/src/common
-
 include $(APPDIR)/Application.mk
diff --git a/examples/pty_test/Makefile b/examples/pty_test/Makefile
index a0e5a2f..1c66823 100644
--- a/examples/pty_test/Makefile
+++ b/examples/pty_test/Makefile
@@ -44,7 +44,6 @@ MODULE = $(CONFIG_EXAMPLES_PTYTEST)
 
 # PTY Test! Example
 
-CFLAGS += -I$(APPDIR)/include
 MAINSRC = pty_test.c
 
 include $(APPDIR)/Application.mk
diff --git a/import/Make.defs b/import/Make.defs
index 7764b0a..4a87383 100644
--- a/import/Make.defs
+++ b/import/Make.defs
@@ -41,17 +41,16 @@ include $(TOPDIR)/scripts/Make.defs
 # Compiler
 
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-  # Windows-native toolchains
-  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
-  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
   ARCHCRT0OBJ = "${shell cygpath -w $(TOPDIR)$(DELIM)startup$(DELIM)crt0$(OBJEXT)}"
 else
-  # Linux/Cygwin-native toolchain
-  ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include
-  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx
   ARCHCRT0OBJ = $(TOPDIR)$(DELIM)startup$(DELIM)crt0$(OBJEXT)
 endif
 
+ARCHINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include}
+
+ARCHXXINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include}
+ARCHXXINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include$(DELIM)cxx}
+
 ARCHCFLAGS += -fno-common -pipe
 ARCHCXXFLAGS += -fno-common -pipe
 
diff --git a/netutils/cjson/Makefile b/netutils/cjson/Makefile
index 9f68f46..755f411 100644
--- a/netutils/cjson/Makefile
+++ b/netutils/cjson/Makefile
@@ -56,7 +56,8 @@ CJSON_SRCDIR = $(CJSON_UNPACKNAME)
 
 APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)netutils
 
-CFLAGS += -I$(APPS_INCDIR) -DCJSON_INCLUDE_CONFIG_H
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPS_INCDIR)}
+CFLAGS += -DCJSON_INCLUDE_CONFIG_H
 
 CSRCS = $(CJSON_SRCDIR)$(DELIM)cJSON.c
 CSRCS += $(CJSON_SRCDIR)$(DELIM)cJSON_Utils.c
diff --git a/system/embedlog/Makefile b/system/embedlog/Makefile
index b2aae52..ad9eefe 100644
--- a/system/embedlog/Makefile
+++ b/system/embedlog/Makefile
@@ -48,7 +48,7 @@ EMBEDLOG_EXT = tar.gz
 EMBEDLOG_SOURCES = embedlog-$(EMBEDLOG_VERSION)
 EMBEDLOG_TARBALL = $(EMBEDLOG_SOURCES).$(EMBEDLOG_EXT)
 
-CFLAGS += -I$(APPDIR)/include/system
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)$(DELIM)include$(DELIM)system}
 
 CSRCS = embedlog/src/el-options.c \
 	embedlog/src/el-perror.c \
diff --git a/system/psmq/Makefile b/system/psmq/Makefile
index 2804439..bae3c3d 100644
--- a/system/psmq/Makefile
+++ b/system/psmq/Makefile
@@ -48,8 +48,8 @@ PSMQ_EXT = tar.gz
 PSMQ_SOURCES = psmq-$(PSMQ_VERSION)
 PSMQ_TARBALL = $(PSMQ_SOURCES).$(PSMQ_EXT)
 
-CFLAGS += -I$(APPDIR)/include/system
-CFLAGS += -I$(APPDIR)/system/psmq/$(PSMQ_SOURCES)
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)$(DELIM)include$(DELIM)system}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPDIR)$(DELIM)system$(DELIM)psmq$(DELIM)$(PSMQ_SOURCES)}
 
 # mandatory source files to compile
 CSRCS = $(PSMQ_SOURCES)/lib/psmq.c \
diff --git a/testing/unity/Makefile b/testing/unity/Makefile
index 2bd0d2d..a7c4209 100644
--- a/testing/unity/Makefile
+++ b/testing/unity/Makefile
@@ -56,7 +56,8 @@ UNITY_SRCDIR = $(UNITY_UNPACKNAME)$(DELIM)src
 
 APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)testing
 
-CFLAGS += -I$(APPS_INCDIR) -DUNITY_INCLUDE_CONFIG_H
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(APPS_INCDIR)}
+CFLAGS += -DUNITY_INCLUDE_CONFIG_H
 
 CSRCS = $(UNITY_SRCDIR)$(DELIM)unity.c