diff --git a/app/Providers/ErrorServiceProvider.php b/app/Providers/ErrorServiceProvider.php
index 852cdd4b..1a4171e7 100644
--- a/app/Providers/ErrorServiceProvider.php
+++ b/app/Providers/ErrorServiceProvider.php
@@ -1,25 +1,29 @@
 <?php namespace App\Providers;
 
-use App, Log, Exception;
+use Exception;
+use Illuminate\Contracts\Logging\Log;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Contracts\Exception\Handler;
 
 class ErrorServiceProvider extends ServiceProvider {
 
 	/**
 	 * Register any error handlers.
 	 *
+	 * @param  Handler  $handler
+	 * @param  Log  $log
 	 * @return void
 	 */
-	public function boot()
+	public function boot(Handler $handler, Log $log)
 	{
 		// Here you may handle any errors that occur in your application, including
 		// logging them or displaying custom views for specific errors. You may
 		// even register several error handlers to handle different types of
 		// exceptions. If nothing is returned, the default error view is
 		// shown, which includes a detailed stack trace during debug.
-		App::error(function(Exception $e)
+		$handler->error(function(Exception $e) use ($log)
 		{
-			Log::error($e);
+			$log->error($e);
 		});
 	}
 
diff --git a/app/Providers/LogServiceProvider.php b/app/Providers/LogServiceProvider.php
index acdd1c2e..40005ea3 100644
--- a/app/Providers/LogServiceProvider.php
+++ b/app/Providers/LogServiceProvider.php
@@ -1,6 +1,6 @@
 <?php namespace App\Providers;
 
-use Log;
+use Illuminate\Contracts\Logging\Log;
 use Illuminate\Support\ServiceProvider;
 
 class LogServiceProvider extends ServiceProvider {
@@ -10,9 +10,9 @@ class LogServiceProvider extends ServiceProvider {
 	 *
 	 * @return void
 	 */
-	public function boot()
+	public function boot(Log $log)
 	{
-		Log::useFiles(storage_path().'/logs/laravel.log');
+		$log->useFiles(storage_path().'/logs/laravel.log');
 	}
 
 	/**
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 00c84574..f502e700 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -1,6 +1,6 @@
 <?php namespace App\Providers;
 
-use App, URL;
+use Illuminate\Contracts\Routing\UrlGenerator;
 use Illuminate\Routing\RouteServiceProvider as ServiceProvider;
 
 class RouteServiceProvider extends ServiceProvider {
@@ -10,11 +10,12 @@ class RouteServiceProvider extends ServiceProvider {
 	 *
 	 * Register any model bindings or pattern based filters.
 	 *
+	 * @param  UrlGenerator  $url
 	 * @return void
 	 */
-	public function before()
+	public function before(UrlGenerator $url)
 	{
-		URL::setRootControllerNamespace(
+		$url->setRootControllerNamespace(
 			trim(config('namespaces.controllers'), '\\')
 		);
 	}
@@ -26,7 +27,7 @@ public function before()
 	 */
 	public function map()
 	{
-		App::booted(function()
+		$this->app->booted(function()
 		{
 			// Once the application has booted, we will include the default routes
 			// file. This "namespace" helper will load the routes file within a