diff --git a/Makefile b/Makefile
index 341b6247398c19c253d42aaacde6f371f82a13cc..2b4449784d4d37b68c40ab5c5547bf122d38e908 100644
--- a/Makefile
+++ b/Makefile
@@ -232,8 +232,6 @@ endif
 
 ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
 
-ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
-
 ifeq ($(AST_DEVMODE),yes)
   ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT) -Wmissing-format-attribute -Wformat-security #-Wformat=2
 endif
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 9258e8d63bac688e75374fb3ae9a40edfd3d786a..18670f9a58f22dfb4afdb7fcdacb3b916553dc5b 100644
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -18,12 +18,6 @@
 # Also note that we can only set one variable per rule, so we have to
 # repeat the left hand side to set multiple variables.
 
-ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)
- ifeq ($(findstring astmm.h,$(ASTCFLAGS)),)
-  ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/astmm.h
- endif
-endif
-
 ifeq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
   ASTCFLAGS+=${GC_CFLAGS}
 endif
diff --git a/include/asterisk.h b/include/asterisk.h
index 9d5c1ae8a50fd68199709a35eb822cf62dbaf387..f55d5bb0d6104287457759e9951dd5a1f32ab963 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -18,15 +18,12 @@
 #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/main/Makefile b/main/Makefile
index db4aad7e4869e16008d7d25ca585c42ef2a9cd9e..b1ef7ef77e0ae7e7f45dba77d3653355804ccd0d 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -123,9 +123,12 @@ ast_expr2.c ast_expr2.h:
 	bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
 
 ast_expr2f.c:
-	flex -o $@ --full ast_expr2.fl # moved the correction of yyfree into the flex input file itself.
-	sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ast_expr2f.c > zz
-	mv zz ast_expr2f.c
+	flex -o $@ --full ast_expr2.fl
+	sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' $@ > $@.fix
+	echo "#include \"asterisk.h\"" > $@
+	echo >> $@
+	cat $@.fix >> $@
+	rm $@.fix
 
 ast_expr2f.o: ASTCFLAGS+=-Wno-unused
 
diff --git a/main/ast_expr2.c b/main/ast_expr2.c
index 9d6bf6e72751106baaea7b50d34d56eb3df33ec7..37f4108bd641b9b3952f425fa279d9fe041c114b 100644
--- a/main/ast_expr2.c
+++ b/main/ast_expr2.c
@@ -143,11 +143,14 @@
  * $FreeBSD: src/bin/expr/expr.y,v 1.16 2000/07/22 10:59:36 se Exp $
  */
 
+#include "asterisk.h"
+
 #include <sys/types.h>
 #include <stdio.h>
-#include "asterisk.h"
+
+#if !defined(STANDALONE)
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#ifdef STANDALONE
+#else
 #ifndef __USE_ISOC99
 #define __USE_ISOC99 1
 #endif
@@ -436,7 +439,6 @@ static int		to_number __P((struct val *));
 static void		to_string __P((struct val *));
 static struct expr_node *alloc_expr_node(enum node_type);
 static void destroy_arglist(struct expr_node *arglist);
-static int is_really_num(char *str);
 
 /* uh, if I want to predeclare yylex with a YYLTYPE, I have to predeclare the yyltype... sigh */
 typedef struct yyltype
@@ -2502,61 +2504,6 @@ is_zero_or_null (struct val *vp)
 	/* NOTREACHED */
 }
 
