diff --git a/lib/Bytecode/Analyzer/AnalyzerInternals.h b/lib/Bytecode/Analyzer/AnalyzerInternals.h
index d9a2e843d80..a1a393d2976 100644
--- a/lib/Bytecode/Analyzer/AnalyzerInternals.h
+++ b/lib/Bytecode/Analyzer/AnalyzerInternals.h
@@ -14,8 +14,11 @@
 #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
@@ -30,6 +33,14 @@
 
 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
diff --git a/lib/Bytecode/Reader/AnalyzerInternals.h b/lib/Bytecode/Reader/AnalyzerInternals.h
index d9a2e843d80..a1a393d2976 100644
--- a/lib/Bytecode/Reader/AnalyzerInternals.h
+++ b/lib/Bytecode/Reader/AnalyzerInternals.h
@@ -14,8 +14,11 @@
 #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
@@ -30,6 +33,14 @@
 
 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