diff --git a/ChangeLog b/ChangeLog
index ace1be4..be41715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 0.8.2
 =====
+  26-Sep-2014:  - fixed some #include and data-type issues.
   25-May-2014:  - PLUGIN_PROCESS_RAW: properly deal with the situation if a
                   RAW plugin modifies the message lengh.
   11-Feb-2013:  - plugin_defaulttarget: add "received from" IP to logging
diff --git a/src/plugins.c b/src/plugins.c
index f883889..1905469 100644
--- a/src/plugins.c
+++ b/src/plugins.c
@@ -19,10 +19,14 @@
 */
 
 #include "config.h"
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
 
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <sys/socket.h>
 
 #include <osipparser2/osip_parser.h>
 
diff --git a/src/siproxd.h b/src/siproxd.h
index 380d535..4700244 100644
--- a/src/siproxd.h
+++ b/src/siproxd.h
@@ -125,7 +125,7 @@ typedef struct {
  */
 typedef struct {
    char *raw_buffer;		/* raw UDP packet */
-   int  raw_buffer_len;		/* length of raw data */
+   size_t  raw_buffer_len;		/* length of raw data */
    osip_message_t *sipmsg;	/* SIP */
    struct sockaddr_in from;	/* received from */
 #define PROTO_UNKN -1