diff --git a/kcms/keyboard/flags.h b/kcms/keyboard/flags.h
index 6d6be87ef..11e6099ff 100644
--- a/kcms/keyboard/flags.h
+++ b/kcms/keyboard/flags.h
@@ -1,72 +1,72 @@
 /*
  *  Copyright (C) 2010 Andriy Rysin (rysin@kde.org)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 
 #ifndef FLAGS_H_
 #define FLAGS_H_
 
 #include <QObject>
 #include <QString>
 #include <QMap>
 
 class QPixmap;
 class QIcon;
-struct LayoutUnit;
+class LayoutUnit;
 class KeyboardConfig;
 struct Rules;
 class QPainter;
 namespace Plasma {
 	class Svg;
 }
 
 class Flags : public QObject
 {
 	Q_OBJECT
 
 public:
 	Flags();
 	~Flags() override;
 
 	const QIcon getIcon(const QString& layout);
 	const QIcon getIconWithText(const LayoutUnit& layoutUnit, const KeyboardConfig& keyboardConfig);
 	const QPixmap& getTransparentPixmap() const { return *transparentPixmap; }
 
 	static QString getLongText(const LayoutUnit& layoutUnit, const Rules* rules);
 	static QString getShortText(const LayoutUnit& layoutUnit, const KeyboardConfig& keyboardConfig);
 	static QString getFullText(const LayoutUnit& layoutUnit, const KeyboardConfig& keyboardConfig, const Rules* rules);
 
 public Q_SLOTS:
 	void themeChanged();
 	void clearCache();
 
 Q_SIGNALS:
 	void pixmapChanged();
 
 private:
 	QIcon createIcon(const QString& layout);
 	QString getCountryFromLayoutName(const QString& fullLayoutName) const;
 	void drawLabel(QPainter& painter, const QString& layoutText, bool flagShown);
 	Plasma::Svg* getSvg();
 
 	QMap<QString, QIcon> iconMap;
 	QMap<QString, QIcon> iconOrTextMap;
 	QPixmap* transparentPixmap;
 	Plasma::Svg* svg;
 };
 
 #endif /* FLAGS_H_ */
diff --git a/kcms/keyboard/layouts_menu.h b/kcms/keyboard/layouts_menu.h
index 63d186cfb..00c91d45d 100644
--- a/kcms/keyboard/layouts_menu.h
+++ b/kcms/keyboard/layouts_menu.h
@@ -1,56 +1,56 @@
 /*
  *  Copyright (C) 2010 Andriy Rysin (rysin@kde.org)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #ifndef LAYOUTS_MENU_H_
 #define LAYOUTS_MENU_H_
 
 #include <QList>
 #include <QIcon>
 
 class QAction;
 class KeyboardConfig;
 class Flags;
 struct Rules;
 class QActionGroup;
-struct LayoutUnit;
+class LayoutUnit;
 
 class LayoutsMenu : public QObject
 {
     Q_OBJECT
 
 public:
 	LayoutsMenu(const KeyboardConfig& keyboardConfig, const Rules& rules, Flags& flags);
 	~LayoutsMenu() override;
 
 	QList<QAction*> contextualActions();
 	static int switchToLayout(const LayoutUnit& layoutUnit, const KeyboardConfig& keyboardConfig);
 
 private Q_SLOTS:
 	void actionTriggered(QAction* action);
 
 private:
 	const QIcon getFlag(const QString& layout) const;
 	QAction* createAction(const LayoutUnit& layoutUnit) const;
 
 	const KeyboardConfig& keyboardConfig;
 	const Rules& rules;
 	Flags& flags;
     QActionGroup* actionGroup;
 };
 
 #endif /* LAYOUTS_MENU_H_ */
diff --git a/kcms/keyboard/xkb_helper.h b/kcms/keyboard/xkb_helper.h
index 6e8f13f5c..5e4f94d2c 100644
--- a/kcms/keyboard/xkb_helper.h
+++ b/kcms/keyboard/xkb_helper.h
@@ -1,35 +1,35 @@
 /*
  *  Copyright (C) 2010 Andriy Rysin (rysin@kde.org)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 
 #ifndef XKB_HELPER_H_
 #define XKB_HELPER_H_
 
 template <typename T> class QList;
-struct LayoutUnit;
+class LayoutUnit;
 class QStringList;
 class KeyboardConfig;
 
 class XkbHelper {
 public:
 	static bool initializeKeyboardLayouts(KeyboardConfig& config);
 	static bool initializeKeyboardLayouts(const QList<LayoutUnit>& layouts);
 	static bool runConfigLayoutCommand(const QStringList& setxkbmapCommandArguments);
 };
 
 #endif /* XKB_HELPER_H_ */