gistfile1.diff

diff --git a/configuration.cc b/configuration.cc
index 5d089e9..ccee3e7 100644
--- a/configuration.cc
+++ b/configuration.cc
@@ -35,7 +35,7 @@
  */
 
 #include <confuse.h>
-
+#include <unistd.h>
 #include "configuration.h"
 #include "ipfix_template.h"
 #include "ipfix_exporter.h"
diff --git a/info_elements/flowkeyindicator.cc b/info_elements/flowkeyindicator.cc
index 4845634..e07d55f 100644
--- a/info_elements/flowkeyindicator.cc
+++ b/info_elements/flowkeyindicator.cc
@@ -36,7 +36,7 @@
  */
 
 #include <math.h>
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "ipfix_template.h"
diff --git a/info_elements/maximumiptotallength.cc b/info_elements/maximumiptotallength.cc
index a59ad0f..08f14be 100644
--- a/info_elements/maximumiptotallength.cc
+++ b/info_elements/maximumiptotallength.cc
@@ -34,7 +34,7 @@
  * $Id: maximumiptotallength.cc 203 2008-12-17 04:05:21Z salcock $
  *
  */
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/maximumttl.cc b/info_elements/maximumttl.cc
index 5d19de2..21acfe6 100644
--- a/info_elements/maximumttl.cc
+++ b/info_elements/maximumttl.cc
@@ -34,7 +34,7 @@
  * $Id: maximumttl.cc 203 2008-12-17 04:05:21Z salcock $
  *
  */
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/meteringprocessid.cc b/info_elements/meteringprocessid.cc
index d88f312..14317db 100644
--- a/info_elements/meteringprocessid.cc
+++ b/info_elements/meteringprocessid.cc
@@ -34,7 +34,7 @@
  * $Id: meteringprocessid.cc 203 2008-12-17 04:05:21Z salcock $
  *
  */
-
+#include <unistd.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/minimumiptotallength.cc b/info_elements/minimumiptotallength.cc
index 408bb0d..0ccfa73 100644
--- a/info_elements/minimumiptotallength.cc
+++ b/info_elements/minimumiptotallength.cc
@@ -36,7 +36,7 @@
  */
 
 #define __STDC_LIMIT_MACROS
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/minimumttl.cc b/info_elements/minimumttl.cc
index 3aaa9a0..1ab08e0 100644
--- a/info_elements/minimumttl.cc
+++ b/info_elements/minimumttl.cc
@@ -34,7 +34,7 @@
  * $Id: minimumttl.cc 203 2008-12-17 04:05:21Z salcock $
  *
  */
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/packettotalcount.cc b/info_elements/packettotalcount.cc
index 18ec71c..e84f130 100644
--- a/info_elements/packettotalcount.cc
+++ b/info_elements/packettotalcount.cc
@@ -34,7 +34,7 @@
  * $Id: packettotalcount.cc 203 2008-12-17 04:05:21Z salcock $
  *
  */
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/tcpacktotalcount.cc b/info_elements/tcpacktotalcount.cc
index 9d70ef3..70eba98 100644
--- a/info_elements/tcpacktotalcount.cc
+++ b/info_elements/tcpacktotalcount.cc
@@ -34,7 +34,7 @@
  * $Id: tcpacktotalcount.cc 203 2008-12-17 04:05:21Z salcock $
  *
  */
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/tcpcontrolbits.cc b/info_elements/tcpcontrolbits.cc
index 9d1ecd1..4936480 100644
--- a/info_elements/tcpcontrolbits.cc
+++ b/info_elements/tcpcontrolbits.cc
@@ -34,7 +34,7 @@
  * $Id: tcpcontrolbits.cc 203 2008-12-17 04:05:21Z salcock $
  *
  */
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/tcpfintotalcount.cc b/info_elements/tcpfintotalcount.cc
index 6d0fb39..fa8dde9 100644
--- a/info_elements/tcpfintotalcount.cc
+++ b/info_elements/tcpfintotalcount.cc
@@ -34,7 +34,7 @@
  * $Id: tcpfintotalcount.cc 203 2008-12-17 04:05:21Z salcock $
  *
  */
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/tcppshtotalcount.cc b/info_elements/tcppshtotalcount.cc
index cca23ec..75226a2 100644
--- a/info_elements/tcppshtotalcount.cc
+++ b/info_elements/tcppshtotalcount.cc
@@ -34,7 +34,7 @@
  * $Id: tcppshtotalcount.cc 203 2008-12-17 04:05:21Z salcock $
  *
  */
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/tcprsttotalcount.cc b/info_elements/tcprsttotalcount.cc
index 8ec260f..437ad73 100644
--- a/info_elements/tcprsttotalcount.cc
+++ b/info_elements/tcprsttotalcount.cc
@@ -34,7 +34,7 @@
  * $Id: tcprsttotalcount.cc 203 2008-12-17 04:05:21Z salcock $
  *
  */
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/tcpsyntotalcount.cc b/info_elements/tcpsyntotalcount.cc
index a2381f1..b026a33 100644
--- a/info_elements/tcpsyntotalcount.cc
+++ b/info_elements/tcpsyntotalcount.cc
@@ -34,7 +34,7 @@
  * $Id: tcpsyntotalcount.cc 204 2008-12-18 21:54:29Z salcock $
  *
  */
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/tcpurgtotalcount.cc b/info_elements/tcpurgtotalcount.cc
index e489eb0..6a28ba1 100644
--- a/info_elements/tcpurgtotalcount.cc
+++ b/info_elements/tcpurgtotalcount.cc
@@ -34,7 +34,7 @@
  * $Id: tcpurgtotalcount.cc 204 2008-12-18 21:54:29Z salcock $
  *
  */
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/info_elements/templateid.cc b/info_elements/templateid.cc
index cbec91e..d672b7b 100644
--- a/info_elements/templateid.cc
+++ b/info_elements/templateid.cc
@@ -34,7 +34,7 @@
  * $Id: templateid.cc 208 2009-02-09 02:07:09Z salcock $
  *
  */
