Index: libgcrypt-1.11.1/random/Makefile.am
===================================================================
--- libgcrypt-1.11.1.orig/random/Makefile.am
+++ libgcrypt-1.11.1/random/Makefile.am
@@ -21,7 +21,7 @@
 # Need to include ../src in addition to top_srcdir because gcrypt.h is
 # a built header.
 AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
-AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+AM_CFLAGS = $(GPG_ERROR_CFLAGS) -ljitterentropy
 
 noinst_LTLIBRARIES = librandom.la
 
@@ -44,14 +44,7 @@ rndgetentropy.c \
 rndoldlinux.c \
 rndegd.c \
 rndunix.c \
-rndw32.c  \
-jitterentropy-gcd.c jitterentropy-gcd.h \
-jitterentropy-health.c jitterentropy-health.h \
-jitterentropy-noise.c jitterentropy-noise.h \
-jitterentropy-sha3.c jitterentropy-sha3.h \
-jitterentropy-timer.c jitterentropy-timer.h \
-jitterentropy-base.h \
-jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h
+rndw32.c
 
 # The rndjent module needs to be compiled without optimization.  */
 if ENABLE_O_FLAG_MUNGING
@@ -60,20 +53,8 @@ else
 o_flag_munging = cat
 endif
 
-rndjent.o: $(srcdir)/rndjent.c jitterentropy-base-user.h \
-           $(srcdir)/jitterentropy-gcd.c $(srcdir)/jitterentropy-gcd.h \
-           $(srcdir)/jitterentropy-health.c $(srcdir)/jitterentropy-health.h \
-           $(srcdir)/jitterentropy-noise.c $(srcdir)/jitterentropy-noise.h \
-           $(srcdir)/jitterentropy-sha3.c $(srcdir)/jitterentropy-sha3.h \
-           $(srcdir)/jitterentropy-timer.c $(srcdir)/jitterentropy-timer.h \
-           $(srcdir)/jitterentropy-base.c $(srcdir)/jitterentropy.h
+rndjent.o: $(srcdir)/rndjent.c
 	`echo $(COMPILE) -c $(srcdir)/rndjent.c | $(o_flag_munging) `
 
-rndjent.lo: $(srcdir)/rndjent.c jitterentropy-base-user.h \
-           $(srcdir)/jitterentropy-gcd.c $(srcdir)/jitterentropy-gcd.h \
-           $(srcdir)/jitterentropy-health.c $(srcdir)/jitterentropy-health.h \
-           $(srcdir)/jitterentropy-noise.c $(srcdir)/jitterentropy-noise.h \
-           $(srcdir)/jitterentropy-sha3.c $(srcdir)/jitterentropy-sha3.h \
-           $(srcdir)/jitterentropy-timer.c $(srcdir)/jitterentropy-timer.h \
-            $(srcdir)/jitterentropy-base.c $(srcdir)/jitterentropy.h
+rndjent.lo: $(srcdir)/rndjent.c
 	`echo $(LTCOMPILE) -c $(srcdir)/rndjent.c | $(o_flag_munging) `
Index: libgcrypt-1.11.1/random/rndjent.c
===================================================================
--- libgcrypt-1.11.1.orig/random/rndjent.c
+++ libgcrypt-1.11.1/random/rndjent.c
@@ -94,17 +94,12 @@
  * jitterentropy-user-base.h file.   */
 
 /* Tell jitterentropy* that all functions shall be static.  */
-#define JENT_PRIVATE_COMPILE 1
+#undef JENT_PRIVATE_COMPILE
 
-#include "jitterentropy-base.c"
 #ifdef JENT_CONF_ENABLE_INTERNAL_TIMER
 #include <pthread.h>
 #endif /* JENT_CONF_ENABLE_INTERNAL_TIMER */
