diff --git a/src/libs/utils/layoutbuilder.cpp b/src/libs/utils/layoutbuilder.cpp
index 3324e9c4f6f..33046a07f7d 100644
--- a/src/libs/utils/layoutbuilder.cpp
+++ b/src/libs/utils/layoutbuilder.cpp
@@ -323,7 +323,7 @@ void doAddWidget(LayoutBuilder &builder, QWidget *widget)
 
     A LayoutBuilder instance is typically used locally within a function and never stored.
 
-    \sa addItem(), addItems(), addRow(), finishRow()
+    \sa addItem(), addItems(), addRow()
 */
 
 
@@ -351,24 +351,15 @@ void LayoutBuilder::addRow(const LayoutItems &items)
     addItems(items);
 }
 
-/*!
-    Instructs a layout builder to finish the current row.
-    This is implicitly called by LayoutBuilder's destructor.
- */
-void LayoutItem::finishRow()
-{
-    addItem(br);
-}
-
 /*!
     This starts a new row containing \a items. The row can be further extended by
     other items using \c addItem() or \c addItems().
 
-    \sa finishRow(), addItem(), addItems()
+    \sa addItem(), addItems()
  */
 void LayoutItem::addRow(const LayoutItems &items)
 {
-    finishRow();
+    addItem(br);
     addItems(items);
 }
 
diff --git a/src/libs/utils/layoutbuilder.h b/src/libs/utils/layoutbuilder.h
index 1a9c3439bcc..f2efeaf2fe9 100644
--- a/src/libs/utils/layoutbuilder.h
+++ b/src/libs/utils/layoutbuilder.h
@@ -24,48 +24,15 @@ QT_END_NAMESPACE
 
 namespace Layouting {
 
-class LayoutBuilder;
-class LayoutItem;
-class Span;
-
-// Special items
-
-class QTCREATOR_UTILS_EXPORT Space
-{
-public:
-    explicit Space(int space) : space(space) {}
-    const int space;
-};
-
-class QTCREATOR_UTILS_EXPORT Stretch
-{
-public:
-    explicit Stretch(int stretch = 1) : stretch(stretch) {}
-    const int stretch;
-};
-
-
 // LayoutItem
 
+class LayoutBuilder;
+class LayoutItem;
 using LayoutItems = QList<LayoutItem>;
 
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const std::function<void(QObject *target)> &t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, QWidget *t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, QLayout *t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, LayoutItem(*t)());
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const QString &t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const Span &t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const Space &t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const Stretch &t);
-
 class QTCREATOR_UTILS_EXPORT LayoutItem
 {
 public:
-    enum class AlignmentType {
-        DefaultAlignment,
-        AlignAsFormLabel,
-    };
-
     using Setter = std::function<void(QObject *target)>;
 
     LayoutItem();
@@ -88,7 +55,6 @@ public:
     void addItem(const LayoutItem &item);
     void addItems(const LayoutItems &items);
     void addRow(const LayoutItems &items);
-    void finishRow();
 
     std::function<void(LayoutBuilder &)> onAdd;
     std::function<void(LayoutBuilder &)> onExit;
@@ -96,6 +62,22 @@ public:
     LayoutItems subItems;
 };
 
+// Special items
+
+class QTCREATOR_UTILS_EXPORT Space
+{
+public:
+    explicit Space(int space) : space(space) {}
+    const int space;
+};
+
+class QTCREATOR_UTILS_EXPORT Stretch
+{
+public:
+    explicit Stretch(int stretch = 1) : stretch(stretch) {}
+    const int stretch;
+};
+
 class QTCREATOR_UTILS_EXPORT Span
 {
 public:
@@ -181,6 +163,17 @@ public:
     int exec(int &argc, char *argv[]);
 };
 
+
+void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const std::function<void(QObject *target)> &t);
+void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, QWidget *t);
+void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, QLayout *t);
+void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, LayoutItem(*t)());
+void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const QString &t);
+void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const Span &t);
+void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const Space &t);
+void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const Stretch &t);
+
+
 // "Singletons"
 
 QTCREATOR_UTILS_EXPORT LayoutItem br();