diff --git a/Source/charon/payloads/ike_header.h b/Source/charon/payloads/ike_header.h
index 76f0e793b..628f2d6f0 100644
--- a/Source/charon/payloads/ike_header.h
+++ b/Source/charon/payloads/ike_header.h
@@ -97,14 +97,6 @@ struct ike_header_s {
 	 */
 	payload_t payload_interface;
 	
-	/**
-	 * @brief set the next payload
-	 *
-	 * @param this 			ike_header_t object
-	 * @param next_payload	next payload type
-	 */
-	void (*set_next_payload) (ike_header_t *this, u_int8_t next_payload);
-	
 	/**
 	 * @brief get the initiator spi
 	 *
diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c
index 4dc9c005f..a21d7ed02 100644
--- a/Source/charon/testcases/generator_test.c
+++ b/Source/charon/testcases/generator_test.c
@@ -51,7 +51,7 @@ void test_generator_with_header_payload(tester_t *tester)
 	header_data = ike_header_create();
 	header_data->set_initiator_spi(header_data,1);
 	header_data->set_responder_spi(header_data,2);
-	header_data->set_next_payload(header_data, 3);
+	((payload_t *) header_data)->set_next_type((payload_t *) header_data, 3);
 	header_data->set_exchange_type(header_data, 6);
 	header_data->set_initiator_flag(header_data, TRUE);
 	header_data->set_response_flag(header_data, TRUE);
@@ -85,7 +85,7 @@ void test_generator_with_header_payload(tester_t *tester)
 
 	header_data->set_initiator_spi(header_data,0x22000054231234LL);
 	header_data->set_responder_spi(header_data,0x122398);
-	header_data->set_next_payload(header_data, 0xF3);
+	((payload_t *) header_data)->set_next_type((payload_t *) header_data,0xF3);
 	header_data->set_exchange_type(header_data, 0x12);
 	header_data->set_initiator_flag(header_data, TRUE);
 	header_data->set_response_flag(header_data, TRUE);