3 files changed, 7 insertions, 4 deletions
diff --git a/llvm/lib/Target/PIC16/PIC16.h b/llvm/lib/Target/PIC16/PIC16.h
index 39a5119aa8d..b1df058cb8e 100644
--- a/llvm/lib/Target/PIC16/PIC16.h
+++ b/llvm/lib/Target/PIC16/PIC16.h
@@ -348,6 +348,10 @@ namespace PIC16CC {
                                            bool Verbose);
   // Banksel optimzer pass.
   FunctionPass *createPIC16MemSelOptimizerPass();
+
+  extern Target ThePIC16Target;
+  extern Target TheCooperTarget;
+  
 } // end namespace llvm;
 
 // Defines symbolic names for PIC16 registers.  This defines a mapping from
diff --git a/llvm/lib/Target/PIC16/PIC16TargetMachine.cpp b/llvm/lib/Target/PIC16/PIC16TargetMachine.cpp
index 9f6266c672c..dca6ade9384 100644
--- a/llvm/lib/Target/PIC16/PIC16TargetMachine.cpp
+++ b/llvm/lib/Target/PIC16/PIC16TargetMachine.cpp
@@ -23,11 +23,9 @@
 using namespace llvm;
 
 // Register the targets
-extern Target ThePIC16Target;
 static RegisterTarget<PIC16TargetMachine> 
 X(ThePIC16Target, "pic16", "PIC16 14-bit [experimental].");
 
-extern Target TheCooperTarget;
 static RegisterTarget<CooperTargetMachine> 
 Y(TheCooperTarget, "cooper", "PIC16 Cooper [experimental].");
 
diff --git a/llvm/lib/Target/PIC16/TargetInfo/PIC16TargetInfo.cpp b/llvm/lib/Target/PIC16/TargetInfo/PIC16TargetInfo.cpp
index 454f4259ff3..20bbba8a91c 100644
--- a/llvm/lib/Target/PIC16/TargetInfo/PIC16TargetInfo.cpp
+++ b/llvm/lib/Target/PIC16/TargetInfo/PIC16TargetInfo.cpp
@@ -7,11 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "PIC16.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetRegistry.h"
 using namespace llvm;
 
-Target ThePIC16Target;
+Target llvm::ThePIC16Target;
 
 static unsigned PIC16_JITMatchQuality() {
   return 0;
@@ -25,7 +26,7 @@ static unsigned PIC16_ModuleMatchQuality(const Module &M) {
   return 0;
 }
 
-Target TheCooperTarget;
+Target llvm::TheCooperTarget;
 
 static unsigned Cooper_JITMatchQuality() {
   return 0;