diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index 348f0480d..8de1e1503 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -61,7 +61,6 @@ use pocketmine\nbt\tag\Short;
 use pocketmine\nbt\tag\String;
 use pocketmine\network\protocol\DataPacket;
 use pocketmine\network\query\QueryHandler;
-use pocketmine\network\query\QueryPacket;
 use pocketmine\network\RakLibInterface;
 use pocketmine\network\rcon\RCON;
 use pocketmine\network\SourceInterface;
diff --git a/src/pocketmine/level/LevelImport.php b/src/pocketmine/level/LevelImport.php
index 9dbc13ea5..33f028efa 100644
--- a/src/pocketmine/level/LevelImport.php
+++ b/src/pocketmine/level/LevelImport.php
@@ -21,7 +21,6 @@
 
 namespace pocketmine\level;
 
-use pocketmine\level\format\pmf\LevelFormat;
 use pocketmine\level\format\PocketChunkParser;
 use pocketmine\nbt\NBT;
 use pocketmine\utils\Config;
diff --git a/src/pocketmine/level/generator/GenerationThread.php b/src/pocketmine/level/generator/GenerationThread.php
index 90f5c72a4..d30f34b13 100644
--- a/src/pocketmine/level/generator/GenerationThread.php
+++ b/src/pocketmine/level/generator/GenerationThread.php
@@ -27,7 +27,7 @@ use pocketmine\Thread;
 class GenerationThread extends Thread{
 
 	protected $loadPaths;
-	/** @var \SplAutoloader */
+	/** @var \ClassLoader */
 	protected $loader;
 	/** @var \ThreadedLogger */
 	protected $logger;
diff --git a/src/pocketmine/level/generator/Normal.php b/src/pocketmine/level/generator/Normal.php
index 1ad9305ae..eead59b2f 100644
--- a/src/pocketmine/level/generator/Normal.php
+++ b/src/pocketmine/level/generator/Normal.php
@@ -29,7 +29,7 @@ use pocketmine\block\Gravel;
 use pocketmine\block\IronOre;
 use pocketmine\block\LapisOre;
 use pocketmine\block\RedstoneOre;
-use pocketmine\item\Block;
+use pocketmine\block\Block;
 use pocketmine\level\generator\noise\Simplex;
 use pocketmine\level\generator\object\OreType;
 use pocketmine\level\generator\populator\Ore;
diff --git a/src/pocketmine/level/generator/object/PineTree.php b/src/pocketmine/level/generator/object/PineTree.php
index 9586fef21..49a665c54 100644
--- a/src/pocketmine/level/generator/object/PineTree.php
+++ b/src/pocketmine/level/generator/object/PineTree.php
@@ -21,7 +21,7 @@
 
 namespace pocketmine\level\generator\object;
 
-use pocketmine\item\Block;
+use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
 use pocketmine\utils\Random;
 
diff --git a/src/pocketmine/level/generator/object/SmallTree.php b/src/pocketmine/level/generator/object/SmallTree.php
index a8d905e69..bf23da940 100644
--- a/src/pocketmine/level/generator/object/SmallTree.php
+++ b/src/pocketmine/level/generator/object/SmallTree.php
@@ -21,7 +21,7 @@
 
 namespace pocketmine\level\generator\object;
 
-use pocketmine\item\Block;
+use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
 use pocketmine\utils\Random;
 
diff --git a/src/pocketmine/level/generator/object/SpruceTree.php b/src/pocketmine/level/generator/object/SpruceTree.php
index 16e1402dc..950081762 100644
--- a/src/pocketmine/level/generator/object/SpruceTree.php
+++ b/src/pocketmine/level/generator/object/SpruceTree.php
@@ -21,7 +21,7 @@
 
 namespace pocketmine\level\generator\object;
 
-use pocketmine\item\Block;
+use pocketmine\block\Block;
 use pocketmine\level\ChunkManager;
 use pocketmine\utils\Random;