diff --git a/Makefile b/Makefile
index 4204c03..8e4f86a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,9 @@ ifndef CONFIG_HOST
 $(error Please run ./configure)
 endif
 
+CFLAGS+=-I./include
+LDFLAGS+=-L.
+
 #Ultrasparc64 users experiencing SIGBUS should try the following gcc options
 #(thanks to Robert Gibbon)
 PLATOPTS_SPARC64=-mcpu=ultrasparc -pipe -fomit-frame-pointer -ffast-math -finline-functions -fweb -frename-registers -mapp-regs
diff --git a/config.mak.in b/config.mak.in
index 997e8e8..92b833c 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -6,7 +6,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 CC=@CC@
 AR=@AR@
 WINDRES=@WINDRES@
-CFLAGS=@CFLAGS@ -I./include
-LDFLAGS=@LDFLAGS@ -L.
+CFLAGS=@CFLAGS@
+LDFLAGS=@LDFLAGS@
 LDLIBS_EXTRA=@LIBS@
 TOOLS_ADDITIONAL=@TOOLS_ADDITIONAL@
diff --git a/scripts/hack_fakeautoconf.sh b/scripts/hack_fakeautoconf.sh
index 7cbd385..3744a22 100755
--- a/scripts/hack_fakeautoconf.sh
+++ b/scripts/hack_fakeautoconf.sh
@@ -21,8 +21,8 @@ CONFIG_HOST=x86_64-w64-mingw32
 CC=gcc
 AR=ar
 WINDRES=windres
-CFLAGS=$CFLAGS -g -O2 -I./include
-LDFLAGS=$LDFLAGS -L.
+CFLAGS=$CFLAGS -g -O2
+LDFLAGS=$LDFLAGS
 LDLIBS_EXTRA=$LDLIBS
 EOF