1 files changed, 3 insertions, 6 deletions

diff --git a/include/sitecing/sitecing_interface_cgi.h b/include/sitecing/sitecing_interface_cgi.h
index da538d6..d17cdb7 100644
--- a/include/sitecing/sitecing_interface_cgi.h
+++ b/include/sitecing/sitecing_interface_cgi.h
@@ -1,13 +1,14 @@
 #ifndef __SITECING_SITECING_INTERFACE_CGI_H
 #define __SITECING_SITECING_INTERFACE_CGI_H
 
 #include <sstream>
 #include <string>
 #include <map>
-#include "kingate/cgi_gateway.h"
+#include <kingate/cgi_gateway.h>
+#include <kingate/headers.h>
 #include "sitecing/sitecing_interface.h"
 #include "sitecing/sitespace.h"
 
 /**
  * @file
  * @brief The sitecing_interface_cgi class declaration.
@@ -23,19 +24,15 @@ namespace sitecing {
         public:
             /**
              * Pointer to the CGI gateway interface.
              */
             kingate::cgi_gateway* cgigw;
             /**
-             * Type for the map of headers to spit out.
-             */
-            typedef map<string,string> headers_t;
-            /**
              * The list of headers to spit out.
              */
-            headers_t headers;
+            kingate::headers headers;
             /**
              * Here is where we prebuffer output.
              */
             stringbuf prebuffer;
             /**
              * Output stream, initially going to prebuffer.