diff --git a/src/server.c b/src/server.c
index 7f202bf..862e559 100644
--- a/src/server.c
+++ b/src/server.c
@@ -171,7 +171,6 @@ void *server_get_property (Window win, Atom at, Atom type, int *num_results)
 	result = XGetWindowProperty(server.dsp, win, at, 0, 0x7fffffff, False, type, &type_ret, &format_ret, &nitems_ret, &bafter_ret, &prop_value);
 
 	// Send back resultcount
-	// it look some version of gcc doesn't do the cast. so we force it.
 	if (num_results) *num_results = (int)nitems_ret;
 
 	if (result == Success && prop_value) return prop_value;
diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index 921f067..06fdb84 100644
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -209,7 +209,7 @@ void get_icon (Task *tsk)
 	int i;
 	Imlib_Image img = NULL;
 	XWMHints *hints = 0;
-	long *data = 0;
+	int32_t *data = 0;
 
 	int k;
 	for (k=0; k<TASK_STATE_COUNT; ++k) {
@@ -224,7 +224,7 @@ void get_icon (Task *tsk)
 	if (data) {
 		// get ARGB icon
 		int w, h;
-		long *tmp_data;
+		int32_t *tmp_data;
 
 		tmp_data = get_best_icon (data, get_icon_count (data, i), i, &w, &h, panel->g_task.icon_size1);
 
diff --git a/src/util/window.c b/src/util/window.c
index f4ef6a0..c6bceb3 100644
--- a/src/util/window.c
+++ b/src/util/window.c
@@ -218,7 +218,7 @@ int window_is_active (Window win)
 }
 
 
-int get_icon_count (long *data, int num)
+int get_icon_count (int32_t *data, int num)
 {
 	int count, pos, w, h;
 
@@ -236,10 +236,10 @@ int get_icon_count (long *data, int num)
 }
 
 
-long *get_best_icon (long *data, int icon_count, int num, int *iw, int *ih, int best_icon_size)
+int32_t *get_best_icon (int32_t *data, int icon_count, int num, int *iw, int *ih, int best_icon_size)
 {
 	int width[icon_count], height[icon_count], pos, i, w, h;
-	long *icon_data[icon_count];
+	int32_t *icon_data[icon_count];
 
 	/* List up icons */
 	pos = 0;
diff --git a/src/util/window.h b/src/util/window.h
index 47798cb..79453ad 100644
--- a/src/util/window.h
+++ b/src/util/window.h
@@ -22,8 +22,8 @@ int window_is_urgent (Window win);
 int window_is_hidden (Window win);
 int window_is_active (Window win);
 int window_is_skip_taskbar (Window win);
-int get_icon_count (long *data, int num);
-long *get_best_icon (long *data, int icon_count, int num, int *iw, int *ih, int best_icon_size);
+int get_icon_count (int32_t *data, int num);
+int32_t *get_best_icon (int32_t *data, int icon_count, int num, int *iw, int *ih, int best_icon_size);
 void window_maximize_restore (Window win);
 void window_toggle_shade (Window win);
 int window_get_desktop (Window win);