3 files changed, 22 insertions, 13 deletions

diff --git a/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp b/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp
index b2180ba..a47bf6c 100644
--- a/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp
@@ -6,8 +6,10 @@ QString Null_String((const char*) 0);
 
 // Implementation of KeyNames
-static struct {
+struct Key_Names_t {
 	int key;
 	char *name;
-} Key_Names[] = {
+};
+
+static const Key_Names_t Key_Names[] = {
 	{ 32, "Space" },
 	{ 39, "Apostrophe" },
@@ -106,8 +108,10 @@ const QString& KeyNames::find(int k) {
 
 // Implementation of ModifierNames
-struct {
+struct Modifier_Names_t {
 	int value;
 	char* name;
-} Modifier_Names[] = {
+};
+
+static const Modifier_Names_t Modifier_Names[] = {
 	{ 8, "Shift" },
 	{ 16, "Control" },
@@ -160,12 +164,14 @@ const QString& ModifierNames::find(int k) {
 // Implementation of KeycodeNames
 
-struct {
+struct Keycode_Names_t {
 	char* name;
 	int keycode;
-} Keycode_Names[] = {
+};
+
+static const Keycode_Names_t Keycode_Names[] = {
 	{ "Escape", 0x1000 },
 	{ "Tab", 0x1001 },
 	{ "Backtab", 0x1002 },
-	{ "Backspace", 0x1003 }, 
+	{ "Backspace", 0x1003 },
 	{ "BackSpace", 0x1003 },
 	{ "Return", 0x1004 },
@@ -182,7 +188,7 @@ struct {
 	{ "Right", 0x1014 },
 	{ "Down", 0x1015 },
-	{ "Prior", 0x1016 }, 
-	{ "PageUp", 0x1016 }, 
-	{ "Next", 0x1017 }, 
+	{ "Prior", 0x1016 },
+	{ "PageUp", 0x1016 },
+	{ "Next", 0x1017 },
 	{ "PageDown", 0x1017 },
 	{ "Shift", 0x1020 },
diff --git a/noncore/games/qasteroids/view.cpp b/noncore/games/qasteroids/view.cpp
index 352c63b..3a4d410 100644
--- a/noncore/games/qasteroids/view.cpp
+++ b/noncore/games/qasteroids/view.cpp
@@ -56,11 +56,12 @@
 #endif
 
-struct
+struct kas_animations_t
 {
     int id;
     const char *path;
     int frames;
-}
-kas_animations [] =
+};
+
+static const kas_animations_t kas_animations [] =
 {
 //    { ID_ROCK_LARGE,       "rock1/rock1\%1.png",       32 },
diff --git a/noncore/games/solitaire/cardpile.h b/noncore/games/solitaire/cardpile.h
index 1eb2499..757e6b3 100644
--- a/noncore/games/solitaire/cardpile.h
+++ b/noncore/games/solitaire/cardpile.h
@@ -21,4 +21,6 @@
 #define CARD_PILE_H
 
+#include "card.h"
+
 
 #include <qpoint.h>