diff --git a/Makefile.in b/Makefile.in
index a64471946c7a0defbd6d41e50d8d275b95814fa3..daa4bb7a6f3bab9fb46c33c2adac310251e50468 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,7 +24,7 @@ endif
 
 COMMONOBJS=dbutil.o buffer.o \
 		dss.o bignum.o \
-		signkey.o rsa.o random.o \
+		signkey.o rsa.o dbrandom.o \
 		queue.o \
 		atomicio.o compat.o fake-rfc2553.o \
 		ltc_prng.o ecc.o ecdsa.o crypto_desc.o \
@@ -52,7 +52,7 @@ CONVERTOBJS=dropbearconvert.o keyimport.o
 SCPOBJS=scp.o progressmeter.o atomicio.o scpmisc.o compat.o
 
 HEADERS=options.h dbutil.h session.h packet.h algo.h ssh.h buffer.h kex.h \
-		dss.h bignum.h signkey.h rsa.h random.h service.h auth.h \
+		dss.h bignum.h signkey.h rsa.h dbrandom.h service.h auth.h \
 		debug.h channel.h chansession.h config.h queue.h sshpty.h \
 		termcodes.h gendss.h genrsa.h runopts.h includes.h \
 		loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
diff --git a/cli-agentfwd.c b/cli-agentfwd.c
index b0c589bc5ba2adcd687a69baeb733dff56c509c4..f166121e7c4f5398c296d0b7c00c613cb04c7e2f 100644
--- a/cli-agentfwd.c
+++ b/cli-agentfwd.c
@@ -34,7 +34,7 @@
 #include "channel.h"
 #include "packet.h"
 #include "buffer.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "listener.h"
 #include "runopts.h"
 #include "atomicio.h"
diff --git a/cli-kex.c b/cli-kex.c
index 18285ac3c935167949c640af540b0c3a0f9b70e3..55b00415fcd997c7864c014b4cc55b34c0c4f191 100644
--- a/cli-kex.c
+++ b/cli-kex.c
@@ -33,7 +33,7 @@
 #include "ssh.h"
 #include "packet.h"
 #include "bignum.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "runopts.h"
 #include "signkey.h"
 #include "ecc.h"
diff --git a/cli-main.c b/cli-main.c
index aa891deadae8dfc317e234bfdcdd836585592902..5cfd017fa60ba2707ab6252ce91d5821682afc3c 100644
--- a/cli-main.c
+++ b/cli-main.c
@@ -28,7 +28,7 @@
 #include "dbutil.h"
 #include "runopts.h"
 #include "session.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "crypto_desc.h"
 
 static void cli_dropbear_exit(int exitcode, const char* format, va_list param) ATTRIB_NORETURN;
diff --git a/cli-session.c b/cli-session.c
index d445d86272a5da7a501d8eab2a30e7843f9f6c5d..2a335d43b2916498f02af9d406b1e4ba69e2b7d0 100644
--- a/cli-session.c
+++ b/cli-session.c
@@ -31,7 +31,7 @@
 #include "packet.h"
 #include "tcpfwd.h"
 #include "channel.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "service.h"
 #include "runopts.h"
 #include "chansession.h"
diff --git a/common-kex.c b/common-kex.c
index d627fd7974eb4eead7741e871cae373b809bf43c..77a7aa69570088108790920cbf65ee1c8c8f047c 100644
--- a/common-kex.c
+++ b/common-kex.c
@@ -32,7 +32,7 @@
 #include "ssh.h"
 #include "packet.h"
 #include "bignum.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "runopts.h"
 #include "ecc.h"
 #include "crypto_desc.h"
diff --git a/common-runopts.c b/common-runopts.c
index fe1089faf430be3a1caed64d666828e702b7bdc4..699ebdaac9fa210f05abae25cdcaef1e8c87c598 100644
--- a/common-runopts.c
+++ b/common-runopts.c
@@ -29,7 +29,7 @@
 #include "dbutil.h"
 #include "auth.h"
 #include "algo.h"
-#include "random.h"
+#include "dbrandom.h"
 
 runopts opts; /* GLOBAL */
 