-#ifdef STANDALONE
-
-void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
-{
-	va_list vars;
-	va_start(vars,fmt);
-	
-        printf("LOG: lev:%d file:%s  line:%d func: %s  ",
-                   level, file, line, function);
-	vprintf(fmt, vars);
-	fflush(stdout);
-	va_end(vars);
-}
-
-
-int main(int argc,char **argv) {
-	char s[4096];
-	char out[4096];
-	FILE *infile;
-	
-	if( !argv[1] )
-		exit(20);
-	
-	if( access(argv[1],F_OK)== 0 )
-	{
-		int ret;
-		
-		infile = fopen(argv[1],"r");
-		if( !infile )
-		{
-			printf("Sorry, couldn't open %s for reading!\n", argv[1]);
-			exit(10);
-		}
-		while( fgets(s,sizeof(s),infile) )
-		{
-			if( s[strlen(s)-1] == '\n' )
-				s[strlen(s)-1] = 0;
-			
-			ret = ast_expr(s, out, sizeof(out),NULL);
-			printf("Expression: %s    Result: [%d] '%s'\n",
-				   s, ret, out);
-		}
-		fclose(infile);
-	}
-	else
-	{
-		if (ast_expr(argv[1], s, sizeof(s), NULL))
-			printf("=====%s======\n",s);
-		else
-			printf("No result\n");
-	}
-}
-
-#endif
-
 #undef ast_yyerror
 #define ast_yyerror(x) ast_yyerror(x, YYLTYPE *yylloc, struct parse_io *parseio)
 
@@ -2581,6 +2528,7 @@ static void destroy_arglist(struct expr_node *arglist)
 	}
 }
 
+#if !defined(STANDALONE)
 static char *compose_func_args(struct expr_node *arglist)
 {
 	struct expr_node *t = arglist;
@@ -2630,7 +2578,7 @@ static int is_really_num(char *str)
 	else
 		return 0;
 }
-
+#endif
 
 static struct val *op_func(struct val *funcname, struct expr_node *arglist, struct ast_channel *chan)
 {
diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl
index f446606f0abe029beac72b84e79ff3fcb243a856..6fca882931af0ff7b9a31f6b253dbc2e9301a6ee 100644
--- a/main/ast_expr2.fl
+++ b/main/ast_expr2.fl
@@ -22,12 +22,10 @@
  * \brief Dialplan Expression Lexical Scanner
  */
 
-#include "asterisk.h"
-
 #include <sys/types.h>
 #include <stdio.h>
 
-#ifndef STANDALONE
+#if !defined(STANDALONE)
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #else
 #ifndef __USE_ISOC99
@@ -276,7 +274,7 @@ int ast_expr(char *expr, char *buf, int length, struct ast_channel *chan)
 			return_value = (res_length <= length) ? res_length : length;
 		} else {
 			if (io.val->u.s)
-#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
+#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE)
 				strncpy(buf, io.val->u.s, length - 1);
 #else /* !STANDALONE && !LOW_MEMORY */
 				ast_copy_string(buf, io.val->u.s, length);
diff --git a/main/ast_expr2.y b/main/ast_expr2.y
index 76fe1600501d194b0fc23ff17d8f83ba2a6cb210..a179feaeb4b1ed363d4193c95150d32ddf6694c9 100644
--- a/main/ast_expr2.y
+++ b/main/ast_expr2.y
@@ -12,11 +12,14 @@
  * $FreeBSD: src/bin/expr/expr.y,v 1.16 2000/07/22 10:59:36 se Exp $
  */
 
+#include "asterisk.h"
+
 #include <sys/types.h>
 #include <stdio.h>
-#include "asterisk.h"
+
+#if !defined(STANDALONE)
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#ifdef STANDALONE
+#else
 #ifndef __USE_ISOC99
 #define __USE_ISOC99 1
 #endif
@@ -305,7 +308,6 @@ static int		to_number __P((struct val *));
 static void		to_string __P((struct val *));
 static struct expr_node *alloc_expr_node(enum node_type);
 static void destroy_arglist(struct expr_node *arglist);
-static int is_really_num(char *str);
 
 /* uh, if I want to predeclare yylex with a YYLTYPE, I have to predeclare the yyltype... sigh */
 typedef struct yyltype
@@ -648,61 +650,6 @@ is_zero_or_null (struct val *vp)
 	/* NOTREACHED */
 }
 
