diff --git a/include/fluidsynth/sfont.h b/include/fluidsynth/sfont.h
index 6d0fd4c7a..1f5345222 100644
--- a/include/fluidsynth/sfont.h
+++ b/include/fluidsynth/sfont.h
@@ -257,8 +257,8 @@ FLUIDSYNTH_API fluid_preset_t *fluid_sfont_iteration_next(fluid_sfont_t *sfont);
 /**
  * Method to get a virtual SoundFont preset name.
  *
- * @param preset Virtual SoundFont preset
- * @return Should return the name of the preset.  The returned string must be
+ * \@param preset Virtual SoundFont preset
+ * \@return Should return the name of the preset.  The returned string must be
  *   valid for the duration of the virtual preset (or the duration of the
  *   SoundFont, in the case of preset iteration).
  */
@@ -267,28 +267,28 @@ typedef const char *(*fluid_preset_get_name_t)(fluid_preset_t *preset);
 /**
  * Method to get a virtual SoundFont preset MIDI bank number.
  *
- * @param preset Virtual SoundFont preset
- * @param return The bank number of the preset
+ * \@param preset Virtual SoundFont preset
+ * \@param return The bank number of the preset
  */
 typedef int (*fluid_preset_get_banknum_t)(fluid_preset_t *preset);
 
 /**
  * Method to get a virtual SoundFont preset MIDI program number.
  *
- * @param preset Virtual SoundFont preset
- * @param return The program number of the preset
+ * \@param preset Virtual SoundFont preset
+ * \@param return The program number of the preset
  */
 typedef int (*fluid_preset_get_num_t)(fluid_preset_t *preset);
 
 /**
  * Method to handle a noteon event (synthesize the instrument).
  *
- * @param preset Virtual SoundFont preset
- * @param synth Synthesizer instance
- * @param chan MIDI channel number of the note on event
- * @param key MIDI note number (0-127)
- * @param vel MIDI velocity (0-127)
- * @return #FLUID_OK on success (0) or #FLUID_FAILED (-1) otherwise
+ * \@param preset Virtual SoundFont preset
+ * \@param synth Synthesizer instance
+ * \@param chan MIDI channel number of the note on event
+ * \@param key MIDI note number (0-127)
+ * \@param vel MIDI velocity (0-127)
+ * \@return #FLUID_OK on success (0) or #FLUID_FAILED (-1) otherwise
  *
  * This method may be called from within synthesis context and therefore
  * should be as efficient as possible and not perform any operations considered
@@ -308,8 +308,8 @@ typedef int (*fluid_preset_noteon_t)(fluid_preset_t *preset, fluid_synth_t *synt
 /**
  * Method to free a virtual SoundFont preset.
  *
- * @param preset Virtual SoundFont preset
- * @return Should return 0
+ * \@param preset Virtual SoundFont preset
+ * \@return Should return 0
  *
  * Any custom user provided cleanup function must ultimately call
  * delete_fluid_preset() to ensure proper cleanup of the #fluid_preset_t struct. If no private data
diff --git a/src/midi/fluid_midi.c b/src/midi/fluid_midi.c
index a84e5ea39..e35c87b60 100644
--- a/src/midi/fluid_midi.c
+++ b/src/midi/fluid_midi.c
@@ -1055,10 +1055,10 @@ fluid_midi_file_get_division(fluid_midi_file *midifile)
 
 /**
  * Create a MIDI event structure.
- * @return New MIDI event structure or NULL when out of memory.
+ * \@return New MIDI event structure or NULL when out of memory.
  */
 fluid_midi_event_t *
