diff --git a/BasePlugin/BaseInterface.hh b/BasePlugin/BaseInterface.hh
index dab613f62959cd70d008f06aedf72e74d00a71b6..ecbdc72a1418033646f5acb7dafc2cc95b4d361b 100644
--- a/BasePlugin/BaseInterface.hh
+++ b/BasePlugin/BaseInterface.hh
@@ -42,7 +42,6 @@
 #pragma once
 
 #include <OpenFlipper/common/Types.hh>
-#include "WhatsThisGenerator.hh"
 
 
 /** \file BaseInterface.hh
diff --git a/common/BaseObject.cc b/common/BaseObject.cc
index 6b71c2719c1ff3c4d5da920d71c0e272c33b20d4..d3b22f4dbdbb0e107c43ae39f5eaba12b2e571dc 100644
--- a/common/BaseObject.cc
+++ b/common/BaseObject.cc
@@ -821,7 +821,38 @@ deleteData() {
 
 }
 
-/** Returns a flat, human readable representation of all comments. */
+QString& BaseObject::getCommentByKey(const QString &key) {
+     return commentsByKey_[key];
+ }
+
+
+ const QString BaseObject::getCommentByKey(const QString &key) const {
+     return commentsByKey_.value(key);
+ }
+
+
+ bool BaseObject::hasCommentForKey(const QString &key) const {
+     return commentsByKey_.contains(key);
+ }
+
+
+ bool BaseObject::hasComments() const {
+     return !commentsByKey_.empty();
+ }
+
+ void BaseObject::clearComment(const QString &key) {
+     commentsByKey_.remove(key);
+ }
+
+ void BaseObject::clearAllComments() {
+     commentsByKey_.clear();
+ }
+
+
+ const QMap<QString, QString>& BaseObject::getAllComments() const {
+     return commentsByKey_;
+ }
+
 const QString BaseObject::getAllCommentsFlat() const {
     QStringList result;
 
diff --git a/common/BaseObject.hh b/common/BaseObject.hh
index 6da9585701761d95d12bfec082ded3e209c37fe6..3901ae03140faa08ca6d3faa09b9f102b62be96d 100644
--- a/common/BaseObject.hh
+++ b/common/BaseObject.hh
@@ -541,41 +541,27 @@ class DLLEXPORT BaseObject : public QObject {
     * If no comment with the specified exists, an empty
     * one is created.
     */
-    QString &getCommentByKey(const QString &key) {
-        return commentsByKey_[key];
-    }
+    QString &getCommentByKey(const QString &key);
 
     /** \brief Get comment for the specified key.
     *
     * If no comment with the specified exists, an empty comment
     * is returned (but not inserted into the map).
     */
-    const QString getCommentByKey(const QString &key) const {
-        return commentsByKey_.value(key);
-    }
+    const QString getCommentByKey(const QString &key) const;
 
     /** Returns true if a comment for the specified key exists, false otherwise. */
-    bool hasCommentForKey(const QString &key) const {
-        return commentsByKey_.contains(key);
-    }
+    bool hasCommentForKey(const QString &key) const;
 
     /** Indicates whether any comment has been supplied for this object. */
-    bool hasComments() const {
-        return !commentsByKey_.empty();
-    }
+    bool hasComments() const;
 
-    void clearComment(const QString &key) {
-        commentsByKey_.remove(key);
-    }
+    void clearComment(const QString &key);
 
-    void clearAllComments() {
-        commentsByKey_.clear();
-    }
+    void clearAllComments();
 
     /** Returns a reference to all comments. */
-    const QMap<QString, QString> &getAllComments() const {
-        return commentsByKey_;
-    }
+    const QMap<QString, QString> &getAllComments() const;
 
     /** Returns a flat, human readable representation of all comments. */
     const QString getAllCommentsFlat() const;