diff --git a/epan/dfilter/grammar.lemon b/epan/dfilter/grammar.lemon
index 2797e6a473..c367f28a9f 100644
--- a/epan/dfilter/grammar.lemon
+++ b/epan/dfilter/grammar.lemon
@@ -90,7 +90,7 @@ any "error" symbols are shifted, if possible. */
 				stnode_value(TOKEN));
 			break;
 		case STTYPE_FIELD:
-			hfinfo = stnode_data(TOKEN);
+			hfinfo = (header_field_info *)stnode_data(TOKEN);
 			dfilter_fail("Syntax error near \"%s\".", hfinfo->abbrev);
 			break;
 		case STTYPE_FUNCTION:
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index f524ab3d90..3e4fbfe979 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.c
@@ -691,7 +691,7 @@ check_relation_LHS_STRING(const char* relation_string,
 			THROW(TypeError);
 		}
 
-		s = stnode_data(st_arg1);
+		s = (char*)stnode_data(st_arg1);
 		fvalue = fvalue_from_string(ftype2, s, dfilter_fail);
 		if (!fvalue) {
 			THROW(TypeError);
diff --git a/epan/dfilter/sttype-test.c b/epan/dfilter/sttype-test.c
index 0188d9ca4e..c9d3abfcde 100644
--- a/epan/dfilter/sttype-test.c
+++ b/epan/dfilter/sttype-test.c
@@ -53,7 +53,7 @@ test_new(gpointer junk)
 static void
 test_free(gpointer value)
 {
-	test_t	*test = value;
+	test_t	*test = (test_t *)value;
 	assert_magic(test, TEST_MAGIC);
 
 	if (test->val1)
@@ -96,7 +96,7 @@ sttype_test_set1(stnode_t *node, test_op_t op, stnode_t *val1)
 {
 	test_t	*test;
 
-	test = stnode_data(node);
+	test = (test_t*)stnode_data(node);
 	assert_magic(test, TEST_MAGIC);
 
 	g_assert(num_operands(op) == 1);
@@ -109,7 +109,7 @@ sttype_test_set2(stnode_t *node, test_op_t op, stnode_t *val1, stnode_t *val2)
 {
 	test_t	*test;
 
-	test = stnode_data(node);
+	test = (test_t*)stnode_data(node);
 	assert_magic(test, TEST_MAGIC);
 
 	g_assert(num_operands(op) == 2);
@@ -123,7 +123,7 @@ sttype_test_set2_args(stnode_t *node, stnode_t *val1, stnode_t *val2)
 {
 	test_t	*test;
 
-	test = stnode_data(node);
+	test = (test_t*)stnode_data(node);
 	assert_magic(test, TEST_MAGIC);
 
 	if (num_operands(test->op) == 1) {
@@ -138,7 +138,7 @@ sttype_test_get(stnode_t *node, test_op_t *p_op, stnode_t **p_val1, stnode_t **p
 {
 	test_t	*test;
 
-	test = stnode_data(node);
+	test = (test_t*)stnode_data(node);
 	assert_magic(test, TEST_MAGIC);
 
 	*p_op = test->op;