4 files changed, 8 insertions, 21 deletions
diff --git a/include/asterisk.h b/include/asterisk.h
index f55d5bb0d..9d5c1ae8a 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -18,12 +18,15 @@
 #ifndef _ASTERISK_H
 #define _ASTERISK_H
 
+/* The include of 'autoconfig.h' is not necessary for any modules that
+   are part of the Asterisk source tree, because the top-level Makefile
+   will forcibly include that header in all compilations before all
+   other headers (even system headers). However, leaving this here will
+   help out-of-tree module builders, and doesn't cause any harm for the
+   in-tree modules.
+*/
 #include "asterisk/autoconfig.h"
 
-#if !defined(NO_MALLOC_DEBUG) && !defined(STANDALONE) && defined(MALLOC_DEBUG)
-#include "asterisk/astmm.h"
-#endif
-
 #include "asterisk/compat.h"
 
 #include "asterisk/logger.h"
diff --git a/include/asterisk/astmm.h b/include/asterisk/astmm.h
index 5d0d47ff5..f2a632e3c 100644
--- a/include/asterisk/astmm.h
+++ b/include/asterisk/astmm.h
@@ -27,13 +27,6 @@
 
 #include "asterisk.h"
 
-/* Include these now to prevent them from being needed later */
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-
 /* Undefine any macros */
 #undef malloc
 #undef calloc
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index a3d73c9da..cc733b344 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -588,10 +588,6 @@ enum {
 	/*! This flag indicates that on a masquerade, an active stream should not
 	 *  be carried over */
 	AST_FLAG_MASQ_NOSTREAM = (1 << 16),
-	/*! This flag indicates that the hangup exten was run when the bridge terminated,
-	 *  a message aimed at preventing a subsequent hangup exten being run at the pbx_run
-	 *  level */
-	AST_FLAG_BRIDGE_HANGUP_RUN = (1 << 17),
 };
 
 /*! \brief ast_bridge_config flags */
@@ -603,7 +599,6 @@ enum {
 	AST_FEATURE_AUTOMON =      (1 << 4),
 	AST_FEATURE_PARKCALL =     (1 << 5),
 	AST_FEATURE_AUTOMIXMON =   (1 << 6),
-	AST_FEATURE_NO_H_EXTEN =   (1 << 7),
 };
 
 /*! \brief bridge configuration */
diff --git a/include/asterisk/hashtab.h b/include/asterisk/hashtab.h
index aa4dc59db..ed9a95e84 100644
--- a/include/asterisk/hashtab.h
+++ b/include/asterisk/hashtab.h
@@ -198,11 +198,7 @@ struct ast_hashtab * ast_hashtab_create(int initial_buckets,
 
 /*!
  * \brief This func will free the hash table and all its memory. 
- * \note It doesn't touch the objects stored in it, unless you
- *       specify a destroy func; it will call that func for each
- *       object in the hashtab, remove all the objects, and then
- *       free the hashtab itself. If no destroyfunc is specified
- *       then the routine will assume you will free it yourself.
+ * \note It doesn't touch the objects stored in it
  * \param tab
  * \param objdestroyfunc
 */