Add additional namespaces and ifdef guard prefixes

... to avoid a possible future conflicts with a same
class names (e.g. at attempt to add a new generators).

Change-Id: Ib8c4218a7f76e2a001dd1354b7676a0843a109ea
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

37 files changed, 312 insertions, 177 deletions

diff --git a/src/plugins/generator/iarew/archs/arm/armarchiversettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armarchiversettingsgroup_v8.cpp
index 3bff5c43a..50fceb40d 100644
--- a/src/plugins/generator/iarew/archs/arm/armarchiversettingsgroup_v8.cpp
+++ b/src/plugins/generator/iarew/archs/arm/armarchiversettingsgroup_v8.cpp
@@ -34,12 +34,14 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace arm {
 namespace v8 {
 
 constexpr int kArchiverArchiveVersion = 0;
 constexpr int kArchiverDataVersion = 0;
 
-namespace ArmArchiver {
+namespace {
 
 // Output page options.
 
@@ -55,7 +57,7 @@ struct OutputPageOptions final
     QString outputFile;
 };
 
-} // namespace ArmArchiver
+} // namespace
 
 // ArmArchiverSettingsGroup
 
@@ -79,7 +81,7 @@ void ArmArchiverSettingsGroup::buildOutputPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    const ArmArchiver::OutputPageOptions opts(baseDirectory, qbsProduct);
+    const OutputPageOptions opts(baseDirectory, qbsProduct);
     // Add 'IarchiveOverride' item (Override default).
     addOptionsGroup(QByteArrayLiteral("IarchiveOverride"),
                     {}, {1});
@@ -89,4 +91,6 @@ void ArmArchiverSettingsGroup::buildOutputPage(
 }
 
 } // namespace v8
+} // namespace arm
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/arm/armarchiversettingsgroup_v8.h b/src/plugins/generator/iarew/archs/arm/armarchiversettingsgroup_v8.h
index 36ad3cc68..c99c2eeba 100644
--- a/src/plugins/generator/iarew/archs/arm/armarchiversettingsgroup_v8.h
+++ b/src/plugins/generator/iarew/archs/arm/armarchiversettingsgroup_v8.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_ARMAARCHIVERSETTINGSGROUP_V8_H
-#define QBS_ARMAARCHIVERSETTINGSGROUP_V8_H
+#ifndef QBS_IAREWARMAARCHIVERSETTINGSGROUP_V8_H
+#define QBS_IAREWARMAARCHIVERSETTINGSGROUP_V8_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace arm {
 namespace v8 {
 
 class ArmArchiverSettingsGroup final : public IarewSettingsPropertyGroup
@@ -49,6 +51,8 @@ private:
 };
 
 } // namespace v8
