diff --git a/src/kernel/cursor-procs.c b/src/kernel/cursor-procs.c
index dcc1ac61..16cc0bc4 100644
--- a/src/kernel/cursor-procs.c
+++ b/src/kernel/cursor-procs.c
@@ -1169,7 +1169,6 @@ void kernel_ShowCursorForGDI (BOOL fShow, void* pdc)
         GAL_SyncUpdate (cur_pdc->surface);
     }
 
-done:
     /* Since 5.0.13 */
     if (fShow) {
         GAL_UnlockSurface(cur_pdc->surface);
diff --git a/src/newgal/fbcon/fbvideo.h b/src/newgal/fbcon/fbvideo.h
index feaf93a4..e1a21472 100644
--- a/src/newgal/fbcon/fbvideo.h
+++ b/src/newgal/fbcon/fbvideo.h
@@ -48,6 +48,7 @@
 #define _GAL_fbvideo_h
 
 #include <pthread.h>
+#include <semaphore.h>
 #include <sys/types.h>
 #include <termios.h>
 #include <linux/fb.h>
diff --git a/src/newgal/surface.c b/src/newgal/surface.c
index 0598a5c1..ec2d3b4a 100644
--- a/src/newgal/surface.c
+++ b/src/newgal/surface.c
@@ -242,12 +242,12 @@ int GAL_SetColorKey (GAL_Surface *surface, Uint32 flag, Uint32 key)
     }
 
     if (flag) {
-        GAL_VideoDevice *video = __mg_current_video;
-        GAL_VideoDevice *this  = __mg_current_video;
-
         surface->flags |= GAL_SRCCOLORKEY;
         surface->format->colorkey = key;
 #if 0
+        GAL_VideoDevice *video = __mg_current_video;
+        GAL_VideoDevice *this  = __mg_current_video;
+
         if ((surface->flags & GAL_HWACCEL) == GAL_HWACCEL) {
             if ((video->SetHWColorKey == NULL) ||
                  (video->SetHWColorKey(this, surface, key) < 0)) {
@@ -299,9 +299,6 @@ int GAL_SetAlpha (GAL_Surface *surface, Uint32 flag, Uint8 value)
         GAL_UnRLESurface(surface, 1);
 
     if (flag) {
-        GAL_VideoDevice *video = __mg_current_video;
-        GAL_VideoDevice *this  = __mg_current_video;
-
         if (flag & GAL_SRCALPHA) {
             surface->flags |= GAL_SRCALPHA;
             surface->format->alpha = value;
@@ -310,6 +307,9 @@ int GAL_SetAlpha (GAL_Surface *surface, Uint32 flag, Uint8 value)
         }
 
 #if 0
+        GAL_VideoDevice *video = __mg_current_video;
+        GAL_VideoDevice *this  = __mg_current_video;
+
         if ((surface->flags & GAL_HWACCEL) == GAL_HWACCEL) {
             if ((video->SetHWAlpha == NULL) ||
                  (video->SetHWAlpha(this, surface, value) < 0)) {