diff --git a/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java b/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java
index 1ff4f35e3..22cddd1ee 100644
--- a/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java
+++ b/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java
@@ -64,6 +64,10 @@ import org.apache.poi.hssf.eventmodel.*;
 import org.apache.poi.hssf.eventusermodel.*;
 import org.apache.poi.hssf.record.Record;
 
+import org.apache.poi.hssf.eventusermodel.HSSFRequest;
+import org.apache.poi.hssf.eventusermodel.HSSFListener;
+import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
+
 /**
  *
  * @author  andy
diff --git a/src/java/org/apache/poi/hssf/dev/EFHSSF.java b/src/java/org/apache/poi/hssf/dev/EFHSSF.java
index e57b97d19..291f15784 100644
--- a/src/java/org/apache/poi/hssf/dev/EFHSSF.java
+++ b/src/java/org/apache/poi/hssf/dev/EFHSSF.java
@@ -66,6 +66,10 @@ import org.apache.poi.hssf.eventmodel.*;
 import org.apache.poi.hssf.eventusermodel.*;
 import org.apache.poi.hssf.usermodel.*;
 
+import org.apache.poi.hssf.eventusermodel.HSSFRequest;
+import org.apache.poi.hssf.eventusermodel.HSSFListener;
+import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
+
 /**
  * Event Factory version of HSSF test class.
  * @author  andy