diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index cf145ef6b7..203ccd1466 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1,8 +1,8 @@
 <?php
 
+use SMW\CompatibilityMode;
 use SMW\NamespaceManager;
 use SMW\NumberFormatter;
-use SMW\CompatibilityMode;
 use SMW\SPARQLStore\SparqlDBConnectionProvider;
 
 /**
diff --git a/includes/articlepages/ConceptPage.php b/includes/articlepages/ConceptPage.php
index 852d71dd1e..682c32eebe 100644
--- a/includes/articlepages/ConceptPage.php
+++ b/includes/articlepages/ConceptPage.php
@@ -3,10 +3,10 @@
 namespace SMW;
 
 use Html;
-use SMW\Query\Language\ConceptDescription;
 use SMW\MediaWiki\ByLanguageCollationMapper;
-use SMWPageLister;
+use SMW\Query\Language\ConceptDescription;
 use SMWDataItem as DataItem;
+use SMWPageLister;
 
 /**
  * Special handling for relation/attribute description pages.
diff --git a/includes/articlepages/SMW_OrderedListPage.php b/includes/articlepages/SMW_OrderedListPage.php
index 6b57f988d0..d83ece7f5c 100644
--- a/includes/articlepages/SMW_OrderedListPage.php
+++ b/includes/articlepages/SMW_OrderedListPage.php
@@ -1,9 +1,8 @@
 <?php
 
+use SMW\ApplicationFactory;
 use SMW\DIProperty;
-
 use SMW\PropertyRegistry;
-use SMW\ApplicationFactory;
 
 /**
  * Abstract subclass of MediaWiki's Article that handles the common tasks of
diff --git a/includes/articlepages/SMW_PropertyPage.php b/includes/articlepages/SMW_PropertyPage.php
index 9d4616e0ec..169b41306e 100644
--- a/includes/articlepages/SMW_PropertyPage.php
+++ b/includes/articlepages/SMW_PropertyPage.php
@@ -2,9 +2,9 @@
 
 use SMW\ApplicationFactory;
 use SMW\DataValueFactory;
+use SMW\Localizer;
 use SMW\RequestOptions;
 use SMW\StringCondition;
-use SMW\Localizer;
 
 /**
  * Implementation of MediaWiki's Article that shows additional information on
diff --git a/includes/datavalues/SMW_DV_Number.php b/includes/datavalues/SMW_DV_Number.php
index 23cc2feecb..5c405b3364 100644
--- a/includes/datavalues/SMW_DV_Number.php
+++ b/includes/datavalues/SMW_DV_Number.php
@@ -1,10 +1,9 @@
 <?php
 
-use SMW\Highlighter;
+use SMW\DataValues\ValueFormatters\DataValueFormatter;
 use SMW\IntlNumberFormatter;
 use SMW\Localizer;
 use SMW\Message;
-use SMW\DataValues\ValueFormatters\DataValueFormatter;
 
 /**
  * @ingroup SMWDataValues
diff --git a/includes/datavalues/SMW_DV_Quantity.php b/includes/datavalues/SMW_DV_Quantity.php
index 16610f3625..0618f6a663 100644
--- a/includes/datavalues/SMW_DV_Quantity.php
+++ b/includes/datavalues/SMW_DV_Quantity.php
@@ -1,9 +1,8 @@
 <?php
 
-use SMW\ApplicationFactory;
-use SMW\NumberFormatter;
-use SMW\Message;
 use SMW\DataValues\UnitConversionFetcher;
+use SMW\Message;
+use SMW\NumberFormatter;
 
 /**
  * @ingroup SMWDataValues
diff --git a/includes/datavalues/SMW_DV_String.php b/includes/datavalues/SMW_DV_String.php
index 55bc9f6664..9330d44ca1 100644
--- a/includes/datavalues/SMW_DV_String.php
+++ b/includes/datavalues/SMW_DV_String.php
@@ -1,9 +1,9 @@
 <?php
 
 use SMW\DataValues\ValueFormatters\DataValueFormatter;
-use SMWDIBlob as DIBlob;
 use SMWDataItem as DataItem;
 use SMWDataValue as DataValue;
+use SMWDIBlob as DIBlob;
 
 /**
  * This datavalue implements String-Datavalues suitable for defining
diff --git a/includes/datavalues/SMW_DataValue.php b/includes/datavalues/SMW_DataValue.php
index a9ab5d7665..e6d8fdb906 100644
--- a/includes/datavalues/SMW_DataValue.php
+++ b/includes/datavalues/SMW_DataValue.php
@@ -8,14 +8,14 @@
  * @ingroup SMW
  */
 use SMW\ApplicationFactory;
+use SMW\DataValues\InfoLinksProvider;
 use SMW\DataValues\ValueFormatterRegistry;
 use SMW\DataValues\ValueValidatorRegistry;
 use SMW\Deserializers\DVDescriptionDeserializerRegistry;
+use SMW\Localizer;
 use SMW\Message;
 use SMW\Options;
