diff --git a/lib/Bytecode/Analyzer/AnalyzerInternals.h b/lib/Bytecode/Analyzer/AnalyzerInternals.h
index a1a393d2976..d7733c7176b 100644
--- a/lib/Bytecode/Analyzer/AnalyzerInternals.h
+++ b/lib/Bytecode/Analyzer/AnalyzerInternals.h
@@ -14,33 +14,14 @@
 #ifndef ANALYZER_INTERNALS_H
 #define ANALYZER_INTERNALS_H
 
-#include "ReaderPrimitives.h"
 #include "Parser.h"
 #include "llvm/Bytecode/Analyzer.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 
-// Enable to trace to figure out what the heck is going on when parsing fails
-//#define TRACE_LEVEL 10
-//#define DEBUG_OUTPUT
-
-#if TRACE_LEVEL    // ByteCodeReading_TRACEr
-#define BCR_TRACE(n, X) \
-    if (n < TRACE_LEVEL) std::cerr << std::string(n*2, ' ') << X
-#else
-#define BCR_TRACE(n, X)
-#endif
 
 namespace llvm {
 
-inline void AbstractBytecodeParser::readBlock(const unsigned char *&Buf,
-			       const unsigned char *EndBuf, 
-			       unsigned &Type, unsigned &Size)
-{
-  Type = read(Buf, EndBuf);
-  Size = read(Buf, EndBuf);
-}
-
 class BytecodeAnalyzer {
   BytecodeAnalyzer(const BytecodeAnalyzer &);  // DO NOT IMPLEMENT
   void operator=(const BytecodeAnalyzer &);  // DO NOT IMPLEMENT
@@ -61,12 +42,6 @@ public:
     BytecodeAnalysis& bca,
     const std::string &ModuleID
   );
-
-  void dump() const {
-    std::cerr << "BytecodeParser instance!\n";
-  }
-private:
-  BytecodeAnalysis TheAnalysis;
 };
 
 } // End llvm namespace
diff --git a/lib/Bytecode/Reader/AnalyzerInternals.h b/lib/Bytecode/Reader/AnalyzerInternals.h
index a1a393d2976..d7733c7176b 100644
--- a/lib/Bytecode/Reader/AnalyzerInternals.h
+++ b/lib/Bytecode/Reader/AnalyzerInternals.h
@@ -14,33 +14,14 @@
 #ifndef ANALYZER_INTERNALS_H
 #define ANALYZER_INTERNALS_H
 
-#include "ReaderPrimitives.h"
 #include "Parser.h"
 #include "llvm/Bytecode/Analyzer.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 
-// Enable to trace to figure out what the heck is going on when parsing fails
-//#define TRACE_LEVEL 10
-//#define DEBUG_OUTPUT
-
-#if TRACE_LEVEL    // ByteCodeReading_TRACEr
-#define BCR_TRACE(n, X) \
-    if (n < TRACE_LEVEL) std::cerr << std::string(n*2, ' ') << X
-#else
-#define BCR_TRACE(n, X)
-#endif
 
 namespace llvm {
 
-inline void AbstractBytecodeParser::readBlock(const unsigned char *&Buf,
-			       const unsigned char *EndBuf, 
-			       unsigned &Type, unsigned &Size)
-{
-  Type = read(Buf, EndBuf);
-  Size = read(Buf, EndBuf);
-}
-
 class BytecodeAnalyzer {
   BytecodeAnalyzer(const BytecodeAnalyzer &);  // DO NOT IMPLEMENT
   void operator=(const BytecodeAnalyzer &);  // DO NOT IMPLEMENT
@@ -61,12 +42,6 @@ public:
     BytecodeAnalysis& bca,
     const std::string &ModuleID
   );
-
-  void dump() const {
-    std::cerr << "BytecodeParser instance!\n";
-  }
-private:
-  BytecodeAnalysis TheAnalysis;
 };
 
 } // End llvm namespace