-#ifdef STANDALONE
-
-void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
-{
-	va_list vars;
-	va_start(vars,fmt);
-	
-        printf("LOG: lev:%d file:%s  line:%d func: %s  ",
-                   level, file, line, function);
-	vprintf(fmt, vars);
-	fflush(stdout);
-	va_end(vars);
-}
-
-
-int main(int argc,char **argv) {
-	char s[4096];
-	char out[4096];
-	FILE *infile;
-	
-	if( !argv[1] )
-		exit(20);
-	
-	if( access(argv[1],F_OK)== 0 )
-	{
-		int ret;
-		
-		infile = fopen(argv[1],"r");
-		if( !infile )
-		{
-			printf("Sorry, couldn't open %s for reading!\n", argv[1]);
-			exit(10);
-		}
-		while( fgets(s,sizeof(s),infile) )
-		{
-			if( s[strlen(s)-1] == '\n' )
-				s[strlen(s)-1] = 0;
-			
-			ret = ast_expr(s, out, sizeof(out),NULL);
-			printf("Expression: %s    Result: [%d] '%s'\n",
-				   s, ret, out);
-		}
-		fclose(infile);
-	}
-	else
-	{
-		if (ast_expr(argv[1], s, sizeof(s), NULL))
-			printf("=====%s======\n",s);
-		else
-			printf("No result\n");
-	}
-}
-
-#endif
-
 #undef ast_yyerror
 #define ast_yyerror(x) ast_yyerror(x, YYLTYPE *yylloc, struct parse_io *parseio)
 
@@ -727,6 +674,7 @@ static void destroy_arglist(struct expr_node *arglist)
 	}
 }
 
+#if !defined(STANDALONE)
 static char *compose_func_args(struct expr_node *arglist)
 {
 	struct expr_node *t = arglist;
@@ -776,7 +724,7 @@ static int is_really_num(char *str)
 	else
 		return 0;
 }
-
+#endif
 
 static struct val *op_func(struct val *funcname, struct expr_node *arglist, struct ast_channel *chan)
 {
diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c
index 2ba568d82e229e8bb5a2a10ac20e112019bbd122..b6ab64e2675b4e205e3bb956ac663d8179e12876 100644
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@@ -1,3 +1,5 @@
+#include "asterisk.h"
+
 #line 2 "ast_expr2f.c"
 
 #line 4 "ast_expr2f.c"
@@ -2316,12 +2318,10 @@ static yyconst yy_state_type yy_NUL_trans[60] =
  * \brief Dialplan Expression Lexical Scanner
  */
 
-#include "asterisk.h"
-
 #include <sys/types.h>
 #include <stdio.h>
 
-#ifndef STANDALONE
+#if !defined(STANDALONE)
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #else
 #ifndef __USE_ISOC99
@@ -4133,7 +4133,7 @@ int ast_expr(char *expr, char *buf, int length, struct ast_channel *chan)
 			return_value = (res_length <= length) ? res_length : length;
 		} else {
 			if (io.val->u.s)
-#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
+#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE)
 				strncpy(buf, io.val->u.s, length - 1);
 #else /* !STANDALONE && !LOW_MEMORY */
 				ast_copy_string(buf, io.val->u.s, length);
diff --git a/main/astmm.c b/main/astmm.c
index 60543ecbc247a5d9e772960b466f5a5cc79e7136..4659d5be2527e3d92c82d1f874f35bcca4fdaca6 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -23,10 +23,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
-#ifdef __AST_DEBUG_MALLOC
-
 #include "asterisk.h"
 
+#ifdef __AST_DEBUG_MALLOC
+
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/paths.h"	/* use ast_config_AST_LOG_DIR */
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index 445f93a55f01ca532ad5f35b62375ed3bc91e7bb..b25b8ab1444e3ee4c5567aa70d32a0f33bb1d219 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -44,7 +44,6 @@
 
 /*LINTLIBRARY*/
 
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index 22ec24105df1f88ce9bd65401eea8f4df5caa3ce..81801f1c9e64f2dc855c12d236991e1a58088452 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -28,7 +28,9 @@
 
 #include "asterisk.h"
 
+#if !defined(STANDALONE)
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#endif
 
 #include <ctype.h>
 #include <regex.h>
@@ -262,7 +264,7 @@ static int reload(void)
 	return pbx_load_module();
 }
 
