diff --git a/src/Magnum/TextureTools/Atlas.cpp b/src/Magnum/TextureTools/Atlas.cpp
index 2554a3ecc..ab1ef3831 100644
--- a/src/Magnum/TextureTools/Atlas.cpp
+++ b/src/Magnum/TextureTools/Atlas.cpp
@@ -25,6 +25,8 @@
 
 #include "Atlas.h"
 
+#include <vector>
+
 #include "Magnum/Math/Functions.h"
 #include "Magnum/Math/Range.h"
 
diff --git a/src/Magnum/TextureTools/Atlas.h b/src/Magnum/TextureTools/Atlas.h
index 43fd1b4f7..7f9f8d140 100644
--- a/src/Magnum/TextureTools/Atlas.h
+++ b/src/Magnum/TextureTools/Atlas.h
@@ -29,7 +29,7 @@
  * @brief Function @ref Magnum::TextureTools::atlas()
  */
 
-#include <vector>
+#include <Corrade/Utility/StlForwardVector.h>
 
 #include "Magnum/Magnum.h"
 #include "Magnum/Math/Vector2.h"
diff --git a/src/Magnum/TextureTools/Test/AtlasTest.cpp b/src/Magnum/TextureTools/Test/AtlasTest.cpp
index c9cc36695..f23179254 100644
--- a/src/Magnum/TextureTools/Test/AtlasTest.cpp
+++ b/src/Magnum/TextureTools/Test/AtlasTest.cpp
@@ -24,6 +24,7 @@
 */
 
 #include <sstream>
+#include <vector>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/DebugStl.h>
 
@@ -35,20 +36,20 @@ namespace Magnum { namespace TextureTools { namespace Test { namespace {
 struct AtlasTest: TestSuite::Tester {
     explicit AtlasTest();
 
-    void create();
-    void createPadding();
-    void createEmpty();
-    void createTooSmall();
+    void basic();
+    void padding();
+    void empty();
+    void tooSmall();
 };
 
 AtlasTest::AtlasTest() {
-    addTests({&AtlasTest::create,
-              &AtlasTest::createPadding,
-              &AtlasTest::createEmpty,
-              &AtlasTest::createTooSmall});
+    addTests({&AtlasTest::basic,
+              &AtlasTest::padding,
+              &AtlasTest::empty,
+              &AtlasTest::tooSmall});
 }
 
-void AtlasTest::create() {
+void AtlasTest::basic() {
     std::vector<Range2Di> atlas = TextureTools::atlas({64, 64}, {
         {12, 18},
         {32, 15},
@@ -62,7 +63,7 @@ void AtlasTest::create() {
         Range2Di::fromSize({0, 25}, {23, 25})}));
 }
 
-void AtlasTest::createPadding() {
+void AtlasTest::padding() {
     std::vector<Range2Di> atlas = TextureTools::atlas({64, 64}, {
         {8, 16},
         {28, 13},
@@ -76,12 +77,12 @@ void AtlasTest::createPadding() {
         Range2Di::fromSize({2, 26}, {19, 23})}));
 }
 
-void AtlasTest::createEmpty() {
+void AtlasTest::empty() {
     std::vector<Range2Di> atlas = TextureTools::atlas({}, {});
     CORRADE_VERIFY(atlas.empty());
 }
 
-void AtlasTest::createTooSmall() {
+void AtlasTest::tooSmall() {
     std::ostringstream o;
     Error redirectError{&o};