diff --git a/jdk/src/share/classes/java/beans/XMLDecoder.java b/jdk/src/share/classes/java/beans/XMLDecoder.java
index 4fd0f9dab77..a0d5aa04ff3 100644
--- a/jdk/src/share/classes/java/beans/XMLDecoder.java
+++ b/jdk/src/share/classes/java/beans/XMLDecoder.java
@@ -60,7 +60,7 @@ import org.xml.sax.helpers.DefaultHandler;
  *
  * @author Philip Milne
  */
-public class XMLDecoder {
+public class XMLDecoder implements AutoCloseable {
     private final DocumentHandler handler = new DocumentHandler();
     private final InputSource input;
     private Object owner;
diff --git a/jdk/src/share/classes/java/beans/XMLEncoder.java b/jdk/src/share/classes/java/beans/XMLEncoder.java
index d4b37da581c..3866a630187 100644
--- a/jdk/src/share/classes/java/beans/XMLEncoder.java
+++ b/jdk/src/share/classes/java/beans/XMLEncoder.java
@@ -204,7 +204,7 @@ import java.nio.charset.UnsupportedCharsetException;
  *
  * @author Philip Milne
  */
-public class XMLEncoder extends Encoder {
+public class XMLEncoder extends Encoder implements AutoCloseable {
 
     private final CharsetEncoder encoder;
     private final String charset;
diff --git a/jdk/src/share/classes/java/io/ObjectInput.java b/jdk/src/share/classes/java/io/ObjectInput.java
index 179760b3d15..3c72518205a 100644
--- a/jdk/src/share/classes/java/io/ObjectInput.java
+++ b/jdk/src/share/classes/java/io/ObjectInput.java
@@ -36,7 +36,7 @@ package java.io;
  * @see java.io.ObjectInputStream
  * @since   JDK1.1
  */
-public interface ObjectInput extends DataInput {
+public interface ObjectInput extends DataInput, AutoCloseable {
     /**
      * Read and return an object. The class that implements this interface
      * defines where the object is "read" from.
diff --git a/jdk/src/share/classes/java/io/ObjectOutput.java b/jdk/src/share/classes/java/io/ObjectOutput.java
index 33426dd39f2..bf55305f388 100644
--- a/jdk/src/share/classes/java/io/ObjectOutput.java
+++ b/jdk/src/share/classes/java/io/ObjectOutput.java
@@ -36,7 +36,7 @@ package java.io;
  * @see java.io.ObjectInputStream
  * @since   JDK1.1
  */
-public interface ObjectOutput extends DataOutput {
+public interface ObjectOutput extends DataOutput, AutoCloseable {
     /**
      * Write an object to the underlying storage or stream.  The
      * class that implements this interface defines how the object is
diff --git a/jdk/src/share/classes/java/util/Scanner.java b/jdk/src/share/classes/java/util/Scanner.java
index 96f6e5bba54..615250ccc3c 100644
--- a/jdk/src/share/classes/java/util/Scanner.java
+++ b/jdk/src/share/classes/java/util/Scanner.java
@@ -343,7 +343,7 @@ import sun.misc.LRUCache;
  *
  * @since   1.5
  */
-public final class Scanner implements Iterator<String> {
+public final class Scanner implements Iterator<String>, Closeable {
 
     // Internal buffer used to hold input
     private CharBuffer buf;
diff --git a/jdk/src/share/classes/javax/sound/midi/MidiDevice.java b/jdk/src/share/classes/javax/sound/midi/MidiDevice.java
index 56e4a61d892..0a8fed47855 100644
--- a/jdk/src/share/classes/javax/sound/midi/MidiDevice.java
+++ b/jdk/src/share/classes/javax/sound/midi/MidiDevice.java
@@ -107,7 +107,7 @@ import java.util.List;
  * @author Florian Bomers
  */
 
-public interface MidiDevice {
+public interface MidiDevice extends AutoCloseable {
 
 
     /**
diff --git a/jdk/src/share/classes/javax/sound/midi/Receiver.java b/jdk/src/share/classes/javax/sound/midi/Receiver.java
index ce6e5a1fdd0..3ff16565c3c 100644
--- a/jdk/src/share/classes/javax/sound/midi/Receiver.java
+++ b/jdk/src/share/classes/javax/sound/midi/Receiver.java
@@ -38,7 +38,7 @@ package javax.sound.midi;
  *
  * @author Kara Kytle
  */
-public interface Receiver {
+public interface Receiver extends AutoCloseable {
 
 
     //$$fb 2002-04-12: fix for 4662090: Contradiction in Receiver specification
diff --git a/jdk/src/share/classes/javax/sound/midi/Transmitter.java b/jdk/src/share/classes/javax/sound/midi/Transmitter.java
index 93232f131ce..c9b173894e2 100644
--- a/jdk/src/share/classes/javax/sound/midi/Transmitter.java
+++ b/jdk/src/share/classes/javax/sound/midi/Transmitter.java
@@ -35,7 +35,7 @@ package javax.sound.midi;
  *
  * @author Kara Kytle
  */
-public interface Transmitter {
+public interface Transmitter extends AutoCloseable {
 
 
     /**
diff --git a/jdk/src/share/classes/javax/sound/sampled/Line.java b/jdk/src/share/classes/javax/sound/sampled/Line.java
index 9ed7c44a078..7d94243703d 100644
--- a/jdk/src/share/classes/javax/sound/sampled/Line.java
+++ b/jdk/src/share/classes/javax/sound/sampled/Line.java
@@ -70,7 +70,7 @@ package javax.sound.sampled;
  * @see LineEvent
  * @since 1.3
  */
-public interface Line {
+public interface Line extends AutoCloseable {
 
     /**
      * Obtains the <code>Line.Info</code> object describing this