-#ifdef STANDALONE_AEL
+#ifdef STANDALONE
 #define AST_MODULE "ael"
 int ael_external_load_module(void);
 int ael_external_load_module(void)
diff --git a/utils/Makefile b/utils/Makefile
index ee8572a29d4eaf4e606f23ceba1c449ccd8ff7cd..e6f1d32a29d96a8deba99c1cc9b6a01b6fdeac5d 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -17,7 +17,9 @@ ASTTOPDIR?=..
 .PHONY: clean all uninstall
 
 # to get check_expr, add it to the ALL_UTILS list
-ALL_UTILS:=astman smsq stereorize streamplayer aelparse muted check_expr conf2ael hashtest2 hashtest astcanary refcounter
+ALL_UTILS:=astman smsq stereorize streamplayer muted check_expr hashtest2 hashtest astcanary refcounter
+# aelparse and conf2ael currently not being built because they rely on extconf, which is horribly broken
+# ALL_UTILS:=aelparse conf2ael
 UTILS:=$(ALL_UTILS)
 
 LIBS += $(BKTR_LIB)	# astobj2 with devmode uses backtrace
@@ -82,6 +84,7 @@ md5.c: $(ASTTOPDIR)/main/md5.c
 	@cp $< $@
 astman: astman.o md5.o
 astman: LIBS+=$(NEWT_LIB)
+astman.o: ASTCFLAGS+=-DNO_MALLOC_DEBUG
 
 stereorize: stereorize.o frame.o
 stereorize: LIBS+=-lm
@@ -106,10 +109,12 @@ pval.c: $(ASTTOPDIR)/res/ael/pval.c
 ast_expr2.c: $(ASTTOPDIR)/main/ast_expr2.c
 	@cp $< $@
 
+ast_expr2.o: ASTCFLAGS+=-DSTANDALONE
+
 ast_expr2f.c: $(ASTTOPDIR)/main/ast_expr2f.c
 	@cp $< $@
 
-ast_expr2f.o: ASTCFLAGS+=-DSTANDALONE_AEL -I$(ASTTOPDIR)/main -Wno-unused
+ast_expr2f.o: ASTCFLAGS+=-DSTANDALONE -I$(ASTTOPDIR)/main -Wno-unused
 
 pval.o : ASTCFLAGS+=-DSTANDALONE
 
@@ -118,17 +123,19 @@ check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o threadstorage.o cl
 aelbison.c: $(ASTTOPDIR)/res/ael/ael.tab.c
 	@cp $< $@
 
-aelbison.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res/ael  -DYYENABLE_NLS=0
+aelbison.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res/ael  -DYYENABLE_NLS=0 -DSTANDALONE
 
 pbx_ael.c: $(ASTTOPDIR)/pbx/pbx_ael.c
 	@cp $< $@
 
-pbx_ael.o: ASTCFLAGS+=-DSTANDALONE_AEL
+pbx_ael.o: ASTCFLAGS+=-DSTANDALONE
 
 aelparse.c: $(ASTTOPDIR)/res/ael/ael_lex.c
 	@cp $< $@
 
-aelparse.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res -DSTANDALONE_AEL -Wno-unused
+ael_main.o: ASTCFLAGS+=-DSTANDALONE
+
+aelparse.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res -DSTANDALONE -Wno-unused
 
 aelparse: aelparse.o aelbison.o pbx_ael.o hashtab.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o
 
@@ -161,8 +168,8 @@ extconf.o: extconf.c
 conf2ael: conf2ael.o ast_expr2f.o ast_expr2.o hashtab.o aelbison.o aelparse.o pbx_ael.o pval.o extconf.o strcompat.o
 
 testexpr2s: $(ASTTOPDIR)/main/ast_expr2f.c $(ASTTOPDIR)/main/ast_expr2.c $(ASTTOPDIR)/main/ast_expr2.h