+} // namespace arm
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_ARMAARCHIVERSETTINGSGROUP_V8_H
+#endif // QBS_IAREWARMAARCHIVERSETTINGSGROUP_V8_H
diff --git a/src/plugins/generator/iarew/archs/arm/armassemblersettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armassemblersettingsgroup_v8.cpp
index 7c7f8e2bf..f4125b188 100644
--- a/src/plugins/generator/iarew/archs/arm/armassemblersettingsgroup_v8.cpp
+++ b/src/plugins/generator/iarew/archs/arm/armassemblersettingsgroup_v8.cpp
@@ -34,12 +34,14 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace arm {
 namespace v8 {
 
 constexpr int kAssemblerArchiveVersion = 2;
 constexpr int kAssemblerDataVersion = 10;
 
-namespace ArmAssembler {
+namespace {
 
 // Language page options.
 
@@ -143,7 +145,7 @@ struct DiagnosticsPageOptions final
     int enableAllWarnings = 0;
 };
 
-} // namespace ArmAssembler
+} // namespace
 
 // ArmAssemblerSettingsGroup
 
@@ -170,7 +172,7 @@ ArmAssemblerSettingsGroup::ArmAssemblerSettingsGroup(
 void ArmAssemblerSettingsGroup::buildLanguagePage(
         const ProductData &qbsProduct)
 {
-    const ArmAssembler::LanguagePageOptions opts(qbsProduct);
+    const LanguagePageOptions opts(qbsProduct);
     // Add 'ACaseSensitivity' item (User symbols are case sensitive).
     addOptionsGroup(QByteArrayLiteral("ACaseSensitivity"),
                     {}, {opts.enableSymbolsCaseSensitive});
@@ -188,7 +190,7 @@ void ArmAssemblerSettingsGroup::buildLanguagePage(
 void ArmAssemblerSettingsGroup::buildOutputPage(
         const ProductData &qbsProduct)
 {
-    const ArmAssembler::OutputPageOptions opts(qbsProduct);
+    const OutputPageOptions opts(qbsProduct);
     // Add 'ADebug' item (Generate debug information).
     addOptionsGroup(QByteArrayLiteral("ADebug"),
                     {}, {opts.debugInfo});
@@ -198,8 +200,7 @@ void ArmAssemblerSettingsGroup::buildPreprocessorPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    const ArmAssembler::PreprocessorPageOptions opts(baseDirectory,
-                                                     qbsProduct);
+    const PreprocessorPageOptions opts(baseDirectory, qbsProduct);
     // Add 'ADefines' item (Defined symbols).
     addOptionsGroup(QByteArrayLiteral("ADefines"),
                     {}, opts.defineSymbols);
@@ -211,7 +212,7 @@ void ArmAssemblerSettingsGroup::buildPreprocessorPage(
 void ArmAssemblerSettingsGroup::buildDiagnosticsPage(
         const ProductData &qbsProduct)
 {
-    const ArmAssembler::DiagnosticsPageOptions opts(qbsProduct);
+    const DiagnosticsPageOptions opts(qbsProduct);
     // Add 'AWarnEnable' item (Enable/disable warnings).
     addOptionsGroup(QByteArrayLiteral("AWarnEnable"),
                     {}, {opts.enableWarnings});
@@ -221,4 +222,6 @@ void ArmAssemblerSettingsGroup::buildDiagnosticsPage(
 }
 
 } // namespace v8
+} // namespace arm
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/arm/armassemblersettingsgroup_v8.h b/src/plugins/generator/iarew/archs/arm/armassemblersettingsgroup_v8.h
index 5db5ca454..b37f06eb1 100644
--- a/src/plugins/generator/iarew/archs/arm/armassemblersettingsgroup_v8.h
+++ b/src/plugins/generator/iarew/archs/arm/armassemblersettingsgroup_v8.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_ARMASSEMBLERSETTINGSGROUP_V8_H
-#define QBS_ARMASSEMBLERSETTINGSGROUP_V8_H
+#ifndef QBS_IAREWARMASSEMBLERSETTINGSGROUP_V8_H
+#define QBS_IAREWARMASSEMBLERSETTINGSGROUP_V8_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace arm {
 namespace v8 {
 
 class ArmAssemblerSettingsGroup final : public IarewSettingsPropertyGroup
@@ -52,6 +54,8 @@ private:
 };
 
 } // namespace v8
+} // namespace arm
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_ARMASSEMBLERSETTINGSGROUP_V8_H
+#endif // QBS_IAREWARMASSEMBLERSETTINGSGROUP_V8_H
diff --git a/src/plugins/generator/iarew/archs/arm/armbuildconfigurationgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armbuildconfigurationgroup_v8.cpp
index ea55eaacb..306b415de 100644
--- a/src/plugins/generator/iarew/archs/arm/armbuildconfigurationgroup_v8.cpp
+++ b/src/plugins/generator/iarew/archs/arm/armbuildconfigurationgroup_v8.cpp
@@ -39,6 +39,8 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace arm {
 namespace v8 {
 
 ArmBuildConfigurationGroup::ArmBuildConfigurationGroup(
@@ -90,4 +92,6 @@ std::unique_ptr<IarewPropertyGroup> ArmBuildConfigurationGroupFactory::create(
 }
 
 } // namespace v8
+} // namespace arm
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/arm/armbuildconfigurationgroup_v8.h b/src/plugins/generator/iarew/archs/arm/armbuildconfigurationgroup_v8.h
index 3d83a6370..1bc3ab549 100644
--- a/src/plugins/generator/iarew/archs/arm/armbuildconfigurationgroup_v8.h
+++ b/src/plugins/generator/iarew/archs/arm/armbuildconfigurationgroup_v8.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_ARMBUILDCONFIGURATIONGROUP_V8_H
-#define QBS_ARMBUILDCONFIGURATIONGROUP_V8_H
+#ifndef QBS_IAREWARMBUILDCONFIGURATIONGROUP_V8_H
+#define QBS_IAREWARMBUILDCONFIGURATIONGROUP_V8_H
 
 #include "../../iarewpropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace arm {
 namespace v8 {
 
 class ArmBuildConfigurationGroup final : public IarewPropertyGroup
@@ -59,6 +61,8 @@ public:
 };
 
 } // namespace v8
+} // namespace arm
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_ARMBUILDCONFIGURATIONGROUP_V8_H
+#endif // QBS_IAREWARMBUILDCONFIGURATIONGROUP_V8_H
diff --git a/src/plugins/generator/iarew/archs/arm/armcompilersettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armcompilersettingsgroup_v8.cpp
index 111f8003b..9d15db75e 100644
--- a/src/plugins/generator/iarew/archs/arm/armcompilersettingsgroup_v8.cpp
+++ b/src/plugins/generator/iarew/archs/arm/armcompilersettingsgroup_v8.cpp
@@ -33,12 +33,14 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace arm {
 namespace v8 {
 
 constexpr int kCompilerArchiveVersion = 2;
 constexpr int kCompilerDataVersion = 34;
 
-namespace ArmCompiler {
+namespace {
 
 // Output page options.
 
@@ -295,7 +297,7 @@ struct CodePageOptions final
     int disableCodeMemoryDataReads = 0;
 };
 
-} // namespace ArmCompiler
+} // namespace
 
 // ArmCompilerSettingsGroup
 
@@ -326,7 +328,7 @@ ArmCompilerSettingsGroup::ArmCompilerSettingsGroup(
 void ArmCompilerSettingsGroup::buildOutputPage(
             const ProductData &qbsProduct)
 {
-    const ArmCompiler::OutputPageOptions opts(qbsProduct);
+    const OutputPageOptions opts(qbsProduct);
     // Add 'CCDebugInfo' item (Generate debug info).
     addOptionsGroup(QByteArrayLiteral("CCDebugInfo"),
                     {}, {opts.debugInfo});
@@ -335,8 +337,9 @@ void ArmCompilerSettingsGroup::buildOutputPage(
 void ArmCompilerSettingsGroup::buildLanguageOnePage(
         const ProductData &qbsProduct)
 {
-    const ArmCompiler::LanguageOnePageOptions opts(qbsProduct);
-    // Add 'IccLang' item with 'auto-extension based' value (Language: C/C++/Auto).
+    const LanguageOnePageOptions opts(qbsProduct);
+    // Add 'IccLang' item with 'auto-extension based'
+    // value (Language: C/C++/Auto).
     addOptionsGroup(QByteArrayLiteral("IccLang"),
                     {}, {opts.languageExtension});
     // Add 'IccCDialect' item (C dialect: c89/99/11).
@@ -368,11 +371,12 @@ void ArmCompilerSettingsGroup::buildLanguageOnePage(
 void ArmCompilerSettingsGroup::buildLanguageTwoPage(
         const ProductData &qbsProduct)
 {
-    const ArmCompiler::LanguageTwoPageOptions opts(qbsProduct);
+    const LanguageTwoPageOptions opts(qbsProduct);
     // Add 'CCSignedPlainChar' item (Plain char is: signed/unsigned).
     addOptionsGroup(QByteArrayLiteral("CCSignedPlainChar"),
                     {}, {opts.plainCharacter});
-    // Add 'IccFloatSemantics' item (Floating-point semantic: strict/relaxed).
+    // Add 'IccFloatSemantics' item
+    // (Floating-point semantic: strict/relaxed).
     addOptionsGroup(QByteArrayLiteral("IccFloatSemantics"),
                     {}, {opts.floatingPointSemantic});
 }
@@ -380,8 +384,9 @@ void ArmCompilerSettingsGroup::buildLanguageTwoPage(
 void ArmCompilerSettingsGroup::buildOptimizationsPage(
         const ProductData &qbsProduct)
 {
-    const ArmCompiler::OptimizationsPageOptions opts(qbsProduct);
-    // Add 'CCOptStrategy', 'CCOptLevel' and 'CCOptLevelSlave' items (Level).
+    const OptimizationsPageOptions opts(qbsProduct);
+    // Add 'CCOptStrategy', 'CCOptLevel'
+    // and 'CCOptLevelSlave' items (Level).
     addOptionsGroup(QByteArrayLiteral("CCOptStrategy"),
                     {}, {opts.optimizationStrategy});
     addOptionsGroup(QByteArrayLiteral("CCOptLevel"),
@@ -409,8 +414,7 @@ void ArmCompilerSettingsGroup::buildPreprocessorPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    const ArmCompiler::PreprocessorPageOptions opts(baseDirectory,
-                                                    qbsProduct);
+    const PreprocessorPageOptions opts(baseDirectory, qbsProduct);
     // Add 'CCDefines' item (Defined symbols).
     addOptionsGroup(QByteArrayLiteral("CCDefines"),
                     {}, opts.defineSymbols);
@@ -422,7 +426,7 @@ void ArmCompilerSettingsGroup::buildPreprocessorPage(
 void ArmCompilerSettingsGroup::buildDiagnosticsPage(
         const ProductData &qbsProduct)
 {
-    const ArmCompiler::DiagnosticsPageOptions opts(qbsProduct);
+    const DiagnosticsPageOptions opts(qbsProduct);
     // Add 'CCDiagWarnAreErr' item (Treat all warnings as errors).
     addOptionsGroup(QByteArrayLiteral("CCDiagWarnAreErr"),
                     {}, {opts.treatWarningsAsErrors});
@@ -431,7 +435,7 @@ void ArmCompilerSettingsGroup::buildDiagnosticsPage(
 void ArmCompilerSettingsGroup::buildCodePage(
         const ProductData &qbsProduct)
 {
-    const ArmCompiler::CodePageOptions opts(qbsProduct);
+    const CodePageOptions opts(qbsProduct);
     // Add 'IProcessorMode2' item (Processor mode: arm/thumb).
     addOptionsGroup(QByteArrayLiteral("IProcessorMode2"),
                     {}, {opts.cpuMode});
@@ -450,4 +454,6 @@ void ArmCompilerSettingsGroup::buildCodePage(
 }
 
 } // namespace v8
+} // namespace arm
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/arm/armcompilersettingsgroup_v8.h b/src/plugins/generator/iarew/archs/arm/armcompilersettingsgroup_v8.h
index 6f2acbeaa..6137bc976 100644
--- a/src/plugins/generator/iarew/archs/arm/armcompilersettingsgroup_v8.h
+++ b/src/plugins/generator/iarew/archs/arm/armcompilersettingsgroup_v8.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_ARMCOMPILERSETTINGSGROUP_V8_H
-#define QBS_ARMCOMPILERSETTINGSGROUP_V8_H
+#ifndef QBS_IAREWARMCOMPILERSETTINGSGROUP_V8_H
+#define QBS_IAREWARMCOMPILERSETTINGSGROUP_V8_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace arm {
 namespace v8 {
 
 class ArmCompilerSettingsGroup final : public IarewSettingsPropertyGroup
@@ -54,6 +56,8 @@ private:
 };
 
 } // namespace v8
+} // namespace arm
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_ARMCOMPILERSETTINGSGROUP_V8_H
+#endif // QBS_IAREWARMCOMPILERSETTINGSGROUP_V8_H
diff --git a/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp
index a281af6cb..61525addd 100644
--- a/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp
+++ b/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp
@@ -35,12 +35,14 @@
 #include <QtCore/qdir.h>
 
 namespace qbs {
+namespace iarew {
+namespace arm {
 namespace v8 {
 
 constexpr int kGeneralArchiveVersion = 3;
 constexpr int kGeneralDataVersion = 30;
 
-namespace ArmGeneral {
+namespace {
 
 struct CpuCoreEntry final
 {
@@ -408,7 +410,7 @@ struct OutputPageOptions final
     QString listingDirectory;
 };
 
-} // namespace ArmGeneral
+} // namespace
 
 // ArmGeneralSettingsGroup
 
@@ -436,7 +438,7 @@ ArmGeneralSettingsGroup::ArmGeneralSettingsGroup(
 void ArmGeneralSettingsGroup::buildTargetPage(
         const ProductData &qbsProduct)
 {
-    const ArmGeneral::TargetPageOptions opts(qbsProduct);
+    const TargetPageOptions opts(qbsProduct);
     // Add 'GBECoreSlave', 'CoreVariant', 'GFPUCoreSlave2' items
     // (Processor variant chooser).
     addOptionsGroup(QByteArrayLiteral("GBECoreSlave"),
@@ -458,7 +460,7 @@ void ArmGeneralSettingsGroup::buildTargetPage(
 void ArmGeneralSettingsGroup::buildLibraryOptionsOnePage(
         const ProductData &qbsProduct)
 {
-    const ArmGeneral::LibraryOnePageOptions opts(qbsProduct);
+    const LibraryOnePageOptions opts(qbsProduct);
     // Add 'OGPrintfVariant' item (Printf formatter).
     addOptionsGroup(QByteArrayLiteral("OGPrintfVariant"),
                     {}, {opts.printfFormatter});
@@ -470,7 +472,7 @@ void ArmGeneralSettingsGroup::buildLibraryOptionsOnePage(
 void ArmGeneralSettingsGroup::buildLibraryOptionsTwoPage(
         const ProductData &qbsProduct)
 {
-    const ArmGeneral::LibraryTwoPageOptions opts(qbsProduct);
+    const LibraryTwoPageOptions opts(qbsProduct);
     // Add 'OgLibHeap' item (Heap selection:
     // auto/advanced/basic/nofree).
     addOptionsGroup(QByteArrayLiteral("OgLibHeap"),
@@ -481,8 +483,7 @@ void ArmGeneralSettingsGroup::buildLibraryConfigPage(
         const QString baseDirectory,
         const ProductData &qbsProduct)
 {
-    const ArmGeneral::LibraryConfigPageOptions opts(baseDirectory,
-                                                    qbsProduct);
+    const LibraryConfigPageOptions opts(baseDirectory, qbsProduct);
     // Add 'GRuntimeLibSelect', 'GRuntimeLibSelectSlave'
     // and 'RTConfigPath2' items
     // (Link with runtime: none/normal/full/custom).
@@ -506,8 +507,7 @@ void ArmGeneralSettingsGroup::buildOutputPage(
         const QString baseDirectory,
         const ProductData &qbsProduct)
 {
-    const ArmGeneral::OutputPageOptions opts(baseDirectory,
-                                             qbsProduct);
+    const OutputPageOptions opts(baseDirectory, qbsProduct);
     // Add 'GOutputBinary' item
     // (Output file: executable/library).
     addOptionsGroup(QByteArrayLiteral("GOutputBinary"),
@@ -527,4 +527,6 @@ void ArmGeneralSettingsGroup::buildOutputPage(
 }
 
 } // namespace v8
+} // namespace arm
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.h b/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.h
index 7d4a444d4..420e98008 100644
--- a/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.h
+++ b/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_ARMGENERALSETTINGSGROUP_V8_H
-#define QBS_ARMGENERALSETTINGSGROUP_V8_H
+#ifndef QBS_IAREWARMGENERALSETTINGSGROUP_V8_H
+#define QBS_IAREWARMGENERALSETTINGSGROUP_V8_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace arm {
 namespace v8 {
 
 class ArmGeneralSettingsGroup final : public IarewSettingsPropertyGroup
@@ -54,6 +56,8 @@ private:
 };
 
 } // namespace v8
+} // namespace arm
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_ARMGENERALSETTINGSGROUP_V8_H
+#endif // QBS_IAREWARMGENERALSETTINGSGROUP_V8_H
diff --git a/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp
index c567b4791..d09a456ca 100644
--- a/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp
+++ b/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp
@@ -35,12 +35,14 @@
 #include <QtCore/qdir.h>
 
 namespace qbs {
+namespace iarew {
+namespace arm {
 namespace v8 {
 
 constexpr int kLinkerArchiveVersion = 0;
 constexpr int kLinkerDataVersion = 20;
 
-namespace ArmLinker {
+namespace {
 
 // Config page options.
 
@@ -291,7 +293,7 @@ struct DiagnosticsPageOptions final
     int treatWarningsAsErrors = 0;
 };
 
-} // namespace ArmLinker
+} // namespace
 
 // ArmLinkerSettingsGroup
 
@@ -324,7 +326,7 @@ void ArmLinkerSettingsGroup::buildConfigPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    ArmLinker::ConfigPageOptions opts(baseDirectory, qbsProduct);
+    ConfigPageOptions opts(baseDirectory, qbsProduct);
     // Add 'IlinkConfigDefines' item
     // (Configuration file symbol definitions).
     addOptionsGroup(QByteArrayLiteral("IlinkConfigDefines"),
@@ -359,8 +361,7 @@ void ArmLinkerSettingsGroup::buildLibraryPage(
         const ProductData &qbsProduct,
         const std::vector<ProductData> &qbsProductDeps)
 {
-    ArmLinker::LibraryPageOptions opts(baseDirectory, qbsProduct,
-                                       qbsProductDeps);
+    LibraryPageOptions opts(baseDirectory, qbsProduct, qbsProductDeps);
     // Add 'IlinkOverrideProgramEntryLabel' item
     // (Override default program entry).
     addOptionsGroup(QByteArrayLiteral("IlinkOverrideProgramEntryLabel"),
@@ -395,7 +396,7 @@ void ArmLinkerSettingsGroup::buildLibraryPage(
 void ArmLinkerSettingsGroup::buildOutputPage(
         const ProductData &qbsProduct)
 {
-    const ArmLinker::OutputPageOptions opts(qbsProduct);
+    const OutputPageOptions opts(qbsProduct);
     // Add 'IlinkDebugInfoEnable' item
     // (Include debug information in output).
     addOptionsGroup(QByteArrayLiteral("IlinkDebugInfoEnable"),
@@ -408,7 +409,7 @@ void ArmLinkerSettingsGroup::buildOutputPage(
 void ArmLinkerSettingsGroup::buildInputPage(
         const ProductData &qbsProduct)
 {
-    const ArmLinker::InputPageOptions opts(qbsProduct);
+    const InputPageOptions opts(qbsProduct);
     // Add 'IlinkKeepSymbols' item ().
     addOptionsGroup(QByteArrayLiteral("IlinkKeepSymbols"),
                     {}, opts.keepSymbols);
@@ -417,7 +418,7 @@ void ArmLinkerSettingsGroup::buildInputPage(
 void ArmLinkerSettingsGroup::buildListPage(
         const ProductData &qbsProduct)
 {
-    const ArmLinker::ListPageOptions opts(qbsProduct);
+    const ListPageOptions opts(qbsProduct);
     // Add 'IlinkMapFile' item (Generate linker map file).
     addOptionsGroup(QByteArrayLiteral("IlinkMapFile"),
                     {}, {opts.generateMap});
@@ -426,7 +427,7 @@ void ArmLinkerSettingsGroup::buildListPage(
 void ArmLinkerSettingsGroup::buildOptimizationsPage(
         const ProductData &qbsProduct)
 {
-    const ArmLinker::OptimizationsPageOptions opts(qbsProduct);
+    const OptimizationsPageOptions opts(qbsProduct);
     // Add 'IlinkOptInline' item (Inline small routines).
     addOptionsGroup(QByteArrayLiteral("IlinkOptInline"),
                     {}, {opts.inlineSmallRoutines});
@@ -443,7 +444,7 @@ void ArmLinkerSettingsGroup::buildOptimizationsPage(
 void ArmLinkerSettingsGroup::buildAdvancedPage(
         const ProductData &qbsProduct)
 {
-    const ArmLinker::AdvancedPageOptions opts(qbsProduct);
+    const AdvancedPageOptions opts(qbsProduct);
     // Add 'IlinkOptExceptionsAllow' item (Allow C++ exceptions).
     addOptionsGroup(QByteArrayLiteral("IlinkOptExceptionsAllow"),
                     {}, {opts.allowExceptions});
@@ -452,7 +453,7 @@ void ArmLinkerSettingsGroup::buildAdvancedPage(
 void ArmLinkerSettingsGroup::buildDefinesPage(
         const ProductData &qbsProduct)
 {
-    const ArmLinker::DefinesPageOptions opts(qbsProduct);
+    const DefinesPageOptions opts(qbsProduct);
     // Add 'IlinkDefines' item (Defined symbols).
     addOptionsGroup(QByteArrayLiteral("IlinkDefines"),
                     {}, {opts.defineSymbols});
@@ -461,7 +462,7 @@ void ArmLinkerSettingsGroup::buildDefinesPage(
 void ArmLinkerSettingsGroup::buildDiagnosticsPage(
         const ProductData &qbsProduct)
 {
-    const ArmLinker::DiagnosticsPageOptions opts(qbsProduct);
+    const DiagnosticsPageOptions opts(qbsProduct);
     // Add 'IlinkWarningsAreErrors' item
     // (Treat all warnings as errors).
     addOptionsGroup(QByteArrayLiteral("IlinkWarningsAreErrors"),
@@ -481,4 +482,6 @@ void ArmLinkerSettingsGroup::buildExtraOptionsPage(
 }
 
 } // namespace v8
+} // namespace arm
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.h b/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.h
index 2dc0a92c4..e86297e6e 100644
--- a/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.h
+++ b/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_ARMLINKERSETTINGSGROUP_V8_H
-#define QBS_ARMLINKERSETTINGSGROUP_V8_H
+#ifndef QBS_IAREWARMLINKERSETTINGSGROUP_V8_H
+#define QBS_IAREWARMLINKERSETTINGSGROUP_V8_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace arm {
 namespace v8 {
 
 class ArmLinkerSettingsGroup final : public IarewSettingsPropertyGroup
@@ -62,6 +64,8 @@ private:
 };
 
 } // namespace v8
+} // namespace arm
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_ARMLINKERSETTINGSGROUP_V8_H
+#endif // QBS_IAREWARMLINKERSETTINGSGROUP_V8_H
diff --git a/src/plugins/generator/iarew/archs/avr/avrarchiversettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrarchiversettingsgroup_v7.cpp
index 2769e8a0d..0376b1621 100644
--- a/src/plugins/generator/iarew/archs/avr/avrarchiversettingsgroup_v7.cpp
+++ b/src/plugins/generator/iarew/archs/avr/avrarchiversettingsgroup_v7.cpp
@@ -34,12 +34,14 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace avr {
 namespace v7 {
 
 constexpr int kArchiverArchiveVersion = 2;
 constexpr int kArchiverDataVersion = 0;
 
-namespace ArmArchiver {
+namespace {
 
 // Output page options.
 
@@ -55,7 +57,7 @@ struct OutputPageOptions final
     QString outputFile;
 };
 
-} // namespace ArmArchiver
+} // namespace
 
 // AvrArchiverSettingsGroup
 
@@ -78,7 +80,7 @@ AvrArchiverSettingsGroup::AvrArchiverSettingsGroup(
 void AvrArchiverSettingsGroup::buildOutputPage(const QString &baseDirectory,
                                                const ProductData &qbsProduct)
 {
-    const ArmArchiver::OutputPageOptions opts(baseDirectory, qbsProduct);
+    const OutputPageOptions opts(baseDirectory, qbsProduct);
     // Add 'XAROutOverride' item (Override default).
     addOptionsGroup(QByteArrayLiteral("XAROutOverride"),
                     {}, {1});
@@ -88,4 +90,6 @@ void AvrArchiverSettingsGroup::buildOutputPage(const QString &baseDirectory,
 }
 
 } // namespace v7
+} // namespace avr
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/avr/avrarchiversettingsgroup_v7.h b/src/plugins/generator/iarew/archs/avr/avrarchiversettingsgroup_v7.h
index fca1ec328..2ff667e1d 100644
--- a/src/plugins/generator/iarew/archs/avr/avrarchiversettingsgroup_v7.h
+++ b/src/plugins/generator/iarew/archs/avr/avrarchiversettingsgroup_v7.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_AVRARCHIVERSETTINGSGROUP_V7_H
-#define QBS_AVRARCHIVERSETTINGSGROUP_V7_H
+#ifndef QBS_IAREWAVRARCHIVERSETTINGSGROUP_V7_H
+#define QBS_IAREWAVRARCHIVERSETTINGSGROUP_V7_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace avr {
 namespace v7 {
 
 class AvrArchiverSettingsGroup final : public IarewSettingsPropertyGroup
@@ -49,6 +51,8 @@ private:
 };
 
 } // namespace v7
+} // namespace avr
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_AVRARCHIVERSETTINGSGROUP_V7_H
+#endif // QBS_IAREWAVRARCHIVERSETTINGSGROUP_V7_H
diff --git a/src/plugins/generator/iarew/archs/avr/avrassemblersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrassemblersettingsgroup_v7.cpp
index 93233d041..80970087f 100644
--- a/src/plugins/generator/iarew/archs/avr/avrassemblersettingsgroup_v7.cpp
+++ b/src/plugins/generator/iarew/archs/avr/avrassemblersettingsgroup_v7.cpp
@@ -34,12 +34,14 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace avr {
 namespace v7 {
 
 constexpr int kAssemblerArchiveVersion = 5;
 constexpr int kAssemblerDataVersion = 11;
 
-namespace AvrAssembler {
+namespace {
 
 // Language page options.
 
@@ -144,7 +146,7 @@ struct DiagnosticsPageOptions final
     int enableAllWarnings = 0;
 };
 
-} // namespace AvrAssembler
+} // namespace
 
 // AvrAssemblerSettingsGroup
 
@@ -171,7 +173,7 @@ AvrAssemblerSettingsGroup::AvrAssemblerSettingsGroup(
 void AvrAssemblerSettingsGroup::buildLanguagePage(
         const ProductData &qbsProduct)
 {
-    const AvrAssembler::LanguagePageOptions opts(qbsProduct);
+    const LanguagePageOptions opts(qbsProduct);
     // Add 'ACaseSensitivity' item (User symbols are case sensitive).
     addOptionsGroup(QByteArrayLiteral("ACaseSensitivity"),
                     {}, {opts.enableSymbolsCaseSensitive});
@@ -186,7 +188,7 @@ void AvrAssemblerSettingsGroup::buildLanguagePage(
 void AvrAssemblerSettingsGroup::buildOutputPage(
         const ProductData &qbsProduct)
 {
-    const AvrAssembler::OutputPageOptions opts(qbsProduct);
+    const OutputPageOptions opts(qbsProduct);
     // Add 'CDebug' item (Generate debug information).
     addOptionsGroup(QByteArrayLiteral("CDebug"),
                     {}, {opts.debugInfo});
@@ -196,8 +198,7 @@ void AvrAssemblerSettingsGroup::buildPreprocessorPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    const AvrAssembler::PreprocessorPageOptions opts(baseDirectory,
-                                                     qbsProduct);
+    const PreprocessorPageOptions opts(baseDirectory, qbsProduct);
     // Add 'ADefines' item (Defined symbols).
     addOptionsGroup(QByteArrayLiteral("ADefines"),
                     {}, opts.defineSymbols);
@@ -209,7 +210,7 @@ void AvrAssemblerSettingsGroup::buildPreprocessorPage(
 void AvrAssemblerSettingsGroup::buildDiagnosticsPage(
         const ProductData &qbsProduct)
 {
-    const AvrAssembler::DiagnosticsPageOptions opts(qbsProduct);
+    const DiagnosticsPageOptions opts(qbsProduct);
     // Add 'AWarnEnable' item (Enable/disable warnings).
     addOptionsGroup(QByteArrayLiteral("AWarnEnable"),
                     {}, {opts.enableWarnings});
@@ -219,4 +220,6 @@ void AvrAssemblerSettingsGroup::buildDiagnosticsPage(
 }
 
 } // namespace v7
+} // namespace avr
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/avr/avrassemblersettingsgroup_v7.h b/src/plugins/generator/iarew/archs/avr/avrassemblersettingsgroup_v7.h
index 8cc47d0c1..608a42652 100644
--- a/src/plugins/generator/iarew/archs/avr/avrassemblersettingsgroup_v7.h
+++ b/src/plugins/generator/iarew/archs/avr/avrassemblersettingsgroup_v7.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_AVRASSEMBLERSETTINGSGROUP_V7_H
-#define QBS_AVRASSEMBLERSETTINGSGROUP_V7_H
+#ifndef QBS_IAREWAVRASSEMBLERSETTINGSGROUP_V7_H
+#define QBS_IAREWAVRASSEMBLERSETTINGSGROUP_V7_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace avr {
 namespace v7 {
 
 class AvrAssemblerSettingsGroup final : public IarewSettingsPropertyGroup
@@ -52,6 +54,8 @@ private:
 };
 
 } // namespace v7
+} // namespace avr
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_AVRASSEMBLERSETTINGSGROUP_V7_H
+#endif // QBS_IAREWAVRASSEMBLERSETTINGSGROUP_V7_H
diff --git a/src/plugins/generator/iarew/archs/avr/avrbuildconfigurationgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrbuildconfigurationgroup_v7.cpp
index 32350550c..07768c254 100644
--- a/src/plugins/generator/iarew/archs/avr/avrbuildconfigurationgroup_v7.cpp
+++ b/src/plugins/generator/iarew/archs/avr/avrbuildconfigurationgroup_v7.cpp
@@ -39,6 +39,8 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace avr {
 namespace v7 {
 
 AvrBuildConfigurationGroup::AvrBuildConfigurationGroup(
@@ -90,4 +92,6 @@ std::unique_ptr<IarewPropertyGroup> AvrBuildConfigurationGroupFactory::create(
 }
 
 } // namespace v7
+} // namespace avr
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/avr/avrbuildconfigurationgroup_v7.h b/src/plugins/generator/iarew/archs/avr/avrbuildconfigurationgroup_v7.h
index 026fc5d01..f00db799e 100644
--- a/src/plugins/generator/iarew/archs/avr/avrbuildconfigurationgroup_v7.h
+++ b/src/plugins/generator/iarew/archs/avr/avrbuildconfigurationgroup_v7.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_AVRBUILDCONFIGURATIONGROUP_V7_H
-#define QBS_AVRBUILDCONFIGURATIONGROUP_V7_H
+#ifndef QBS_IAREWAVRBUILDCONFIGURATIONGROUP_V7_H
+#define QBS_IAREWAVRBUILDCONFIGURATIONGROUP_V7_H
 
 #include "../../iarewpropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace avr {
 namespace v7 {
 
 class AvrBuildConfigurationGroup final : public IarewPropertyGroup
@@ -59,6 +61,8 @@ public:
 };
 
 } // namespace v7
+} // namespace avr
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_AVRBUILDCONFIGURATIONGROUP_V7_H
+#endif // QBS_IAREWAVRBUILDCONFIGURATIONGROUP_V7_H
diff --git a/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.cpp
index 41bd77e31..03f6194f9 100644
--- a/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.cpp
+++ b/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.cpp
@@ -33,12 +33,14 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace avr {
 namespace v7 {
 
 constexpr int kCompilerArchiveVersion = 6;
 constexpr int kCompilerDataVersion = 17;
 
-namespace AvrCompiler {
+namespace {
 
 // Output page options.
 
@@ -295,7 +297,7 @@ struct CodePageOptions final
     int lockRegistersCount = 0;
 };
 
-} // namespace AvrCompiler
+} // namespace
 
 // AvrCompilerSettingsGroup
 
@@ -324,7 +326,7 @@ AvrCompilerSettingsGroup::AvrCompilerSettingsGroup(
 void AvrCompilerSettingsGroup::buildOutputPage(
         const ProductData &qbsProduct)
 {
-    const AvrCompiler::OutputPageOptions opts(qbsProduct);
+    const OutputPageOptions opts(qbsProduct);
     // Add 'CCDebugInfo' item (Generate debug info).
     addOptionsGroup(QByteArrayLiteral("CCDebugInfo"),
                     {}, {opts.debugInfo});
@@ -343,7 +345,7 @@ void AvrCompilerSettingsGroup::buildOutputPage(
 void AvrCompilerSettingsGroup::buildLanguageOnePage(
         const ProductData &qbsProduct)
 {
-    const AvrCompiler::LanguageOnePageOptions opts(qbsProduct);
+    const LanguageOnePageOptions opts(qbsProduct);
     // Add 'IccLang' item with 'auto-extension based'
     // value (Language: C/C++/Auto).
     addOptionsGroup(QByteArrayLiteral("IccLang"),
@@ -374,7 +376,7 @@ void AvrCompilerSettingsGroup::buildLanguageOnePage(
 void AvrCompilerSettingsGroup::buildLanguageTwoPage(
         const ProductData &qbsProduct)
 {
-    const AvrCompiler::LanguageTwoPageOptions opts(qbsProduct);
+    const LanguageTwoPageOptions opts(qbsProduct);
     // Add 'CCCharIs' item (Plain char is: signed/unsigned).
     addOptionsGroup(QByteArrayLiteral("CCCharIs"),
                     {}, {opts.plainCharacter});
@@ -390,7 +392,7 @@ void AvrCompilerSettingsGroup::buildLanguageTwoPage(
 void AvrCompilerSettingsGroup::buildOptimizationsPage(
         const ProductData &qbsProduct)
 {
-    const AvrCompiler::OptimizationsPageOptions opts(qbsProduct);
+    const OptimizationsPageOptions opts(qbsProduct);
     // Add 'CCOptStrategy', 'CCOptLevel' and
     // 'CCOptLevelSlave' items (Level).
     addOptionsGroup(QByteArrayLiteral("CCOptStrategy"),
@@ -420,8 +422,7 @@ void AvrCompilerSettingsGroup::buildPreprocessorPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    const AvrCompiler::PreprocessorPageOptions opts(baseDirectory,
-                                                    qbsProduct);
+    const PreprocessorPageOptions opts(baseDirectory, qbsProduct);
     // Add 'CCDefines' item (Defines symbols).
     addOptionsGroup(QByteArrayLiteral("CCDefines"),
                     {}, opts.defineSymbols);
@@ -434,7 +435,7 @@ void AvrCompilerSettingsGroup::buildPreprocessorPage(
 void AvrCompilerSettingsGroup::buildDiagnosticsPage(
         const ProductData &qbsProduct)
 {
-    const AvrCompiler::DiagnosticsPageOptions opts(qbsProduct);
+    const DiagnosticsPageOptions opts(qbsProduct);
     // Add 'CCWarnAsError' item (Treat all warnings as errors).
     addOptionsGroup(QByteArrayLiteral("CCWarnAsError"),
                     {}, {opts.warningsAsErrors});
@@ -443,7 +444,7 @@ void AvrCompilerSettingsGroup::buildDiagnosticsPage(
 void AvrCompilerSettingsGroup::buildCodePage(
         const ProductData &qbsProduct)
 {
-    const AvrCompiler::CodePageOptions opts(qbsProduct);
+    const CodePageOptions opts(qbsProduct);
     // Add 'CCConstInRAM' item (Place string literals
     // and constants in initialized RAM).
     addOptionsGroup(QByteArrayLiteral("CCConstInRAM"),
@@ -467,4 +468,6 @@ void AvrCompilerSettingsGroup::buildCodePage(
 }
 
 } // namespace v7
+} // namespace avr
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.h b/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.h
index 06e623f2f..2d8c53b84 100644
--- a/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.h
+++ b/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_AVRCOMPILERSETTINGSGROUP_V7_H
-#define QBS_AVRCOMPILERSETTINGSGROUP_V7_H
+#ifndef QBS_IAREWAVRCOMPILERSETTINGSGROUP_V7_H
+#define QBS_IAREWAVRCOMPILERSETTINGSGROUP_V7_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace avr {
 namespace v7 {
 
 class AvrCompilerSettingsGroup final : public IarewSettingsPropertyGroup
@@ -55,6 +57,8 @@ private:
 };
 
 } // namespace v7
+} // namespace avr
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_AVRCOMPILERSETTINGSGROUP_V7_H
+#endif // QBS_IAREWAVRCOMPILERSETTINGSGROUP_V7_H
diff --git a/src/plugins/generator/iarew/archs/avr/avrgeneralsettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrgeneralsettingsgroup_v7.cpp
index a69e2c2ed..4136864b3 100644
--- a/src/plugins/generator/iarew/archs/avr/avrgeneralsettingsgroup_v7.cpp
+++ b/src/plugins/generator/iarew/archs/avr/avrgeneralsettingsgroup_v7.cpp
@@ -33,12 +33,14 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace avr {
 namespace v7 {
 
 constexpr int kGeneralArchiveVersion = 12;
 constexpr int kGeneralDataVersion = 10;
 
-namespace AvrGeneral {
+namespace {
 
 struct TargetMcuEntry final
 {
@@ -651,7 +653,7 @@ struct OutputPageOptions final
     QString listingDirectory;
 };
 
-} // namespace AvrGeneral
+} // namespace
 
 // AvrGeneralSettingsGroup
 
@@ -679,7 +681,7 @@ AvrGeneralSettingsGroup::AvrGeneralSettingsGroup(
 void AvrGeneralSettingsGroup::buildTargetPage(
         const ProductData &qbsProduct)
 {
-    const AvrGeneral::TargetPageOptions opts(qbsProduct);
+    const TargetPageOptions opts(qbsProduct);
     // Add 'GenDeviceSelectMenu' item
     // (Processor configuration chooser).
     addOptionsGroup(QByteArrayLiteral("GenDeviceSelectMenu"),
@@ -697,7 +699,7 @@ void AvrGeneralSettingsGroup::buildTargetPage(
 void AvrGeneralSettingsGroup::buildSystemPage(
         const ProductData &qbsProduct)
 {
-    const AvrGeneral::SystemPageOptions opts (qbsProduct);
+    const SystemPageOptions opts (qbsProduct);
     // Add 'SCCStackSize' item (Data stack
     // - CSTACK size in bytes).
     addOptionsGroup(QByteArrayLiteral("SCCStackSize"),
@@ -711,7 +713,7 @@ void AvrGeneralSettingsGroup::buildSystemPage(
 void AvrGeneralSettingsGroup::buildLibraryOptionsPage(
         const ProductData &qbsProduct)
 {
-    const AvrGeneral::LibraryOptionsPageOptions opts(qbsProduct);
+    const LibraryOptionsPageOptions opts(qbsProduct);
     // Add 'Output variant' item (Printf formatter).
     addOptionsGroup(QByteArrayLiteral("Output variant"),
                     {}, {opts.printfFormatter});
@@ -724,8 +726,7 @@ void AvrGeneralSettingsGroup::buildLibraryConfigPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    const AvrGeneral::LibraryConfigPageOptions opts(baseDirectory,
-                                                    qbsProduct);
+    const LibraryConfigPageOptions opts(baseDirectory, qbsProduct);
     // Add 'GRuntimeLibSelect' and 'GRuntimeLibSelectSlave' items
     // (Link with runtime: none/dlib/clib/etc).
     addOptionsGroup(QByteArrayLiteral("GRuntimeLibSelect"),
@@ -744,8 +745,7 @@ void AvrGeneralSettingsGroup::buildOutputPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    const AvrGeneral::OutputPageOptions opts(baseDirectory,
-                                             qbsProduct);
+    const OutputPageOptions opts(baseDirectory, qbsProduct);
     // Add 'GOutputBinary' item (Output file: executable/library).
     addOptionsGroup(QByteArrayLiteral("GOutputBinary"),
                     {}, {opts.binaryType});
@@ -761,4 +761,6 @@ void AvrGeneralSettingsGroup::buildOutputPage(
 }
 
 } // namespace v7
+} // namespace avr
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/avr/avrgeneralsettingsgroup_v7.h b/src/plugins/generator/iarew/archs/avr/avrgeneralsettingsgroup_v7.h
index 8a0d54ee6..5411eeae8 100644
--- a/src/plugins/generator/iarew/archs/avr/avrgeneralsettingsgroup_v7.h
+++ b/src/plugins/generator/iarew/archs/avr/avrgeneralsettingsgroup_v7.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_AVRGENERALSETTINGSGROUP_V7_H
-#define QBS_AVRGENERALSETTINGSGROUP_V7_H
+#ifndef QBS_IAREWAVRGENERALSETTINGSGROUP_V7_H
+#define QBS_IAREWAVRGENERALSETTINGSGROUP_V7_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace avr {
 namespace v7 {
 
 class AvrGeneralSettingsGroup final : public IarewSettingsPropertyGroup
@@ -54,6 +56,8 @@ private:
 };
 
 } // namespace v7
+} // namespace avr
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_AVRGENERALSETTINGSGROUP_V7_H
+#endif // QBS_IAREWAVRGENERALSETTINGSGROUP_V7_H
diff --git a/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp
index 5fe286198..1cf2e7302 100644
--- a/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp
+++ b/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp
@@ -35,12 +35,14 @@
 #include <QtCore/qdir.h>
 
 namespace qbs {
+namespace iarew {
+namespace avr {
 namespace v7 {
 
 constexpr int kLinkerArchiveVersion = 3;
 constexpr int kLinkerDataVersion = 16;
 
-namespace AvrLinker {
+namespace {
 
 // Config page options.
 
@@ -249,7 +251,7 @@ struct DiagnosticsPageOptions final
     int suppressAllWarnings = 0;
 };
 
-} // namespace AvrLinker
+} // namespace
 
 // AvrLinkerSettingsGroup
 
@@ -280,8 +282,7 @@ void AvrLinkerSettingsGroup::buildConfigPage(
         const ProductData &qbsProduct,
         const std::vector<ProductData> &qbsProductDeps)
 {
-    AvrLinker::ConfigPageOptions opts(baseDirectory, qbsProduct,
-                                      qbsProductDeps);
+    ConfigPageOptions opts(baseDirectory, qbsProduct, qbsProductDeps);
 
     if (opts.configFilePaths.count() > 0) {
         // Note: IAR IDE does not allow to specify a multiple config files,
@@ -329,7 +330,7 @@ void AvrLinkerSettingsGroup::buildConfigPage(
 void AvrLinkerSettingsGroup::buildOutputPage(
         const ProductData &qbsProduct)
 {
-    const AvrLinker::OutputPageOptions opts(qbsProduct);
+    const OutputPageOptions opts(qbsProduct);
     // Add 'XOutOverride' item (Override default output file).
     addOptionsGroup(QByteArrayLiteral("XOutOverride"),
                     {}, {1});
@@ -341,7 +342,7 @@ void AvrLinkerSettingsGroup::buildOutputPage(
 void AvrLinkerSettingsGroup::buildListPage(
         const ProductData &qbsProduct)
 {
-    const AvrLinker::ListPageOptions opts(qbsProduct);
+    const ListPageOptions opts(qbsProduct);
     // Add 'XList' item (Generate linker listing).
     addOptionsGroup(QByteArrayLiteral("XList"),
                     {}, {opts.generateMap});
@@ -350,7 +351,7 @@ void AvrLinkerSettingsGroup::buildListPage(
 void AvrLinkerSettingsGroup::buildDefinePage(
         const ProductData &qbsProduct)
 {
-    const AvrLinker::DefinePageOptions opts(qbsProduct);
+    const DefinePageOptions opts(qbsProduct);
     // Add 'XDefines' item (Defined symbols).
     addOptionsGroup(QByteArrayLiteral("XDefines"),
                     {}, opts.defineSymbols);
@@ -359,7 +360,7 @@ void AvrLinkerSettingsGroup::buildDefinePage(
 void AvrLinkerSettingsGroup::buildDiagnosticsPage(
         const ProductData &qbsProduct)
 {
-    const AvrLinker::DiagnosticsPageOptions opts(qbsProduct);
+    const DiagnosticsPageOptions opts(qbsProduct);
     // Add 'SuppressAllWarn' item (Suppress all warnings).
     addOptionsGroup(QByteArrayLiteral("SuppressAllWarn"),
                     {}, {opts.suppressAllWarnings});
@@ -380,4 +381,6 @@ void AvrLinkerSettingsGroup::buildExtraOptionsPage(const ProductData &qbsProduct
 }
 
 } // namespace v7
+} // namespace avr
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.h b/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.h
index 97d20db58..5427937b7 100644
--- a/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.h
+++ b/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_AVRLINKERSETTINGSGROUP_V7_H
-#define QBS_AVRLINKERSETTINGSGROUP_V7_H
+#ifndef QBS_IAREWAVRLINKERSETTINGSGROUP_V7_H
+#define QBS_IAREWAVRLINKERSETTINGSGROUP_V7_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace avr {
 namespace v7 {
 
 class AvrLinkerSettingsGroup final : public IarewSettingsPropertyGroup
@@ -57,6 +59,8 @@ private:
 };
 
 } // namespace v7
+} // namespace avr
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_AVRLINKERSETTINGSGROUP_V7_H
+#endif // QBS_IAREWAVRLINKERSETTINGSGROUP_V7_H
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51archiversettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51archiversettingsgroup_v10.cpp
index 81bbdb3e7..a10b46079 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51archiversettingsgroup_v10.cpp
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51archiversettingsgroup_v10.cpp
@@ -34,12 +34,14 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace mcs51 {
 namespace v10 {
 
 constexpr int kArchiverArchiveVersion = 2;
 constexpr int kArchiverDataVersion = 1;
 
-namespace ArmArchiver {
+namespace {
 
 // Output page options.
 
@@ -55,7 +57,7 @@ struct OutputPageOptions final
     QString outputFile;
 };
 
-} // namespace ArmArchiver
+} // namespace
 
 // Mcs51ArchiverSettingsGroup
 
@@ -79,8 +81,7 @@ void Mcs51ArchiverSettingsGroup::buildOutputPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    const ArmArchiver::OutputPageOptions opts(baseDirectory,
-                                              qbsProduct);
+    const OutputPageOptions opts(baseDirectory, qbsProduct);
     // Add 'XAROverride' item (Override default).
     addOptionsGroup(QByteArrayLiteral("XAROverride"),
                     {}, {1});
@@ -90,4 +91,6 @@ void Mcs51ArchiverSettingsGroup::buildOutputPage(
 }
 
 } // namespace v10
+} // namespace mcs51
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51archiversettingsgroup_v10.h b/src/plugins/generator/iarew/archs/mcs51/mcs51archiversettingsgroup_v10.h
index d8d8b266c..21c66433d 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51archiversettingsgroup_v10.h
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51archiversettingsgroup_v10.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_MCS51ARCHIVERSETTINGSGROUP_V10_H
-#define QBS_MCS51ARCHIVERSETTINGSGROUP_V10_H
+#ifndef QBS_IAREWMCS51ARCHIVERSETTINGSGROUP_V10_H
+#define QBS_IAREWMCS51ARCHIVERSETTINGSGROUP_V10_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace mcs51 {
 namespace v10 {
 
 class Mcs51ArchiverSettingsGroup final : public IarewSettingsPropertyGroup
@@ -50,6 +52,8 @@ private:
 };
 
 } // namespace v10
+} // namespace mcs51
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_MCS51ARCHIVERSETTINGSGROUP_V10_H
+#endif // QBS_IAREWMCS51ARCHIVERSETTINGSGROUP_V10_H
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp
index 8cfc94be2..80ca0fd50 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp
@@ -34,12 +34,14 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace mcs51 {
 namespace v10 {
 
 constexpr int kAssemblerArchiveVersion = 2;
 constexpr int kAssemblerDataVersion = 6;
 
-namespace Mcs51Assembler {
+namespace {
 
 // Language page options.
 
@@ -144,7 +146,7 @@ struct DiagnosticsPageOptions final
     int enableAllWarnings = 0;
 };
 
-} // namespace Mcs51Assembler
+} // namespace
 
 // Mcs51AssemblerSettingsGroup
 
@@ -172,7 +174,7 @@ Mcs51AssemblerSettingsGroup::Mcs51AssemblerSettingsGroup(
 void Mcs51AssemblerSettingsGroup::buildLanguagePage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Assembler::LanguagePageOptions opts(qbsProduct);
+    const LanguagePageOptions opts(qbsProduct);
     // Add 'ACaseSensitivity' item (User symbols are case sensitive).
     addOptionsGroup(QByteArrayLiteral("ACaseSensitivity"),
                     {}, {opts.enableSymbolsCaseSensitive});
@@ -187,7 +189,7 @@ void Mcs51AssemblerSettingsGroup::buildLanguagePage(
 void Mcs51AssemblerSettingsGroup::buildOutputPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Assembler::OutputPageOptions opts(qbsProduct);
+    const OutputPageOptions opts(qbsProduct);
     // Add 'Debug' item (Generate debug information).
     addOptionsGroup(QByteArrayLiteral("Debug"),
                     {}, {opts.debugInfo});
@@ -197,8 +199,7 @@ void Mcs51AssemblerSettingsGroup::buildPreprocessorPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    const Mcs51Assembler::PreprocessorPageOptions opts(baseDirectory,
-                                                       qbsProduct);
+    const PreprocessorPageOptions opts(baseDirectory, qbsProduct);
     // Add 'ADefines' item (Defined symbols).
     addOptionsGroup(QByteArrayLiteral("ADefines"),
                     {}, opts.defineSymbols);
@@ -210,7 +211,7 @@ void Mcs51AssemblerSettingsGroup::buildPreprocessorPage(
 void Mcs51AssemblerSettingsGroup::buildDiagnosticsPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Assembler::DiagnosticsPageOptions opts(qbsProduct);
+    const DiagnosticsPageOptions opts(qbsProduct);
     // Add 'AWarnEnable' item (Enable/disable warnings).
     addOptionsGroup(QByteArrayLiteral("AWarnEnable"),
                     {}, {opts.enableWarnings});
@@ -220,4 +221,6 @@ void Mcs51AssemblerSettingsGroup::buildDiagnosticsPage(
 }
 
 } // namespace v10
+} // namespace mcs51
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.h b/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.h
index 55bbddde3..bb9f4b613 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.h
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_MCS51ASSEMBLERSETTINGSGROUP_V10_H
-#define QBS_MCS51ASSEMBLERSETTINGSGROUP_V10_H
+#ifndef QBS_IAREWMCS51ASSEMBLERSETTINGSGROUP_V10_H
+#define QBS_IAREWMCS51ASSEMBLERSETTINGSGROUP_V10_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace mcs51 {
 namespace v10 {
 
 class Mcs51AssemblerSettingsGroup final : public IarewSettingsPropertyGroup
@@ -53,6 +55,8 @@ private:
 };
 
 } // namespace v10
+} // namespace mcs51
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_MCS51ASSEMBLERSETTINGSGROUP_V10_H
+#endif // QBS_IAREWMCS51ASSEMBLERSETTINGSGROUP_V10_H
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51buildconfigurationgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51buildconfigurationgroup_v10.cpp
index 9f69c88a6..74cdb6d0f 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51buildconfigurationgroup_v10.cpp
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51buildconfigurationgroup_v10.cpp
@@ -39,6 +39,8 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace mcs51 {
 namespace v10 {
 
 Mcs51BuildConfigurationGroup::Mcs51BuildConfigurationGroup(
@@ -89,4 +91,6 @@ std::unique_ptr<IarewPropertyGroup> Mcs51BuildConfigurationGroupFactory::create(
 }
 
 } // namespace v10
+} // namespace mcs51
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51buildconfigurationgroup_v10.h b/src/plugins/generator/iarew/archs/mcs51/mcs51buildconfigurationgroup_v10.h
index 53dd71f32..d8153a0f0 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51buildconfigurationgroup_v10.h
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51buildconfigurationgroup_v10.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_MCS51BUILDCONFIGURATIONGROUP_V10_H
-#define QBS_MCS51BUILDCONFIGURATIONGROUP_V10_H
+#ifndef QBS_IAREWMCS51BUILDCONFIGURATIONGROUP_V10_H
+#define QBS_IAREWMCS51BUILDCONFIGURATIONGROUP_V10_H
 
 #include "../../iarewpropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace mcs51 {
 namespace v10 {
 
 class Mcs51BuildConfigurationGroup final : public IarewPropertyGroup
@@ -60,6 +62,8 @@ public:
 };
 
 } // namespace v10
+} // namespace mcs51
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_MCS51BUILDCONFIGURATIONGROUP_V10_H
+#endif // QBS_IAREWMCS51BUILDCONFIGURATIONGROUP_V10_H
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51compilersettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51compilersettingsgroup_v10.cpp
index f66399837..94b747529 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51compilersettingsgroup_v10.cpp
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51compilersettingsgroup_v10.cpp
@@ -33,12 +33,14 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace mcs51 {
 namespace v10 {
 
 constexpr int kCompilerArchiveVersion = 7;
 constexpr int kCompilerDataVersion = 12;
 
-namespace Mcs51Compiler {
+namespace {
 
 // Output page options.
 
@@ -296,7 +298,7 @@ struct CodePageOptions final
     int excludeUbrofMessagesInOutput = 0;
 };
 
-} // namespace Mcs51Compiler
+} // namespace
 
 // Mcs51CompilerSettingsGroup
 
@@ -326,7 +328,7 @@ Mcs51CompilerSettingsGroup::Mcs51CompilerSettingsGroup(
 void Mcs51CompilerSettingsGroup::buildOutputPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Compiler::OutputPageOptions opts(qbsProduct);
+    const OutputPageOptions opts(qbsProduct);
     // Add 'CCDebugInfo' item (Generate debug info).
     addOptionsGroup(QByteArrayLiteral("CCDebugInfo"),
                     {}, {opts.debugInfo});
@@ -342,7 +344,7 @@ void Mcs51CompilerSettingsGroup::buildOutputPage(
 void Mcs51CompilerSettingsGroup::buildLanguageOnePage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Compiler::LanguageOnePageOptions opts(qbsProduct);
+    const LanguageOnePageOptions opts(qbsProduct);
     // Add 'IccLang' item with 'auto-extension based'
     // value (Language: C/C++/Auto).
     addOptionsGroup(QByteArrayLiteral("IccLang"),
@@ -373,7 +375,7 @@ void Mcs51CompilerSettingsGroup::buildLanguageOnePage(
 void Mcs51CompilerSettingsGroup::buildLanguageTwoPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Compiler::LanguageTwoPageOptions opts(qbsProduct);
+    const LanguageTwoPageOptions opts(qbsProduct);
     // Add 'CharIs' item (Plain char is: signed/unsigned).
     addOptionsGroup(QByteArrayLiteral("CharIs"),
                     {}, {opts.plainCharacter});
@@ -389,7 +391,7 @@ void Mcs51CompilerSettingsGroup::buildLanguageTwoPage(
 void Mcs51CompilerSettingsGroup::buildOptimizationsPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Compiler::OptimizationsPageOptions opts(qbsProduct);
+    const OptimizationsPageOptions opts(qbsProduct);
     // Add 'CCOptStrategy', 'CCOptLevel' and
     // 'CCOptLevelSlave' items (Level).
     addOptionsGroup(QByteArrayLiteral("CCOptStrategy"),
@@ -418,8 +420,7 @@ void Mcs51CompilerSettingsGroup::buildPreprocessorPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    const Mcs51Compiler::PreprocessorPageOptions opts(baseDirectory,
-                                                      qbsProduct);
+    const PreprocessorPageOptions opts(baseDirectory, qbsProduct);
     // Add 'CCDefines' item (Defines symbols).
     addOptionsGroup(QByteArrayLiteral("CCDefines"),
                     {}, opts.defineSymbols);
@@ -431,7 +432,7 @@ void Mcs51CompilerSettingsGroup::buildPreprocessorPage(
 void Mcs51CompilerSettingsGroup::buildDiagnosticsPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Compiler::DiagnosticsPageOptions opts(qbsProduct);
+    const DiagnosticsPageOptions opts(qbsProduct);
     // Add 'CCDiagWarnAreErr' item (Treat all warnings as errors).
     addOptionsGroup(QByteArrayLiteral("CCDiagWarnAreErr"),
                     {}, {opts.warningsAsErrors});
@@ -440,7 +441,7 @@ void Mcs51CompilerSettingsGroup::buildDiagnosticsPage(
 void Mcs51CompilerSettingsGroup::buildCodePage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Compiler::CodePageOptions opts(qbsProduct);
+    const CodePageOptions opts(qbsProduct);
     // Add 'RomMonBpPadding' item (Padding for ROM-monitor breakpoints).
     addOptionsGroup(QByteArrayLiteral("RomMonBpPadding"),
                     {}, {opts.paddingForRomMonitorBreakpoints});
@@ -450,4 +451,6 @@ void Mcs51CompilerSettingsGroup::buildCodePage(
 }
 
 } // namespace v10
+} // namespace mcs51
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51compilersettingsgroup_v10.h b/src/plugins/generator/iarew/archs/mcs51/mcs51compilersettingsgroup_v10.h
index e032f0a70..e68a7628f 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51compilersettingsgroup_v10.h
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51compilersettingsgroup_v10.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_MCS51COMPILERSETTINGSGROUP_V10_H
-#define QBS_MCS51COMPILERSETTINGSGROUP_V10_H
+#ifndef QBS_IAREWMCS51COMPILERSETTINGSGROUP_V10_H
+#define QBS_IAREWMCS51COMPILERSETTINGSGROUP_V10_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace mcs51 {
 namespace v10 {
 
 class Mcs51CompilerSettingsGroup final : public IarewSettingsPropertyGroup
@@ -56,6 +58,8 @@ private:
 };
 
 } // namespace v10
+} // namespace mcs51
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_MCS51COMPILERSETTINGSGROUP_V10_H
+#endif // QBS_IAREWMCS51COMPILERSETTINGSGROUP_V10_H
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp
index 815e905d5..48a2681f0 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp
@@ -33,12 +33,14 @@
 #include "../../iarewutils.h"
 
 namespace qbs {
+namespace iarew {
+namespace mcs51 {
 namespace v10 {
 
 constexpr int kGeneralArchiveVersion = 4;
 constexpr int kGeneralDataVersion = 9;
 
-namespace Mcs51General {
+namespace {
 
 // Target page options.
 
@@ -759,7 +761,7 @@ struct OutputPageOptions final
     QString listingDirectory;
 };
 
-} // namespace Mcs51General
+} // namespace
 
 // Mcs51GeneralSettingsGroup
 
@@ -790,7 +792,7 @@ Mcs51GeneralSettingsGroup::Mcs51GeneralSettingsGroup(
 void Mcs51GeneralSettingsGroup::buildTargetPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51General::TargetPageOptions opts(qbsProduct);
+    const TargetPageOptions opts(qbsProduct);
     // Add 'OGChipConfigPath' item (Device: <chip name>).
     addOptionsGroup(QByteArrayLiteral("OGChipConfigPath"),
                     {}, {opts.chipInfoPath});
@@ -834,7 +836,7 @@ void Mcs51GeneralSettingsGroup::buildTargetPage(
 void Mcs51GeneralSettingsGroup::buildStackHeapPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51General::StackHeapPageOptions opts(qbsProduct);
+    const StackHeapPageOptions opts(qbsProduct);
     // Add 'General Idata Stack Size' item (Stack size: IDATA).
     addOptionsGroup(QByteArrayLiteral("General Idata Stack Size"),
                     {}, {opts.idataStack});
@@ -877,7 +879,7 @@ void Mcs51GeneralSettingsGroup::buildStackHeapPage(
 void Mcs51GeneralSettingsGroup::buildDataPointerPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51General::DptrPageOptions opts(qbsProduct);
+    const DptrPageOptions opts(qbsProduct);
     // Add 'Nr of Datapointers' item (Number of DPTRs: 1...8).
     addOptionsGroup(QByteArrayLiteral("Nr of Datapointers"),
                     {}, {opts.dptrsCountIndex});
@@ -916,7 +918,7 @@ void Mcs51GeneralSettingsGroup::buildDataPointerPage(
 void Mcs51GeneralSettingsGroup::buildCodeBankPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51General::CodeBankPageOptions opts(qbsProduct);
+    const CodeBankPageOptions opts(qbsProduct);
     // Add 'CodeBankReg' item (Register address).
     addOptionsGroup(QByteArrayLiteral("CodeBankReg"),
                     {}, {opts.registerAddress});
@@ -937,7 +939,7 @@ void Mcs51GeneralSettingsGroup::buildCodeBankPage(
 void Mcs51GeneralSettingsGroup::buildLibraryOptionsPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51General::LibraryOptionsPageOptions opts(qbsProduct);
+    const LibraryOptionsPageOptions opts(qbsProduct);
     // Add 'Output variant' item (Printf formatter).
     addOptionsGroup(QByteArrayLiteral("Output variant"),
                     {}, {opts.printfFormatter});
@@ -950,8 +952,7 @@ void Mcs51GeneralSettingsGroup::buildLibraryConfigPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    const Mcs51General::LibraryConfigPageOptions opts(baseDirectory,
-                                                      qbsProduct);
+    const LibraryConfigPageOptions opts(baseDirectory, qbsProduct);
     // Add 'GRuntimeLibSelect2' and 'GRuntimeLibSelectSlave2' items
     // (Link with runtime: none/dlib/clib/etc).
     addOptionsGroup(QByteArrayLiteral("GRuntimeLibSelect2"),
@@ -970,8 +971,7 @@ void Mcs51GeneralSettingsGroup::buildOutputPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    const Mcs51General::OutputPageOptions opts(baseDirectory,
-                                               qbsProduct);
+    const OutputPageOptions opts(baseDirectory, qbsProduct);
     // Add 'GOutputBinary' item (Output file: executable/library).
     addOptionsGroup(QByteArrayLiteral("GOutputBinary"),
                     {}, {opts.binaryType});
@@ -987,4 +987,6 @@ void Mcs51GeneralSettingsGroup::buildOutputPage(
 }
 
 } // namespace v10
+} // namespace mcs51
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.h b/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.h
index 4189aebdc..1805a87af 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.h
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_MCS51GENERALSETTINGSGROUP_V10_H
-#define QBS_MCS51GENERALSETTINGSGROUP_V10_H
+#ifndef QBS_IAREWMCS51GENERALSETTINGSGROUP_V10_H
+#define QBS_IAREWMCS51GENERALSETTINGSGROUP_V10_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace mcs51 {
 namespace v10 {
 
 class Mcs51GeneralSettingsGroup final : public IarewSettingsPropertyGroup
@@ -57,6 +59,8 @@ private:
 };
 
 } // namespace v10
+} // namespace mcs51
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_MCS51GENERALSETTINGSGROUP_V10_H
+#endif // QBS_IAREWMCS51GENERALSETTINGSGROUP_V10_H
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp
index 7f45e245d..04e6f4f3d 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp
@@ -35,12 +35,14 @@
 #include <QtCore/qdir.h>
 
 namespace qbs {
+namespace iarew {
+namespace mcs51 {
 namespace v10 {
 
 constexpr int kLinkerArchiveVersion = 4;
 constexpr int kLinkerDataVersion = 21;
 
-namespace Mcs51Linker {
+namespace {
 
 // Config page options.
 
@@ -194,7 +196,7 @@ struct DiagnosticsPageOptions final
     int suppressAllWarnings = 0;
 };
 
-} // namespace Mcs51Linker
+} // namespace
 
 // Mcs51LinkerSettingsGroup
 
@@ -227,7 +229,7 @@ void Mcs51LinkerSettingsGroup::buildConfigPage(
         const QString &baseDirectory,
         const ProductData &qbsProduct)
 {
-    Mcs51Linker::ConfigPageOptions opts(baseDirectory, qbsProduct);
+    ConfigPageOptions opts(baseDirectory, qbsProduct);
 
     if (opts.configFilePaths.count() > 0) {
         // Note: IAR IDE does not allow to specify a multiple config files,
@@ -270,7 +272,7 @@ void Mcs51LinkerSettingsGroup::buildConfigPage(
 void Mcs51LinkerSettingsGroup::buildOutputPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Linker::OutputPageOptions opts(qbsProduct);
+    const OutputPageOptions opts(qbsProduct);
     // Add 'XOutOverride' item (Override default output file).
     addOptionsGroup(QByteArrayLiteral("XOutOverride"),
                     {}, {1});
@@ -282,7 +284,7 @@ void Mcs51LinkerSettingsGroup::buildOutputPage(
 void Mcs51LinkerSettingsGroup::buildListPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Linker::ListPageOptions opts(qbsProduct);
+    const ListPageOptions opts(qbsProduct);
     // Add 'XList' item (Generate linker listing).
     addOptionsGroup(QByteArrayLiteral("XList"),
                     {}, {opts.generateMap});
@@ -291,7 +293,7 @@ void Mcs51LinkerSettingsGroup::buildListPage(
 void Mcs51LinkerSettingsGroup::buildDefinePage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Linker::DefinePageOptions opts(qbsProduct);
+    const DefinePageOptions opts(qbsProduct);
     // Add 'XDefines' item (Defined symbols).
     addOptionsGroup(QByteArrayLiteral("XDefines"),
                     {}, opts.defineSymbols);
@@ -300,7 +302,7 @@ void Mcs51LinkerSettingsGroup::buildDefinePage(
 void Mcs51LinkerSettingsGroup::buildDiagnosticsPage(
         const ProductData &qbsProduct)
 {
-    const Mcs51Linker::DiagnosticsPageOptions opts(qbsProduct);
+    const DiagnosticsPageOptions opts(qbsProduct);
     // Add 'SuppressAllWarn' item (Suppress all warnings).
     addOptionsGroup(QByteArrayLiteral("SuppressAllWarn"),
                     {}, {opts.suppressAllWarnings});
@@ -327,4 +329,6 @@ void Mcs51LinkerSettingsGroup::buildExtraOptionsPage(
 }
 
 } // namespace v10
+} // namespace mcs51
+} // namespace iarew
 } // namespace qbs
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.h b/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.h
index ecfd077e9..fec80e5e6 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.h
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.h
@@ -28,12 +28,14 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_MCS51LINKERSETTINGSGROUP_V10_H
-#define QBS_MCS51LINKERSETTINGSGROUP_V10_H
+#ifndef QBS_IAREWMCS51LINKERSETTINGSGROUP_V10_H
+#define QBS_IAREWMCS51LINKERSETTINGSGROUP_V10_H
 
 #include "../../iarewsettingspropertygroup.h"
 
 namespace qbs {
+namespace iarew {
+namespace mcs51 {
 namespace v10 {
 
 class Mcs51LinkerSettingsGroupPrivate;
@@ -59,6 +61,8 @@ private:
 };
 
 } // namespace v10
+} // namespace mcs51
+} // namespace iarew
 } // namespace qbs
 
-#endif // QBS_MCS51LINKERSETTINGSGROUP_V10_H
+#endif // QBS_IAREWMCS51LINKERSETTINGSGROUP_V10_H
diff --git a/src/plugins/generator/iarew/iarewproject.cpp b/src/plugins/generator/iarew/iarewproject.cpp
index 9a18e807e..ee3775798 100644
--- a/src/plugins/generator/iarew/iarewproject.cpp
+++ b/src/plugins/generator/iarew/iarewproject.cpp
@@ -51,9 +51,12 @@ IarewProject::IarewProject(const GeneratableProject &genProject,
     Q_ASSERT(genProject.projects.size() == genProduct.data.size());
 
     // Create available configuration group factories.
-    m_factories.push_back(std::make_unique<v8::ArmBuildConfigurationGroupFactory>());
-    m_factories.push_back(std::make_unique<v7::AvrBuildConfigurationGroupFactory>());
-    m_factories.push_back(std::make_unique<v10::Mcs51BuildConfigurationGroupFactory>());
+    m_factories.push_back(std::make_unique<
+                          iarew::arm::v8::ArmBuildConfigurationGroupFactory>());
+    m_factories.push_back(std::make_unique<
+                          iarew::avr::v7::AvrBuildConfigurationGroupFactory>());
+    m_factories.push_back(std::make_unique<
+                          iarew::mcs51::v10::Mcs51BuildConfigurationGroupFactory>());
 
     // Construct file version item.
     appendChild<IarewFileVersionProperty>(versionInfo);