diff --git a/composer.json b/composer.json
index 11008cd8..843fd311 100644
--- a/composer.json
+++ b/composer.json
@@ -43,6 +43,9 @@
             "File": "phpseclib/",
             "Math": "phpseclib/",
             "Net": "phpseclib/"
-        }
+        },
+        "files": [
+            "phpseclib/Crypt/Random.php"
+        ]
     }
 }
diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php
index 51c3df10..a58ce3bc 100644
--- a/phpseclib/Crypt/RSA.php
+++ b/phpseclib/Crypt/RSA.php
@@ -83,7 +83,7 @@ if (!class_exists('Math_BigInteger')) {
 // will trigger a call to __autoload() if you're wanting to auto-load classes
 // call function_exists() a second time to stop the require_once from being called outside
 // of the auto loader
-if (!function_exists('crypt_random_string') && !class_exists('Crypt_Random') && !function_exists('crypt_random_string')) {
+if (!function_exists('crypt_random_string')) {
     require_once('Crypt/Random.php');
 }
 
@@ -2658,4 +2658,4 @@ class Crypt_RSA {
                 return $this->_rsassa_pss_verify($message, $signature);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
index c05a4cd0..7845fe50 100644
--- a/phpseclib/Net/SSH2.php
+++ b/phpseclib/Net/SSH2.php
@@ -80,11 +80,7 @@ if (!class_exists('Math_BigInteger')) {
 /**
  * Include Crypt_Random
  */
-// the class_exists() will only be called if the crypt_random_string function hasn't been defined and
-// will trigger a call to __autoload() if you're wanting to auto-load classes
-// call function_exists() a second time to stop the require_once from being called outside
-// of the auto loader
-if (!function_exists('crypt_random_string') && !class_exists('Crypt_Random') && !function_exists('crypt_random_string')) {
+if (!function_exists('crypt_random_string')) {
     require_once('Crypt/Random.php');
 }