diff --git a/src/Plugins/TGAImporter/TGAImporter.cpp b/src/Plugins/TGAImporter/TGAImporter.cpp
index 40c7ccbc5..199536620 100644
--- a/src/Plugins/TGAImporter/TGAImporter.cpp
+++ b/src/Plugins/TGAImporter/TGAImporter.cpp
@@ -17,14 +17,14 @@
 
 #include "Utility/Endianness.h"
 #include "Math/Vector2.h"
-#include "Image.h"
+#include "Trade/Image.h"
 
 using namespace std;
 using namespace Corrade::Utility;
 
-PLUGIN_REGISTER(Magnum::Plugins::TGAImporter::TGAImporter, "cz.mosra.magnum.AbstractImporter/0.1")
+PLUGIN_REGISTER(Magnum::Trade::TGAImporter::TGAImporter, "cz.mosra.magnum.Trade.AbstractImporter/0.1")
 
-namespace Magnum { namespace Plugins { namespace TGAImporter {
+namespace Magnum { namespace Trade { namespace TGAImporter {
 
 static_assert(sizeof(TGAImporter::Header) == 18, "TGAImporter: header size is not 18 bytes");
 
diff --git a/src/Plugins/TGAImporter/TGAImporter.h b/src/Plugins/TGAImporter/TGAImporter.h
index 80db81947..1e93c53bd 100644
--- a/src/Plugins/TGAImporter/TGAImporter.h
+++ b/src/Plugins/TGAImporter/TGAImporter.h
@@ -1,5 +1,5 @@
-#ifndef Magnum_Plugins_TGAImporter_TGAImporter_h
-#define Magnum_Plugins_TGAImporter_TGAImporter_h
+#ifndef Magnum_Trade_TGAImporter_TGAImporter_h
+#define Magnum_Trade_TGAImporter_TGAImporter_h
 /*
     Copyright © 2010, 2011, 2012 Vladimír Vondruš <mosra@centrum.cz>
 
@@ -16,14 +16,12 @@
 */
 
 /** @file
- * @brief Class Magnum::TGAImporter
+ * @brief Class Magnum::Trade::TGAImporter::TGAImporter
  */
 
-#include "AbstractImporter.h"
+#include "Trade/AbstractImporter.h"
 
-#include "Magnum.h"
-
-namespace Magnum { namespace Plugins { namespace TGAImporter {
+namespace Magnum { namespace Trade { namespace TGAImporter {
 
 class TGAImporter: public AbstractImporter {
     public:
diff --git a/src/Plugins/TGAImporter/Test/TGAImporterTest.cpp b/src/Plugins/TGAImporter/Test/TGAImporterTest.cpp
index f1600d3e9..3db36c206 100644
--- a/src/Plugins/TGAImporter/Test/TGAImporterTest.cpp
+++ b/src/Plugins/TGAImporter/Test/TGAImporterTest.cpp
@@ -23,9 +23,9 @@
 using namespace std;
 using namespace Corrade::Utility;
 
-QTEST_APPLESS_MAIN(Magnum::Plugins::TGAImporter::Test::TGAImporterTest)
+QTEST_APPLESS_MAIN(Magnum::Trade::TGAImporter::Test::TGAImporterTest)
 
-namespace Magnum { namespace Plugins { namespace TGAImporter { namespace Test {
+namespace Magnum { namespace Trade { namespace TGAImporter { namespace Test {
 
 void TGAImporterTest::paletted() {
     const char data[] = { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
diff --git a/src/Plugins/TGAImporter/Test/TGAImporterTest.h b/src/Plugins/TGAImporter/Test/TGAImporterTest.h
index 7b2b18c83..5f4a25ec4 100644
--- a/src/Plugins/TGAImporter/Test/TGAImporterTest.h
+++ b/src/Plugins/TGAImporter/Test/TGAImporterTest.h
@@ -1,5 +1,5 @@
-#ifndef Magnum_Plugins_TGAImporter_Test_TGAImporterTest_h
-#define Magnum_Plugins_TGAImporter_Test_TGAImporterTest_h
+#ifndef Magnum_Trade_TGAImporter_Test_TGAImporterTest_h
+#define Magnum_Trade_TGAImporter_Test_TGAImporterTest_h
 /*
     Copyright © 2010, 2011, 2012 Vladimír Vondruš <mosra@centrum.cz>
 
@@ -17,7 +17,7 @@
 
 #include <QtCore/QObject>
 
-namespace Magnum { namespace Plugins { namespace TGAImporter { namespace Test {
+namespace Magnum { namespace Trade { namespace TGAImporter { namespace Test {
 
 class TGAImporterTest: public QObject {
     Q_OBJECT