diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index 46d38e83f1..f8f8338b41 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -105,7 +105,7 @@ gboolean
 follow_add_to_gtk_text(char *buffer, size_t nchars, gboolean is_server,
 		       void *arg)
 {
-	GtkWidget *text = arg;
+	GtkWidget *text = (GtkWidget *)arg;
 	GtkTextBuffer *buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
 	GtkTextIter    iter;
 
@@ -146,7 +146,7 @@ static gboolean
 follow_print_text(char *buffer, size_t nchars, gboolean is_server _U_,
 		  void *arg)
 {
-	print_stream_t *stream = arg;
+	print_stream_t *stream = (print_stream_t *)arg;
 	size_t i;
 	char *str;
 
@@ -160,7 +160,7 @@ follow_print_text(char *buffer, size_t nchars, gboolean is_server _U_,
 	}
 
 	/* convert unterminated char array to a zero terminated string */
-	str = g_malloc(nchars + 1);
+	str = (char *)g_malloc(nchars + 1);
 	memcpy(str, buffer, nchars);
 	str[nchars] = 0;
 	print_line(stream, /*indent*/ 0, str);
@@ -172,7 +172,7 @@ follow_print_text(char *buffer, size_t nchars, gboolean is_server _U_,
 static gboolean
 follow_write_raw(char *buffer, size_t nchars, gboolean is_server _U_, void *arg)
 {
-	FILE *fh = arg;
+	FILE *fh = (FILE *)arg;
 	size_t nwritten;
 
 	nwritten = fwrite(buffer, 1, nchars, fh);
@@ -186,7 +186,7 @@ follow_write_raw(char *buffer, size_t nchars, gboolean is_server _U_, void *arg)
 static void
 follow_charset_toggle_cb(GtkWidget * w _U_, gpointer data)
 {
-	follow_info_t	*follow_info = data;
+	follow_info_t	*follow_info = (follow_info_t *)data;
 
 	/*
 	 * A radio button toggles when it goes on and when it goes
@@ -242,7 +242,7 @@ follow_load_text(follow_info_t *follow_info)
 void
 follow_filter_out_stream(GtkWidget * w _U_, gpointer data)
 {
-	follow_info_t	*follow_info = data;
+	follow_info_t	*follow_info = (follow_info_t *)data;
 
 	/* Lock out user from messing with us. (ie. don't free our data!) */
 	gtk_widget_set_sensitive(follow_info->streamwindow, FALSE);
@@ -263,7 +263,7 @@ follow_filter_out_stream(GtkWidget * w _U_, gpointer data)
 static void
 follow_find_cb(GtkWidget * w _U_, gpointer data)
 {
-	follow_info_t      	*follow_info = data;
+	follow_info_t      	*follow_info = (follow_info_t *)data;
 	GtkWidget		*find_dlg_w, *main_vb, *buttons_row, *find_lb;
 	GtkWidget		*find_hb, *find_text_box, *find_bt, *cancel_bt;
 
@@ -312,8 +312,8 @@ follow_find_cb(GtkWidget * w _U_, gpointer data)
 	buttons_row = dlg_button_row_new(GTK_STOCK_FIND, GTK_STOCK_CANCEL,
 					 NULL);
 	gtk_box_pack_start(GTK_BOX(main_vb), buttons_row, TRUE, TRUE, 0);
-	find_bt = g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_FIND);
-	cancel_bt = g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_CANCEL);
+	find_bt   = (GtkWidget *)g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_FIND);
+	cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_CANCEL);
 
 	g_signal_connect(find_bt, "clicked", G_CALLBACK(follow_find_button_cb), follow_info);
 	g_object_set_data(G_OBJECT(find_bt), "find_string", find_text_box);
@@ -333,7 +333,7 @@ follow_find_button_cb(GtkWidget * w, gpointer data)
 {
 	gboolean		found;
 	const gchar		*find_string;
-	follow_info_t	*follow_info = data;
+	follow_info_t	*follow_info = (follow_info_t *)data;
 	GtkTextBuffer	*buffer;
 	GtkTextIter		iter, match_start, match_end;
 	GtkTextMark		*last_pos_mark;
@@ -379,7 +379,7 @@ follow_find_button_cb(GtkWidget * w, gpointer data)
 static void
 follow_find_destroy_cb(GtkWidget * win _U_, gpointer data)
 {
-	follow_info_t	*follow_info = data;
+	follow_info_t	*follow_info = (follow_info_t *)data;
 
 	/* Note that we no longer have a dialog box. */
 	follow_info->find_dlg_w = NULL;
@@ -391,7 +391,7 @@ follow_print_stream(GtkWidget * w _U_, gpointer data)
 	print_stream_t	*stream;
 	gboolean	 to_file;
 	const char	*print_dest;
-	follow_info_t	*follow_info = data;
+	follow_info_t	*follow_info =(follow_info_t *) data;
 #ifdef _WIN32
 	gboolean         win_printer = FALSE;
 	int              tmp_fd;
@@ -527,7 +527,7 @@ static void
 follow_save_as_cmd_cb(GtkWidget *w _U_, gpointer data)
 {
 	GtkWidget		*new_win;
-	follow_info_t	*follow_info = data;
+	follow_info_t	*follow_info = (follow_info_t *)data;
 
 #if 0  /* XXX: GtkFileChooserDialog/gtk_dialog_run currently being used is effectively modal so this is not req'd */
 	if (follow_info->follow_save_as_w != NULL) {
@@ -595,12 +595,12 @@ follow_save_as_ok_cb(GtkWidget * w _U_, gpointer fs)
 		   directory, and leave the selection box displayed. */
 		set_last_open_dir(to_name);
 		g_free(to_name);
-		file_selection_set_current_folder(fs, get_last_open_dir());
-		gtk_file_chooser_set_current_name(fs, "");
+		file_selection_set_current_folder((GtkWidget *)fs, get_last_open_dir());
+		gtk_file_chooser_set_current_name((GtkFileChooser *)fs, "");
 		return FALSE; /* do gtk_dialog_run again */
 	}
 
-	follow_info = g_object_get_data(G_OBJECT(fs), E_FOLLOW_INFO_KEY);
+	follow_info = (follow_info_t *)g_object_get_data(G_OBJECT(fs), E_FOLLOW_INFO_KEY);
 
 	if (follow_info->show_type == SHOW_RAW) {
 		/* Write the data out as raw binary data */
@@ -667,7 +667,7 @@ follow_save_as_ok_cb(GtkWidget * w _U_, gpointer fs)
 static void
 follow_save_as_destroy_cb(GtkWidget * win _U_, gpointer data)
 {
-	follow_info_t	*follow_info = data;
+	follow_info_t	*follow_info = (follow_info_t *)data;
 
 	/* Note that we no longer have a dialog box. */
 	follow_info->follow_save_as_w = NULL;
@@ -676,7 +676,7 @@ follow_save_as_destroy_cb(GtkWidget * win _U_, gpointer data)
 static void
 follow_stream_direction_changed(GtkWidget *w, gpointer data)
 {
-	follow_info_t *follow_info = data;
+	follow_info_t *follow_info = (follow_info_t *)data;
 
 	switch(gtk_combo_box_get_active(GTK_COMBO_BOX(w))) {
 
@@ -885,17 +885,17 @@ follow_stream(const gchar *title, follow_info_t *follow_info,
 	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 5);
 
 
-	button = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_FILTER_OUT_STREAM);
+	button = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_FILTER_OUT_STREAM);
 	gtk_widget_set_tooltip_text(button, "Build a display filter which cuts this stream from the capture");
 	g_signal_connect(button, "clicked", G_CALLBACK(follow_filter_out_stream),
 		       follow_info);
 
-	button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
+	button = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
 	window_set_cancel_button(streamwindow, button, window_cancel_button_cb);
 	gtk_widget_set_tooltip_text(button, "Close the dialog and keep the current display filter");
 	gtk_widget_grab_default(button);
 
-	button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+	button = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
 	g_signal_connect(button, "clicked", G_CALLBACK(topic_cb),
 			 (gpointer)HELP_FOLLOW_STREAM_DIALOG);
 
@@ -932,7 +932,7 @@ follow_destroy_cb(GtkWidget *w, gpointer data _U_)
 	GList *cur;
 	int i;
 
-	follow_info = g_object_get_data(G_OBJECT(w), E_FOLLOW_INFO_KEY);
+	follow_info = (follow_info_t *)g_object_get_data(G_OBJECT(w), E_FOLLOW_INFO_KEY);
 
 	switch(follow_info->follow_type) {
 
@@ -947,7 +947,7 @@ follow_destroy_cb(GtkWidget *w, gpointer data _U_)
 	case FOLLOW_UDP :
 		for(cur = follow_info->payload; cur; cur = g_list_next(cur))
 			if(cur->data) {
-				follow_record = cur->data;
+			follow_record = (follow_record_t *)cur->data;
 				if(follow_record->data)
 					g_byte_array_free(follow_record->data,
 							  TRUE);
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index 3929d7ce1e..1f7189bd29 100644
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -318,7 +318,7 @@ static gboolean dialog_graph_dump_to_file(graph_analysis_data_t *user_data)
 		return FALSE;
 	}
 
-	time_str       = g_malloc(COL_MAX_LEN);
+	time_str       = (gchar *)g_malloc(COL_MAX_LEN);
 	label_string   = g_string_new("");
 	empty_line     = g_string_new("");
 	separator_line = g_string_new("");
@@ -329,7 +329,7 @@ static gboolean dialog_graph_dump_to_file(graph_analysis_data_t *user_data)
 	list = g_list_first(user_data->graph_info->list);
 	while (list)
 	{
-		gai = list->data;
+		gai = (graph_analysis_item_t *)list->data;
 		list = g_list_next(list);
 
 		if (!gai->display)
@@ -412,7 +412,7 @@ static gboolean dialog_graph_dump_to_file(graph_analysis_data_t *user_data)
 	list = g_list_first(user_data->graph_info->list);
 	while (list)
 	{
-		gai = list->data;
+		gai = (graph_analysis_item_t *)list->data;
 		list = g_list_next(list);
 
 		if (!gai->display)
@@ -533,7 +533,7 @@ static void overwrite_existing_file_cb(gpointer dialog _U_, gint btn, gpointer u
 	switch (btn) {
 	case(ESD_BTN_YES):
 	    /* overwrite the file*/
-	    dialog_graph_dump_to_file(user_data);
+	    dialog_graph_dump_to_file((graph_analysis_data_t *)user_data);
 	    break;
 	case(ESD_BTN_NO):
 	    break;
@@ -547,7 +547,7 @@ static void overwrite_existing_file_cb(gpointer dialog _U_, gint btn, gpointer u
 static gboolean save_to_file_ok_cb(GtkWidget *ok_bt _U_, gpointer user_data)
 {
 	FILE *file_test;
-	graph_analysis_data_t *user_data_p = user_data;
+	graph_analysis_data_t *user_data_p = (graph_analysis_data_t *)user_data;
 
 	user_data_p->dlg.save_file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(save_to_file_w));
 
@@ -584,7 +584,7 @@ static gboolean save_to_file_ok_cb(GtkWidget *ok_bt _U_, gpointer user_data)
 	}
 
 	else{
-		if (!dialog_graph_dump_to_file(user_data)) {
+		if (!dialog_graph_dump_to_file((graph_analysis_data_t *)user_data)) {
 			/* Couldn't open the file ?  */
 			g_free(user_data_p->dlg.save_file);
 			return TRUE;
@@ -728,7 +728,7 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data)
 	}
 
 	bg_pixbuf =  gdk_pixbuf_new_from_xpm_data(voip_bg_xpm);
-	time_str = g_malloc(COL_MAX_LEN);
+	time_str = (gchar *)g_malloc(COL_MAX_LEN);
 	user_data->dlg.needs_redraw = FALSE;
 
 	gtk_widget_get_allocation(user_data->dlg.draw_area_time, &draw_area_time_alloc);
@@ -795,7 +795,7 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data)
 	i = 0;
 	while (list)
 	{
-		gai = list->data;
+		gai = (graph_analysis_item_t *)list->data;
 		if (gai->display) {
 			if (current_item>=display_items) break;		/* the item is outside the display */
 			if (i>=first_item) {
@@ -1339,7 +1339,7 @@ static void dialog_graph_redraw(graph_analysis_data_t *user_data)
 /****************************************************************************/
 static gboolean button_press_event(GtkWidget *widget _U_, GdkEventButton *event, gpointer data)
 {
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 	guint32 item;
 
 	if (event->type != GDK_BUTTON_PRESS) return TRUE;
@@ -1364,7 +1364,7 @@ static gboolean button_press_event(GtkWidget *widget _U_, GdkEventButton *event,
 /****************************************************************************/
 static gboolean key_press_event(GtkWidget *widget _U_, GdkEventKey *event, gpointer data)
 {
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 
 	/* if there is nothing selected, just return */
 	if (user_data->dlg.selected_item == 0xFFFFFFFF) return TRUE;
@@ -1399,7 +1399,7 @@ static gboolean key_press_event(GtkWidget *widget _U_, GdkEventKey *event, gpoin
 /****************************************************************************/
 static gboolean draw_area_draw(GtkWidget *widget, cairo_t *cr, gpointer data)
 {
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 	GtkAllocation allocation;
 
 	gtk_widget_get_allocation (widget, &allocation);
@@ -1419,7 +1419,7 @@ static gboolean draw_area_draw(GtkWidget *widget, cairo_t *cr, gpointer data)
 static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event _U_, gpointer data)
 {
 	GtkAllocation allocation;
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 	cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
 
 
@@ -1443,7 +1443,7 @@ static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event _U_, gpoin
 static gboolean
 draw_area_scrolled(GtkAdjustment *adjustment _U_, gpointer data)
 {
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 	cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(user_data->dlg.draw_area));
 
 
@@ -1454,7 +1454,7 @@ draw_area_scrolled(GtkAdjustment *adjustment _U_, gpointer data)
 /****************************************************************************/
 static gboolean draw_comments(GtkWidget *widget, cairo_t *cr, gpointer data)
 {
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 	GtkAllocation          allocation;
 
 	gtk_widget_get_allocation (widget, &allocation);
@@ -1475,7 +1475,7 @@ static gboolean draw_comments(GtkWidget *widget, cairo_t *cr, gpointer data)
 static gboolean expose_event_comments(GtkWidget *widget, GdkEventExpose *event _U_, gpointer data)
 {
 	GtkAllocation allocation;
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 	cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
 
 	if (gtk_widget_is_drawable(widget)) {
@@ -1498,7 +1498,7 @@ static gboolean expose_event_comments(GtkWidget *widget, GdkEventExpose *event _
 static gboolean
 comments_area_scrolled(GtkAdjustment *adjustment _U_, gpointer data)
 {
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 	cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(user_data->dlg.draw_area_comments));
 
 
@@ -1527,7 +1527,7 @@ static gboolean draw_time(GtkWidget *widget, cairo_t *cr, gpointer data)
 static gboolean expose_event_time(GtkWidget *widget, GdkEventExpose *event _U_, gpointer data)
 {
 	GtkAllocation          allocation;
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 	cairo_t               *cr        = gdk_cairo_create (gtk_widget_get_window(widget));
 
 	if (gtk_widget_is_drawable(widget) ) {
@@ -1549,7 +1549,7 @@ static gboolean expose_event_time(GtkWidget *widget, GdkEventExpose *event _U_,
 /****************************************************************************/
 static gboolean configure_event(GtkWidget *widget, GdkEventConfigure *event _U_, gpointer data)
 {
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 	GtkAllocation          widget_alloc;
 	cairo_t               *cr;
 
@@ -1601,7 +1601,7 @@ static gboolean configure_event(GtkWidget *widget, GdkEventConfigure *event _U_,
 /****************************************************************************/
 static gboolean configure_event_comments(GtkWidget *widget, GdkEventConfigure *event _U_, gpointer data)
 {
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 	GtkAllocation          widget_alloc;
 	cairo_t               *cr;
 
@@ -1653,7 +1653,7 @@ static gboolean configure_event_comments(GtkWidget *widget, GdkEventConfigure *e
 /****************************************************************************/
 static gboolean configure_event_time(GtkWidget *widget, GdkEventConfigure *event _U_, gpointer data)
 {
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 	GtkAllocation          widget_alloc;
 	cairo_t               *cr;
 
@@ -1706,7 +1706,7 @@ static gboolean configure_event_time(GtkWidget *widget, GdkEventConfigure *event
 /****************************************************************************/
 static gboolean pane_callback(GtkWidget *widget _U_, GParamSpec *pspec _U_, gpointer data)
 {
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 	GtkAllocation          draw_area_comments_alloc, draw_area_alloc;
 	cairo_t               *cr;
 
@@ -1753,7 +1753,7 @@ static gboolean pane_callback(GtkWidget *widget _U_, GParamSpec *pspec _U_, gpoi
 /****************************************************************************/
 static void v_scrollbar_changed(GtkWidget *widget _U_, gpointer data)
 {
-	graph_analysis_data_t *user_data = data;
+	graph_analysis_data_t *user_data = (graph_analysis_data_t *)data;
 
 	if ((user_data->dlg.first_item+gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)+1 == user_data->num_items)
 	    && (gtk_adjustment_get_value(user_data->dlg.v_scrollbar_adjustment) >= user_data->dlg.first_item ))
@@ -2033,7 +2033,7 @@ static void get_nodes(graph_analysis_data_t *user_data)
 	list = g_list_first(user_data->graph_info->list);
 	while (list)
 	{
-		gai = list->data;
+		gai = (graph_analysis_item_t *)list->data;
 		if (gai->display) {
 			user_data->num_items++;
 			if (!user_data->dlg.inverse) {
@@ -2053,7 +2053,7 @@ graph_analysis_data_t *graph_analysis_init(void)
 {
 	graph_analysis_data_t *user_data;
 	/* init */
-	user_data = g_malloc(sizeof(graph_analysis_data_t));
+	user_data = g_new(graph_analysis_data_t,1);
 
 	/* init user_data */
 	graph_analysis_init_dlg(user_data);
diff --git a/ui/gtk/gui_stat_util.c b/ui/gtk/gui_stat_util.c
index 793707bc83..1d29df84a0 100644
--- a/ui/gtk/gui_stat_util.c
+++ b/ui/gtk/gui_stat_util.c
@@ -76,7 +76,7 @@ create_stat_table(GtkWidget *scrolled_window, GtkWidget *vbox, int columns, cons
 	if (columns <= 0)
 		return NULL;
 
-	types = g_malloc(columns *sizeof(GType));
+	types = (GType *)g_malloc(columns *sizeof(GType));
 	for (i = 0; i < columns; i++)
 		types[i] = headers[i].type;
 
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
index 15a2359d51..43270711a9 100644
--- a/ui/gtk/gui_utils.c
+++ b/ui/gtk/gui_utils.c
@@ -242,7 +242,7 @@ window_present(GtkWidget *win)
     gtk_window_present(GTK_WINDOW(win));
 
     /* do we have a previously saved size and position of this window? */
-    name = g_object_get_data(G_OBJECT(win), WINDOW_GEOM_KEY);
+    name = (const gchar *)g_object_get_data(G_OBJECT(win), WINDOW_GEOM_KEY);
     if(name) {
         if(window_geom_load(name, &geom)) {
             /* XXX - use prefs to select which values to set? */
@@ -444,7 +444,7 @@ window_destroy(GtkWidget *win)
     if(gtk_widget_get_has_window(win) && gtk_widget_get_visible(win)) {
         window_get_geometry(win, &geom);
 
-        name = g_object_get_data(G_OBJECT(win), WINDOW_GEOM_KEY);
+        name = (const gchar *)g_object_get_data(G_OBJECT(win), WINDOW_GEOM_KEY);
         if(name) {
             window_geom_save(name, &geom);
             g_free((gpointer)name);
@@ -656,7 +656,7 @@ pipe_input_cb(GIOChannel   *source _U_,
               GIOCondition  condition _U_,
               gpointer      data)
 {
-    pipe_input_t *pipe_input = data;
+    pipe_input_t *pipe_input = (pipe_input_t *)data;
 
 
     /* avoid reentrancy problems and stack overflow */
@@ -1039,9 +1039,7 @@ static void
 copy_binary_free_cb(GtkClipboard  *clipboard _U_,
                          gpointer  user_data_or_owner)
 {
-    copy_binary_t* copy_data;
-    copy_data = user_data_or_owner;
-    destroy_copy_binary_t(copy_data);
+    destroy_copy_binary_t((copy_binary_t*)user_data_or_owner);
 }
 
 static void
@@ -1052,7 +1050,7 @@ copy_binary_get_cb(GtkClipboard     *clipboard _U_,
 {
     copy_binary_t* copy_data;
 
-    copy_data = user_data_or_owner;
+    copy_data = (copy_binary_t*)user_data_or_owner;
 
     /* Just do a dumb set as binary data */
     gtk_selection_data_set(selection_data, GDK_NONE, 8, copy_data->data, copy_data->len);
diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c
index f2b74de62e..6da8af5dd8 100644
--- a/ui/gtk/manual_addr_resolv.c
+++ b/ui/gtk/manual_addr_resolv.c
@@ -56,15 +56,15 @@ man_addr_resolv_ok(GtkWidget *w _U_, gpointer data _U_)
   gchar       *addr;
   gboolean     active, redissect = FALSE;
 
-  addr_cb = g_object_get_data(G_OBJECT(man_addr_resolv_dlg), "address");
-  name_te = g_object_get_data(G_OBJECT(man_addr_resolv_dlg), "name");
+  addr_cb = (GtkWidget *)g_object_get_data(G_OBJECT(man_addr_resolv_dlg), "address");
+  name_te = (GtkWidget *)g_object_get_data(G_OBJECT(man_addr_resolv_dlg), "name");
 
   addr = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(addr_cb));
   name = gtk_entry_get_text(GTK_ENTRY(name_te));
 
   if (strlen(addr) && strlen(name)) {
     if (!add_ip_name_from_string(addr, name)) {
-      GtkWidget *dialog = simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+      GtkWidget *dialog = (GtkWidget *)simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
                                         "Illegal IP address: \"%s\".", addr);
       simple_dialog_set_cb(dialog, man_addr_ill_addr_cb, NULL);
       g_free(addr);
@@ -75,7 +75,7 @@ man_addr_resolv_ok(GtkWidget *w _U_, gpointer data _U_)
   }
   g_free(addr);
 
-  resolv_cb = g_object_get_data(G_OBJECT(man_addr_resolv_dlg), "resolv");
+  resolv_cb = (GtkWidget *)g_object_get_data(G_OBJECT(man_addr_resolv_dlg), "resolv");
   active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resolv_cb));
   if (!gbl_resolv_flags.network_name && active) {
     /* Name resolution for Network Layer activated */
@@ -99,9 +99,9 @@ changed_cb(GtkWidget *w _U_, GtkWidget *ok_bt)
   GtkWidget   *addr_cb, *name_cb, *resolv_cb;
   gboolean     active;
 
-  name_cb   = g_object_get_data(G_OBJECT(man_addr_resolv_dlg), "name");
-  addr_cb   = g_object_get_data(G_OBJECT(man_addr_resolv_dlg), "address");
-  resolv_cb = g_object_get_data(G_OBJECT(man_addr_resolv_dlg), "resolv");
+  name_cb   = (GtkWidget *)g_object_get_data(G_OBJECT(man_addr_resolv_dlg), "name");
+  addr_cb   = (GtkWidget *)g_object_get_data(G_OBJECT(man_addr_resolv_dlg), "address");
+  resolv_cb = (GtkWidget *)g_object_get_data(G_OBJECT(man_addr_resolv_dlg), "resolv");
 
   name   = gtk_entry_get_text(GTK_ENTRY(name_cb));
   addr   = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(addr_cb));
@@ -138,7 +138,7 @@ manual_addr_resolv_dlg(GtkWidget *w _U_, gpointer data)
     GList *addr_entry;
     addr_list = get_ip_address_list_from_packet_list_row(data);
     for (addr_entry = addr_list; addr_entry != NULL; addr_entry = g_list_next(addr_entry)) {
-      gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(addr_cb), addr_entry->data);
+      gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(addr_cb), (const gchar *)addr_entry->data);
     }
     gtk_combo_box_set_active(GTK_COMBO_BOX(addr_cb), 0);
   }
@@ -176,10 +176,10 @@ manual_addr_resolv_dlg(GtkWidget *w _U_, gpointer data)
   g_signal_connect(resolv_cb, "toggled", G_CALLBACK(changed_cb), ok_bt);
   dlg_set_activate(name_te, ok_bt);
 
-  close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
+  close_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
   window_set_cancel_button(man_addr_resolv_dlg, close_bt, window_cancel_button_cb);
 
-  help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+  help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
   g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_MANUAL_ADDR_RESOLVE_DIALOG);
 
   gtk_widget_grab_default(ok_bt);