-	$(CC) -g -c -I$(ASTTOPDIR)/include -DSTANDALONE_AEL $(ASTTOPDIR)/main/ast_expr2f.c -o ast_expr2f.o
-	$(CC) -g -c -I$(ASTTOPDIR)/include -DSTANDALONE_AEL $(ASTTOPDIR)/main/ast_expr2.c -o ast_expr2.o
+	$(CC) -g -c -I$(ASTTOPDIR)/include -DSTANDALONE $(ASTTOPDIR)/main/ast_expr2f.c -o ast_expr2f.o
+	$(CC) -g -c -I$(ASTTOPDIR)/include -DSTANDALONE $(ASTTOPDIR)/main/ast_expr2.c -o ast_expr2.o
 	$(CC) -g -o testexpr2s ast_expr2f.o ast_expr2.o
 	rm ast_expr2.o ast_expr2f.o 
 	./testexpr2s expr2.testinput
diff --git a/utils/ael_main.c b/utils/ael_main.c
index 6ef84cbcfddd6f04f1959a6c44ad6cac4d6d8ea3..2178525a4ed6a190cc7518125d7009dc5b4319d4 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -169,16 +169,6 @@ struct ast_custom_function *ast_custom_function_find(const char *name)
 	return 0; /* in "standalone" mode, functions are just not avail */
 }
 
