diff --git a/Makefile b/Makefile
index 41e1e25..deea8e7 100644
--- a/Makefile
+++ b/Makefile
@@ -51,28 +51,28 @@ modem  : qnmodem
 qngateway : QnetGateway.o aprs.o UnixDgramSocket.o QnetConfigure.o $(IRCOBJS)
 	g++ $(CPPFLAGS) -o $@ $^ $(LDFLAGS) -pthread
 
-qnlink : QnetLink.o DPlusAuthenticator.o TCPReaderWriterClient.o Random.o UnixDgramSocket.o QnetConfigure.o
+qnlink : QnetLink.o DPlusAuthenticator.o TCPReaderWriterClient.o UnixDgramSocket.o QnetConfigure.o
 	g++ $(CPPFLAGS) -o $@ $^ $(LDFLAGS) -pthread
 
 qnrelay : QnetRelay.o UnixDgramSocket.o QnetConfigure.o
 	g++ $(CPPFLAGS) -o $@ $^ $(LDFLAGS)
 
-qnitap : QnetITAP.o Random.o UnixDgramSocket.o QnetConfigure.o
+qnitap : QnetITAP.o UnixDgramSocket.o QnetConfigure.o
 	g++ $(CPPFLAGS) -o $@ $^ $(LDFLAGS)
 
-qnmodem : QnetModem.o Random.o UnixDgramSocket.o QnetConfigure.o
+qnmodem : QnetModem.o UnixDgramSocket.o QnetConfigure.o
 		g++ $(CPPFLAGS) -o $@ $^ $(LDFLAGS)
 
-qndvap : QnetDVAP.o DVAPDongle.o Random.o UnixDgramSocket.o QnetConfigure.o $(DSTROBJS)
+qndvap : QnetDVAP.o DVAPDongle.o UnixDgramSocket.o QnetConfigure.o $(DSTROBJS)
 	g++ $(CPPFLAGS) -o $@ $^ $(LDFLAGS) -pthread
 
-qndvrptr : QnetDVRPTR.o Random.o UnixDgramSocket.o QnetConfigure.o $(DSTROBJS)
+qndvrptr : QnetDVRPTR.o UnixDgramSocket.o QnetConfigure.o $(DSTROBJS)
 	g++ $(CPPFLAGS) -o $@ $^ $(LDFLAGS)
 
-qnremote : QnetRemote.o Random.o UnixDgramSocket.o QnetConfigure.o
+qnremote : QnetRemote.o UnixDgramSocket.o QnetConfigure.o
 	g++ $(CPPFLAGS) -o $@ $^ $(LDFLAGS)
 
-qnvoice : QnetVoice.o Random.o QnetConfigure.o
+qnvoice : QnetVoice.o QnetConfigure.o
 	g++ $(CPPFLAGS) -o $@ $^ $(LDFLAGS)
 
 %.o : %.cpp
diff --git a/Random.cpp b/Random.cpp
deleted file mode 100644
index ad087a7..0000000
--- a/Random.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *   Copyright (C) 2018 by Thomas A. Early N7TAE
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <unistd.h>
-
-#include <cstdlib>
-
-#include "Random.h"
-
-CRandom::CRandom()
-{
-	srandom(getpid());
-}
-
-CRandom::~CRandom() {}
-
-unsigned short CRandom::NewStreamID()
-{
-	unsigned short r = 0;
-	while (0 == r)
-		r = 0xffffu & random();
-	return r;
-}
diff --git a/Random.h b/Random.h
index 390830d..d1b2cd4 100644
--- a/Random.h
+++ b/Random.h
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2018 by Thomas A. Early N7TAE
+ *   Copyright (C) 2018-2019 by Thomas A. Early N7TAE
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -18,12 +18,21 @@
 
 #pragma once
 
+#include <unistd.h>
+#include <cstdlib>
+
 class CRandom
 {
 public:
-	CRandom();
+	CRandom() { srandom(getpid()); }
 
-	~CRandom();
+	~CRandom() {}
 
-	unsigned short NewStreamID();
+	unsigned short NewStreamID()
+	{
+		unsigned short r = 0;
+		while (0 == r)
+			r = 0xffffU & random();
+		return r;
+	}
 };