diff --git a/src/screen.c b/src/screen.c
index 271614a4..835b3272 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1304,8 +1304,11 @@ void ScreenCapture(WScreen *scr, int mode)
 	}
 
 	switch (mode) {
+		WWindow *wwin;
+		XImage *pimg;
+
 		case PRINT_WINDOW:
-			WWindow *wwin = scr->focused_window;
+			wwin = scr->focused_window;
 			if (wwin && !wwin->flags.shaded) {
 				/*
 				 * check if hint WM_TAKE_FOCUS is set, if it's the case
@@ -1316,7 +1319,6 @@ void ScreenCapture(WScreen *scr, int mode)
 				}
 				else {
 					/* we will only capture the visible window part */
-					XImage *pimg;
 					int x_crop = 0;
 					int y_crop = 0;
 					int w_crop = wwin->client.width;
@@ -1345,8 +1347,6 @@ void ScreenCapture(WScreen *scr, int mode)
 			}
 			break;
 		case PRINT_PARTIAL:
-			XImage *pimg;
-
 			pimg = imageCaptureArea(scr);
 			if (pimg) {
 				img = RCreateImageFromXImage(scr->rcontext, pimg, None);
diff --git a/src/wsmap.c b/src/wsmap.c
index 064f8df9..6f30e36a 100644
--- a/src/wsmap.c
+++ b/src/wsmap.c
@@ -492,6 +492,9 @@ static void handle_event(WWorkspaceMap *wsmap, W_WorkspaceMap *wsmap_array)
 		modifiers = ev.xkey.state & w_global.shortcut.modifiers_mask;
 
 		switch (ev.type) {
+			WMScreen *wmscr;
+			WMColor *black;
+
 		case KeyPress:
 			if (ev.xkey.keycode == escKey || (wKeyBindings[WKBD_WORKSPACEMAP].keycode != 0 &&
 			                                  wKeyBindings[WKBD_WORKSPACEMAP].keycode == ev.xkey.keycode &&
@@ -531,8 +534,8 @@ static void handle_event(WWorkspaceMap *wsmap, W_WorkspaceMap *wsmap_array)
 			break;
 
 		case  FocusIn:
-			WMScreen *wmscr = wsmap->scr->wmscreen;
-			WMColor *black = WMBlackColor(wmscr);
+			wmscr = wsmap->scr->wmscreen;
+			black = WMBlackColor(wmscr);
 			const char *text = "?";
 			WMFont *bold = WMBoldSystemFontOfSize(wmscr, wsmap->mini_workspace_width / 3);
 			int x = (wsmap->mini_workspace_width / 2) - (WMWidthOfString(bold, text, strlen(text)) / 2);