diff --git a/include/llvm/CodeGen/ELFWriter.h b/lib/CodeGen/ELFWriter.h
similarity index 99%
rename from include/llvm/CodeGen/ELFWriter.h
rename to lib/CodeGen/ELFWriter.h
index 7eb5ca3fea8..e64a9c946b6 100644
--- a/include/llvm/CodeGen/ELFWriter.h
+++ b/lib/CodeGen/ELFWriter.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CODEGEN_ELFWRITER_H
-#define LLVM_CODEGEN_ELFWRITER_H
+#ifndef ELFWRITER_H
+#define ELFWRITER_H
 
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include <list>
@@ -34,13 +34,12 @@ namespace llvm {
       return *(MachineCodeEmitter*)MCE;
     }
 
+    ELFWriter(std::ostream &O, TargetMachine &TM);
     ~ELFWriter();
 
     typedef std::vector<unsigned char> DataBuffer;
 
   protected:
-    ELFWriter(std::ostream &O, TargetMachine &TM);
-
     /// Output stream to send the resultant object file to.
     ///
     std::ostream &O;
diff --git a/include/llvm/CodeGen/MachOWriter.h b/lib/CodeGen/MachOWriter.h
similarity index 99%
rename from include/llvm/CodeGen/MachOWriter.h
rename to lib/CodeGen/MachOWriter.h
index bff94b4b2f4..a26945874af 100644
--- a/include/llvm/CodeGen/MachOWriter.h
+++ b/lib/CodeGen/MachOWriter.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CODEGEN_MACHOWRITER_H
-#define LLVM_CODEGEN_MACHOWRITER_H
+#ifndef MACHOWRITER_H
+#define MACHOWRITER_H
 
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
@@ -87,6 +87,8 @@ namespace llvm {
     MachineCodeEmitter &getMachineCodeEmitter() const {
       return *(MachineCodeEmitter*)MCE;
     }
+
+    MachOWriter(std::ostream &O, TargetMachine &TM);
     virtual ~MachOWriter();
 
     virtual const char *getPassName() const {
@@ -95,8 +97,6 @@ namespace llvm {
 
     typedef std::vector<unsigned char> DataBuffer;
   protected:
-    MachOWriter(std::ostream &O, TargetMachine &TM);
-
     /// Output stream to send the resultant object file to.
     ///
     std::ostream &O;