-new_fluid_midi_event()
+new_fluid_midi_event(void)
 {
     fluid_midi_event_t *evt;
     evt = FLUID_NEW(fluid_midi_event_t);
@@ -2696,7 +2696,7 @@ int fluid_player_get_midi_tempo(fluid_player_t *player)
  * new_fluid_midi_parser
  */
 fluid_midi_parser_t *
-new_fluid_midi_parser()
+new_fluid_midi_parser(void)
 {
     fluid_midi_parser_t *parser;
     parser = FLUID_NEW(fluid_midi_parser_t);
diff --git a/src/midi/fluid_midi_router.c b/src/midi/fluid_midi_router.c
index e1d58e86e..bff0029c9 100644
--- a/src/midi/fluid_midi_router.c
+++ b/src/midi/fluid_midi_router.c
@@ -127,8 +127,8 @@ new_fluid_midi_router(fluid_settings_t *settings, handle_midi_event_func_t handl
 
 /**
  * Delete a MIDI router instance.
- * @param router MIDI router to delete
- * @return Returns #FLUID_OK on success, #FLUID_FAILED otherwise (only if NULL
+ * \@param router MIDI router to delete
+ * \@return Returns #FLUID_OK on success, #FLUID_FAILED otherwise (only if NULL
  *   \a router passed really)
  */
 void
diff --git a/src/midi/fluid_seq.c b/src/midi/fluid_seq.c
index 81e63d220..7a681c1af 100644
--- a/src/midi/fluid_seq.c
+++ b/src/midi/fluid_seq.c
@@ -174,12 +174,12 @@ delete_fluid_sequencer(fluid_sequencer_t *seq)
 /**
  * Check if a sequencer is using the system timer or not.
  *
- * @param seq Sequencer object
- * @return TRUE if system timer is being used, FALSE otherwise.
+ * \@param seq Sequencer object
+ * \@return TRUE if system timer is being used, FALSE otherwise.
  *
- * @deprecated As of fluidsynth 2.1.1 the usage of the system timer has been deprecated.
+ * \@deprecated As of fluidsynth 2.1.1 the usage of the system timer has been deprecated.
  *
- * @since 1.1.0
+ * \@since 1.1.0
  */
 int
 fluid_sequencer_get_use_system_timer(fluid_sequencer_t *seq)
diff --git a/src/rvoice/fluid_chorus.c b/src/rvoice/fluid_chorus.c
index c80dc9e98..3d1441688 100644
--- a/src/rvoice/fluid_chorus.c
+++ b/src/rvoice/fluid_chorus.c
@@ -621,8 +621,8 @@ static int new_mod_delay_line(fluid_chorus_t *chorus, int delay_length)
  * fluid_chorus_set() must be called at least one time after calling
  * new_fluid_chorus().
  *
- * @param sample_rate, audio sample rate in Hz.
- * @return pointer on chorus unit.
+ * \@param sample_rate, audio sample rate in Hz.
+ * \@return pointer on chorus unit.
  */
 fluid_chorus_t *
 new_fluid_chorus(fluid_real_t sample_rate)
@@ -921,9 +921,9 @@ fluid_chorus_samplerate_change(fluid_chorus_t *chorus, fluid_real_t sample_rate)
 
 /**
  * Process chorus by mixing the result in output buffer.
- * @param chorus pointer on chorus unit returned by new_fluid_chorus().
- * @param in, pointer on monophonic input buffer of FLUID_BUFSIZE samples.
- * @param left_out, right_out, pointers on stereo output buffers of
+ * \@param chorus pointer on chorus unit returned by new_fluid_chorus().
+ * \@param in, pointer on monophonic input buffer of FLUID_BUFSIZE samples.
+ * \@param left_out, right_out, pointers on stereo output buffers of
  *  FLUID_BUFSIZE samples.
  */
 void fluid_chorus_processmix(fluid_chorus_t *chorus, const fluid_real_t *in,
@@ -996,9 +996,9 @@ void fluid_chorus_processmix(fluid_chorus_t *chorus, const fluid_real_t *in,
 
 /**
  * Process chorus by putting the result in output buffer (no mixing).
- * @param chorus pointer on chorus unit returned by new_fluid_chorus().
- * @param in, pointer on monophonic input buffer of FLUID_BUFSIZE samples.
- * @param left_out, right_out, pointers on stereo output buffers of
+ * \@param chorus pointer on chorus unit returned by new_fluid_chorus().
+ * \@param in, pointer on monophonic input buffer of FLUID_BUFSIZE samples.
+ * \@param left_out, right_out, pointers on stereo output buffers of
  *  FLUID_BUFSIZE samples.
  */
 /* Duplication of code ... (replaces sample data instead of mixing) */
@@ -1012,7 +1012,7 @@ void fluid_chorus_processreplace(fluid_chorus_t *chorus, const fluid_real_t *in,
     /* foreach sample, process output sample then input sample */
     for(sample_index = 0; sample_index < FLUID_BUFSIZE; sample_index++)
     {
-        fluid_real_t out; /* block output */
+        fluid_real_t out = 0.0; /* block output */
 
         d_out[0] = d_out[1] = 0.0f; /* clear stereo unit input */
 
diff --git a/src/rvoice/fluid_rvoice_mixer.c b/src/rvoice/fluid_rvoice_mixer.c
index c1e2fb2e8..ba81a0e83 100644
--- a/src/rvoice/fluid_rvoice_mixer.c
+++ b/src/rvoice/fluid_rvoice_mixer.c
@@ -1032,15 +1032,15 @@ fluid_rvoice_mixer_set_reverb_full(const fluid_rvoice_mixer_t *mixer,
  * get one reverb shadow parameter for one fx group.
  * (see fluid_rvoice_mixer_set_reverb_full())
  *
- * @param mixer that contains all fx group units.
- * @param fx_group index of the fx group to get parameter from.
+ * \@param mixer that contains all fx group units.
+ * \@param fx_group index of the fx group to get parameter from.
  *  must be in the range [0..mixer->fx_units[.
- * @param enum indicating the parameter to get.
+ * \@param enum indicating the parameter to get.
  *  FLUID_REVERB_ROOMSIZE, reverb room size value.
  *  FLUID_REVERB_DAMP, reverb damping value.
  *  FLUID_REVERB_WIDTH, reverb width value.
  *  FLUID_REVERB_LEVEL, reverb level value.
- * @return value.
+ * \@return value.
  */
 double
 fluid_rvoice_mixer_reverb_get_param(const fluid_rvoice_mixer_t *mixer,
@@ -1096,11 +1096,11 @@ fluid_rvoice_mixer_set_chorus_full(const fluid_rvoice_mixer_t *mixer,
  * get one chorus shadow parameter for one fx group.
  * (see fluid_rvoice_mixer_set_chorus_full())
  *
- * @param mixer that contains all fx groups units.
- * @param fx_group index of the fx group to get parameter from.
+ * \@param mixer that contains all fx groups units.
+ * \@param fx_group index of the fx group to get parameter from.
  *  must be in the range [0..mixer->fx_units[.
- * @param get Flags indicating which parameter to get (#fluid_chorus_set_t)
- * @return the parameter value (0.0 is returned if error)
+ * \@param get Flags indicating which parameter to get (#fluid_chorus_set_t)
+ * \@return the parameter value (0.0 is returned if error)
  */
 double
 fluid_rvoice_mixer_chorus_get_param(const fluid_rvoice_mixer_t *mixer,
diff --git a/src/sfloader/fluid_defsfont.c b/src/sfloader/fluid_defsfont.c
index 129867d0f..6d233757a 100644
--- a/src/sfloader/fluid_defsfont.c
+++ b/src/sfloader/fluid_defsfont.c
@@ -1312,9 +1312,9 @@ static int fluid_preset_zone_create_voice_zones(fluid_preset_zone_t *preset_zone
 /**
  * Checks if modulator mod is identical to another modulator in the list
  * (specs SF 2.0X  7.4, 7.8).
- * @param mod, modulator list.
- * @param name, if not NULL, pointer on a string displayed as warning.
- * @return TRUE if mod is identical to another modulator, FALSE otherwise.
+ * \@param mod, modulator list.
+ * \@param name, if not NULL, pointer on a string displayed as warning.
+ * \@return TRUE if mod is identical to another modulator, FALSE otherwise.
  */
 static int
 fluid_zone_is_mod_identical(fluid_mod_t *mod, char *name)
@@ -1345,8 +1345,8 @@ fluid_zone_is_mod_identical(fluid_mod_t *mod, char *name)
  * This is appropriate to internal synthesizer modulators tables
  * which have a fixed size (FLUID_NUM_MOD).
  *
- * @param zone_name, zone name
- * @param list_mod, address of pointer on modulator list.
+ * \@param zone_name, zone name
+ * \@param list_mod, address of pointer on modulator list.
  */
 static void fluid_limit_mod_list(char *zone_name, fluid_mod_t **list_mod)
 {
@@ -1384,8 +1384,8 @@ static void fluid_limit_mod_list(char *zone_name, fluid_mod_t **list_mod)
  * Checks and remove invalid modulators from a zone modulators list.
  * - checks valid modulator sources (specs SF 2.01  7.4, 7.8, 8.2.1).
  * - checks identical modulators in the list (specs SF 2.01  7.4, 7.8).
- * @param zone_name, zone name.
- * @param list_mod, address of pointer on modulators list.
+ * \@param zone_name, zone name.
+ * \@param list_mod, address of pointer on modulators list.
  */
 static void
 fluid_zone_check_mod(char *zone_name, fluid_mod_t **list_mod)
@@ -1746,7 +1746,7 @@ fluid_preset_zone_get_inst(fluid_preset_zone_t *zone)
  * new_fluid_inst
  */
 fluid_inst_t *
-new_fluid_inst()
+new_fluid_inst(void)
 {
     fluid_inst_t *inst = FLUID_NEW(fluid_inst_t);
 
@@ -1807,7 +1807,7 @@ fluid_inst_import_sfont(int inst_idx, fluid_defsfont_t *defsfont, SFData *sfdata
     fluid_list_t *inst_list;
     fluid_inst_t *inst;
     SFZone *sfzone;
-    SFInst *sfinst;
+    SFInst *sfinst = NULL;
     fluid_inst_zone_t *inst_zone;
     char zone_name[256];
     int count;
@@ -2014,7 +2014,7 @@ fluid_inst_zone_import_sfont(fluid_inst_zone_t *inst_zone, fluid_inst_zone_t *gl
     if (inst_zone->gen[GEN_SAMPLEID].flags == GEN_SET)
     {
         fluid_list_t *list;
-        SFSample *sfsample;
+        SFSample *sfsample = NULL;
         int sample_idx = (int) inst_zone->gen[GEN_SAMPLEID].val;
 
         /* find the SFSample by index */
diff --git a/src/sfloader/fluid_sfont.c b/src/sfloader/fluid_sfont.c
index 00423c003..82dd6a5d4 100644
--- a/src/sfloader/fluid_sfont.c
+++ b/src/sfloader/fluid_sfont.c
@@ -497,7 +497,7 @@ void delete_fluid_preset(fluid_preset_t *preset)
  * @return  The sample on success, NULL otherwise.
  */
 fluid_sample_t *
-new_fluid_sample()
+new_fluid_sample(void)
 {
     fluid_sample_t *sample = NULL;
 
@@ -536,15 +536,15 @@ delete_fluid_sample(fluid_sample_t *sample)
 /**
  * Returns the size of the fluid_sample_t structure.
  *
- * @return Size of fluid_sample_t in bytes
+ * \@return Size of fluid_sample_t in bytes
  *
  * Useful in low latency scenarios e.g. to allocate a pool of samples.
  *
- * @note It is recommend to zero initialize the memory before using the object.
+ * \@note It is recommend to zero initialize the memory before using the object.
  *
- * @warning Do NOT allocate samples on the stack and assign them to a voice!
+ * \@warning Do NOT allocate samples on the stack and assign them to a voice!
  */
-size_t fluid_sample_sizeof()
+size_t fluid_sample_sizeof(void)
 {
     return sizeof(fluid_sample_t);
 }
diff --git a/src/synth/fluid_chan.c b/src/synth/fluid_chan.c
index 0f2eecb44..823e059c8 100644
--- a/src/synth/fluid_chan.c
+++ b/src/synth/fluid_chan.c
@@ -425,10 +425,10 @@ fluid_channel_update_legato_staccato_state(fluid_channel_t *chan)
  * When a note is added at noteOn each element is use in the forward direction
  * and indexed by i_last variable.
  *
- * @param chan  fluid_channel_t.
- * @param key MIDI note number (0-127).
- * @param vel MIDI velocity (0-127, 0=noteoff).
- * @param onenote. When 1 the function adds the note but the monophonic list
+ * \@param chan  fluid_channel_t.
+ * \@param key MIDI note number (0-127).
+ * \@param vel MIDI velocity (0-127, 0=noteoff).
+ * \@param onenote. When 1 the function adds the note but the monophonic list
  *                 keeps only one note (used on noteOn poly).
  * Note: i_last index keeps a trace of the most recent note added.
  *       prev_note keeps a trace of the note prior i_last note.
@@ -528,11 +528,11 @@ fluid_channel_search_monolist(fluid_channel_t *chan, unsigned char key, int *i_p
  * When a note is removed at noteOff the element concerned is fast unlinked
  * and relinked after the i_last element.
  *
- * @param chan  fluid_channel_t.
- * @param
+ * \@param chan  fluid_channel_t.
+ * \@param
  *   i, index of the note to remove. If i is invalid or the list is
  *      empty, the function do nothing and returns FLUID_FAILED.
- * @param
+ * \@param
  *   On input, i_prev is a pointer on index of the note previous i.
  *   On output i_prev is a pointer on index of the note previous i if i is the last note
  *   in the list,FLUID_FAILED otherwise. When the returned index is valid it means
@@ -666,8 +666,8 @@ void fluid_channel_invalid_prev_note_staccato(fluid_channel_t *chan)
 
 /**
  * The function handles poly/mono commutation on legato pedal On/Off.
- * @param chan  fluid_channel_t.
- * @param value, value of the CC legato.
+ * \@param chan  fluid_channel_t.
+ * \@param value, value of the CC legato.
  */
 void fluid_channel_cc_legato(fluid_channel_t *chan, int value)
 {
@@ -704,8 +704,8 @@ void fluid_channel_cc_legato(fluid_channel_t *chan, int value)
  * Breath Sync mode and in monophonic playing, the breath controller allows
  * to trigger noteon/noteoff note when the musician starts to breath (noteon) and
  * stops to breath (noteoff).
- * @param chan  fluid_channel_t.
- * @param value, value of the CC Breath..
+ * \@param chan  fluid_channel_t.
+ * \@param value, value of the CC Breath..
  */
 void fluid_channel_cc_breath_note_on_off(fluid_channel_t *chan, int value)
 {
diff --git a/src/synth/fluid_event.c b/src/synth/fluid_event.c
index 48b781bd7..88adb77b1 100644
--- a/src/synth/fluid_event.c
+++ b/src/synth/fluid_event.c
@@ -56,7 +56,7 @@ fluid_event_clear(fluid_event_t *evt)
  * @return New sequencer event structure or NULL if out of memory
  */
 fluid_event_t *
-new_fluid_event()
+new_fluid_event(void)
 {
     fluid_event_t *evt;
 
diff --git a/src/synth/fluid_mod.c b/src/synth/fluid_mod.c
index 959967208..d41a2f016 100644
--- a/src/synth/fluid_mod.c
+++ b/src/synth/fluid_mod.c
@@ -480,7 +480,7 @@ fluid_mod_get_value(fluid_mod_t *mod, fluid_voice_t *voice)
  * @return New allocated modulator or NULL if out of memory
  */
 fluid_mod_t *
-new_fluid_mod()
+new_fluid_mod(void)
 {
     fluid_mod_t *mod = FLUID_NEW(fluid_mod_t);
 
@@ -507,11 +507,11 @@ delete_fluid_mod(fluid_mod_t *mod)
 /**
  * Returns the size of the fluid_mod_t structure.
  *
- * @return Size of fluid_mod_t in bytes
+ * \@return Size of fluid_mod_t in bytes
  *
  * Useful in low latency scenarios e.g. to allocate a modulator on the stack.
  */
-size_t fluid_mod_sizeof()
+size_t fluid_mod_sizeof(void)
 {
     return sizeof(fluid_mod_t);
 }
@@ -519,8 +519,8 @@ size_t fluid_mod_sizeof()
 /**
  * Checks if modulator with source 1 other than CC is FLUID_MOD_NONE.
  *
- * @param mod, modulator.
- * @return TRUE if modulator source 1 other than cc is FLUID_MOD_NONE, FALSE otherwise.
+ * \@param mod, modulator.
+ * \@return TRUE if modulator source 1 other than cc is FLUID_MOD_NONE, FALSE otherwise.
  */
 static int
 fluid_mod_is_src1_none(const fluid_mod_t *mod)
@@ -531,11 +531,11 @@ fluid_mod_is_src1_none(const fluid_mod_t *mod)
 /**
  * Checks if modulators source other than CC source is invalid.
  *
- * @param mod, modulator.
- * @param src1_select, source input selection to check.
+ * \@param mod, modulator.
+ * \@param src1_select, source input selection to check.
  *   1 to check src1 source.
  *   0 to check src2 source.
- * @return FALSE if selected modulator source other than cc is invalid, TRUE otherwise.
+ * \@return FALSE if selected modulator source other than cc is invalid, TRUE otherwise.
  *
  * (specs SF 2.01  7.4, 7.8, 8.2.1)
  */
@@ -570,11 +570,11 @@ fluid_mod_check_non_cc_source(const fluid_mod_t *mod, unsigned char src1_select)
 /**
  * Checks if modulator CC source is invalid (specs SF 2.01  7.4, 7.8, 8.2.1).
  *
- * @param mod, modulator.
- * @src1_select, source input selection:
+ * \@param mod, modulator.
+ * \@src1_select, source input selection:
  *   1 to check src1 source or
  *   0 to check src2 source.
- * @return FALSE if selected modulator's source CC is invalid, TRUE otherwise.
+ * \@return FALSE if selected modulator's source CC is invalid, TRUE otherwise.
  */
 static int
 fluid_mod_check_cc_source(const fluid_mod_t *mod, unsigned char src1_select)
@@ -614,9 +614,9 @@ fluid_mod_check_cc_source(const fluid_mod_t *mod, unsigned char src1_select)
 /**
  * Checks valid modulator sources (specs SF 2.01  7.4, 7.8, 8.2.1)
  *
- * @param mod, modulator.
- * @param name,if not NULL, pointer on a string displayed as a warning.
- * @return TRUE if modulator sources src1, src2 are valid, FALSE otherwise.
+ * \@param mod, modulator.
+ * \@param name,if not NULL, pointer on a string displayed as a warning.
+ * \@return TRUE if modulator sources src1, src2 are valid, FALSE otherwise.
  */
 int fluid_mod_check_sources(const fluid_mod_t *mod, char *name)
 {
diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
index 458dc39c2..442e9e606 100644
--- a/src/synth/fluid_synth.c
+++ b/src/synth/fluid_synth.c
@@ -5501,7 +5501,7 @@ int
 fluid_synth_sfreload(fluid_synth_t *synth, int id)
 {
     char *filename = NULL;
-    fluid_sfont_t *sfont;
+    fluid_sfont_t *sfont = NULL;
     fluid_sfloader_t *loader;
     fluid_list_t *list;
     int index, ret = FLUID_FAILED;
@@ -6029,17 +6029,17 @@ int fluid_synth_set_reverb_group_level(fluid_synth_t *synth, int fx_group,
 
 /**
  * Set one reverb parameter to one fx groups.
- * @param synth FluidSynth instance.
- * @param fx_group Index of the fx group.
+ * \@param synth FluidSynth instance.
+ * \@param fx_group Index of the fx group.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter will be applied to all fx groups.
- * @param enum indicating the parameter to set (#fluid_reverb_param).
+ * \@param enum indicating the parameter to set (#fluid_reverb_param).
  *  FLUID_REVERB_ROOMSIZE, roomsize Reverb room size value (0.0-1.0)
  *  FLUID_REVERB_DAMP, reverb damping value (0.0-1.0)
  *  FLUID_REVERB_WIDTH, reverb width value (0.0-100.0)
  *  FLUID_REVERB_LEVEL, reverb level value (0.0-1.0)
- * @param value, parameter value
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise
+ * \@param value, parameter value
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise
  */
 int
 fluid_synth_reverb_set_param(fluid_synth_t *synth, int fx_group,
@@ -6237,17 +6237,17 @@ int fluid_synth_get_reverb_group_level(fluid_synth_t *synth, int fx_group,
 
 /**
  * Get one reverb parameter value of one fx groups.
- * @param synth FluidSynth instance
- * @param fx_group index of the fx group to get parameter value from.
+ * \@param synth FluidSynth instance
+ * \@param fx_group index of the fx group to get parameter value from.
  *  Must be in the range -1 to synth->effects_groups-1. If -1 get the
  *  parameter common to all fx groups.
- * @param enum indicating the parameter to get (#fluid_reverb_param).
+ * \@param enum indicating the parameter to get (#fluid_reverb_param).
  *  FLUID_REVERB_ROOMSIZE, reverb room size value.
  *  FLUID_REVERB_DAMP, reverb damping value.
  *  FLUID_REVERB_WIDTH, reverb width value.
  *  FLUID_REVERB_LEVEL, reverb level value.
- * @param value pointer on the value to return.
- * @return FLUID_OK if success, FLUID_FAILED otherwise.
+ * \@param value pointer on the value to return.
+ * \@return FLUID_OK if success, FLUID_FAILED otherwise.
  */
 static int fluid_synth_reverb_get_param(fluid_synth_t *synth, int fx_group,
                                         int param, double *value)
@@ -6279,9 +6279,9 @@ static int fluid_synth_reverb_get_param(fluid_synth_t *synth, int fx_group,
 
 /**
  * Enable or disable all chorus groups.
- * @param synth FluidSynth instance
- * @param on TRUE to enable chorus, FALSE to disable
- * @deprecated Use fluid_synth_chorus_on() in new code instead.
+ * \@param synth FluidSynth instance
+ * \@param on TRUE to enable chorus, FALSE to disable
+ * \@deprecated Use fluid_synth_chorus_on() in new code instead.
  */
 void
 fluid_synth_set_chorus_on(fluid_synth_t *synth, int on)
@@ -6297,12 +6297,12 @@ fluid_synth_set_chorus_on(fluid_synth_t *synth, int on)
 
 /**
  * Enable or disable chorus on one or all groups.
- * @param synth FluidSynth instance
- * @param fx_group Index of the fx group.
+ * \@param synth FluidSynth instance
+ * \@param fx_group Index of the fx group.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter will be applied to all fx groups.
- * @param on TRUE to enable chorus, FALSE to disable
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise
+ * \@param on TRUE to enable chorus, FALSE to disable
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise
  */
 int
 fluid_synth_chorus_on(fluid_synth_t *synth, int fx_group, int on)
@@ -6336,17 +6336,17 @@ fluid_synth_chorus_on(fluid_synth_t *synth, int fx_group, int on)
 /**
  * Set chorus parameters to all fx groups.
  * Keep in mind, that the needed CPU time is proportional to 'nr'.
- * @param synth FluidSynth instance
- * @param nr Chorus voice count (0-99, CPU time consumption proportional to
+ * \@param synth FluidSynth instance
+ * \@param nr Chorus voice count (0-99, CPU time consumption proportional to
  *   this value)
- * @param level Chorus level (0.0-10.0)
- * @param speed Chorus speed in Hz (0.1-5.0)
- * @param depth_ms Chorus depth (max value depends on synth sample-rate,
+ * \@param level Chorus level (0.0-10.0)
+ * \@param speed Chorus speed in Hz (0.1-5.0)
+ * \@param depth_ms Chorus depth (max value depends on synth sample-rate,
  *   0.0-21.0 is safe for sample-rate values up to 96KHz)
- * @param type Chorus waveform type (#fluid_chorus_mod)
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise
- * @deprecated Use the individual chorus setter functions in new code instead.
- * 
+ * \@param type Chorus waveform type (#fluid_chorus_mod)
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise
+ * \@deprecated Use the individual chorus setter functions in new code instead.
+ *
  * Keep in mind, that the needed CPU time is proportional to 'nr'.
  */
 int fluid_synth_set_chorus(fluid_synth_t *synth, int nr, double level,
@@ -6367,10 +6367,10 @@ int fluid_synth_set_chorus(fluid_synth_t *synth, int nr, double level,
 /**
  * Set the chorus voice count of all groups.
  *
- * @param synth FluidSynth instance
- * @param nr Chorus voice count (0-99, CPU time consumption proportional to
+ * \@param synth FluidSynth instance
+ * \@param nr Chorus voice count (0-99, CPU time consumption proportional to
  *   this value)
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise
  * @deprecated Use fluid_synth_set_chorus_group_nr() in new code instead.
  */
 int fluid_synth_set_chorus_nr(fluid_synth_t *synth, int nr)
@@ -6381,9 +6381,9 @@ int fluid_synth_set_chorus_nr(fluid_synth_t *synth, int nr)
 /**
  * Set the chorus level of all groups.
  *
- * @param synth FluidSynth instance
- * @param level Chorus level (0.0-10.0)
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise
+ * \@param synth FluidSynth instance
+ * \@param level Chorus level (0.0-10.0)
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise
  * @deprecated Use fluid_synth_set_chorus_group_level() in new code instead.
  */
 int fluid_synth_set_chorus_level(fluid_synth_t *synth, double level)
@@ -6394,10 +6394,10 @@ int fluid_synth_set_chorus_level(fluid_synth_t *synth, double level)
 /**
  * Set the chorus speed of all groups.
  *
- * @param synth FluidSynth instance
- * @param speed Chorus speed in Hz (0.1-5.0)
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise
- * @deprecated Use fluid_synth_set_chorus_group_speed() in new code instead.
+ * \@param synth FluidSynth instance
+ * \@param speed Chorus speed in Hz (0.1-5.0)
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise
+ * \@deprecated Use fluid_synth_set_chorus_group_speed() in new code instead.
  */
 int fluid_synth_set_chorus_speed(fluid_synth_t *synth, double speed)
 {
@@ -6407,11 +6407,11 @@ int fluid_synth_set_chorus_speed(fluid_synth_t *synth, double speed)
 /**
  * Set the chorus depth of all groups.
  *
- * @param synth FluidSynth instance
- * @param depth_ms Chorus depth (max value depends on synth sample-rate,
+ * \@param synth FluidSynth instance
+ * \@param depth_ms Chorus depth (max value depends on synth sample-rate,
  *   0.0-21.0 is safe for sample-rate values up to 96KHz)
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise
- * @deprecated Use fluid_synth_set_chorus_group_depth() in new code instead.
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise
+ * \@deprecated Use fluid_synth_set_chorus_group_depth() in new code instead.
  */
 int fluid_synth_set_chorus_depth(fluid_synth_t *synth, double depth_ms)
 {
@@ -6421,10 +6421,10 @@ int fluid_synth_set_chorus_depth(fluid_synth_t *synth, double depth_ms)
 /**
  * Set the chorus type of all groups.
  *
- * @param synth FluidSynth instance
- * @param type Chorus waveform type (#fluid_chorus_mod)
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise
- * @deprecated Use fluid_synth_set_chorus_group_type() in new code instead.
+ * \@param synth FluidSynth instance
+ * \@param type Chorus waveform type (#fluid_chorus_mod)
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise
+ * \@deprecated Use fluid_synth_set_chorus_group_type() in new code instead.
  */
 int fluid_synth_set_chorus_type(fluid_synth_t *synth, int type)
 {
@@ -6433,12 +6433,12 @@ int fluid_synth_set_chorus_type(fluid_synth_t *synth, int type)
 
 /**
  * Set chorus voice count nr to one or all chorus groups.
- * @param synth FluidSynth instance.
- * @param fx_group Index of the fx group.
+ * \@param synth FluidSynth instance.
+ * \@param fx_group Index of the fx group.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter will be applied to all groups.
- * @param nr Voice count to set. Must be in the range indicated by \setting{synth_chorus_nr}
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise.
+ * \@param nr Voice count to set. Must be in the range indicated by \setting{synth_chorus_nr}
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise.
  */
 int
 fluid_synth_set_chorus_group_nr(fluid_synth_t *synth, int fx_group, int nr)
@@ -6448,12 +6448,12 @@ fluid_synth_set_chorus_group_nr(fluid_synth_t *synth, int fx_group, int nr)
 
 /**
  * Set chorus output level to one or all chorus groups.
- * @param synth FluidSynth instance.
- * @param fx_group Index of the fx group.
+ * \@param synth FluidSynth instance.
+ * \@param fx_group Index of the fx group.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter will be applied to all groups.
- * @param level Output level to set. Must be in the range indicated by \setting{synth_chorus_level}
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise.
+ * \@param level Output level to set. Must be in the range indicated by \setting{synth_chorus_level}
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise.
  */
 int
 fluid_synth_set_chorus_group_level(fluid_synth_t *synth, int fx_group, double level)
@@ -6463,12 +6463,12 @@ fluid_synth_set_chorus_group_level(fluid_synth_t *synth, int fx_group, double le
 
 /**
  * Set chorus lfo speed to one or all chorus groups.
- * @param synth FluidSynth instance.
- * @param fx_group Index of the fx group.
+ * \@param synth FluidSynth instance.
+ * \@param fx_group Index of the fx group.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter will be applied to all groups.
- * @param speed Lfo speed to set. Must be in the range indicated by \setting{synth_chorus_speed}
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise.
+ * \@param speed Lfo speed to set. Must be in the range indicated by \setting{synth_chorus_speed}
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise.
  */
 int
 fluid_synth_set_chorus_group_speed(fluid_synth_t *synth, int fx_group, double speed)
@@ -6478,12 +6478,12 @@ fluid_synth_set_chorus_group_speed(fluid_synth_t *synth, int fx_group, double sp
 
 /**
  * Set chorus lfo depth to one or all chorus groups.
- * @param synth FluidSynth instance.
- * @param fx_group Index of the fx group.
+ * \@param synth FluidSynth instance.
+ * \@param fx_group Index of the fx group.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter will be applied to all groups.
- * @param depth_ms lfo depth to set. Must be in the range indicated by \setting{synth_chorus_depth}
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise.
+ * \@param depth_ms lfo depth to set. Must be in the range indicated by \setting{synth_chorus_depth}
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise.
  */
 int
 fluid_synth_set_chorus_group_depth(fluid_synth_t *synth, int fx_group, double depth_ms)
@@ -6493,12 +6493,12 @@ fluid_synth_set_chorus_group_depth(fluid_synth_t *synth, int fx_group, double de
 
 /**
  * Set chorus lfo waveform type to one or all chorus groups.
- * @param synth FluidSynth instance.
- * @param fx_group Index of the fx group.
+ * \@param synth FluidSynth instance.
+ * \@param fx_group Index of the fx group.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter will be applied to all groups.
- * @param type Lfo waveform type to set. (#fluid_chorus_mod)
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise.
+ * \@param type Lfo waveform type to set. (#fluid_chorus_mod)
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise.
  */
 int
 fluid_synth_set_chorus_group_type(fluid_synth_t *synth, int fx_group, int type)
@@ -6508,11 +6508,11 @@ fluid_synth_set_chorus_group_type(fluid_synth_t *synth, int fx_group, int type)
 
 /**
  * Set one chorus parameter to one fx groups.
- * @param synth FluidSynth instance.
- * @param fx_group Index of the fx group.
+ * \@param synth FluidSynth instance.
+ * \@param fx_group Index of the fx group.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter will be applied to all groups.
- * @param enum indicating the parameter to set (#fluid_chorus_param).
+ * \@param enum indicating the parameter to set (#fluid_chorus_param).
  *  FLUID_CHORUS_NR, chorus voice count (0-99, CPU time consumption proportional to
  *  this value).
  *  FLUID_CHORUS_LEVEL, chorus level (0.0-10.0).
@@ -6520,8 +6520,8 @@ fluid_synth_set_chorus_group_type(fluid_synth_t *synth, int fx_group, int type)
  *  FLUID_CHORUS_DEPTH, chorus depth (max value depends on synth sample-rate,
  *   0.0-21.0 is safe for sample-rate values up to 96KHz).
  *  FLUID_CHORUS_TYPE, chorus waveform type (#fluid_chorus_mod)
- * @param value, parameter value
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise.
+ * \@param value, parameter value
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise.
  */
 int
 fluid_synth_chorus_set_param(fluid_synth_t *synth, int fx_group, int param,
@@ -6620,9 +6620,9 @@ fluid_synth_set_chorus_full(fluid_synth_t *synth, int fx_group, int set,
 
 /**
  * Get chorus voice number (delay line count) value of all fx groups.
- * @param synth FluidSynth instance
- * @return Chorus voice count
- * @deprecated Use fluid_synth_get_chorus_group_nr() in new code instead.
+ * \@param synth FluidSynth instance
+ * \@return Chorus voice count
+ * \@deprecated Use fluid_synth_get_chorus_group_nr() in new code instead.
  */
 int
 fluid_synth_get_chorus_nr(fluid_synth_t *synth)
@@ -6634,9 +6634,9 @@ fluid_synth_get_chorus_nr(fluid_synth_t *synth)
 
 /**
  * Get chorus level of all fx groups.
- * @param synth FluidSynth instance
- * @return Chorus level value
- * @deprecated Use fluid_synth_get_chorus_group_level() in new code instead.
+ * \@param synth FluidSynth instance
+ * \@return Chorus level value
+ * \@deprecated Use fluid_synth_get_chorus_group_level() in new code instead.
  */
 double
 fluid_synth_get_chorus_level(fluid_synth_t *synth)
@@ -6648,9 +6648,9 @@ fluid_synth_get_chorus_level(fluid_synth_t *synth)
 
 /**
  * Get chorus speed in Hz of all fx groups.
- * @param synth FluidSynth instance
- * @return Chorus speed in Hz
- * @deprecated Use fluid_synth_get_chorus_group_speed() in new code instead.
+ * \@param synth FluidSynth instance
+ * \@return Chorus speed in Hz
+ * \@deprecated Use fluid_synth_get_chorus_group_speed() in new code instead.
  */
 double
 fluid_synth_get_chorus_speed(fluid_synth_t *synth)
@@ -6662,9 +6662,9 @@ fluid_synth_get_chorus_speed(fluid_synth_t *synth)
 
 /**
  * Get chorus depth of all fx groups.
- * @param synth FluidSynth instance
- * @return Chorus depth
- * @deprecated Use fluid_synth_get_chorus_group_depth() in new code instead.
+ * \@param synth FluidSynth instance
+ * \@return Chorus depth
+ * \@deprecated Use fluid_synth_get_chorus_group_depth() in new code instead.
  */
 double
 fluid_synth_get_chorus_depth(fluid_synth_t *synth)
@@ -6676,8 +6676,8 @@ fluid_synth_get_chorus_depth(fluid_synth_t *synth)
 
 /**
  * Get chorus waveform type of all fx groups.
- * @param synth FluidSynth instance
- * @return Chorus waveform type (#fluid_chorus_mod)
+ * \@param synth FluidSynth instance
+ * \@return Chorus waveform type (#fluid_chorus_mod)
  * @deprecated Use fluid_synth_get_chorus_group_type() in new code instead.
  */
 int
@@ -6690,12 +6690,12 @@ fluid_synth_get_chorus_type(fluid_synth_t *synth)
 
 /**
  * Get chorus count nr of one or all fx groups.
- * @param synth FluidSynth instance.
- * @param fx_group Index of the fx group from which to fetch the chorus voice count.
+ * \@param synth FluidSynth instance.
+ * \@param fx_group Index of the fx group from which to fetch the chorus voice count.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter common to all fx groups is fetched.
- * @param nr valid pointer on value to return.
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise.
+ * \@param nr valid pointer on value to return.
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise.
  */
 int
 fluid_synth_get_chorus_group_nr(fluid_synth_t *synth, int fx_group, int *nr)
@@ -6709,12 +6709,12 @@ fluid_synth_get_chorus_group_nr(fluid_synth_t *synth, int fx_group, int *nr)
 
 /**
  * Get chorus output level of one or all fx groups.
- * @param synth FluidSynth instance.
- * @param fx_group Index of the fx group from which chorus level to fetch.
+ * \@param synth FluidSynth instance.
+ * \@param fx_group Index of the fx group from which chorus level to fetch.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter common to all fx groups is fetched.
- * @param level valid pointer on value to return.
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise.
+ * \@param level valid pointer on value to return.
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise.
  */
 int
 fluid_synth_get_chorus_group_level(fluid_synth_t *synth, int fx_group, double *level)
@@ -6724,12 +6724,12 @@ fluid_synth_get_chorus_group_level(fluid_synth_t *synth, int fx_group, double *l
 
 /**
  * Get chorus waveform lfo speed of one or all fx groups.
- * @param synth FluidSynth instance.
- * @param fx_group Index of the fx group from which lfo speed to fetch.
+ * \@param synth FluidSynth instance.
+ * \@param fx_group Index of the fx group from which lfo speed to fetch.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter common to all fx groups is fetched.
- * @param speed valid pointer on value to return.
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise.
+ * \@param speed valid pointer on value to return.
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise.
  */
 int
 fluid_synth_get_chorus_group_speed(fluid_synth_t *synth, int fx_group, double *speed)
@@ -6739,12 +6739,12 @@ fluid_synth_get_chorus_group_speed(fluid_synth_t *synth, int fx_group, double *s
 
 /**
  * Get chorus lfo depth of one or all fx groups.
- * @param synth FluidSynth instance
- * @param fx_group Index of the fx group from which lfo depth to fetch.
+ * \@param synth FluidSynth instance
+ * \@param fx_group Index of the fx group from which lfo depth to fetch.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter common to all fx groups is fetched.
- * @param depth_ms valid pointer on value to return.
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise
+ * \@param depth_ms valid pointer on value to return.
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise
  */
 int
 fluid_synth_get_chorus_group_depth(fluid_synth_t *synth, int fx_group, double *depth_ms)
@@ -6754,12 +6754,12 @@ fluid_synth_get_chorus_group_depth(fluid_synth_t *synth, int fx_group, double *d
 
 /**
  * Get chorus waveform type of one or all fx groups.
- * @param synth FluidSynth instance
- * @param fx_group Index of the fx group from which to fetch the waveform type.
+ * \@param synth FluidSynth instance
+ * \@param fx_group Index of the fx group from which to fetch the waveform type.
  *  Must be in the range <code>-1 to (fluid_synth_count_effects_groups()-1)</code>. If -1 the
  *  parameter common to all fx groups is fetched.
- * @param type valid pointer on waveform type to return (#fluid_chorus_mod)
- * @return #FLUID_OK on success, #FLUID_FAILED otherwise
+ * \@param type valid pointer on waveform type to return (#fluid_chorus_mod)
+ * \@return #FLUID_OK on success, #FLUID_FAILED otherwise
  */
 int
 fluid_synth_get_chorus_group_type(fluid_synth_t *synth, int fx_group, int *type)
@@ -6773,16 +6773,16 @@ fluid_synth_get_chorus_group_type(fluid_synth_t *synth, int fx_group, int *type)
 
 /**
  * Get chorus parameter value of one or all fx groups.
- * @param synth FluidSynth instance
- * @param fx_group index of the fx group
- * @param enum indicating the parameter to get.
+ * \@param synth FluidSynth instance
+ * \@param fx_group index of the fx group
+ * \@param enum indicating the parameter to get.
  *  FLUID_CHORUS_NR, chorus voice count.
  *  FLUID_CHORUS_LEVEL, chorus level.
  *  FLUID_CHORUS_SPEED, chorus speed.
  *  FLUID_CHORUS_DEPTH, chorus depth.
  *  FLUID_CHORUS_TYPE, chorus waveform type.
- * @param value pointer on the value to return.
- * @return FLUID_OK if success, FLUID_FAILED otherwise.
+ * \@param value pointer on the value to return.
+ * \@return FLUID_OK if success, FLUID_FAILED otherwise.
  */
 static int fluid_synth_chorus_get_param(fluid_synth_t *synth, int fx_group,
                                         int param, double *value)
@@ -8216,8 +8216,8 @@ int fluid_synth_reset_basic_channel(fluid_synth_t *synth, int chan)
  * new basic channel group.
  * The function fails if the new group overlaps the next basic channel group.
  *
- * @param see fluid_synth_set_basic_channel.
- * @return
+ * \@param see fluid_synth_set_basic_channel.
+ * \@return
  * - On success, the effective number of channels for this new basic channel group,
  *   #FLUID_FAILED otherwise.
  * - #FLUID_FAILED
diff --git a/src/synth/fluid_synth_monopoly.c b/src/synth/fluid_synth_monopoly.c
index d1de13196..63978dbda 100644
--- a/src/synth/fluid_synth_monopoly.c
+++ b/src/synth/fluid_synth_monopoly.c
@@ -142,11 +142,11 @@
  *        - in mono legato , prev_note is returned.
  *
  * On input
- * @param chan  fluid_channel_t.
- * @param defaultFromkey, the default 'fromkey portamento' note or 'fromkey legato'
+ * \@param chan  fluid_channel_t.
+ * \@param defaultFromkey, the default 'fromkey portamento' note or 'fromkey legato'
  *       note (see description above).
  *
- * @return
+ * \@return
  *  1)'fromkey portamento' is returned in fluid_synth_t.fromkey_portamento.
  *  If valid,it means that portamento is enabled .
  *
@@ -528,12 +528,12 @@ fluid_synth_noteon_mono_staccato(fluid_synth_t *synth, int chan, int key, int ve
  * the last noteoff of the passage occurs. That means that if sustain or sostenuto
  * is depressed, only the last note of a legato passage will be sustained.
  *
- * @param synth instance.
- * @param chan MIDI channel number (0 to MIDI channel count - 1).
- * @param key MIDI note number (0-127).
- * @param Mono, 1 noteoff on monophonic note.
+ * \@param synth instance.
+ * \@param chan MIDI channel number (0 to MIDI channel count - 1).
+ * \@param key MIDI note number (0-127).
+ * \@param Mono, 1 noteoff on monophonic note.
  *              0 noteoff on polyphonic note.
- * @return FLUID_OK on success, FLUID_FAILED otherwise.
+ * \@return FLUID_OK on success, FLUID_FAILED otherwise.
  *
  * Note: On return, on monophonic, possible sustained note is memorized in
  * key_mono_sustained. Memorization is done here on noteOff.
diff --git a/src/synth/fluid_voice.c b/src/synth/fluid_voice.c
index f605832e0..421e73538 100644
--- a/src/synth/fluid_voice.c
+++ b/src/synth/fluid_voice.c
@@ -1497,8 +1497,8 @@ fluid_voice_add_mod(fluid_voice_t *voice, fluid_mod_t *mod, int mode)
 /**
  * Adds a modulator to the voice.
  * local version of fluid_voice_add_mod function. Called at noteon time.
- * @param voice, mod, mode, same as for fluid_voice_add_mod() (see above).
- * @param check_limit_count is the modulator number limit to handle with existing
+ * \@param voice, mod, mode, same as for fluid_voice_add_mod() (see above).
+ * \@param check_limit_count is the modulator number limit to handle with existing
  *   identical modulator(i.e mode FLUID_VOICE_OVERWRITE, FLUID_VOICE_ADD).
  *   - When FLUID_NUM_MOD, all the voices modulators (since the previous call)
  *     are checked for identity.
diff --git a/src/utils/fluid_hash.h b/src/utils/fluid_hash.h
index 96b2471be..548a08505 100644
--- a/src/utils/fluid_hash.h
+++ b/src/utils/fluid_hash.h
@@ -73,7 +73,7 @@ struct _fluid_hashtable_t
 
 struct _fluid_hashtable_iter_t
 {
-    /*< private >*/
+    /* \< private >*/
     void 	*dummy1;
     void 	*dummy2;
     void 	*dummy3;
diff --git a/src/utils/fluid_sys.c b/src/utils/fluid_sys.c
index a09a370f4..e1c0214c5 100644
--- a/src/utils/fluid_sys.c
+++ b/src/utils/fluid_sys.c
@@ -399,7 +399,7 @@ char *fluid_strtok(char **str, char *delim)
 
 /**
  * Suspend the execution of the current thread for the specified amount of time.
- * @param milliseconds to wait.
+ * \@param milliseconds to wait.
  */
 void fluid_msleep(unsigned int msecs)
 {
@@ -1302,10 +1302,10 @@ fluid_istream_readline(fluid_istream_t in, fluid_ostream_t out, char *prompt,
 
 /**
  * Reads a line from an input stream (socket).
- * @param in The input socket
- * @param buf Buffer to store data to
- * @param len Maximum length to store to buf
- * @return 1 if a line was read, 0 on end of stream, -1 on error
+ * \@param in The input socket
+ * \@param buf Buffer to store data to
+ * \@param len Maximum length to store to buf
+ * \@return 1 if a line was read, 0 on end of stream, -1 on error
  */
 static int
 fluid_istream_gets(fluid_istream_t in, char *buf, int len)
diff --git a/xcode-ios/FluidSynth.xcodeproj/project.pbxproj b/xcode-ios/FluidSynth.xcodeproj/project.pbxproj
index ebf5495d2..7f3314250 100644
--- a/xcode-ios/FluidSynth.xcodeproj/project.pbxproj
+++ b/xcode-ios/FluidSynth.xcodeproj/project.pbxproj
@@ -116,8 +116,8 @@
 		0597CA0591654880B4A92172 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				8A9A012E29F32EEF000AF341 /* libfluidsynth.a */,
 				8A9A029629F3DEFE000AF341 /* make_tables */,
+				8A9A012E29F32EEF000AF341 /* libfluidsynth.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -293,12 +293,12 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(PROJECT_DIR)/fluid_conv_tables.inc.h",
-				"$(PROJECT_DIR)/fluid_rvoice_dsp_tables.inc.h",
+				$PROJECT_DIR/fluid_conv_tables.inc.h,
+				$PROJECT_DIR/fluid_rvoice_dsp_tables.inc.h,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "$TARGET_BUILD_DIR/make_tables \"$(PROJECT_DIR)\"\n";
+			shellScript = "$TARGET_BUILD_DIR/make_tables $PROJECT_DIR/ || true\n";
 		};
 		8A9A040C29F55DBC000AF341 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/xcode-ios/FluidSynthSDL2.xcodeproj/project.pbxproj b/xcode-ios/FluidSynthSDL2.xcodeproj/project.pbxproj
index 416a8e89e..ae7578a7c 100644
--- a/xcode-ios/FluidSynthSDL2.xcodeproj/project.pbxproj
+++ b/xcode-ios/FluidSynthSDL2.xcodeproj/project.pbxproj
@@ -296,12 +296,12 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(PROJECT_DIR)/fluid_conv_tables.inc.h",
-				"$(PROJECT_DIR)/fluid_rvoice_dsp_tables.inc.h",
+				$PROJECT_DIR/fluid_conv_tables.inc.h,
+				$PROJECT_DIR/fluid_rvoice_dsp_tables.inc.h,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "$TARGET_BUILD_DIR/make_tables \"$(PROJECT_DIR)\"\n";
+			shellScript = "$TARGET_BUILD_DIR/make_tables $PROJECT_DIR/ || true\n";
 		};
 		8A9A040C29F55DBC000AF341 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/xcode-ios/FluidSynthSDL2dependency.xcodeproj/project.pbxproj b/xcode-ios/FluidSynthSDL2dependency.xcodeproj/project.pbxproj
index e19d5ebff..927be77f5 100644
--- a/xcode-ios/FluidSynthSDL2dependency.xcodeproj/project.pbxproj
+++ b/xcode-ios/FluidSynthSDL2dependency.xcodeproj/project.pbxproj
@@ -508,12 +508,12 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(PROJECT_DIR)/fluid_conv_tables.inc.h",
-				"$(PROJECT_DIR)/fluid_rvoice_dsp_tables.inc.h",
+				$PROJECT_DIR/fluid_conv_tables.inc.h,
+				$PROJECT_DIR/fluid_rvoice_dsp_tables.inc.h,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "$TARGET_BUILD_DIR/make_tables \"$(PROJECT_DIR)\"\n";
+			shellScript = "$TARGET_BUILD_DIR/make_tables $PROJECT_DIR/ || true\n";
 		};
 		8A9A040C29F55DBC000AF341 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;