From 6563a5ac6fe1c23f07cb8a8eccffb0c654fee45e Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Mon, 16 Aug 2021 09:59:04 -0400
Subject: [PATCH] TT#101150 move some header includes/defs around

Change-Id: I2507b1bb22d4ba10f632fe2fa794fde975734f99
---
 include/call.h       | 11 ++++++-----
 include/control_ng.h | 14 +++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/include/call.h b/include/call.h
index fc360cb6c..62d36e588 100644
--- a/include/call.h
+++ b/include/call.h
@@ -15,6 +15,12 @@
 #include <openssl/x509.h>
 #include <limits.h>
 #include <stdbool.h>
+
+#define MAX_RTP_PACKET_SIZE	8192
+#define RTP_BUFFER_HEAD_ROOM	128
+#define RTP_BUFFER_TAIL_ROOM	512
+#define RTP_BUFFER_SIZE		(MAX_RTP_PACKET_SIZE + RTP_BUFFER_HEAD_ROOM + RTP_BUFFER_TAIL_ROOM)
+
 #include "compat.h"
 #include "socket.h"
 #include "media_socket.h"
@@ -82,11 +88,6 @@ enum {
 #define ERROR_NO_FREE_LOGS	-101
 #define ERROR_NO_ICE_AGENT	-102
 
-#define MAX_RTP_PACKET_SIZE	8192
-#define RTP_BUFFER_HEAD_ROOM	128
-#define RTP_BUFFER_TAIL_ROOM	512
-#define RTP_BUFFER_SIZE		(MAX_RTP_PACKET_SIZE + RTP_BUFFER_HEAD_ROOM + RTP_BUFFER_TAIL_ROOM)
-
 #ifndef RTP_LOOP_PROTECT
 #define RTP_LOOP_PROTECT	28 /* number of bytes */
 #define RTP_LOOP_PACKETS	2  /* number of packets */
diff --git a/include/control_ng.h b/include/control_ng.h
index de3c1ed63..dd22774e2 100644
--- a/include/control_ng.h
+++ b/include/control_ng.h
@@ -1,13 +1,6 @@
 #ifndef _CONTROL_NG_H_
 #define _CONTROL_NG_H_
 
-#include "obj.h"
-#include "udp_listener.h"
-#include "socket.h"
-#include "str.h"
-#include "tcp_listener.h"
-#include "bencode.h"
-
 struct poller;
 
 enum ng_command {
@@ -39,6 +32,13 @@ enum ng_command {
 	NGC_COUNT // last, number of elements
 };
 
+#include "obj.h"
+#include "udp_listener.h"
+#include "socket.h"
+#include "str.h"
+#include "tcp_listener.h"
+#include "bencode.h"
+
 struct ng_command_stats {
 	mutex_t lock;
 	unsigned int count;