-
+#include <stdio.h>
 #include "ipfix_element.h"
 #include "ipfix.h"
 #include "element_macros.h"
diff --git a/ipfix_element.cc b/ipfix_element.cc
index dcd976b..7694b6d 100644
--- a/ipfix_element.cc
+++ b/ipfix_element.cc
@@ -33,7 +33,7 @@
  * $Id: ipfix_element.cc 218 2009-02-12 03:09:21Z salcock $
  *
  */
-
+#include <stdio.h>
 #include <assert.h>
 #include <sys/socket.h>
 #include <sys/types.h>
diff --git a/ipfix_reader.cc b/ipfix_reader.cc
index f65b3c5..126c861 100644
--- a/ipfix_reader.cc
+++ b/ipfix_reader.cc
@@ -45,6 +45,7 @@
 
 #define  __STDC_FORMAT_MACROS
 
+#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/simple_tcp_reader.cc b/simple_tcp_reader.cc
index 0da1f2c..ae02cc1 100644
--- a/simple_tcp_reader.cc
+++ b/simple_tcp_reader.cc
@@ -39,7 +39,8 @@
  * is primarily intended for testing the exporters, but should also be a handy
  * example for anyone looking to develop a more complicated collector. 
  */
-
+#include <stdio.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/simple_udp_reader.cc b/simple_udp_reader.cc
index 5946082..44f9d5a 100644
--- a/simple_udp_reader.cc
+++ b/simple_udp_reader.cc
@@ -39,7 +39,8 @@
  * is primarily intended for testing the exporters, but should also be a handy
  * example for anyone looking to develop a more complicated collector. 
  */
-
+#include <unistd.h>
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/tcp_exporter.cc b/tcp_exporter.cc
index 1d418cf..68b2ad2 100644
--- a/tcp_exporter.cc
+++ b/tcp_exporter.cc
@@ -35,7 +35,7 @@
  *
  */
 
-
+#include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
diff --git a/traceipfix.h b/traceipfix.h
index 0feaa3f..7f0188d 100644
--- a/traceipfix.h
+++ b/traceipfix.h
@@ -42,6 +42,7 @@
 #include <map>
 #include "ipfix_template.h"
 #include <libtrace.h>
+#include <string.h>
 #include <vector>
 #include <set>
 
diff --git a/udp_exporter.cc b/udp_exporter.cc
index 71bd708..1da4804 100644
--- a/udp_exporter.cc
+++ b/udp_exporter.cc
@@ -33,7 +33,7 @@
  * $Id: udp_exporter.cc 180 2008-10-29 04:14:37Z salcock $
  *
  */
-
+#include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>