diff --git a/src/console/piconsole.cpp b/src/console/piconsole.cpp
index e8b3a3a1..138ecc12 100644
--- a/src/console/piconsole.cpp
+++ b/src/console/piconsole.cpp
@@ -907,7 +907,7 @@ void PIConsole::listenServers() {
 	stopPeer();
 	server_mode = false;
 	server_name.clear();
-	srand(PISystemTime::current().nanoseconds);
+	randomize();
 	peer = new PIPeer("_rcc_:" + PIDateTime::current().toString("hhmmssddMMyy_") + PIString::fromNumber(rand()));
 	CONNECT2(void, const PIString & , const PIByteArray &, peer, dataReceivedEvent, this, peerReceived);
 	peer_timer->start(100.);
diff --git a/src/io/pifiletransfer.cpp b/src/io/pifiletransfer.cpp
index 76b44866..f5a3adbd 100644
--- a/src/io/pifiletransfer.cpp
+++ b/src/io/pifiletransfer.cpp
@@ -1,5 +1,4 @@
 #include "pifiletransfer.h"
-#include "piincludes_p.h"
 
 const char PIFileTransfer::sign[] = {'P', 'F', 'T'};
 
@@ -79,7 +78,7 @@ bool PIFileTransfer::sendFiles(const PIVector<PFTFileInfo> &files) {
 		if (files_[i].isDir()) files_[i].size = 0;
 		//		piCout << "prepare" << i << files_[i].path << files_[i].dest_path << files_[i].name();
 	}
-	srand(PISystemTime::current().toMilliseconds());
+	randomize();
 	pftheader.session_id = rand();
 	sendFilesStarted();
 	cur_file_string = "build session";
diff --git a/src/io/pipeer.cpp b/src/io/pipeer.cpp
index 05264957..7be359a3 100755
--- a/src/io/pipeer.cpp
+++ b/src/io/pipeer.cpp
@@ -19,7 +19,6 @@
 
 #include "pipeer.h"
 #include "piconfig.h"
-#include "piincludes_p.h"
 
 #define _PIPEER_MSG_SIZE         4000
 #define _PIPEER_MSG_TTL          100
@@ -149,7 +148,7 @@ PIPeer::PIPeer(const PIString & n): PIIODevice(), inited__(false), eth_tcp_srv(P
 	self_info.dist = 0;
 	self_info.time = PISystemTime::current();
 	//joinMulticastGroup("239.240.241.242");
-	srand(uint(PISystemTime::current(true).toMicroseconds()));
+	randomize();
 	//id_ = self_info.name + "_" + PIString::fromNumber(rand());
 	CONNECTU(&sync_timer, tickEvent, this, timerEvent);
 	prev_ifaces = PIEthernet::interfaces();
diff --git a/utils/system_daemon/main.cpp b/utils/system_daemon/main.cpp
index 13babdd7..1fdafc01 100755
--- a/utils/system_daemon/main.cpp
+++ b/utils/system_daemon/main.cpp
@@ -28,7 +28,7 @@
 
 class _Init {
 public:
-	_Init() {srand(PISystemTime::current().toMicroseconds());}
+	_Init() {randomize();}
 };
 _Init _pisd_init;