diff --git a/common-session.c b/common-session.c
index a300138f1fc2bcdcbfa5694d1163d9a834fcf72e..f4016b593c417dd950448637ada32d7512d174f4 100644
--- a/common-session.c
+++ b/common-session.c
@@ -30,7 +30,7 @@
 #include "buffer.h"
 #include "dss.h"
 #include "ssh.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "kex.h"
 #include "channel.h"
 #include "runopts.h"
diff --git a/random.c b/dbrandom.c
similarity index 99%
rename from random.c
rename to dbrandom.c
index cc448ec8ee452403da04bff22265804be5e7ca3d..e2f55c2c9d44a689b120fa5b5bd3740b61cca173 100644
--- a/random.c
+++ b/dbrandom.c
@@ -26,7 +26,7 @@
 #include "buffer.h"
 #include "dbutil.h"
 #include "bignum.h"
-#include "random.h"
+#include "dbrandom.h"
 
 
 /* this is used to generate unique output from the same hashpool */
diff --git a/random.h b/dbrandom.h
similarity index 100%
rename from random.h
rename to dbrandom.h
diff --git a/dropbearconvert.c b/dropbearconvert.c
index 958ced615aa986b0c51ec9e93e895f6a2f97aba9..37ee7acae84608b7a131030828e4807618184356 100644
--- a/dropbearconvert.c
+++ b/dropbearconvert.c
@@ -29,7 +29,7 @@
 #include "dbutil.h"
 #include "keyimport.h"
 #include "crypto_desc.h" 
