diff --git a/code/search/SearchIndex.php b/code/search/SearchIndex.php
index 6f5a865..4cb65f2 100644
--- a/code/search/SearchIndex.php
+++ b/code/search/SearchIndex.php
@@ -1,4 +1,5 @@
 <?php
+namespace FulltextSearch;
 
 use SilverStripe\View\ViewableData;
 use SilverStripe\ORM\DataObject;
diff --git a/code/search/SearchQuery.php b/code/search/SearchQuery.php
index 8f5d08b..beb3767 100644
--- a/code/search/SearchQuery.php
+++ b/code/search/SearchQuery.php
@@ -5,6 +5,7 @@
  *
  * API very much still in flux.
  */
+use SilverStripe\View\ViewableData;
 class SearchQuery extends ViewableData
 {
     public static $missing = null;
diff --git a/code/search/SearchUpdater.php b/code/search/SearchUpdater.php
index 0c836f0..cb21301 100644
--- a/code/search/SearchUpdater.php
+++ b/code/search/SearchUpdater.php
@@ -12,6 +12,14 @@
  *
  * TODO: The way we bind in is awful hacky.
  */
+use SilverStripe\Core\Object;
+use SilverStripe\Control\RequestFilter;
+use SilverStripe\Control\HTTPRequest;
+use SilverStripe\Control\Session;
+use SilverStripe\ORM\DataModel;
+use SilverStripe\Control\HTTPResponse;
+use SilverStripe\ORM\DataExtension;
+
 class SearchUpdater extends Object
 {
     /**
@@ -206,12 +214,13 @@ class SearchUpdater extends Object
 
 class SearchUpdater_BindManipulationCaptureFilter implements RequestFilter
 {
-    public function preRequest(SS_HTTPRequest $request, Session $session, DataModel $model)
+
+    public function preRequest(HTTPRequest $request, Session $session, DataModel $model)
     {
         SearchUpdater::bind_manipulation_capture();
     }
 
-    public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model)
+    public function postRequest(HTTPRequest $request, HTTPResponse $response, DataModel $model)
     {
         /* NOP */
     }
diff --git a/code/solr/Solr.php b/code/solr/Solr.php
index b79a160..3614776 100644
--- a/code/solr/Solr.php
+++ b/code/solr/Solr.php
@@ -154,9 +154,10 @@ class Solr
         static $included = false;
 
         if (!$included) {
-            set_include_path(get_include_path() . PATH_SEPARATOR . Director::baseFolder() . '/fulltextsearch/thirdparty/solr-php-client');
-            require_once('Apache/Solr/Service.php');
-            require_once('Apache/Solr/Document.php');
+            $solr_php_path = BASE_PATH . DIRECTORY_SEPARATOR . 'fulltextsearch/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');
 
             $included = true;
         }