--- a/volta.h	Mon Oct 17 09:12:00 2011 -0700
+++ b/volta.h	Mon Oct 17 09:12:00 2011 -0700
@@ -129,11 +129,11 @@
 struct in_addr *copy_ipv4_token( char *, unsigned short int );
 
 int accept_loop( void );
-struct request *parse( char *p );
 void process( char * );
-struct request *parse( char * );
-void populate_request( struct request * );
-void cleanup_request( struct request * );
+request *parse( char * );
+request *init_request( void );
+void populate_request( request * );
+void cleanup_request( request * );
 
 #endif