diff --git a/llvm/include/llvm/Support/InstVisitor.h b/llvm/include/llvm/Support/InstVisitor.h
index a9b3b7150656..6eef0f9a1060 100644
--- a/llvm/include/llvm/Support/InstVisitor.h
+++ b/llvm/include/llvm/Support/InstVisitor.h
@@ -70,12 +70,13 @@ class AllocationInst;
 
 
 template<typename SubClass, typename RetTy=void>
-struct InstVisitor {
+class InstVisitor {
   //===--------------------------------------------------------------------===//
   // Interface code - This is the public interface of the InstVisitor that you
   // use to visit instructions...
   //
 
+public:
   // Generic visit method - Allow visitation to all instructions in a range
   template<class Iterator>
   void visit(Iterator Start, Iterator End) {
diff --git a/llvm/lib/Analysis/InstCount.cpp b/llvm/lib/Analysis/InstCount.cpp
index 96c255ba3114..12d16b081e7b 100644
--- a/llvm/lib/Analysis/InstCount.cpp
+++ b/llvm/lib/Analysis/InstCount.cpp
@@ -29,7 +29,7 @@ namespace {
 #include "llvm/Instruction.def"
 
   class InstCount : public FunctionPass, public InstVisitor<InstCount> {
-    friend struct InstVisitor<InstCount>;
+    friend class InstVisitor<InstCount>;
 
     void visitFunction  (Function &F) { ++TotalFuncs; }
     void visitBasicBlock(BasicBlock &BB) { ++TotalBlocks; }