diff --git a/src/pcapng.c b/src/pcapng.c
index 21f0439..a9f55d9 100644
--- a/src/pcapng.c
+++ b/src/pcapng.c
@@ -1,13 +1,11 @@
-#include <stdlib.h>
 #include <stdint.h>
-#include <stdarg.h>
-#include <string.h>
-#include <inttypes.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <hexagram/pcapng.h>
+
 ssize_t hexagram_pcapng_stream_read(fd, handler, error)
     int fd;
     hexagram_pcapng_block_handler *handler;
@@ -20,7 +18,6 @@ ssize_t hexagram_pcapng_stream_read(fd, handler, error)
     while (1) {
         ssize_t readlen;
         size_t bodylen;
-        off_t seeklen;
 
         if ((readlen = read(fd, &header, sizeof(header))) < 0) {
             *error = HEXAGRAM_PCAPNG_ERROR_IO;
@@ -58,6 +55,7 @@ ssize_t hexagram_pcapng_stream_read(fd, handler, error)
 
     *error = HEXAGRAM_PCAPNG_ERROR_OK;
 
+done:
     return total;
 
 error_io: