diff --git a/librz/core/rop.c b/librz/core/rop.c
index 2cfb758ebf9..b1b426c9455 100644
--- a/librz/core/rop.c
+++ b/librz/core/rop.c
@@ -772,7 +772,7 @@ static void update_search_context(const RzRopSearchContext *context, const char
 	}
 }
 
-static RzList *construct_rop_gadget(RzCore *core, ut8 *buf, int idx, RzRopSearchContext *context,
+static RzList /*<RzCoreAsmHit *>*/ *construct_rop_gadget(RzCore *core, ut8 *buf, int idx, RzRopSearchContext *context,
 	RzList /*<char *>*/ *rx_list, RzRopEndListPair *end_gadget) {
 	int endaddr = end_gadget->instr_offset;
 	const char *start = NULL, *end = NULL;
@@ -931,7 +931,7 @@ static int fetch_search_itv(const RzCore *core, RzInterval *search_itv) {
 	return 0;
 }
 
-static RzList * /*<RzRopEndListPair *>*/ compute_end_gadget_list(const RzCore *core, const ut8 *buf, const RzRopSearchContext *context) {
+static RzList /*<RzRopEndListPair *>*/ *compute_end_gadget_list(const RzCore *core, const ut8 *buf, const RzRopSearchContext *context) {
 	RzList /*<RzRopEndListPair *>*/ *end_list = rz_list_newf(free);
 	const int delta = context->to - context->from;
 
diff --git a/librz/include/rz_rop.h b/librz/include/rz_rop.h
index f0ac171943f..c7787b32c91 100644
--- a/librz/include/rz_rop.h
+++ b/librz/include/rz_rop.h
@@ -110,12 +110,12 @@ typedef struct rz_rop_search_context_t {
 
 // Command APIs
 RZ_API RzCmdStatus rz_core_rop_search(RzCore *core, RZ_OWN RzRopSearchContext *context);
-RZ_API RzCmdStatus rz_core_rop_gadget_info(RzCore *core, RzRopSearchContext *context);
+RZ_API RzCmdStatus rz_core_rop_gadget_info(RzCore *core, RZ_OWN RzRopSearchContext *context);
 RZ_API bool rz_core_rop_analyze_constraint(RzCore *core, const char *str, RzRopConstraint *rop_constraint);
 
 // ROP Search Context APIs
 RZ_OWN RZ_API RzRopSearchContext *rz_core_rop_search_context_new(RZ_NONNULL const RzCore *core, RZ_NULLABLE const char *greparg,
-								 bool regexp, RzRopRequestMask mask, RZ_BORROW RzCmdStateOutput *state);
+	bool regexp, RzRopRequestMask mask, RZ_BORROW RzCmdStateOutput *state);
 RZ_API void rz_core_rop_search_context_free(RZ_NULLABLE RzRopSearchContext *context);
 
 // ROP Constraint APIs
@@ -125,7 +125,7 @@ RZ_OWN RZ_API RzList /*<RzRopConstraint *>*/ *rz_rop_constraint_list_new(void);
 // ROP Gadget Info APIs
 RZ_API void rz_core_rop_gadget_info_free(RZ_NULLABLE RzRopGadgetInfo *gadget_info);
 RZ_API void rz_core_rop_gadget_info_add_register(const RZ_NONNULL RZ_OUT RzRopGadgetInfo *gadget_info,
-						 RZ_NONNULL RzRopRegInfo *reg_info, bool is_dependency);
+	RZ_NONNULL RzRopRegInfo *reg_info, bool is_dependency);
 RZ_API int rz_core_rop_gadget_info_update_register(RZ_INOUT RzRopGadgetInfo *gadget_info, RZ_NONNULL RzRopRegInfo *new_reg_info);
 RZ_API RZ_OWN RzRopGadgetInfo *rz_core_rop_gadget_info_new(ut64 address);
 RZ_IPI RzRopRegInfo *rz_core_rop_reg_info_dup(RzRopRegInfo *src);