diff --git a/config.mk b/config.mk
index 5e97e654b01b774ad1ddad0c32827128ddded888..ff5babcb1cd9ec77b4381477fbde799304ef8229 100644
--- a/config.mk
+++ b/config.mk
@@ -13,7 +13,7 @@ image_dir = $(prefix)/share/feh/images
 font_dir = $(prefix)/share/feh/fonts
 
 # default CFLAGS
-CFLAGS = -g -Wall -Wextra -O2
+CFLAGS = -g -Wall -Wextra -pedantic -O2
 
 # Comment these out if you don't have libxinerama
 xinerama = -DHAVE_LIBXINERAMA
diff --git a/src/imlib.c b/src/imlib.c
index 00aa6e5859f0e80a9d9c6ee0fb7afc0511963403..a789e1ba6adf7ebf29e46f57c947fcae966dd714 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -1044,7 +1044,7 @@ void feh_draw_actions(winwidget w)
 	}
 
 	gib_imlib_get_text_size(fn, "defined actions:", NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
-// Check for the widest line
+/* Check for the widest line */
 	max_tw = tw;
 
 	for (i = 0; i < 10; i++) {
diff --git a/src/ipc.h b/src/ipc.h
index 395b1509427caed7ef0a4f6cd41aed0def1c30a2..ac1b814fd5e53bfbba609fb836a92463e9334408 100644
--- a/src/ipc.h
+++ b/src/ipc.h
@@ -45,7 +45,7 @@ typedef struct {
 enum {
 	IPC_CMD_QUIT,
 	IPC_CMD_FILELIST_NEXT,
-	IPC_CMD_FILELIST_PREV,
+	IPC_CMD_FILELIST_PREV
 };
 
 #endif
diff --git a/src/winwidget.c b/src/winwidget.c
index 40d9fd20b6fcce554d04ecefe0b246bf1bdcfd73..c629f68bdfb028d6aed8fa1162c092958dd1e197 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -896,9 +896,9 @@ void feh_debug_print_winwid(winwidget w)
 	       "im_x = %d\n" "im_y = %d\n" "zoom = %f\n"
 	       "click_offset_x = %d\n" "click_offset_y = %d\n"
 	       "im_click_offset_x = %d\n" "im_click_offset_y = %d\n"
-	       "has_rotated = %d\n", w, w->win, w->w, w->h, w->im_w,
-	       w->im_h, w->im_angle, w->type, w->had_resize, w->im, w->gc,
-	       w->bg_pmap, w->name, w->file, w->mode, w->im_x, w->im_y,
+	       "has_rotated = %d\n", (void *)w, w->win, w->w, w->h, w->im_w,
+	       w->im_h, w->im_angle, w->type, w->had_resize, w->im, (void *)w->gc,
+	       w->bg_pmap, w->name, (void *)w->file, w->mode, w->im_x, w->im_y,
 	       w->zoom, w->click_offset_x, w->click_offset_y,
 	       w->im_click_offset_x, w->im_click_offset_y, w->has_rotated);
 }