1.1 --- a/src/message.c	Wed Mar 11 12:06:15 2015 +0100
     1.2 +++ b/src/message.c	Wed Mar 11 12:21:34 2015 +0100
     1.3 @@ -1,7 +1,9 @@
     1.4 -#include "pEp_internal.h"
     1.5 +#include <stdlib.h>
     1.6 +#include <string.h>
     1.7 +#include <assert.h>
     1.8  
     1.9 -#include <memory.h>
    1.10 -#include <assert.h>
    1.11 +#include "message.h"
    1.12 +#include "dynamic_api.h"
    1.13  
    1.14  DYNAMIC_API message *new_message(
    1.15          PEP_msg_direction dir,