Index: /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Types.pm
===================================================================
--- /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Types.pm (revision 25179)
+++ /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Types.pm (revision 25223)
@@ -20,5 +20,5 @@
     my $param = shift;
     if (ref($param) eq 'HASH') {
-        HTTP::Headers->new(%$param);
+        HTTP::Headers::Fast->new(%$param);
     } else {
         $param;
Index: /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Interface/Standalone.pm
===================================================================
--- /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Interface/Standalone.pm (revision 25211)
+++ /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Interface/Standalone.pm (revision 25223)
@@ -231,8 +231,8 @@
             }
         }
-        HTTP::Headers->new(@hdr);
+        HTTP::Headers::Fast->new(@hdr);
     }
     else {
-        HTTP::Headers->new;
+        HTTP::Headers::Fast->new;
     }
 }
Index: /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Role/RequestBuilder/HTTPBody.pm
===================================================================
--- /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Role/RequestBuilder/HTTPBody.pm (revision 25195)
+++ /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Role/RequestBuilder/HTTPBody.pm (revision 25223)
@@ -79,5 +79,5 @@
         for my $upload (@{ $files }) {
             my $u = HTTP::Engine::Request::Upload->new;
-            $u->headers(HTTP::Headers->new(%{ $upload->{headers} }));
+            $u->headers(HTTP::Headers::Fast->new(%{ $upload->{headers} }));
             $u->type($u->headers->content_type);
             $u->tempname($upload->{tempname});
Index: /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Role/RequestBuilder/ParseEnv.pm
===================================================================
--- /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Role/RequestBuilder/ParseEnv.pm (revision 25195)
+++ /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Role/RequestBuilder/ParseEnv.pm (revision 25223)
@@ -28,5 +28,5 @@
     my $env = $req->_connection->{env};
 
-    HTTP::Headers->new(
+    HTTP::Headers::Fast->new(
         map {
             (my $field = $_) =~ s/^HTTPS?_//;
Index: /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Request.pm
===================================================================
--- /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Request.pm (revision 25216)
+++ /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Request.pm (revision 25223)
@@ -1,6 +1,5 @@
 package HTTP::Engine::Request;
 use Shika;
-use Carp;
-use HTTP::Headers;
+use HTTP::Headers::Fast;
 use HTTP::Body;
 use HTTP::Engine::Types;
@@ -8,4 +7,5 @@
 use URI::QueryParam;
 use HTTP::Engine::Types;
+require Carp; # Carp->import is too heavy =(
 
 # Shika role merging is borked with attributes
@@ -305,5 +305,5 @@
     my($self, $args) = @_;
     
-    carp( 'No arguments passed to uri_with()' ) unless $args;
+    Carp::carp( 'No arguments passed to uri_with()' ) unless $args;
 
     for my $value (values %{ $args }) {
@@ -343,5 +343,5 @@
 
     if ( @args ) {
-        croak "The HTTP::Request method 'content' is unsupported when used as a writer, use HTTP::Engine::RequestBuilder";
+        Carp::croak "The HTTP::Request method 'content' is unsupported when used as a writer, use HTTP::Engine::RequestBuilder";
     } else {
         return $self->raw_body;
@@ -355,5 +355,5 @@
 
 sub parse {
-    croak "The HTTP::Request method 'parse' is unsupported, use HTTP::Engine::RequestBuilder";
+    Carp::croak "The HTTP::Request method 'parse' is unsupported, use HTTP::Engine::RequestBuilder";
 }
 
Index: /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Response.pm
===================================================================
--- /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Response.pm (revision 25216)
+++ /lang/perl/HTTP-Engine/branches/shika/lib/HTTP/Engine/Response.pm (revision 25223)
@@ -3,5 +3,5 @@
 
 use HTTP::Status ();
-use HTTP::Headers;
+use HTTP::Headers::Fast;
 use HTTP::Engine::Types;
 
@@ -49,5 +49,5 @@
     # isa     => Header,
     coerce  => \&coerce_headers,
-    default => sub { HTTP::Headers->new },
+    default => sub { HTTP::Headers::Fast->new },
     handles => [ qw(content_encoding content_length content_type header) ],
 );