diff --git a/kcontrol/keyboard/x11_helper.h b/kcontrol/keyboard/x11_helper.h
index 69490d64..98765794 100644
--- a/kcontrol/keyboard/x11_helper.h
+++ b/kcontrol/keyboard/x11_helper.h
@@ -54,7 +54,8 @@ private:
 	int xkbOpcode;
 };
 
-struct XkbConfig {
+class XkbConfig {
+public:
 	QString keyboardModel;
 	QStringList layouts;
 	QStringList variants;
@@ -64,7 +65,8 @@ struct XkbConfig {
 };
 
 
-struct LayoutUnit {
+class LayoutUnit {
+public:
 	static const int MAX_LABEL_LENGTH;
 
 	//TODO: move these to private?
@@ -106,7 +108,8 @@ private:
 	QKeySequence shortcut;
 };
 
-struct LayoutSet {
+class LayoutSet {
+public:
 	QList<LayoutUnit> layouts;
 	LayoutUnit currentLayout;
 
diff --git a/kcontrol/keyboard/xkb_rules.h b/kcontrol/keyboard/xkb_rules.h
index 2be85624..8066ebda 100644
--- a/kcontrol/keyboard/xkb_rules.h
+++ b/kcontrol/keyboard/xkb_rules.h
@@ -85,7 +85,8 @@ struct OptionGroupInfo: public ConfigItem {
     }
 };
 
-struct Rules {
+class Rules {
+public:
     enum ExtrasFlag { NO_EXTRAS, READ_EXTRAS };
 
 	static const char XKB_OPTION_GROUP_SEPARATOR;