-void ast_register_file_version(const char *file, const char *version);
-void ast_register_file_version(const char *file, const char *version)
-{
-}
-
-void ast_unregister_file_version(const char *file);
-void ast_unregister_file_version(const char *file)
-{
-}
-
 #if !defined(LOW_MEMORY)
 int ast_add_profile(const char *x, uint64_t scale)
 {
diff --git a/utils/astman.c b/utils/astman.c
index a8b8e597a5b371e12d9c938f89d8d07f72bc6fb1..e8d3c4d9ea35ce59ba5b3fc9d80f90d5b68bc158 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -24,6 +24,8 @@
 
 #include "asterisk.h"
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "asterisk.h"
+
 #include <newt.h>
 #include <stdio.h>
 #include <sys/time.h>
diff --git a/utils/extconf.c b/utils/extconf.c
index 2a492d778a88f40171d53a6f75af27b40220c780..4353ba7bef087d7f818f5d968ffeeff98c721389 100644
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -23,6 +23,8 @@
  * for operations outside of asterisk. A huge, awful hack.
  *
  */
+#include "asterisk.h"
+
 #undef DEBUG_THREADS
 
 #include "asterisk/compat.h"
@@ -81,12 +83,6 @@ struct ast_channel
 #define VERBOSE_PREFIX_3 "    -- "
 #define VERBOSE_PREFIX_4 "       > "
 
-/* IN CONFLICT: void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
-   __attribute__ ((format (printf, 5, 6))); */
-
-static void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__ ((format (printf,5,6)));
-
-
 void ast_backtrace(void);
 
 void ast_queue_log(const char *queuename, const char *callid, const char *agent, const char *event, const char *fmt, ...)
@@ -100,9 +96,6 @@ int ast_unregister_verbose(void (*verboser)(const char *string));
 
 void ast_console_puts(const char *string);
 
-void ast_console_puts_mutable(const char *string);
-void ast_console_toggle_mute(int fd);
-
 #define _A_ __FILE__, __LINE__, __PRETTY_FUNCTION__
 
 #ifdef LOG_DEBUG
@@ -1767,56 +1760,6 @@ static void ast_config_destroy(struct ast_config *cfg)
 #define AST_CACHE_DIR_LEN 	512
 #define AST_FILENAME_MAX	80
 
-/*! \ingroup main_options */
-enum ast_option_flags {
-	/*! Allow \#exec in config files */
-	AST_OPT_FLAG_EXEC_INCLUDES = (1 << 0),
-	/*! Do not fork() */
-	AST_OPT_FLAG_NO_FORK = (1 << 1),
-	/*! Keep quiet */
-	AST_OPT_FLAG_QUIET = (1 << 2),
-	/*! Console mode */
-	AST_OPT_FLAG_CONSOLE = (1 << 3),
-	/*! Run in realtime Linux priority */
-	AST_OPT_FLAG_HIGH_PRIORITY = (1 << 4),
-	/*! Initialize keys for RSA authentication */
-	AST_OPT_FLAG_INIT_KEYS = (1 << 5),
-	/*! Remote console */
-	AST_OPT_FLAG_REMOTE = (1 << 6),
-	/*! Execute an asterisk CLI command upon startup */
-	AST_OPT_FLAG_EXEC = (1 << 7),
-	/*! Don't use termcap colors */
-	AST_OPT_FLAG_NO_COLOR = (1 << 8),
-	/*! Are we fully started yet? */
-	AST_OPT_FLAG_FULLY_BOOTED = (1 << 9),
-	/*! Trascode via signed linear */
-	AST_OPT_FLAG_TRANSCODE_VIA_SLIN = (1 << 10),
-	/*! Enable priority jumping in applications */
-	AST_OPT_FLAG_PRIORITY_JUMPING = (1 << 11),
-	/*! Dump core on a seg fault */
-	AST_OPT_FLAG_DUMP_CORE = (1 << 12),
-	/*! Cache sound files */
-	AST_OPT_FLAG_CACHE_RECORD_FILES = (1 << 13),
-	/*! Display timestamp in CLI verbose output */
-	AST_OPT_FLAG_TIMESTAMP = (1 << 14),
-	/*! Override config */
-	AST_OPT_FLAG_OVERRIDE_CONFIG = (1 << 15),
-	/*! Reconnect */
-	AST_OPT_FLAG_RECONNECT = (1 << 16),
-	/*! Transmit Silence during Record() */
-	AST_OPT_FLAG_TRANSMIT_SILENCE = (1 << 17),
-	/*! Suppress some warnings */
-	AST_OPT_FLAG_DONT_WARN = (1 << 18),
-	/*! End CDRs before the 'h' extension */
-	AST_OPT_FLAG_END_CDR_BEFORE_H_EXTEN = (1 << 19),
-	/*! Use DAHDI Timing for generators if available */
-	AST_OPT_FLAG_INTERNAL_TIMING = (1 << 20),
-	/*! Always fork, even if verbose or debug settings are non-zero */
-	AST_OPT_FLAG_ALWAYS_FORK = (1 << 21),
-	/*! Disable log/verbose output to remote consoles */
-	AST_OPT_FLAG_MUTE = (1 << 22)
-};
-
 /*! These are the options that set by default when Asterisk starts */
 #define AST_DEFAULT_OPTIONS AST_OPT_FLAG_TRANSCODE_VIA_SLIN
 
@@ -1850,8 +1793,6 @@ extern int option_maxcalls;		/*!< Maximum number of simultaneous channels */
 extern double option_maxload;
 extern char defaultlanguage[];
 
-extern time_t ast_startuptime;
-extern time_t ast_lastreloadtime;
 extern pid_t ast_mainpid;
 
 extern char record_cache_dir[AST_CACHE_DIR_LEN];
@@ -2706,14 +2647,6 @@ static const char *ast_var_name(const struct ast_var_t *var)
 	return name;
 }
 
-
-/* stolen from asterisk.c */
-
-static struct ast_flags ast_options = { AST_DEFAULT_OPTIONS };
-static int option_verbose = 0;                         /*!< Verbosity level */
-static int option_debug = 0;                           /*!< Debug level */
-
-
 /* experiment 1: see if it's easier just to use existing config code
  *               to read in the extensions.conf file. In this scenario, 
                  I have to rip/copy code from other modules, because they
@@ -2735,7 +2668,7 @@ static void ast_log(int level, const char *file, int line, const char *function,
 	va_end(vars);
 }
 
-static void __attribute__((format (printf, 1, 2))) ast_verbose(const char *fmt, ...)
+void __attribute__((format (printf, 1, 2))) ast_verbose(const char *fmt, ...)
 {
 	va_list vars;
 	va_start(vars,fmt);