diff --git a/src/java/org/apache/poi/ss/usermodel/HeaderFooter.java b/src/java/org/apache/poi/ss/usermodel/HeaderFooter.java
index c58f929e4..d862125ca 100644
--- a/src/java/org/apache/poi/ss/usermodel/HeaderFooter.java
+++ b/src/java/org/apache/poi/ss/usermodel/HeaderFooter.java
@@ -21,12 +21,45 @@ package org.apache.poi.ss.usermodel;
  *  {@link Footer}.
  */
 public interface HeaderFooter {
-    public String getLeft();
-    public void setLeft( String newLeft );
+    /**
+     * Get the left side of the header or footer.
+     *
+     * @return The string representing the left side.
+     */
+    String getLeft();
 
-    public String getCenter();
-    public void setCenter( String newCenter );
+    /**
+     * Sets the left string.
+     *
+     * @param newLeft The string to set as the left side.
+     */
+    void setLeft(String newLeft);
 
-    public String getRight();
-    public void setRight( String newRight );
+    /**
+     * Get the center of the header or footer.
+     *
+     * @return The string representing the center.
+     */
+    String getCenter();
+
+    /**
+     * Sets the center string.
+     *
+     * @param newCenter The string to set as the center.
+     */
+    void setCenter(String newCenter);
+
+    /**
+     * Get the right side of the header or footer.
+     *
+     * @return The string representing the right side.
+     */
+    String getRight();
+
+    /**
+     * Sets the right string or footer.
+     *
+     * @param newRight The string to set as the right side.
+     */
+    void setRight(String newRight);
 }
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Footer.java b/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Footer.java
index 2566d43bf..de592a146 100644
--- a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Footer.java
+++ b/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Footer.java
@@ -17,8 +17,7 @@
 
 package org.apache.poi.ss.usermodel;
 
-public interface Footer {
-
+public interface Footer extends HeaderFooter {
     /**
      * Get the left side of the footer.
      * @return The string representing the left side.
@@ -54,5 +53,4 @@ public interface Footer {
      * @param newRight The string to set as the right side.
      */
     void setRight(String newRight);
-
-}
\ No newline at end of file
+}
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Header.java b/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Header.java
index ef9e355ea..9e864b573 100644
--- a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Header.java
+++ b/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Header.java
@@ -17,8 +17,7 @@
 
 package org.apache.poi.ss.usermodel;
 
-public interface Header {
-
+public interface Header extends HeaderFooter {
     /**
      * Get the left side of the header.
      *
@@ -60,5 +59,4 @@ public interface Header {
      * @param newRight The string to set as the right side.
      */
     void setRight(String newRight);
-
-}
\ No newline at end of file
+}