diff --git a/src/aclass.c b/src/aclass.c
index 57fe211b..52679a76 100644
--- a/src/aclass.c
+++ b/src/aclass.c
@@ -645,9 +645,9 @@ ActionEncode(Action * aa, char *buf, int len)
      case EVENT_KEY_UP:
 	event = "KeyUp";
 	goto encode_kb;
+      encode_kb:
 	if (!aa->key_str)
 	   return 0;
-      encode_kb:
 	len = Esnprintf(buf, len, "%-7s %4s %8s %s\n", event, mod, aa->key_str,
 			(aa->action->params) ? aa->action->params : "");
 	break;
diff --git a/src/backgrounds.c b/src/backgrounds.c
index 5fd60404..f4e3d1ac 100644
--- a/src/backgrounds.c
+++ b/src/backgrounds.c
@@ -729,8 +729,8 @@ BackgroundApplyWin(Background * bg, Window win)
 void
 BackgroundSet(Background * bg, Window win, unsigned int w, unsigned int h)
 {
-   Pixmap              pmap;
-   unsigned long       pixel;
+   Pixmap              pmap = None;
+   unsigned long       pixel = 0;
 
    if (bg->pmap)
       pmap = bg->pmap;
diff --git a/src/ecompmgr.c b/src/ecompmgr.c
index 93441624..20d56bd3 100644
--- a/src/ecompmgr.c
+++ b/src/ecompmgr.c
@@ -181,8 +181,8 @@ static struct
    XserverRegion       rgn_screen;
    int                 shadow_mode;
    unsigned int        opac_or;	/* 0 -> 0xffffffff */
-   float               opac_blur;	/* 0. -> 1. */
-   float               opac_sharp;	/* 0. -> 1. */
+   double              opac_blur;	/* 0. -> 1. */
+   double              opac_sharp;	/* 0. -> 1. */
 } Mode_compmgr;
 
 #define _ECM_SET_CLIP_CHANGED()  Mode_compmgr.reorder = 1
@@ -2517,7 +2517,6 @@ ECompMgrHandleRootEvent(XEvent * ev, void *prm)
 	   goto case_CreateNotify;
 	else
 	   goto case_DestroyNotify;
-	break;
 
      case ConfigureNotify:
 	if (ev->xconfigure.window == VRoot.win)
diff --git a/src/ewin-ops.c b/src/ewin-ops.c
index 6a3e4da0..e0628066 100644
--- a/src/ewin-ops.c
+++ b/src/ewin-ops.c
@@ -33,7 +33,6 @@
 #include "iclass.h"		/* FIXME - Should not be here */
 #include "snaps.h"
 #include "xwin.h"
-#include <math.h>
 
 static const WinOp  winops[] = {
    {"border", 2, 1, 0, EWIN_OP_BORDER},
diff --git a/src/mwm.c b/src/mwm.c
index 19117bd0..8395dd4c 100644
--- a/src/mwm.c
+++ b/src/mwm.c
@@ -23,7 +23,6 @@
 #include "E.h"
 #include "ewins.h"
 #include "hints.h"
-#include <X11/Xatom.h>
 
 /* Motif window hints */
 #define MWM_HINTS_FUNCTIONS           (1L << 0)