diff --git a/Makefile b/Makefile
index 2723efbbeb..44fd62f148 100644
--- a/Makefile
+++ b/Makefile
@@ -76,8 +76,8 @@ endif
 
 HOSTCC = gcc
 HOSTCXX = g++
-HOSTCFLAGS := -I$(srck) -I$(objk) -g
-HOSTCXXFLAGS := -I$(srck) -I$(objk)
+HOSTCFLAGS := -g
+HOSTCXXFLAGS := -g
 LIBGCC_FILE_NAME := $(shell test -r `$(CC) -print-libgcc-file-name` && $(CC) -print-libgcc-file-name)
 
 DOXYGEN := doxygen
diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile
index 6cdc845913..75c4ff7a32 100644
--- a/util/kconfig/Makefile
+++ b/util/kconfig/Makefile
@@ -344,3 +344,5 @@ $(objk)/lxdialog/lxdialog: $(objk)/dochecklxdialog \
 $(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c
 	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@
 
+$(objk)/%.o: HOSTCFLAGS+=-I$(srck) -I$(objk)
+$(objk)/%.o: HOSTCXXFLAGS+=-I$(srck) -I$(objk)
diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.inc
index 080734c793..0acda04340 100644
--- a/util/nvramtool/Makefile.inc
+++ b/util/nvramtool/Makefile.inc
@@ -27,10 +27,6 @@ endif
 ifeq ($(OS_ARCH), NetBSD)
 NVRAMTOOLLDLFLAGS = -l$(shell uname -p)
 endif
-ifeq ($(OS_ARCH), FreeBSD)
-NVRAMTOOLFLAGS += -O2 -g -Wall -W
-HOSTCFLAGS =
-endif
 ifeq ($(shell uname -o), Cygwin)
 NVRAMTOOLFLAGS += -O2 -g -Wall -W -D__GLIBC__
 NVRAMTOOLLDFLAGS = -lioperm