diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Row.java b/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Row.java
index b010233d1..28257bae4 100644
--- a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Row.java
+++ b/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Row.java
@@ -20,7 +20,7 @@ package org.apache.poi.ss.usermodel;
 import java.lang.Iterable;
 import java.util.Iterator;
 
-public interface Row extends Iterable {
+public interface Row extends Iterable<Cell> {
 
     // used for collections
     public final static int INITIAL_CAPACITY = 5;
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Sheet.java b/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Sheet.java
index baa1055ad..fe533b284 100644
--- a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Sheet.java
+++ b/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Sheet.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
 import org.apache.poi.hssf.util.PaneInformation;
 import org.apache.poi.hssf.util.Region;
 
-public interface Sheet extends Iterable {
+public interface Sheet extends Iterable<Row> {
 
     /* Constants for margins */
     public static final short LeftMargin = Sheet.LeftMargin;
@@ -250,13 +250,13 @@ public interface Sheet extends Iterable {
      * @return an iterator of the PHYSICAL rows.  Meaning the 3rd element may not
      * be the third row if say for instance the second row is undefined.
      */
-    Iterator rowIterator();
+    Iterator<Row> rowIterator();
     
     /**
      * Alias for {@link #rowIterator()} to allow 
      *  foreach loops
      */
-    Iterator iterator();
+    Iterator<Row> iterator();
 
     /**
      * whether alternate expression evaluation is on