diff --git a/Makefile.target b/Makefile.target
index 45c9305643..ce7473f919 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -43,14 +43,7 @@ all: $(PROGS)
 # cpu emulator library
 libobj-y = exec.o translate-all.o cpu-exec.o translate.o host-utils.o
 libobj-$(CONFIG_KQEMU) += kqemu.o
-# TCG code generator
 libobj-y += tcg/tcg.o tcg/tcg-runtime.o
-QEMU_CFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
-ifeq ($(ARCH),sparc64)
-QEMU_CFLAGS+=-I$(SRC_PATH)/tcg/sparc
-endif
-QEMU_CFLAGS+=-I$(SRC_PATH)/fpu
-
 libobj-$(CONFIG_SOFTFLOAT) += fpu/softfloat.o
 libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o
 libobj-y += op_helper.o helper.o
diff --git a/configure b/configure
index 3dc9fffdaa..a252dff85e 100755
--- a/configure
+++ b/configure
@@ -2070,6 +2070,14 @@ fi
 cflags=""
 ldflags=""
 
+if test "$ARCH" = "sparc64" ; then
+  cflags="-I\$(SRC_PATH)/tcg/sparc $cflags"
+else
+  cflags="-I\$(SRC_PATH)/tcg/\$(ARCH) $cflags"
+fi
+cflags="-I\$(SRC_PATH)/tcg $cflags"
+cflags="-I\$(SRC_PATH)/fpu $cflags"
+
 case "$ARCH" in
 alpha)
   # Ensure there's only a single GP