Eliminate includes file and include locally as required.

IMFMessage.cpp

@@ -34,20 +34,10 @@ namespace coreutils {
       out << newHeaders.str() << "\r\n";
    }
 
-   void IMFMessage::addHeader(const char *key, const char *value) {
-      newHeaders << key << ": " << value << "\r\n";
-   }
-
-   void IMFMessage::addHeader(const char *key, std::string &value) {
-      newHeaders << key << ": " << value << "\r\n";
-   }
-
-   void IMFMessage::addHeader(ZString &key, ZString &value) {
-      newHeaders << key << ": " << value << "\r\n";
-   }
-
-   void IMFMessage::addHeader(const char *key, ZString &value) {
-      newHeaders << key << ": " << value << "\r\n";
+   void IMFMessage::addHeader(IMFHeader header) {
+      std::stringstream out;
+      header.output(out);
+      newHeaders << out.str() ;
    }
 
    ZString IMFMessage::getHeader(ZString key, bool valueOnly) {