diff --git a/src/2d_graph.cpp b/src/2d_graph.cpp
index 2b7d9b6..cc87c27 100644
--- a/src/2d_graph.cpp
+++ b/src/2d_graph.cpp
@@ -364,7 +364,7 @@ void surface::blend(tpos sx, tpos sy, tpos dx, tpos dy, tcolor color, BLEND_OP o
   RGB   color_rgb;
   RGB   pixel;
 
-  byte  r,g,b;
+  Uint8 r, g, b;
   color_unmap(color, &r, &g, &b);
   color_rgb.r = r;
   color_rgb.g = g;
@@ -726,8 +726,8 @@ spr_handle sprite_store::sprite_insert(const char *p_file, spr_handle first, spr
   SURFACE *p_orig = NULL;
   FHANDLE f;  
   int     scale = FALSE;
-  char    filename[200];
-  char    line[200];
+  char    filename[201];
+  char    line[201];
 
   strncpy(filename, p_file, 200);
   change_tail(filename, BITMAP_FORMAT);
diff --git a/src/defines.h b/src/defines.h
index 3cb8427..f04f327 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -447,9 +447,9 @@ typedef int anim_handle;
 #define INI_USER_DIRECTORY "~/.berusky"
 #define INI_USER_LEVELS    "~/.berusky/User"
 #define INI_USER_PROFILES  "~/.berusky/Profiles"
-#define INI_FILE_GLOBAL    "/etc/berusky/"INI_FILE_NAME
-#define INI_FILE_USER      "~/.berusky/"INI_FILE_NAME
-#define INI_FILE_LOCAL     "./"INI_FILE_NAME
+#define INI_FILE_GLOBAL    "/etc/berusky/" INI_FILE_NAME
+#define INI_FILE_USER      "~/.berusky/" INI_FILE_NAME
+#define INI_FILE_LOCAL     "./" INI_FILE_NAME
 #define DIRECTORY_GET(d)   (d)
 #define FILE_GET(d)        (d)
 #elif WINDOWS
diff --git a/src/level_game.cpp b/src/level_game.cpp
index 1fc6e94..f521075 100644
--- a/src/level_game.cpp
+++ b/src/level_game.cpp
@@ -32,6 +32,7 @@
 #endif // LINUX
 
 #include "berusky.h"
+#include <cstddef>
 
 /**************************************************************** 
   Player - structure for storing information about player