diff --git a/code/search/SearchIndex.php b/code/search/SearchIndex.php
index 4cb65f2..1857ee3 100644
--- a/code/search/SearchIndex.php
+++ b/code/search/SearchIndex.php
@@ -1,5 +1,5 @@
 <?php
-namespace FulltextSearch;
+namespace SilverStripe\FullTextSearch;
 
 use SilverStripe\View\ViewableData;
 use SilverStripe\ORM\DataObject;
diff --git a/code/solr/Solr.php b/code/solr/Solr.php
index 073d933..033fa95 100644
--- a/code/solr/Solr.php
+++ b/code/solr/Solr.php
@@ -154,10 +154,10 @@ class Solr
         static $included = false;
 
         if (!$included) {
-            $solr_php_path = __DIR__. '/../..' . '/thirdparty/solr-php-client';
-            set_include_path($solr_php_path);
-            require_once($solr_php_path . DIRECTORY_SEPARATOR . 'Apache/Solr/Service.php');
-            require_once($solr_php_path . DIRECTORY_SEPARATOR . 'Apache/Solr/Document.php');
+            $solr_php_path = __DIR__. '/../..' . '/thirdparty/solr-php-client/';
+            set_include_path(get_include_path() . PATH_SEPARATOR . $solr_php_path);
+            require_once($solr_php_path . 'Apache/Solr/Service.php');
+            require_once($solr_php_path . 'Apache/Solr/Document.php');
 
             $included = true;
         }
diff --git a/code/solr/SolrIndex.php b/code/solr/SolrIndex.php
index f74dbf1..bfe7477 100644
--- a/code/solr/SolrIndex.php
+++ b/code/solr/SolrIndex.php
@@ -4,6 +4,8 @@ Solr::include_client_api();
 
 use SilverStripe\Dev\BuildTask;
 use SilverStripe\Control\Director;
+use SilverStripe\FulltextSearch\SearchIndex;
+
 abstract class SolrIndex extends SearchIndex
 {
     public static $fulltextTypeMap = array(