diff --git a/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xCodec.java b/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xCodec.java
index e90a4756297..e144b29ac5e 100644
--- a/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xCodec.java
+++ b/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xCodec.java
@@ -43,7 +43,9 @@ import org.apache.lucene.util.MutableBits;
 
 /**
  * Supports the Lucene 3.x index format (readonly)
+ * @deprecated
  */
+@Deprecated
 public class Lucene3xCodec extends Codec {
   public Lucene3xCodec() {
     super("Lucene3x");
diff --git a/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java b/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java
index 43d552897b4..d59e5f40a87 100644
--- a/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java
+++ b/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java
@@ -34,7 +34,9 @@ import org.apache.lucene.store.IndexInput;
 
 /**
  * @lucene.experimental
+ * @deprecated
  */
+@Deprecated
 public class Lucene3xFieldInfosReader extends FieldInfosReader {
   /** Extension of field infos */
   static final String FIELD_INFOS_EXTENSION = "fnm";
diff --git a/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java b/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java
index 9ac63a991c0..1a7fef6ed32 100644
--- a/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java
+++ b/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java
@@ -26,7 +26,6 @@ import org.apache.lucene.codecs.PerDocProducer;
 import org.apache.lucene.index.PerDocWriteState;
 import org.apache.lucene.index.SegmentInfo;
 import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.store.Directory;
 
 /**
  * Lucene3x ReadOnly NormsFormat implementation
diff --git a/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java b/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java
index 5e95e00c88c..1583c7f4df9 100644
--- a/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java
+++ b/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java
@@ -43,7 +43,9 @@ import org.apache.lucene.util.StringHelper;
 /**
  * Reads Lucene 3.x norms format and exposes it via DocValues API
  * @lucene.experimental
+ * @deprecated
  */
+@Deprecated
 class Lucene3xNormsProducer extends PerDocProducer {
   
   /** norms header placeholder */
@@ -52,9 +54,7 @@ class Lucene3xNormsProducer extends PerDocProducer {
   /** Extension of norms file */
   static final String NORMS_EXTENSION = "nrm";
   
-  /** Extension of separate norms file
-   * @deprecated */
-  @Deprecated
+  /** Extension of separate norms file */
   static final String SEPARATE_NORMS_EXTENSION = "s";
   
   final Map<String,NormsDocValues> norms = new HashMap<String,NormsDocValues>();
@@ -203,8 +203,6 @@ class Lucene3xNormsProducer extends PerDocProducer {
     }
   }
   
-  /** @deprecated */
-  @Deprecated
   static void separateFiles(SegmentInfo info, Set<String> files) throws IOException {
     Map<Integer,Long> normGen = info.getNormGen();
     if (normGen != null) {
diff --git a/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java b/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java
index 9f3124c5bb7..7737456d831 100644
--- a/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java
+++ b/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java
@@ -37,7 +37,9 @@ import org.apache.lucene.store.IOContext;
 /**
  * Lucene 3x implementation of {@link SegmentInfosReader}.
  * @lucene.experimental
+ * @deprecated
  */
+@Deprecated
 public class Lucene3xSegmentInfosReader extends SegmentInfosReader {
 
   @Override
diff --git a/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java b/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
index 91544ba3c41..bd5695b81fd 100644
--- a/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
+++ b/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
@@ -45,6 +45,8 @@ import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IOUtils;
 
+/** @deprecated */
+@Deprecated
 public class Lucene3xTermVectorsReader extends TermVectorsReader {
 
   // NOTE: if you make a new format, it must be larger than
diff --git a/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java b/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java
index e9d713011cd..62ff23e2f19 100644
--- a/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java
+++ b/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java
@@ -36,7 +36,9 @@ import org.apache.lucene.util.packed.PackedInts;
  * index segment. Pairs are accessed either by Term or by ordinal position the
  * set. The Terms and TermInfo are actually serialized and stored into a byte
  * array and pointers to the position of each are stored in a int array.
+ * @deprecated
  */
+@Deprecated
 class TermInfosReaderIndex {
 
   private static final int MAX_PAGE_BITS = 18; // 256 KB block