-#include "random.h" 
+#include "dbrandom.h" 
 
 
 static int do_convert(int intype, const char* infile, int outtype,
diff --git a/dropbearkey.c b/dropbearkey.c
index 01385a1b21b08a235b353825fc6ff03e56da517d..1eb4db2f4afb524fd1639b03991b9da05bb56aea 100644
--- a/dropbearkey.c
+++ b/dropbearkey.c
@@ -53,7 +53,7 @@
 #include "gendss.h"
 #include "ecdsa.h"
 #include "crypto_desc.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "gensignkey.h"
 
 static void printhelp(char * progname);
diff --git a/dss.c b/dss.c
index b3b2bb1eb04af159babff40058d7fd0ad905bdd9..d4c4407a2c21c7176ffe25eff24b4941cd48df19 100644
--- a/dss.c
+++ b/dss.c
@@ -28,7 +28,7 @@
 #include "dss.h"
 #include "buffer.h"
 #include "ssh.h"
-#include "random.h"
+#include "dbrandom.h"
 
 /* Handle DSS (Digital Signature Standard), aka DSA (D.S. Algorithm),
  * operations, such as key reading, signing, verification. Key generation
diff --git a/gendss.c b/gendss.c
index 2785aecd69a94c438a5a1bdce0e5bf9c2cf8dc19..21d13a04883055cb6ea0dbbd1cfdc2d8f302ace6 100644
--- a/gendss.c
+++ b/gendss.c
@@ -26,7 +26,7 @@
 #include "dbutil.h"
 #include "signkey.h"
 #include "bignum.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "buffer.h"
 #include "gendss.h"
 #include "dss.h"
diff --git a/genrsa.c b/genrsa.c
index 5df191e829dfc9f3e9e06b0c1ded2c6a79ed4d33..cdc585db44865d85690396ed828e062c4933b403 100644
--- a/genrsa.c
+++ b/genrsa.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "dbutil.h"
 #include "bignum.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "rsa.h"
 #include "genrsa.h"
 
diff --git a/gensignkey.c b/gensignkey.c
index 2869d2c4a6efc5765d6ed5bbd6fc54cee0ddf6e1..cb66ffff7fef7038cec7918e64729b1867806055 100644
--- a/gensignkey.c
+++ b/gensignkey.c
@@ -5,7 +5,7 @@
 #include "genrsa.h"
 #include "gendss.h"
 #include "signkey.h"
-#include "random.h"
+#include "dbrandom.h"
 
 #define RSA_DEFAULT_SIZE 2048
 #define DSS_DEFAULT_SIZE 1024
diff --git a/ltc_prng.c b/ltc_prng.c
index 60cd590fd98db61ea3a214088a0815228a7bc253..af73dac62f4c2e0880f741b9665bf8d61fba268b 100644
--- a/ltc_prng.c
+++ b/ltc_prng.c
@@ -13,7 +13,7 @@
  */
 #include "options.h"
 #include "includes.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "ltc_prng.h"
 
 /**
diff --git a/packet.c b/packet.c
index 6f872d2d68d968680e4bdaf32bdba30db7009d8e..1b5ee93d4f0ba08861d092028f54dcb5924ae7d7 100644
--- a/packet.c
+++ b/packet.c
@@ -30,7 +30,7 @@
 #include "algo.h"
 #include "buffer.h"
 #include "kex.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "service.h"
 #include "auth.h"
 #include "channel.h"
diff --git a/process-packet.c b/process-packet.c
index ecc4863354d53cbabab7c81ea64c62f9269bcc84..0b92510675979f0418326f4b8655698022de1aba 100644
--- a/process-packet.c
+++ b/process-packet.c
@@ -30,7 +30,7 @@
 #include "algo.h"
 #include "buffer.h"
 #include "kex.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "service.h"
 #include "auth.h"
 #include "channel.h"
diff --git a/rsa.c b/rsa.c
index e2abab18b055b8cfbb7e2bbd9ce35a91942b49b1..7eb64131a499a7a0306cf9ad6c219b1592d9c494 100644
--- a/rsa.c
+++ b/rsa.c
@@ -34,7 +34,7 @@
 #include "rsa.h"
 #include "buffer.h"
 #include "ssh.h"
-#include "random.h"
+#include "dbrandom.h"
 
 #ifdef DROPBEAR_RSA 
 
diff --git a/svr-agentfwd.c b/svr-agentfwd.c
index 30105038f928da1cdcf07f0a374ba4c541a200d5..3c4daab18c5b0898431732e3eb53861c173a59e5 100644
--- a/svr-agentfwd.c
+++ b/svr-agentfwd.c
@@ -37,7 +37,7 @@
 #include "channel.h"
 #include "packet.h"
 #include "buffer.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "listener.h"
 #include "auth.h"
 
diff --git a/svr-auth.c b/svr-auth.c
index 2a3ef0e2ba80b1ad1272e92485457accabf4733a..9051d85fc1f5c7b7ecb323727328b8634624b5ff 100644
--- a/svr-auth.c
+++ b/svr-auth.c
@@ -33,7 +33,7 @@
 #include "packet.h"
 #include "auth.h"
 #include "runopts.h"
-#include "random.h"
+#include "dbrandom.h"
 
 static void authclear();
 static int checkusername(unsigned char *username, unsigned int userlen);
diff --git a/svr-chansession.c b/svr-chansession.c
index 5dd5540b5002ad05eb6078e178aa6d91d57ff0c6..b585a9a51faaef34733dd28ce80fbfee77d440e1 100644
--- a/svr-chansession.c
+++ b/svr-chansession.c
@@ -32,7 +32,7 @@
 #include "sshpty.h"
 #include "termcodes.h"
 #include "ssh.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "x11fwd.h"
 #include "agentfwd.h"
 #include "runopts.h"
diff --git a/svr-kex.c b/svr-kex.c
index 629a31b1b691b636d6387c4900c940a37dc282f8..24f1d73726f931402ab86869788041a98800260c 100644
--- a/svr-kex.c
+++ b/svr-kex.c
@@ -32,7 +32,7 @@
 #include "ssh.h"
 #include "packet.h"
 #include "bignum.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "runopts.h"
 #include "ecc.h"
 #include "gensignkey.h"
diff --git a/svr-main.c b/svr-main.c
index 5e4150a1996d8cb3cef604dcb66a37d7ccce600e..c4b8c48867869f20736e6f1333988c8f6fdc5810 100644
--- a/svr-main.c
+++ b/svr-main.c
@@ -28,7 +28,7 @@
 #include "buffer.h"
 #include "signkey.h"
 #include "runopts.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "crypto_desc.h"
 
 static size_t listensockets(int *sock, size_t sockcount, int *maxfd);
diff --git a/svr-session.c b/svr-session.c
index 76ad45015456e7736d20f15272fa9d137e5de9fb..2852f296500535a63915dfe661a40bf1dabf6ee7 100644
--- a/svr-session.c
+++ b/svr-session.c
@@ -30,7 +30,7 @@
 #include "buffer.h"
 #include "dss.h"
 #include "ssh.h"
-#include "random.h"
+#include "dbrandom.h"
 #include "kex.h"
 #include "channel.h"
 #include "chansession.h"