diff --git a/DirectoryEntry.h b/DirectoryEntry.h
index 09fe9c9..461e6d2 100644
--- a/DirectoryEntry.h
+++ b/DirectoryEntry.h
@@ -1,40 +1,42 @@
 #ifndef __DirectoryEntry_h__
 # define __DirectoryEntry_h__
 
-# include "includes"
+#include <dirent.h>
+#include <string>
+#include <string.h>
 
 namespace coreutils {
-   
+
    class DirectoryEntry {
-      
+
     public:
       DirectoryEntry(struct dirent *entry) {
-	 memcpy(&this->entry, entry, sizeof(struct dirent));
+	      memcpy(&this->entry, entry, sizeof(struct dirent));
       }
-      
-      ~DirectoryEntry() {}		
-      
+
+      ~DirectoryEntry() {}
+
       std::string getName() {
-	 return std::string(entry.d_name);
+   	   return std::string(entry.d_name);
       }
 
       unsigned char getType() {
-	 return entry.d_type;
+	      return entry.d_type;
       }
-      
+
       bool isFile() {
 	 return entry.d_type == DT_REG;
       }
-      
+
       bool isDirectory() {
 	 return entry.d_type == DT_DIR;
       }
-      
+
     private:
       struct dirent entry;
-      
+
    };
-   
+
 }
 
 #endif
diff --git a/File.cpp b/File.cpp
index b0605e7..e56e512 100644
--- a/File.cpp
+++ b/File.cpp
@@ -1,5 +1,10 @@
 #include "File.h"
 #include "Exception.h"
+#include <sys/stat.h>
+#include <sstream>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 namespace coreutils {
 
diff --git a/File.h b/File.h
index 578028f..49fc6bc 100644
--- a/File.h
+++ b/File.h
@@ -1,7 +1,8 @@
 #ifndef __File_h__
 #define __File_h__
 
-#include "includes"
+#include <string>
+#include <fcntl.h>
 
 ///
 /// File
diff --git a/IMFMessage.cpp b/IMFMessage.cpp
index 3d471dd..440ded2 100644
--- a/IMFMessage.cpp
+++ b/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) {
diff --git a/IMFMessage.h b/IMFMessage.h
index aa06ec3..edb8da4 100644
--- a/IMFMessage.h
+++ b/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);
diff --git a/IMFResponse.cpp b/IMFResponse.cpp
index b82305c..dc8e1e0 100644
--- a/IMFResponse.cpp
+++ b/IMFResponse.cpp
@@ -18,12 +18,12 @@ namespace coreutils {
       if(mode == LENGTH) {
          sprintf(contentLength, "%li", content.str().length());
          ZString conlen(contentLength);
-         addHeader("Content-Length", conlen);
+         addHeader(IMFHeader("Content-Length", conlen));
       }
       else
-        addHeader("Transfer-Encoding", "chunked");
+        addHeader(IMFHeader("Transfer-Encoding", "chunked"));
 
-      addHeader("Server", "JETServer v0.0.1");
+      addHeader(IMFHeader("Server", "JETServer v0.0.1"));
 
       output(response);
       response << content.str();
diff --git a/IMFResponse.h b/IMFResponse.h
index 8f3507b..aa05448 100644
--- a/IMFResponse.h
+++ b/IMFResponse.h
@@ -1,8 +1,9 @@
 #ifndef __IMFResponse_h__
 #define __IMFResponse_h__
 
-#include "includes"
 #include "IMFMessage.h"
+#include <sstream>
+#include <string>
 
 namespace coreutils {
 
diff --git a/Log.cpp b/Log.cpp
index 8ce30be..ca05f72 100644
--- a/Log.cpp
+++ b/Log.cpp
@@ -1,5 +1,10 @@
 #include "Log.h"
 #include "LogListener.h"
+#include <sstream>
+#include <iostream>
+#include <iomanip>
+#include <sys/syscall.h>
+#include <unistd.h>
 
 namespace coreutils {
 
diff --git a/Log.h b/Log.h
index b98dde2..8419b84 100644
--- a/Log.h
+++ b/Log.h
@@ -1,9 +1,11 @@
 #ifndef __Log_h__
 #define __Log_h__
 
-#include "includes"
 #include "File.h"
 #include "LogListener.h"
+#include <mutex>
+#include <string>
+#include <sstream>
 
 namespace coreutils {
    
diff --git a/includes b/includes_deprecated
similarity index 100%
rename from includes
rename to includes_deprecated