diff --git a/openpdf/src/main/java/com/lowagie/text/DocListener.java b/openpdf/src/main/java/com/lowagie/text/DocListener.java
index 75c0fb69a..42c0e0e16 100644
--- a/openpdf/src/main/java/com/lowagie/text/DocListener.java
+++ b/openpdf/src/main/java/com/lowagie/text/DocListener.java
@@ -58,7 +58,7 @@
  * @see        DocWriter
  */
 
-public interface DocListener extends ElementListener {
+public interface DocListener extends ElementListener, AutoCloseable {
 
     // methods
 
diff --git a/openpdf/src/main/java/com/lowagie/text/Document.java b/openpdf/src/main/java/com/lowagie/text/Document.java
index a943e6b8a..0e78c68f1 100644
--- a/openpdf/src/main/java/com/lowagie/text/Document.java
+++ b/openpdf/src/main/java/com/lowagie/text/Document.java
@@ -103,7 +103,7 @@
  * </BLOCKQUOTE>
  */
 
-public class Document implements AutoCloseable, DocListener {
+public class Document implements DocListener {
     
     // membervariables
     private static final String VERSION_PROPERTIES = "com/lowagie/text/version.properties";
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java b/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java
index 5bc12272a..ac8eb869f 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java
@@ -66,7 +66,7 @@
  * @author Joakim Sandstroem
  * Created on 6.9.2006
  */
-public class MappedRandomAccessFile {
+public class MappedRandomAccessFile implements AutoCloseable {
     
     private MappedByteBuffer mappedByteBuffer = null;
     private FileChannel channel = null;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java b/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java
index eb5d7237f..2f38eb39e 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PRTokeniser.java
@@ -56,7 +56,7 @@
  *
  * @author  Paulo Soares (psoares@consiste.pt)
  */
-public class PRTokeniser {
+public class PRTokeniser implements AutoCloseable {
     
     public static final int TK_NUMBER = 1;
     public static final int TK_STRING = 2;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFields.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFields.java
index 2e8beb48f..49661b125 100755
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFields.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyFields.java
@@ -63,7 +63,7 @@
  * @author  Paulo Soares (psoares@consiste.pt)
  */
 public class PdfCopyFields
-    implements PdfViewerPreferences, PdfEncryptionSettings {
+    implements PdfViewerPreferences, PdfEncryptionSettings, AutoCloseable {
     
     private PdfCopyFieldsImp fc;
     
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyForms.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyForms.java
index d350c0cbe..82c8367ca 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyForms.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopyForms.java
@@ -66,7 +66,7 @@
  * @since 2.1.5
  */
 public class PdfCopyForms
-    implements PdfViewerPreferences, PdfEncryptionSettings {
+    implements PdfViewerPreferences, PdfEncryptionSettings, AutoCloseable {
     
     /** The class with the actual implementations. */
     private PdfCopyFormsImp fc;
diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamper.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamper.java
index 0d26ece12..9d3978d01 100644
--- a/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamper.java
+++ b/openpdf/src/main/java/com/lowagie/text/pdf/PdfStamper.java
@@ -80,7 +80,7 @@
  * @author Paulo Soares (psoares@consiste.pt)
  */
 public class PdfStamper
-    implements PdfViewerPreferences, PdfEncryptionSettings {
+    implements PdfViewerPreferences, PdfEncryptionSettings, AutoCloseable {
     /**
      * The writer
      */    
diff --git a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpWriter.java b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpWriter.java
index bcbaae1ad..9923ac007 100644
--- a/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpWriter.java
+++ b/openpdf/src/main/java/com/lowagie/text/xml/xmp/XmpWriter.java
@@ -66,7 +66,7 @@
  * Metadata to a PDF Dictionary. Remark that this class doesn't cover the
  * complete XMP specification. 
  */
-public class XmpWriter {
+public class XmpWriter implements AutoCloseable {
 
     /** A possible charset for the XMP. */
     public static final String UTF8 = "UTF-8";