From 66fa03f17e962aba34f9fef02c5d3bca524632ed Mon Sep 17 00:00:00 2001
From: Nathan van der Werf <nvanderwerf93@gmail.com>
Date: Fri, 24 Aug 2018 19:40:40 +0200
Subject: [PATCH] Revert "Remove unused imports"

This reverts commit 742a5f415bc45819b11c77402efc114fa2f4451e.
---
 modules/backend/ServiceProvider.php                            | 1 +
 modules/backend/formwidgets/Repeater.php                       | 1 +
 modules/backend/models/Preference.php                          | 1 +
 modules/backend/models/UserPreference.php                      | 2 ++
 modules/backend/traits/FormModelSaver.php                      | 1 +
 modules/backend/widgets/Lists.php                              | 1 +
 modules/cms/ServiceProvider.php                                | 1 +
 modules/cms/classes/Asset.php                                  | 1 +
 modules/cms/classes/ComponentBase.php                          | 2 ++
 modules/cms/classes/Controller.php                             | 3 +++
 modules/cms/classes/Page.php                                   | 2 ++
 modules/cms/components/UnknownComponent.php                    | 1 +
 modules/cms/controllers/Index.php                              | 1 +
 modules/cms/controllers/ThemeLogs.php                          | 2 ++
 modules/cms/controllers/ThemeOptions.php                       | 1 +
 modules/cms/controllers/Themes.php                             | 2 ++
 modules/cms/twig/Extension.php                                 | 2 ++
 modules/cms/twig/FlashNode.php                                 | 1 +
 modules/cms/twig/FlashTokenParser.php                          | 1 +
 modules/cms/widgets/AssetList.php                              | 2 ++
 modules/system/ServiceProvider.php                             | 2 ++
 modules/system/classes/CombineAssets.php                       | 1 +
 modules/system/classes/MailManager.php                         | 3 +++
 modules/system/classes/MarkupManager.php                       | 1 +
 modules/system/classes/PluginBase.php                          | 1 +
 modules/system/classes/SettingsManager.php                     | 2 ++
 modules/system/classes/SystemController.php                    | 1 +
 modules/system/classes/UpdateManager.php                       | 1 +
 modules/system/console/OctoberDown.php                         | 1 +
 modules/system/console/OctoberFresh.php                        | 2 ++
 modules/system/console/OctoberInstall.php                      | 2 ++
 modules/system/console/OctoberUp.php                           | 2 ++
 modules/system/console/OctoberUpdate.php                       | 1 +
 modules/system/console/PluginInstall.php                       | 1 +
 modules/system/console/PluginRefresh.php                       | 1 +
 modules/system/controllers/EventLogs.php                       | 2 ++
 modules/system/controllers/MailBrandSettings.php               | 2 ++
 modules/system/controllers/MailLayouts.php                     | 2 ++
 modules/system/controllers/MailPartials.php                    | 2 ++
 modules/system/controllers/MailTemplates.php                   | 1 +
 modules/system/controllers/RequestLogs.php                     | 2 ++
 modules/system/controllers/Settings.php                        | 1 +
 .../2015_10_01_000014_Db_System_Mail_Layout_Rename.php         | 1 +
 modules/system/models/MailPartial.php                          | 1 +
 modules/system/models/Parameter.php                            | 1 +
 modules/system/traits/ConfigMaker.php                          | 1 +
 modules/system/twig/Extension.php                              | 2 ++
 47 files changed, 69 insertions(+)

diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php
index 92b503d08..195ab1856 100644
--- a/modules/backend/ServiceProvider.php
+++ b/modules/backend/ServiceProvider.php
@@ -1,6 +1,7 @@
 <?php namespace Backend;
 
 use App;
+use Backend;
 use BackendMenu;
 use BackendAuth;
 use Backend\Classes\WidgetManager;
diff --git a/modules/backend/formwidgets/Repeater.php b/modules/backend/formwidgets/Repeater.php
index 6c0cdf269..4debdfe72 100644
--- a/modules/backend/formwidgets/Repeater.php
+++ b/modules/backend/formwidgets/Repeater.php
@@ -2,6 +2,7 @@
 
 use Lang;
 use ApplicationException;
