Eliminate includes file and include locally as required.

IMFMessage.h

@@ -1,6 +1,7 @@
 #ifndef __IMFMessage_h__
 #define __IMFMessage_h__
 
+#include <typeinfo>
 #include <sstream>
 #include <string>
 #include <vector>
@@ -10,6 +11,10 @@
 
 namespace coreutils {
 
+   ///
+   ///
+   ///
+
    class IMFMessage : public ZString {
 
     public:
@@ -19,10 +24,7 @@ namespace coreutils {
 
       void output(std::stringstream &out);
 
-      void addHeader(const char *key, std::string &value);
-      void addHeader(const char *key, const char *value);
-      void addHeader(ZString &key, ZString &value);
-      void addHeader(const char *key, ZString &value);
+      void addHeader(IMFHeader header);
 
       ZString getHeader(ZString key, bool valueOnly = true);
       ZString getHeaderKeyPairValue(const char *headerKey, const char *key);