diff --git a/qla2x00t-32gbit/Makefile b/qla2x00t-32gbit/Makefile
index c2cc64523..8a6e745a6 100644
--- a/qla2x00t-32gbit/Makefile
+++ b/qla2x00t-32gbit/Makefile
@@ -45,8 +45,9 @@ endif
 INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 
 ifneq ($(PATCHLEVEL),)
-ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter \
-	-Wno-missing-field-initializers -I$(src)/../scst/include -I$(src)\
+ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter	\
+	-Wno-missing-field-initializers				\
+	-I$(src)/../scst/include -I$(src)/include		\
 	-DDEFAULT_SYMBOL_NAMESPACE=QLA32GB
 
 ifneq ($(CONFIG_SCSI_QLA2XXX_TARGET),)
diff --git a/qla2x00t-32gbit/extract-qla2xxx-orig b/qla2x00t-32gbit/extract-qla2xxx-orig
index 3e41f29eb..59aba4837 100755
--- a/qla2x00t-32gbit/extract-qla2xxx-orig
+++ b/qla2x00t-32gbit/extract-qla2xxx-orig
@@ -18,12 +18,12 @@ cd qla2xxx-orig || exit $?
 download_and_extract_kernel_tree "${kernel_version}"
 touch "linux-${kernel_version}"/drivers/scsi/qla2xxx/*
 rm -rf "${kernel_version}"
-mkdir -p "${kernel_version}/trace/events"
+mkdir -p "${kernel_version}/include/trace/events"
 mv "linux-${kernel_version}"/drivers/scsi/qla2xxx/* "${kernel_version}"
-if [ -e "linux-${kernel_version}"/trace/events/qla.h ]; then
-    touch "linux-${kernel_version}"/trace/events/qla.h
-    mv "linux-${kernel_version}"/trace/events/qla.h \
-       "${kernel_version}/trace/events"
+if [ -e "linux-${kernel_version}"/include/trace/events/qla.h ]; then
+    touch "linux-${kernel_version}"/include/trace/events/qla.h
+    mv "linux-${kernel_version}"/include/trace/events/qla.h \
+       "${kernel_version}/include/trace/events"
 fi
 rm -rf "linux-${kernel_version}"
 cd ..
diff --git a/qla2x00t-32gbit/generate-in-tree-patches b/qla2x00t-32gbit/generate-in-tree-patches
index 73faf5518..9b8c8d2ce 100755
--- a/qla2x00t-32gbit/generate-in-tree-patches
+++ b/qla2x00t-32gbit/generate-in-tree-patches
@@ -26,10 +26,10 @@ for g in Kconfig *.[ch]; do
   fi
 done
 
-for g in trace/events/qla.h; do
+for g in include/trace/events/qla.h; do
   f1="qla2xxx-orig/${kernel_version}/$g"
   f2="$g"
-  f3="in-tree-patches/${kernel_version}/${g#trace/events/}.patch"
+  f3="in-tree-patches/${kernel_version}/${g#include/trace/events/}.patch"
   if [ "$f1" -nt "$f3" -o "$f2" -nt "$f3" ]; then
     if [ -e "$f1" ]; then
       diff -up "$f1" "$f2" > "$f3"
diff --git a/qla2x00t-32gbit/trace/events/qla.h b/qla2x00t-32gbit/include/trace/events/qla.h
similarity index 100%
rename from qla2x00t-32gbit/trace/events/qla.h
rename to qla2x00t-32gbit/include/trace/events/qla.h