+use Backend\Classes\FormField;
 use Backend\Classes\FormWidgetBase;
 
 /**
diff --git a/modules/backend/models/Preference.php b/modules/backend/models/Preference.php
index 0715b8017..084c0b0b4 100644
--- a/modules/backend/models/Preference.php
+++ b/modules/backend/models/Preference.php
@@ -9,6 +9,7 @@ use BackendAuth;
 use DirectoryIterator;
 use DateTime;
 use DateTimeZone;
+use Carbon\Carbon;
 
 /**
  * Backend preferences for the backend user
diff --git a/modules/backend/models/UserPreference.php b/modules/backend/models/UserPreference.php
index cb7ee5846..97a26e159 100644
--- a/modules/backend/models/UserPreference.php
+++ b/modules/backend/models/UserPreference.php
@@ -1,6 +1,8 @@
 <?php namespace Backend\Models;
 
+use Exception;
 use BackendAuth;
+use October\Rain\Database\Model;
 use SystemException;
 use October\Rain\Auth\Models\Preferences as PreferencesBase;
 
diff --git a/modules/backend/traits/FormModelSaver.php b/modules/backend/traits/FormModelSaver.php
index 2f33fa7e3..17a422e22 100644
--- a/modules/backend/traits/FormModelSaver.php
+++ b/modules/backend/traits/FormModelSaver.php
@@ -3,6 +3,7 @@
 use Str;
 use Backend\Classes\FormField;
 use October\Rain\Halcyon\Model as HalcyonModel;
+use October\Rain\Database\Model as DatabaseModel;
 
 /**
  * Implements special logic for processing form data, typically from from postback, and
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 0c83abd16..45e790008 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -16,6 +16,7 @@ use Backend\Classes\ListColumn;
 use Backend\Classes\WidgetBase;
 use October\Rain\Database\Model;
 use ApplicationException;
+use DateTime;
 
 /**
  * List Widget
diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php
index 603052295..01da9d401 100644
--- a/modules/cms/ServiceProvider.php
+++ b/modules/cms/ServiceProvider.php
@@ -3,6 +3,7 @@
 use App;
 use Lang;
 use Event;
+use Backend;
 use BackendMenu;
 use BackendAuth;
 use Backend\Models\UserRole;
diff --git a/modules/cms/classes/Asset.php b/modules/cms/classes/Asset.php
index d64ed9956..48d4b4697 100644
--- a/modules/cms/classes/Asset.php
+++ b/modules/cms/classes/Asset.php
@@ -3,6 +3,7 @@
 use File;
 use Lang;
 use Config;
+use Cms\Classes\Theme;
 use Cms\Helpers\File as FileHelper;
 use October\Rain\Extension\Extendable;
 use ApplicationException;
diff --git a/modules/cms/classes/ComponentBase.php b/modules/cms/classes/ComponentBase.php
index efe067530..9546cd4c0 100644
--- a/modules/cms/classes/ComponentBase.php
+++ b/modules/cms/classes/ComponentBase.php
@@ -3,6 +3,8 @@
 use Str;
 use Lang;
 use Config;
+use Cms\Classes\CodeBase;
+use Cms\Classes\CmsException;
 use October\Rain\Extension\Extendable;
 use BadMethodCallException;
 
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 0b14c9561..6188f0cdb 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -22,10 +22,13 @@ use Cms\Twig\Extension as CmsTwigExtension;
 use Cms\Models\MaintenanceSetting;
 use System\Models\RequestLog;
 use System\Helpers\View as ViewHelper;
+use System\Classes\ErrorHandler;
 use System\Classes\CombineAssets;
 use System\Twig\Extension as SystemTwigExtension;
 use October\Rain\Exception\AjaxException;
+use October\Rain\Exception\SystemException;
 use October\Rain\Exception\ValidationException;
+use October\Rain\Exception\ApplicationException;
 use October\Rain\Parse\Bracket as TextParser;
 use Illuminate\Http\RedirectResponse;
 
diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php
index 2ea4ce171..4c1b9bef7 100644
--- a/modules/cms/classes/Page.php
+++ b/modules/cms/classes/Page.php
@@ -1,6 +1,8 @@
 <?php namespace Cms\Classes;
 
 use Lang;
+use Cms\Classes\Theme;
+use Cms\Classes\Layout;
 use ApplicationException;
 use October\Rain\Filesystem\Definitions as FileDefinitions;
 
diff --git a/modules/cms/components/UnknownComponent.php b/modules/cms/components/UnknownComponent.php
index 9282216b4..aa2b6bcbb 100644
--- a/modules/cms/components/UnknownComponent.php
+++ b/modules/cms/components/UnknownComponent.php
@@ -1,5 +1,6 @@
 <?php namespace Cms\Components;
 
+use Cms\Classes\CodeBase;
 use Cms\Classes\ComponentBase;
 
 class UnknownComponent extends ComponentBase
diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
index d7cb19fd2..b27b6f858 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -21,6 +21,7 @@ use Cms\Classes\CmsCompoundObject;
 use Cms\Classes\ComponentManager;
 use Cms\Classes\ComponentPartial;
 use Backend\Classes\Controller;
+use Backend\Classes\WidgetManager;
 use October\Rain\Router\Router as RainRouter;
 use ApplicationException;
 use Cms\Classes\Asset;
diff --git a/modules/cms/controllers/ThemeLogs.php b/modules/cms/controllers/ThemeLogs.php
index 5e390217f..03bd0cd79 100644
--- a/modules/cms/controllers/ThemeLogs.php
+++ b/modules/cms/controllers/ThemeLogs.php
@@ -4,12 +4,14 @@ use Str;
 use Lang;
 use File;
 use Flash;
+use Backend;
 use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
 use ApplicationException;
 use System\Classes\SettingsManager;
 use Cms\Models\ThemeLog;
+use Exception;
 
 /**
  * Request Logs controller
diff --git a/modules/cms/controllers/ThemeOptions.php b/modules/cms/controllers/ThemeOptions.php
index 9333e1c06..9be5d4766 100644
--- a/modules/cms/controllers/ThemeOptions.php
+++ b/modules/cms/controllers/ThemeOptions.php
@@ -1,6 +1,7 @@
 <?php namespace Cms\Controllers;
 
 use Flash;
+use Backend;
 use BackendMenu;
 use ApplicationException;
 use Cms\Models\ThemeData;
diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php
index d80015d61..dd25ac807 100644
--- a/modules/cms/controllers/Themes.php
+++ b/modules/cms/controllers/Themes.php
@@ -4,10 +4,12 @@ use File;
 use Yaml;
 use Flash;
 use Config;
+use Backend;
 use Redirect;
 use BackendMenu;
 use ValidationException;
 use ApplicationException;
+use Cms\Models\ThemeData;
 use Cms\Models\ThemeExport;
 use Cms\Models\ThemeImport;
 use Cms\Classes\Theme as CmsTheme;
diff --git a/modules/cms/twig/Extension.php b/modules/cms/twig/Extension.php
index 0080dc02e..f123a744e 100644
--- a/modules/cms/twig/Extension.php
+++ b/modules/cms/twig/Extension.php
@@ -4,9 +4,11 @@ use Flash;
 use Block;
 use Event;
 use Twig_Extension;
+use Twig_TokenParser;
 use Twig_SimpleFilter;
 use Twig_SimpleFunction;
 use Cms\Classes\Controller;
+use Cms\Classes\CmsException;
 use ApplicationException;
 
 /**
diff --git a/modules/cms/twig/FlashNode.php b/modules/cms/twig/FlashNode.php
index 0e272e199..1658b8bc6 100644
--- a/modules/cms/twig/FlashNode.php
+++ b/modules/cms/twig/FlashNode.php
@@ -2,6 +2,7 @@
 
 use Twig_Node;
 use Twig_Compiler;
+use Twig_Node_Expression;
 
 /**
  * Represents a flash node
diff --git a/modules/cms/twig/FlashTokenParser.php b/modules/cms/twig/FlashTokenParser.php
index a7acb53cb..aca671b77 100644
--- a/modules/cms/twig/FlashTokenParser.php
+++ b/modules/cms/twig/FlashTokenParser.php
@@ -2,6 +2,7 @@
 
 use Twig_Node;
 use Twig_Token;
+use Twig_Node_Print;
 use Twig_TokenParser;
 
 /**
diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php
index 67e262f2f..201968324 100644
--- a/modules/cms/widgets/AssetList.php
+++ b/modules/cms/widgets/AssetList.php
@@ -12,9 +12,11 @@ use Validator;
 use Cms\Classes\Theme;
 use Cms\Classes\Asset;
 use Backend\Classes\WidgetBase;
+use System\Classes\PluginManager;
 use ApplicationException;
 use ValidationException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
 use October\Rain\Filesystem\Definitions as FileDefinitions;
 use RecursiveIteratorIterator;
 use RecursiveDirectoryIterator;
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 82a934d62..a29e8f946 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -5,6 +5,7 @@ use Lang;
 use View;
 use Event;
 use Config;
+use Backend;
 use Request;
 use Validator;
 use BackendMenu;
@@ -21,6 +22,7 @@ use System\Twig\Loader as TwigLoader;
 use System\Twig\Extension as TwigExtension;
 use System\Models\EventLog;
 use System\Models\MailSetting;
+use System\Models\MailTemplate;
 use System\Classes\CombineAssets;
 use Backend\Classes\WidgetManager;
 use October\Rain\Support\ModuleServiceProvider;
diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index 34dceea32..0d8427e13 100644
--- a/modules/system/classes/CombineAssets.php
+++ b/modules/system/classes/CombineAssets.php
@@ -11,6 +11,7 @@ use Config;
 use Request;
 use Response;
 use Assetic\Asset\FileAsset;
+use Assetic\Asset\GlobAsset;
 use Assetic\Asset\AssetCache;
 use Assetic\Asset\AssetCollection;
 use Assetic\Factory\AssetFactory;
diff --git a/modules/system/classes/MailManager.php b/modules/system/classes/MailManager.php
index 945394157..3dd1be6c3 100644
--- a/modules/system/classes/MailManager.php
+++ b/modules/system/classes/MailManager.php
@@ -1,10 +1,13 @@
 <?php namespace System\Classes;
 
+use Twig;
 use Markdown;
 use System\Models\MailPartial;
 use System\Models\MailTemplate;
 use System\Models\MailBrandSetting;
 use System\Helpers\View as ViewHelper;
+use System\Classes\PluginManager;
+use System\Classes\MarkupManager;
 use System\Twig\MailPartialTokenParser;
 use TijsVerkoyen\CssToInlineStyles\CssToInlineStyles;
 
diff --git a/modules/system/classes/MarkupManager.php b/modules/system/classes/MarkupManager.php
index 7708021a2..523848b36 100644
--- a/modules/system/classes/MarkupManager.php
+++ b/modules/system/classes/MarkupManager.php
@@ -5,6 +5,7 @@ use Twig_TokenParser;
 use Twig_SimpleFilter;
 use Twig_SimpleFunction;
 use ApplicationException;
+use System\Classes\PluginManager;
 
 /**
  * This class manages Twig functions, token parsers and filters.
diff --git a/modules/system/classes/PluginBase.php b/modules/system/classes/PluginBase.php
index 54fbf20a6..737035d74 100644
--- a/modules/system/classes/PluginBase.php
+++ b/modules/system/classes/PluginBase.php
@@ -4,6 +4,7 @@ use Illuminate\Support\ServiceProvider as ServiceProviderBase;
 use ReflectionClass;
 use SystemException;
 use Yaml;
+use Backend;
 
 /**
  * Plugin base class
diff --git a/modules/system/classes/SettingsManager.php b/modules/system/classes/SettingsManager.php
index d2c389061..9b4b7f781 100644
--- a/modules/system/classes/SettingsManager.php
+++ b/modules/system/classes/SettingsManager.php
@@ -1,7 +1,9 @@
 <?php namespace System\Classes;
 
 use Event;
+use Backend;
 use BackendAuth;
+use System\Classes\PluginManager;
 use SystemException;
 
 /**
diff --git a/modules/system/classes/SystemController.php b/modules/system/classes/SystemController.php
index edfe60981..8fa3e4a06 100644
--- a/modules/system/classes/SystemController.php
+++ b/modules/system/classes/SystemController.php
@@ -2,6 +2,7 @@
 
 use Lang;
 use ApplicationException;
+use System\Classes\CombineAssets;
 use Illuminate\Routing\Controller as ControllerBase;
 use Exception;
 
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index 916e3f10b..b16734349 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -5,6 +5,7 @@ use App;
 use Url;
 use File;
 use Lang;
+use Http;
 use Cache;
 use Schema;
 use Config;
diff --git a/modules/system/console/OctoberDown.php b/modules/system/console/OctoberDown.php
index 5f39fdba9..ebff07a64 100644
--- a/modules/system/console/OctoberDown.php
+++ b/modules/system/console/OctoberDown.php
@@ -3,6 +3,7 @@
 use Illuminate\Console\Command;
 use System\Classes\UpdateManager;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
 
 /**
  * Console command to tear down the database.
diff --git a/modules/system/console/OctoberFresh.php b/modules/system/console/OctoberFresh.php
index e87e5422d..b32c32854 100644
--- a/modules/system/console/OctoberFresh.php
+++ b/modules/system/console/OctoberFresh.php
@@ -2,6 +2,8 @@
 
 use File;
 use Artisan;
+use Cms\Classes\Theme;
+use Cms\Classes\ThemeManager;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 
diff --git a/modules/system/console/OctoberInstall.php b/modules/system/console/OctoberInstall.php
index 78b206b94..a953cb9a0 100644
--- a/modules/system/console/OctoberInstall.php
+++ b/modules/system/console/OctoberInstall.php
@@ -8,6 +8,8 @@ use PDO;
 use File;
 use Config;
 use Artisan;
+use Cms\Classes\Theme;
+use Cms\Classes\ThemeManager;
 use Backend\Database\Seeds\SeedSetupAdmin;
 use System\Classes\UpdateManager;
 use October\Rain\Config\ConfigWriter;
diff --git a/modules/system/console/OctoberUp.php b/modules/system/console/OctoberUp.php
index a599732b6..b4fd908a1 100644
--- a/modules/system/console/OctoberUp.php
+++ b/modules/system/console/OctoberUp.php
@@ -2,6 +2,8 @@
 
 use Illuminate\Console\Command;
 use System\Classes\UpdateManager;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
 
 /**
  * Console command to migrate the database.
diff --git a/modules/system/console/OctoberUpdate.php b/modules/system/console/OctoberUpdate.php
index f2404f862..f44541f94 100644
--- a/modules/system/console/OctoberUpdate.php
+++ b/modules/system/console/OctoberUpdate.php
@@ -5,6 +5,7 @@ use Config;
 use Illuminate\Console\Command;
 use System\Classes\UpdateManager;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
 
 /**
  * Console command to perform a system update.
diff --git a/modules/system/console/PluginInstall.php b/modules/system/console/PluginInstall.php
index 4b7420a79..1586108b7 100644
--- a/modules/system/console/PluginInstall.php
+++ b/modules/system/console/PluginInstall.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Console\Command;
 use System\Classes\UpdateManager;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 use System\Classes\PluginManager;
 
diff --git a/modules/system/console/PluginRefresh.php b/modules/system/console/PluginRefresh.php
index b79be41ca..11749721c 100644
--- a/modules/system/console/PluginRefresh.php
+++ b/modules/system/console/PluginRefresh.php
@@ -3,6 +3,7 @@
 use Illuminate\Console\Command;
 use System\Classes\UpdateManager;
 use System\Classes\PluginManager;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 
 /**
diff --git a/modules/system/controllers/EventLogs.php b/modules/system/controllers/EventLogs.php
index 1c4814dfb..b303b978c 100644
--- a/modules/system/controllers/EventLogs.php
+++ b/modules/system/controllers/EventLogs.php
@@ -5,12 +5,14 @@ use Str;
 use Lang;
 use File;
 use Flash;
+use Backend;
 use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
 use ApplicationException;
 use System\Classes\SettingsManager;
 use System\Models\EventLog;
+use Exception;
 
 /**
  * Event Logs controller
diff --git a/modules/system/controllers/MailBrandSettings.php b/modules/system/controllers/MailBrandSettings.php
index a95c100fb..f316c5079 100644
--- a/modules/system/controllers/MailBrandSettings.php
+++ b/modules/system/controllers/MailBrandSettings.php
@@ -4,6 +4,7 @@ use Lang;
 use File;
 use Flash;
 use Config;
+use Backend;
 use Redirect;
 use BackendMenu;
 use ApplicationException;
@@ -13,6 +14,7 @@ use System\Classes\MailManager;
 use Backend\Classes\Controller;
 use System\Models\MailLayout;
 use System\Models\MailTemplate;
+use Exception;
 
 /**
  * Mail brand customization controller
diff --git a/modules/system/controllers/MailLayouts.php b/modules/system/controllers/MailLayouts.php
index dbfa6956b..126797cd4 100644
--- a/modules/system/controllers/MailLayouts.php
+++ b/modules/system/controllers/MailLayouts.php
@@ -4,11 +4,13 @@ use Str;
 use Lang;
 use File;
 use Flash;
+use Backend;
 use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
 use ApplicationException;
 use System\Classes\SettingsManager;
+use Exception;
 
 /**
  * Mail layouts controller
diff --git a/modules/system/controllers/MailPartials.php b/modules/system/controllers/MailPartials.php
index acfb6a40d..93536a2ed 100644
--- a/modules/system/controllers/MailPartials.php
+++ b/modules/system/controllers/MailPartials.php
@@ -4,11 +4,13 @@ use Str;
 use Lang;
 use File;
 use Flash;
+use Backend;
 use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
 use ApplicationException;
 use System\Classes\SettingsManager;
+use Exception;
 
 /**
  * Mail partials controller
diff --git a/modules/system/controllers/MailTemplates.php b/modules/system/controllers/MailTemplates.php
index 77389c65c..dc9c90e46 100644
--- a/modules/system/controllers/MailTemplates.php
+++ b/modules/system/controllers/MailTemplates.php
@@ -5,6 +5,7 @@ use Lang;
 use File;
 use Mail;
 use Flash;
+use Backend;
 use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
diff --git a/modules/system/controllers/RequestLogs.php b/modules/system/controllers/RequestLogs.php
index d59150338..e9a52eaad 100644
--- a/modules/system/controllers/RequestLogs.php
+++ b/modules/system/controllers/RequestLogs.php
@@ -4,12 +4,14 @@ use Str;
 use Lang;
 use File;
 use Flash;
+use Backend;
 use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
 use ApplicationException;
 use System\Classes\SettingsManager;
 use System\Models\RequestLog;
+use Exception;
 
 /**
  * Request Logs controller
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index 522ff0f38..33cb8fc4c 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -2,6 +2,7 @@
 
 use Lang;
 use Flash;
+use Backend;
 use Redirect;
 use BackendMenu;
 use System\Classes\SettingsManager;
diff --git a/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php b/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php
index 7102c02c8..a89063f78 100644
--- a/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php
+++ b/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php
@@ -1,6 +1,7 @@
 <?php
 
 use System\Models\MailLayout;
+use October\Rain\Database\Schema\Blueprint;
 use October\Rain\Database\Updates\Migration;
 
 class DbSystemMailLayoutRename extends Migration
diff --git a/modules/system/models/MailPartial.php b/modules/system/models/MailPartial.php
index a69061c36..00b8b23df 100644
--- a/modules/system/models/MailPartial.php
+++ b/modules/system/models/MailPartial.php
@@ -1,5 +1,6 @@
 <?php namespace System\Models;
 
+use Twig;
 use View;
 use Model;
 use Markdown;
diff --git a/modules/system/models/Parameter.php b/modules/system/models/Parameter.php
index 65eb50f70..3ebecbf09 100644
--- a/modules/system/models/Parameter.php
+++ b/modules/system/models/Parameter.php
@@ -2,6 +2,7 @@
 
 use Cache;
 use October\Rain\Database\Model;
+use Exception;
 
 /**
  * Parameters model
diff --git a/modules/system/traits/ConfigMaker.php b/modules/system/traits/ConfigMaker.php
index 0b068227f..ea76c969d 100644
--- a/modules/system/traits/ConfigMaker.php
+++ b/modules/system/traits/ConfigMaker.php
@@ -5,6 +5,7 @@ use File;
 use Lang;
 use Event;
 use SystemException;
+use Backend\Classes\Controller;
 use stdClass;
 use Config;
 
diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php
index 0097ee4ee..0c6e037fe 100644
--- a/modules/system/twig/Extension.php
+++ b/modules/system/twig/Extension.php
@@ -2,7 +2,9 @@
 
 use Url;
 use Twig_Extension;
+use Twig_TokenParser;
 use Twig_SimpleFilter;
+use Twig_SimpleFunction;
 use ApplicationException;
 use System\Classes\MediaLibrary;
 use System\Classes\MarkupManager;