3 files changed, 5 insertions, 4 deletions

diff --git a/apps/plugins/lib/buflib.c b/apps/plugins/lib/buflib.c
index 5d03ca4bb9..930e49d02e 100644
--- a/apps/plugins/lib/buflib.c
+++ b/apps/plugins/lib/buflib.c
@@ -23,8 +23,8 @@
 *
 ****************************************************************************/
 
+#include <stdlib.h> /* for abs() */
 #include "buflib.h"
-
 /* The main goal of this design is fast fetching of the pointer for a handle.
  * For that reason, the handles are stored in a table at the end of the buffer
  * with a fixed address, so that returning the pointer for a handle is a simple
@@ -311,7 +311,7 @@ buflib_free(struct buflib_context *ctx, int handle_num)
     while (next_block < freed_block)
     {
         block = next_block;
-        next_block += ABS(block->val);
+        next_block += abs(block->val);
     }
     /* If next_block == block, the above loop didn't go anywhere. If it did,
      * and the block before this one is empty, we can combine them.
diff --git a/apps/plugins/lib/jhash.h b/apps/plugins/lib/jhash.h
index 97d1ac3d93..7699e24587 100644
--- a/apps/plugins/lib/jhash.h
+++ b/apps/plugins/lib/jhash.h
@@ -24,8 +24,8 @@
 #ifndef _LIB_JHASH_H_
 #define _LIB_JHASH_H_
 #include <inttypes.h>     /* defines uint32_t etc */
-#include <sys/types.h>
-#include <plugin.h>
+#include <string.h>       /* size_t */
+#include "plugin.h"
 
 /*
 hashw() -- hash an array of uint32_t into a 32-bit value
diff --git a/apps/plugins/lib/strncpy.c b/apps/plugins/lib/strncpy.c
index 7c1973ba66..f80e759969 100644
--- a/apps/plugins/lib/strncpy.c
+++ b/apps/plugins/lib/strncpy.c
@@ -39,6 +39,7 @@ QUICKREF
 
 #include <string.h>
 #include <limits.h>
+#include "plugin.h"
 
 /*SUPPRESS 560*/
 /*SUPPRESS 530*/