-#include "jitterentropy-gcd.c"
-#include "jitterentropy-health.c"
-#include "jitterentropy-noise.c"
-#include "jitterentropy-sha3.c"
-#include "jitterentropy-timer.c"
+#include <jitterentropy.h>
 
 /* This is the lock we use to serialize access to this RNG.  The extra
  * integer variable is only used to check the locking state; that is,
Index: libgcrypt-1.11.1/random/Makefile.in
===================================================================
--- libgcrypt-1.11.1.orig/random/Makefile.in
+++ libgcrypt-1.11.1/random/Makefile.in
@@ -147,12 +147,7 @@ am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/jitterentropy-base.Plo \
-	./$(DEPDIR)/jitterentropy-gcd.Plo \
-	./$(DEPDIR)/jitterentropy-health.Plo \
-	./$(DEPDIR)/jitterentropy-noise.Plo \
-	./$(DEPDIR)/jitterentropy-sha3.Plo \
-	./$(DEPDIR)/jitterentropy-timer.Plo \
+am__depfiles_remade = \
 	./$(DEPDIR)/random-csprng.Plo ./$(DEPDIR)/random-drbg.Plo \
 	./$(DEPDIR)/random-system.Plo ./$(DEPDIR)/random.Plo \
 	./$(DEPDIR)/rndegd.Plo ./$(DEPDIR)/rndgetentropy.Plo \
@@ -375,7 +370,7 @@ top_srcdir = @top_srcdir@
 # Need to include ../src in addition to top_srcdir because gcrypt.h is
 # a built header.
 AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
-AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+AM_CFLAGS = $(GPG_ERROR_CFLAGS) -ljitterentropy
 noinst_LTLIBRARIES = librandom.la
 GCRYPT_MODULES = @GCRYPT_RANDOM@
 librandom_la_DEPENDENCIES = $(GCRYPT_MODULES)
@@ -394,14 +389,7 @@ rndgetentropy.c \
 rndoldlinux.c \
 rndegd.c \
 rndunix.c \
-rndw32.c  \
-jitterentropy-gcd.c jitterentropy-gcd.h \
-jitterentropy-health.c jitterentropy-health.h \
-jitterentropy-noise.c jitterentropy-noise.h \
-jitterentropy-sha3.c jitterentropy-sha3.h \
-jitterentropy-timer.c jitterentropy-timer.h \
-jitterentropy-base.h \
-jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h
+rndw32.c
 
 @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat
 
@@ -461,12 +449,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jitterentropy-base.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jitterentropy-gcd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jitterentropy-health.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jitterentropy-noise.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jitterentropy-sha3.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jitterentropy-timer.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random-csprng.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random-drbg.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random-system.Plo@am__quote@ # am--include-marker
@@ -636,12 +618,6 @@ clean-am: clean-generic clean-libtool cl
 	mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/jitterentropy-base.Plo
-	-rm -f ./$(DEPDIR)/jitterentropy-gcd.Plo
-	-rm -f ./$(DEPDIR)/jitterentropy-health.Plo
-	-rm -f ./$(DEPDIR)/jitterentropy-noise.Plo
-	-rm -f ./$(DEPDIR)/jitterentropy-sha3.Plo
-	-rm -f ./$(DEPDIR)/jitterentropy-timer.Plo
 	-rm -f ./$(DEPDIR)/random-csprng.Plo
 	-rm -f ./$(DEPDIR)/random-drbg.Plo
 	-rm -f ./$(DEPDIR)/random-system.Plo
@@ -698,12 +674,6 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/jitterentropy-base.Plo
-	-rm -f ./$(DEPDIR)/jitterentropy-gcd.Plo
-	-rm -f ./$(DEPDIR)/jitterentropy-health.Plo
-	-rm -f ./$(DEPDIR)/jitterentropy-noise.Plo
-	-rm -f ./$(DEPDIR)/jitterentropy-sha3.Plo
-	-rm -f ./$(DEPDIR)/jitterentropy-timer.Plo
 	-rm -f ./$(DEPDIR)/random-csprng.Plo
 	-rm -f ./$(DEPDIR)/random-drbg.Plo
 	-rm -f ./$(DEPDIR)/random-system.Plo
@@ -752,22 +722,10 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
-rndjent.o: $(srcdir)/rndjent.c jitterentropy-base-user.h \
-           $(srcdir)/jitterentropy-gcd.c $(srcdir)/jitterentropy-gcd.h \
-           $(srcdir)/jitterentropy-health.c $(srcdir)/jitterentropy-health.h \
-           $(srcdir)/jitterentropy-noise.c $(srcdir)/jitterentropy-noise.h \
-           $(srcdir)/jitterentropy-sha3.c $(srcdir)/jitterentropy-sha3.h \
-           $(srcdir)/jitterentropy-timer.c $(srcdir)/jitterentropy-timer.h \
-           $(srcdir)/jitterentropy-base.c $(srcdir)/jitterentropy.h
+rndjent.o: $(srcdir)/rndjent.c
 	`echo $(COMPILE) -c $(srcdir)/rndjent.c | $(o_flag_munging) `
 
-rndjent.lo: $(srcdir)/rndjent.c jitterentropy-base-user.h \
-           $(srcdir)/jitterentropy-gcd.c $(srcdir)/jitterentropy-gcd.h \
-           $(srcdir)/jitterentropy-health.c $(srcdir)/jitterentropy-health.h \
-           $(srcdir)/jitterentropy-noise.c $(srcdir)/jitterentropy-noise.h \
-           $(srcdir)/jitterentropy-sha3.c $(srcdir)/jitterentropy-sha3.h \
-           $(srcdir)/jitterentropy-timer.c $(srcdir)/jitterentropy-timer.h \
-            $(srcdir)/jitterentropy-base.c $(srcdir)/jitterentropy.h
+rndjent.lo: $(srcdir)/rndjent.c
 	`echo $(LTCOMPILE) -c $(srcdir)/rndjent.c | $(o_flag_munging) `
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.