diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.35 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.35
index 940c7416d..f933b36f7 100644
--- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.35
+++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.35
@@ -1,4 +1,4 @@
-ccflags-y += -Iinclude/scst -Wno-unused-parameter
+ccflags-y += -Wno-unused-parameter
 
 obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
 	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
diff --git a/scst/src/dev_handlers/scst_dev_handler.h b/scst/src/dev_handlers/scst_dev_handler.h
index c147270aa..224b7e5ee 100644
--- a/scst/src/dev_handlers/scst_dev_handler.h
+++ b/scst/src/dev_handlers/scst_dev_handler.h
@@ -3,7 +3,11 @@
 
 #include <linux/module.h>
 #include <scsi/scsi_eh.h>
+#ifdef INSIDE_KERNEL_TREE
+#include <scst/scst_debug.h>
+#else
 #include "scst_debug.h"
+#endif
 
 #define SCST_DEV_UA_RETRIES 5
 #define SCST_PASSTHROUGH_RETRIES	0