-use SMW\Localizer;
 use SMW\Query\QueryComparator;
-use SMW\DataValues\InfoLinksProvider;
 
 /**
  * Objects of this type represent all that is known about a certain user-provided
diff --git a/includes/query/SMW_QueryParser.php b/includes/query/SMW_QueryParser.php
index fa7c75d1e3..ac4f43186b 100644
--- a/includes/query/SMW_QueryParser.php
+++ b/includes/query/SMW_QueryParser.php
@@ -1,5 +1,7 @@
 <?php
 
+use SMW\DataTypeRegistry;
+use SMW\DIWikiPage;
 use SMW\Query\Language\ClassDescription;
 use SMW\Query\Language\ConceptDescription;
 use SMW\Query\Language\Description;
@@ -7,8 +9,6 @@
 use SMW\Query\Language\SomeProperty;
 use SMW\Query\Language\ThingDescription;
 use SMW\Query\Parser\DescriptionProcessor;
-use SMW\DataTypeRegistry;
-use SMW\DIWikiPage;
 
 /**
  * Objects of this class are in charge of parsing a query string in order
diff --git a/includes/specials/SMW_SpecialBrowse.php b/includes/specials/SMW_SpecialBrowse.php
index 230ebfa23c..9890b3d9c2 100644
--- a/includes/specials/SMW_SpecialBrowse.php
+++ b/includes/specials/SMW_SpecialBrowse.php
@@ -1,11 +1,11 @@
 <?php
 
+use SMW\ApplicationFactory;
+use SMW\DataValueFactory;
 use SMW\DIProperty;
-use SMW\UrlEncoder;
 use SMW\Localizer;
 use SMW\SemanticData;
-use SMW\ApplicationFactory;
-use SMW\DataValueFactory;
+use SMW\UrlEncoder;
 
 /**
  * @ingroup SMWSpecialPage
diff --git a/includes/specials/SMW_SpecialSMWAdmin.php b/includes/specials/SMW_SpecialSMWAdmin.php
index fe8fa447ba..9aed7c692f 100644
--- a/includes/specials/SMW_SpecialSMWAdmin.php
+++ b/includes/specials/SMW_SpecialSMWAdmin.php
@@ -2,9 +2,9 @@
 
 use SMW\ApplicationFactory;
 use SMW\MediaWiki\Jobs\RefreshJob;
-use SMW\SQLStore\PropertyTableIdReferenceDisposer;
 use SMW\MediaWiki\ManualEntryLogger;
 use SMW\Settings;
+use SMW\SQLStore\PropertyTableIdReferenceDisposer;
 use SMW\Store;
 use SMW\StoreFactory;
 
diff --git a/includes/storage/SMW_QueryResult.php b/includes/storage/SMW_QueryResult.php
index c37d43fd4a..e8c66492be 100644
--- a/includes/storage/SMW_QueryResult.php
+++ b/includes/storage/SMW_QueryResult.php
@@ -3,8 +3,8 @@
 use SMW\HashBuilder;
 use SMW\Query\PrintRequest;
 use SMW\Query\QueryLinker;
-use SMW\SerializerFactory;
 use SMW\Query\TemporaryEntityListAccumulator;
+use SMW\SerializerFactory;
 
 /**
  * Objects of this class encapsulate the result of a query in SMW. They
diff --git a/includes/storage/SMW_ResultArray.php b/includes/storage/SMW_ResultArray.php
index 2287751898..4b967c19d5 100644
--- a/includes/storage/SMW_ResultArray.php
+++ b/includes/storage/SMW_ResultArray.php
@@ -1,13 +1,11 @@
 <?php
 
+use SMW\DataValueFactory;
 use SMW\InTextAnnotationParser;
 use SMW\Query\PrintRequest;
-use SMW\Localizer;
-use SMW\DataValueFactory;
-use SMWDIBlob as DIBlob;
-use SMWQuery as Query;
-use SMWDataItem as DataItem;
 use SMW\Query\TemporaryEntityListAccumulator;
+use SMWDataItem as DataItem;
+use SMWDIBlob as DIBlob;
 
 /**
  * Container for the contents of a single result field of a query result,
diff --git a/includes/storage/SQLStore/SMW_Sql3SmwIds.php b/includes/storage/SQLStore/SMW_Sql3SmwIds.php
index 63cab28c1e..4561d3e9cf 100644
--- a/includes/storage/SQLStore/SMW_Sql3SmwIds.php
+++ b/includes/storage/SQLStore/SMW_Sql3SmwIds.php
@@ -1,9 +1,9 @@
 <?php
 
-use SMW\DIWikiPage;
+use SMW\ApplicationFactory;
 use SMW\DIProperty;
+use SMW\DIWikiPage;
 use SMW\HashBuilder;
-use SMW\ApplicationFactory;
 use SMW\SQLStore\IdToDataItemMatchFinder;
 use SMW\SQLStore\PropertyStatisticsTable;
 use SMW\SQLStore\RedirectInfoStore;