Index: jitterentropy-library-3.6.3/jitterentropy.h
===================================================================
--- jitterentropy-library-3.6.3.orig/jitterentropy.h
+++ jitterentropy-library-3.6.3/jitterentropy.h
@@ -42,6 +42,10 @@
 #ifndef _JITTERENTROPY_H
 #define _JITTERENTROPY_H
 
+#include <unistd.h>
+#include <errno.h>
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -162,11 +166,13 @@ extern "C" {
  * Jitter RNG State Definition Section
  ***************************************************************************/
 
+#ifdef __JITTERENTROPY_INTERNAL
 #if defined(_MSC_VER)
 #include "arch/jitterentropy-base-windows.h"
 #else
 #include "jitterentropy-base-user.h"
 #endif
+#endif
 
 #define JENT_SHA3_256_SIZE_DIGEST_BITS	256
 #define JENT_SHA3_256_SIZE_DIGEST	(JENT_SHA3_256_SIZE_DIGEST_BITS >> 3)
Index: jitterentropy-library-3.6.3/Makefile
===================================================================
--- jitterentropy-library-3.6.3.orig/Makefile
+++ jitterentropy-library-3.6.3/Makefile
@@ -9,6 +9,7 @@ LDFLAGS +=-Wl,-z,relro,-z,now -lpthread
 
 # Enable internal timer support
 CFLAGS += -DJENT_CONF_ENABLE_INTERNAL_TIMER
+CFLAGS += -D__JITTERENTROPY_INTERNAL
 
 GCCVERSIONFORMAT := $(shell echo `$(CC) -dumpversion | tr '.' '\n' | wc -l`)
 ifeq "$(GCCVERSIONFORMAT)" "3"