diff --git a/UnitTests/CButton/Makefile b/UnitTests/CButton/Makefile
index 87649ac3c..01bca12a5 100644
--- a/UnitTests/CButton/Makefile
+++ b/UnitTests/CButton/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CButtonArray/Makefile b/UnitTests/CButtonArray/Makefile
index 03f7624f9..84d19277e 100644
--- a/UnitTests/CButtonArray/Makefile
+++ b/UnitTests/CButtonArray/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CCheckBox/Makefile b/UnitTests/CCheckBox/Makefile
index 715fe4dad..5aa96e618 100644
--- a/UnitTests/CCheckBox/Makefile
+++ b/UnitTests/CCheckBox/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CGlyphButton/Makefile b/UnitTests/CGlyphButton/Makefile
index db91bdfbc..ec0c5d5d3 100644
--- a/UnitTests/CGlyphButton/Makefile
+++ b/UnitTests/CGlyphButton/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CImage/Makefile b/UnitTests/CImage/Makefile
index fb2640446..5970d59d1 100644
--- a/UnitTests/CImage/Makefile
+++ b/UnitTests/CImage/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CKeypad/Makefile b/UnitTests/CKeypad/Makefile
index 36ae2f543..b0aba9603 100644
--- a/UnitTests/CKeypad/Makefile
+++ b/UnitTests/CKeypad/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CLabel/Makefile b/UnitTests/CLabel/Makefile
index 2ddfbbf42..9a5fa1321 100644
--- a/UnitTests/CLabel/Makefile
+++ b/UnitTests/CLabel/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CLatchButton/Makefile b/UnitTests/CLatchButton/Makefile
index a44e7e954..e50db8914 100644
--- a/UnitTests/CLatchButton/Makefile
+++ b/UnitTests/CLatchButton/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CLatchButtonArray/Makefile b/UnitTests/CLatchButtonArray/Makefile
index a11c9bfd6..544167ec9 100644
--- a/UnitTests/CLatchButtonArray/Makefile
+++ b/UnitTests/CLatchButtonArray/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CListBox/Makefile b/UnitTests/CListBox/Makefile
index a396d4b01..1161460b4 100644
--- a/UnitTests/CListBox/Makefile
+++ b/UnitTests/CListBox/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CProgressBar/Makefile b/UnitTests/CProgressBar/Makefile
index 11b802f92..6fee2fac9 100644
--- a/UnitTests/CProgressBar/Makefile
+++ b/UnitTests/CProgressBar/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CRadioButton/Makefile b/UnitTests/CRadioButton/Makefile
index b642ebaf3..97e8a398e 100644
--- a/UnitTests/CRadioButton/Makefile
+++ b/UnitTests/CRadioButton/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CScrollbarHorizontal/Makefile b/UnitTests/CScrollbarHorizontal/Makefile
index c952fd1e2..952ec4c6b 100644
--- a/UnitTests/CScrollbarHorizontal/Makefile
+++ b/UnitTests/CScrollbarHorizontal/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CScrollbarVertical/Makefile b/UnitTests/CScrollbarVertical/Makefile
index 81b8ced26..4e44699ee 100644
--- a/UnitTests/CScrollbarVertical/Makefile
+++ b/UnitTests/CScrollbarVertical/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CSliderHorizonal/Makefile b/UnitTests/CSliderHorizonal/Makefile
index e31f1f033..5bc6c84c6 100644
--- a/UnitTests/CSliderHorizonal/Makefile
+++ b/UnitTests/CSliderHorizonal/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CSliderVertical/Makefile b/UnitTests/CSliderVertical/Makefile
index 3a86b57e9..4c6a660f0 100644
--- a/UnitTests/CSliderVertical/Makefile
+++ b/UnitTests/CSliderVertical/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/CTextBox/Makefile b/UnitTests/CTextBox/Makefile
index b73ce8f4a..8fde36bb0 100644
--- a/UnitTests/CTextBox/Makefile
+++ b/UnitTests/CTextBox/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/UnitTests/nxwm/Makefile b/UnitTests/nxwm/Makefile
index cfcdef750..73cb0b42a 100644
--- a/UnitTests/nxwm/Makefile
+++ b/UnitTests/nxwm/Makefile
@@ -35,7 +35,6 @@
 
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -45,7 +44,6 @@ NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
 NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
 NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
 
-INCDIR=$(TOPDIR)/tools/incdir.sh
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
   CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
diff --git a/libnxwidgets/Makefile b/libnxwidgets/Makefile
index 4673c1f98..880117a24 100644
--- a/libnxwidgets/Makefile
+++ b/libnxwidgets/Makefile
@@ -33,7 +33,6 @@
 #
 #################################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 # Control build verbosity
@@ -87,8 +86,8 @@ ifeq ($(WINTOOL),y)
 INCDIROPT = -w
 endif
 
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
-CXXFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
+CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
 DEPPATH = --dep-path src
 VPATH = src
 
diff --git a/nxwm/Makefile b/nxwm/Makefile
index 372f3c186..81b9dcdeb 100644
--- a/nxwm/Makefile
+++ b/nxwm/Makefile
@@ -33,7 +33,6 @@
 #
 #################################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 # Control build verbosity
@@ -89,10 +88,10 @@ ifeq ($(WINTOOL),y)
 INCDIROPT = -w
 endif
 
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWMDIR)/include}
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
-CXXFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWMDIR)/include}
-CXXFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWMDIR)/include}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
+CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWMDIR)/include}
+CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
 
 DEPPATH = --dep-path src
 VPATH = src