simplify autoconfig include mechanism (make tholo happy he can use lint again :-)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32846 f38db490-d61c-443f-a65b-d21fe96a405b

8 files changed, 32 insertions, 34 deletions

diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 9150e5773..c02cdfe71 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -28,6 +28,10 @@
  * \ingroup cdr_drivers
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
@@ -37,10 +41,6 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index 6aad620d8..f540e0a6b 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -30,6 +30,10 @@
  * \ingroup cdr_drivers
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
@@ -39,10 +43,6 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index c24130df7..1e1db4890 100644
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -25,15 +25,15 @@
  * \ingroup cdr_drivers
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/types.h>
 #include <strings.h>
 #include <unistd.h>
 #include <time.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index e42631e7e..e7bafb886 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -32,6 +32,10 @@
 	<depend>unixodbc</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
@@ -51,10 +55,6 @@
 #include <w32api/sqltypes.h>
 #endif
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/config.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 356a2e5ab..7ee41927e 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -36,20 +36,19 @@
 	<depend>pgsql</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
 
 #include <libpq-fe.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/config.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index 9b40b1cf9..450afd6e2 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -29,6 +29,10 @@
 	<depend>radiusclient</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Rev$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -38,10 +42,6 @@
 #include <sys/types.h>
 #include <radiusclient-ng.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Rev$")
-
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index 3d4d79387..718ef4838 100644
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -35,18 +35,17 @@
 	<depend>sqlite</depend>
  ***/
 
-#include <sys/types.h>
+#include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include <sys/types.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <sqlite.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/logger.h"
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index ecc6c2945..7541d260e 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -59,6 +59,10 @@ CREATE TABLE [dbo].[cdr] (
 	<depend>freetds</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
@@ -71,10 +75,6 @@ CREATE TABLE [dbo].[cdr] (
 #include <tdsconvert.h>
 #include <ctype.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/config.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"