diff --git a/apps/app_queue.c b/apps/app_queue.c
index 5e7730b3c1878dfd8be2be0e97ad7b8bcaae5076..e37f230532490398d2def5eb2a72226492a72d73 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1268,8 +1268,12 @@ static const struct autopause {
 #define DEFAULT_TIMEOUT		15
 #define RECHECK			1		/*!< Recheck every second to see we we're at the top yet */
 #define MAX_PERIODIC_ANNOUNCEMENTS 10           /*!< The maximum periodic announcements we can have */
-#define DEFAULT_MIN_ANNOUNCE_FREQUENCY 15       /*!< The minimum number of seconds between position announcements \
-                                                     The default value of 15 provides backwards compatibility */
+/*!
+ * \brief The minimum number of seconds between position announcements.
+ * \note The default value of 15 provides backwards compatibility.
+ */
+#define DEFAULT_MIN_ANNOUNCE_FREQUENCY 15
+
 #define MAX_QUEUE_BUCKETS 53
 
 #define	RES_OKAY	0		/*!< Action completed */
diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index 4c3611849130ca881280bcf248540813aed5ed35..dad7c49174b88e3be5fc4361a84a00a6c79f6fd4 100644
--- a/include/asterisk/manager.h
+++ b/include/asterisk/manager.h
@@ -518,8 +518,6 @@ struct stasis_message_type *ast_manager_get_generic_type(void);
  */
 struct stasis_topic *ast_manager_get_topic(void);
 
-struct ast_json;
-
 /*!
  * \since 12
  * \brief Publish an event to AMI
diff --git a/include/asterisk/stasis.h b/include/asterisk/stasis.h
index 943e0c72cfb9692a0cfda1d88d5e178d89a7df62..955bdc3fcfad8a89168128447a9c7f0712e0945b 100644
--- a/include/asterisk/stasis.h
+++ b/include/asterisk/stasis.h
@@ -731,7 +731,7 @@ struct ao2_container *stasis_cache_dump(struct stasis_cache *cache,
 void stasis_log_bad_type_access(const char *name);
 
 /*!
- * \brief Boiler-plate removing macro for defining message types.
+ * \brief Boiler-plate messaging macro for defining public message types.
  *
  * \code
  *	STASIS_MESSAGE_TYPE_DEFN(ast_foo_type,
@@ -757,7 +757,7 @@ void stasis_log_bad_type_access(const char *name);
 	}
 
 /*!
- * \brief Boiler-plate removing macro for defining local message types.
+ * \brief Boiler-plate messaging macro for defining local message types.
  *
  * \code
  *	STASIS_MESSAGE_TYPE_DEFN_LOCAL(ast_foo_type,
@@ -783,7 +783,7 @@ void stasis_log_bad_type_access(const char *name);
 	}
 
 /*!
-* \brief Boiler-plate removing macro for initializing message types.
+* \brief Boiler-plate messaging macro for initializing message types.
  *
  * \code
  *	if (STASIS_MESSAGE_TYPE_INIT(ast_foo_type) != 0) {
@@ -805,7 +805,7 @@ void stasis_log_bad_type_access(const char *name);
 	})
 
 /*!
- * \brief Boiler-plate removing macro for cleaning up message types.
+ * \brief Boiler-plate messaging macro for cleaning up message types.
  *
  * Note that if your type is defined in core instead of a loadable module, you
  * should call message type cleanup from an ast_register_cleanup() handler