diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h
index 48820c73335d..4ed51f15eb34 100644
--- a/modules/juce_core/juce_core.h
+++ b/modules/juce_core/juce_core.h
@@ -299,6 +299,8 @@ JUCE_END_IGNORE_WARNINGS_MSVC
 #include "misc/juce_Functional.h"
 #include "containers/juce_Span.h"
 #include "misc/juce_Result.h"
+#include "maths/juce_BigInteger.h"
+#include "maths/juce_Random.h"
 #include "misc/juce_Uuid.h"
 #include "misc/juce_ConsoleApplication.h"
 #include "containers/juce_Variant.h"
@@ -332,9 +334,7 @@ JUCE_END_IGNORE_WARNINGS_MSVC
 #include "json/juce_JSONUtils.h"
 #include "serialisation/juce_Serialisation.h"
 #include "json/juce_JSONSerialisation.h"
-#include "maths/juce_BigInteger.h"
 #include "maths/juce_Expression.h"
-#include "maths/juce_Random.h"
 #include "misc/juce_RuntimePermissions.h"
 #include "misc/juce_WindowsRegistry.h"
 #include "threads/juce_ChildProcess.h"
diff --git a/modules/juce_core/misc/juce_Uuid.cpp b/modules/juce_core/misc/juce_Uuid.cpp
index ab2b4341251d..c5b72032d231 100644
--- a/modules/juce_core/misc/juce_Uuid.cpp
+++ b/modules/juce_core/misc/juce_Uuid.cpp
@@ -35,10 +35,8 @@
 namespace juce
 {
 
-Uuid::Uuid()
+Uuid::Uuid(Random r)
 {
-    Random r;
-
     for (size_t i = 0; i < sizeof (uuid); ++i)
         uuid[i] = (uint8) (r.nextInt (256));
 
diff --git a/modules/juce_core/misc/juce_Uuid.h b/modules/juce_core/misc/juce_Uuid.h
index 98e61cc6518d..22fe29e2b46d 100644
--- a/modules/juce_core/misc/juce_Uuid.h
+++ b/modules/juce_core/misc/juce_Uuid.h
@@ -52,7 +52,7 @@ class JUCE_API  Uuid
 public:
     //==============================================================================
     /** Creates a new unique ID, compliant with RFC 4122 version 4. */
-    Uuid();
+    Uuid(Random r = Random());
 
     /** Destructor. */
     ~Uuid() noexcept;
@@ -145,6 +145,8 @@ class JUCE_API  Uuid
     uint8 uuid[sizeInBytes];
     String getHexRegion (int, int) const;
     int compare (Uuid) const noexcept;
+    
+    void init(Random& r);
 
     JUCE_LEAK_DETECTOR (Uuid)
 };