diff --git a/include/Contact.php b/include/Contact.php
index 5787439c1..20ae524cb 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Network\Probe;
 
 // Included here for completeness, but this is a very dangerous operation.
 // It is the caller's responsibility to confirm the requestor's intent and
@@ -363,7 +364,6 @@ function get_contact_details_by_addr($addr, $uid = -1) {
 				dbesc($addr));
 
 	if (!dbm::is_result($r)) {
-		require_once('include/Probe.php');
 		$data = Probe::uri($addr);
 
 		$profile = get_contact_details_by_url($data['url'], $uid);
@@ -589,7 +589,6 @@ function get_contact($url, $uid = 0, $no_update = false) {
 		return 0;
 	}
 
-	require_once('include/Probe.php');
 	$data = Probe::uri($url);
 
 	// Last try in gcontact for unsupported networks
diff --git a/include/Scrape.php b/include/Scrape.php
index bb9af60d7..2d5205984 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -1,5 +1,6 @@
 <?php
-require_once('include/Probe.php');
+
+use Friendica\Network\Probe;
 
 /**
  *
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index c1a6d38c0..80ee1b50d 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Network\Probe;
 
 use League\HTMLToMarkdown\HtmlConverter;
 
diff --git a/include/cronjobs.php b/include/cronjobs.php
index a2fc99825..f367df7b1 100644
--- a/include/cronjobs.php
+++ b/include/cronjobs.php
@@ -2,11 +2,11 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Network\Probe;
 
 function cronjobs_run(&$argv, &$argc){
 	global $a;
 
-	require_once('include/Probe.php');
 	require_once 'include/datetime.php';
 	require_once 'include/ostatus.php';
 	require_once 'include/post_update.php';
diff --git a/include/network.php b/include/network.php
index 72d3ce626..0345ac720 100644
--- a/include/network.php
+++ b/include/network.php
@@ -6,9 +6,9 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Network\Probe;
 
 require_once("include/xml.php");
-require_once('include/Probe.php');
 
 /**
  * @brief Curl wrapper
diff --git a/include/ostatus.php b/include/ostatus.php
index 1138906ca..cc9ee4c70 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -6,6 +6,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 require_once("include/Scrape.php");
+use Friendica\Network\Probe;
 
 require_once 'include/Contact.php';
 require_once 'include/threads.php';
diff --git a/include/salmon.php b/include/salmon.php
index 8ebd9016f..6e08d0aaf 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -1,7 +1,8 @@
 <?php
 
+use Friendica\Network\Probe;
+
 require_once 'include/crypto.php';
-require_once('include/Probe.php');
 
 function get_salmon_key($uri, $keyhash) {
 	$ret = array();
diff --git a/include/socgraph.php b/include/socgraph.php
index 8f13d8955..94924873d 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -10,6 +10,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 require_once("include/Scrape.php");
+use Friendica\Network\Probe;
 
 require_once 'include/datetime.php';
 require_once 'include/network.php';
diff --git a/mod/contacts.php b/mod/contacts.php
index 2ddd17e73..57c96a1e3 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Network\Probe;
 
 require_once('include/Scrape.php');
 require_once 'include/Contact.php';
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 10ea8937e..897e85ecb 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -19,8 +19,8 @@
  */
 
 use Friendica\App;
+use Friendica\Network\Probe;
 
-require_once('include/Probe.php');
 require_once 'include/enotify.php';
 require_once 'include/group.php';
 
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 8e461cbb3..eadbb920d 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -15,7 +15,7 @@
 use Friendica\App;
 
 require_once('include/Scrape.php');
-require_once('include/Probe.php');
+use Friendica\Network\Probe;
 require_once 'include/enotify.php';
 require_once 'include/group.php';
 
diff --git a/mod/photos.php b/mod/photos.php
index 1d20120a8..bf21b3437 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Network\Probe;
 
 require_once 'include/Photo.php';
 require_once 'include/photos.php';
@@ -12,7 +13,6 @@ require_once 'include/security.php';
 require_once 'include/redir.php';
 require_once 'include/tags.php';
 require_once 'include/threads.php';
-require_once 'include/Probe.php';
 
 function photos_init(App $a) {
 
diff --git a/mod/profiles.php b/mod/profiles.php
index 0d3e1afba..7d2bceec1 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -1,9 +1,9 @@
 <?php
 
 use Friendica\App;
+use Friendica\Network\Probe;
 
 require_once 'include/Contact.php';
-require_once('include/Probe.php');
 
 function profiles_init(App $a) {
 
diff --git a/mod/webfinger.php b/mod/webfinger.php
index a831fc12c..d72315a5b 100644
--- a/mod/webfinger.php
+++ b/mod/webfinger.php
@@ -1,8 +1,7 @@
 <?php
 
 use Friendica\App;
-
-require_once("include/Probe.php");
+use Friendica\Network\Probe;
 
 function webfinger_content(App $a) {
 
diff --git a/include/Probe.php b/src/Network/Probe.php
similarity index 99%
rename from include/Probe.php
rename to src/Network/Probe.php
index 85f64d29b..0b707856b 100644
--- a/include/Probe.php
+++ b/src/Network/Probe.php
@@ -1,6 +1,9 @@
 <?php
+
+namespace Friendica\Network;
+
 /**
- * @file include/Probe.php
+ * @file src/Network/Probe.php
  * @brief Functions for probing URL
  *
  */