diff --git a/includes/omapip/omapip.h b/includes/omapip/omapip.h
index 372e5c52..255a4e6f 100644
--- a/includes/omapip/omapip.h
+++ b/includes/omapip/omapip.h
@@ -326,16 +326,15 @@ int omapi_td_strcmp (omapi_typed_data_t *, const char *);
 isc_result_t omapi_make_value (omapi_value_t **, omapi_data_string_t *,
 			       omapi_typed_data_t *, const char *);
 isc_result_t omapi_make_const_value (omapi_value_t **, omapi_data_string_t *,
-				     const u_int8_t *, unsigned, const char *);
+				     const unsigned char *,
+				     unsigned, const char *);
 isc_result_t omapi_make_int_value (omapi_value_t **, omapi_data_string_t *,
 				   int, const char *);
 isc_result_t omapi_make_handle_value (omapi_value_t **, omapi_data_string_t *,
 				      omapi_object_t *, const char *);
 isc_result_t omapi_make_string_value (omapi_value_t **, omapi_data_string_t *,
 				      char *, const char *);
-isc_result_t omapi_get_int_value (u_int32_t *, omapi_typed_data_t *);
-
-
+isc_result_t omapi_get_int_value (unsigned long *, omapi_typed_data_t *);
 
 isc_result_t omapi_object_handle (omapi_handle_t *, omapi_object_t *);
 isc_result_t omapi_handle_lookup (omapi_object_t **, omapi_handle_t);
diff --git a/omapip/support.c b/omapip/support.c
index 86535d5b..dfd06704 100644
--- a/omapip/support.c
+++ b/omapip/support.c
@@ -550,7 +550,7 @@ isc_result_t omapi_make_value (omapi_value_t **vp, omapi_data_string_t *name,
 
 isc_result_t omapi_make_const_value (omapi_value_t **vp,
 				     omapi_data_string_t *name,
-				     const u_int8_t *value,
+				     const unsigned char *value,
 				     unsigned len, const char *caller)
 {
 	isc_result_t status;
@@ -663,7 +663,7 @@ isc_result_t omapi_make_string_value (omapi_value_t **vp,
 	return ISC_R_SUCCESS;
 }
 
-isc_result_t omapi_get_int_value (u_int32_t *v, omapi_typed_data_t *t)
+isc_result_t omapi_get_int_value (unsigned long *v, omapi_typed_data_t *t)
 {
 	u_int32_t rv;