common: Reverse the order of the header includes

I tried to make the headers be included in local to global order. This
way any potential missing includes are detected making it easier to
make changes to header location and includes.

include/clock.hh

@@ -1,5 +1,13 @@
 #pragma once
 
+#ifdef _WIN32
+#include <winsock2.h>
+#include <windows.h>
+#else
+#include <sys/time.h>
+#endif
+
+
 #include <chrono>
 
 namespace uvgrtp {

include/crypto.hh

@@ -25,7 +25,7 @@
 #include <cryptopp/crc.h>
 
 #endif
-#else // __cplusplus
+#else // __cplusplus < 201703L
 #ifndef __RTP_NO_CRYPTO__
 #define __RTP_CRYPTO__
 
@@ -42,6 +42,8 @@
 #endif
 #endif // __cplusplus
 
+#include <iostream>
+
 namespace uvgrtp {
 
     namespace crypto {

include/dispatch.hh

@@ -1,14 +1,14 @@
 #pragma once
 
-#include <condition_variable>
-#include <queue>
-#include <thread>
-
 #include "queue.hh"
 #include "socket.hh"
 #include "runner.hh"
 #include "util.hh"
 
+#include <condition_variable>
+#include <queue>
+#include <thread>
+
 namespace uvgrtp {
 
     /* System call dispatcher is an optimization technique which aims to minimize

include/formats/h264.hh

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <deque>
+#include "formats/h26x.hh"
-
 #include "frame.hh"
 #include "queue.hh"
-#include "formats/h26x.hh"
+
+#include <deque>
 
 namespace uvgrtp {
 

include/formats/h265.hh

@@ -1,14 +1,14 @@
 #pragma once
 
+#include "formats/h26x.hh"
+#include "frame.hh"
+#include "queue.hh"
+
 #include <deque>
 #include <map>
 #include <unordered_set>
 #include <vector>
 
-#include "frame.hh"
-#include "queue.hh"
-#include "formats/h26x.hh"
-
 namespace uvgrtp {
 
     namespace formats {

include/formats/h266.hh

@@ -1,8 +1,9 @@
 #pragma once
 
+#include "formats/h26x.hh"
 #include "frame.hh"
 #include "queue.hh"
-#include "formats/h26x.hh"
+
 
 namespace uvgrtp {
 

include/formats/media.hh

@@ -1,15 +1,15 @@
 #pragma once
 
-#include <map>
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-
 #include "../rtp.hh"
 #include "../socket.hh"
 #include "../queue.hh"
 #include "../util.hh"
 
+#include <map>
+#include <memory>
+#include <unordered_map>
+#include <unordered_set>
+
 namespace uvgrtp {
 
     namespace formats {

include/frame.hh

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "util.hh"
+
 #ifdef _WIN32
 #include <winsock2.h>
 #include <windows.h>
@@ -11,7 +13,6 @@
 #include <string>
 #include <vector>
 
-#include "util.hh"
 
 #define RTP_HEADER_LENGTH   12
 #define RTCP_HEADER_LENGTH  12

include/holepuncher.hh

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <atomic>
-
 #include "runner.hh"
 #include "socket.hh"
 #include "util.hh"
 
+#include <atomic>
+
 namespace uvgrtp {
 
     class holepuncher : public runner {

include/lib.hh

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <map>
 #include "session.hh"
+#include <map>
 
 namespace uvgrtp {
 

include/media_stream.hh

@@ -1,8 +1,5 @@
 #pragma once
 
-#include <unordered_map>
-#include <memory>
-
 #include "holepuncher.hh"
 #include "pkt_dispatch.hh"
 #include "rtcp.hh"
@@ -13,6 +10,11 @@
 
 #include "formats/media.hh"
 
+#include <unordered_map>
+#include <memory>
+
+
+
 namespace uvgrtp {
 
     class media_stream {

include/mingw_inet.hh

@@ -1,5 +1,9 @@
 #pragma once
 
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
+
 namespace uvgrtp {
     namespace mingw {
         int inet_pton(int af, const char *src, struct in_addr *dst);

include/pkt_dispatch.hh

@@ -1,13 +1,13 @@
 #pragma once
 
-#include <mutex>
-#include <unordered_map>
-
 #include "frame.hh"
 #include "runner.hh"
 #include "socket.hh"
 #include "util.hh"
 
+#include <mutex>
+#include <unordered_map>
+
 namespace uvgrtp {
 
     typedef rtp_error_t (*packet_handler)(ssize_t, void *, int, uvgrtp::frame::rtp_frame **);

include/poll.hh

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <vector>
-
 #include "socket.hh"
 
+#include <vector>
+
 namespace uvgrtp {
     namespace poll {
         /* Cross-platform poll implementation for listening to a socket for a period of time

include/queue.hh

@@ -1,10 +1,5 @@
 #pragma once
 
-#include <atomic>
-#include <memory>
-#include <unordered_map>
-#include <vector>
-
 #include "dispatch.hh"
 #include "frame.hh"
 #include "rtp.hh"
@@ -12,6 +7,11 @@
 #include "srtp/base.hh"
 #include "util.hh"
 
+#include <atomic>
+#include <memory>
+#include <unordered_map>
+#include <vector>
+
 #if defined(_MSC_VER)
 typedef SSIZE_T ssize_t;
 #endif

include/rtcp.hh

@@ -1,10 +1,5 @@
 #pragma once
 
-#include <bitset>
-#include <map>
-#include <thread>
-#include <vector>
-
 #include "clock.hh"
 #include "frame.hh"
 #include "runner.hh"
@@ -12,6 +7,11 @@
 #include "srtp/srtcp.hh"
 #include "util.hh"
 
+#include <bitset>
+#include <map>
+#include <thread>
+#include <vector>
+
 namespace uvgrtp {
 
     /// \cond DO_NOT_DOCUMENT

include/rtp.hh

@@ -1,5 +1,4 @@
-#ifndef __RTP_HH_
+#pragma once
-#define __RTP_HH_
 
 #include "clock.hh"
 #include "frame.hh"
@@ -68,5 +67,3 @@ namespace uvgrtp {
 };
 
 namespace uvg_rtp = uvgrtp;
-
-#endif /* __RTP_HH_ */

include/runner.hh

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <thread>
-
 #include "util.hh"
 
+#include <thread>
+
 namespace uvgrtp {
     class runner {
         public:

include/session.hh

@@ -1,12 +1,12 @@
 #pragma once
 
+#include "media_stream.hh"
+#include "zrtp.hh"
+
 #include <mutex>
 #include <string>
 #include <vector>
 
-#include "media_stream.hh"
-#include "zrtp.hh"
-
 namespace uvgrtp {
 
     class session {

include/socket.hh

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "util.hh"
+
 #ifdef _WIN32
 #include <winsock2.h>
 #include <mswsock.h>
@@ -13,7 +15,6 @@
 #include <vector>
 #include <string>
 
-#include "util.hh"
 
 namespace uvgrtp {
 

include/srtp/base.hh

@@ -1,5 +1,11 @@
 #pragma once
 
+#include "../debug.hh"
+#include "../frame.hh"
+#include "../rtp.hh"
+#include "../util.hh"
+#include "../zrtp.hh"
+
 #ifdef _WIN32
 #include <winsock2.h>
 #include <mswsock.h>
@@ -13,11 +19,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include "../debug.hh"
+
-#include "../frame.hh"
-#include "../rtp.hh"
-#include "../util.hh"
-#include "../zrtp.hh"
 
 enum {
     AES128_KEY_SIZE = 16,

include/zrtp.hh

@@ -1,5 +1,11 @@
 #pragma once
 
+#include "crypto.hh"
+#include "frame.hh"
+#include "socket.hh"
+#include "zrtp/defines.hh"
+#include "zrtp/zrtp_receiver.hh"
+
 #ifdef _WIN32
 #include <winsock2.h>
 #include <mswsock.h>
@@ -12,11 +18,7 @@
 #include <mutex>
 #include <vector>
 
-#include "crypto.hh"
+
-#include "frame.hh"
-#include "socket.hh"
-#include "zrtp/defines.hh"
-#include "zrtp/zrtp_receiver.hh"
 
 namespace uvgrtp {
 

include/zrtp/commit.hh

@@ -1,11 +1,12 @@
 #pragma once
 
+#include "zrtp/defines.hh"
+#include "zrtp/zrtp_receiver.hh"
+
 #include "frame.hh"
 #include "socket.hh"
 #include "util.hh"
 
-#include "zrtp/defines.hh"
-#include "zrtp/zrtp_receiver.hh"
 
 namespace uvgrtp {
 

include/zrtp/confack.hh

@@ -1,11 +1,13 @@
 #pragma once
 
+#include "zrtp/defines.hh"
+#include "zrtp/zrtp_receiver.hh"
+#include "zrtp.hh"
+
 #include "frame.hh"
 #include "socket.hh"
 #include "util.hh"
 
-#include "zrtp/defines.hh"
-#include "zrtp/zrtp_receiver.hh"
 
 namespace uvgrtp {
 

include/zrtp/confirm.hh

@@ -1,11 +1,14 @@
 #pragma once
 
+
+#include "zrtp/zrtp_receiver.hh"
+#include "zrtp.hh"
+#include "zrtp/defines.hh"
+
 #include "frame.hh"
 #include "socket.hh"
 #include "util.hh"
 
-#include "zrtp/defines.hh"
-#include "zrtp/zrtp_receiver.hh"
 
 namespace uvgrtp {
 

include/zrtp/dh_kxchng.hh

@@ -1,11 +1,13 @@
 #pragma once
 
+#include "zrtp/defines.hh"
+#include "zrtp/zrtp_receiver.hh"
+
 #include "frame.hh"
 #include "socket.hh"
 #include "util.hh"
 
-#include "zrtp/defines.hh"
+
-#include "zrtp/zrtp_receiver.hh"
 
 namespace uvgrtp {
 

include/zrtp/error.hh

@@ -1,10 +1,12 @@
 #pragma once
 
+#include "zrtp/defines.hh"
+#include "zrtp/zrtp_receiver.hh"
+
 #include "frame.hh"
 #include "socket.hh"
 #include "util.hh"
-#include "zrtp/defines.hh"
+
-#include "zrtp/zrtp_receiver.hh"
 
 namespace uvgrtp {
 

include/zrtp/hello.hh

@@ -1,12 +1,12 @@
 #pragma once
 
+#include "zrtp/defines.hh"
+#include "zrtp/zrtp_receiver.hh"
+
 #include "frame.hh"
 #include "socket.hh"
 #include "util.hh"
 
-#include "zrtp/defines.hh"
-#include "zrtp/zrtp_receiver.hh"
-
 namespace uvgrtp {
 
     typedef struct capabilities zrtp_capab_t;

include/zrtp/hello_ack.hh

@@ -1,10 +1,11 @@
 #pragma once
 
+#include "zrtp/defines.hh"
+#include "zrtp/zrtp_receiver.hh"
+
 #include "frame.hh"
 #include "socket.hh"
 #include "util.hh"
-#include "zrtp/defines.hh"
-#include "zrtp/zrtp_receiver.hh"
 
 namespace uvgrtp {
 

include/zrtp/zrtp_receiver.hh

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "socket.hh"
+
 namespace uvgrtp {
     namespace zrtp_msg {
 

src/clock.cc

@@ -1,11 +1,5 @@
-#ifdef _WIN32
-#include <winsock2.h>
-#include <windows.h>
-#else
-#include <sys/time.h>
-#endif
-
 #include "clock.hh"
+
 #include <stdio.h>
 
 static const uint64_t EPOCH = 2208988800ULL;

src/crypto.cc

@@ -1,7 +1,10 @@
-#include <iostream>
 #include "crypto.hh"
+
 #include "debug.hh"
 
+
+
+
 /* ***************** hmac-sha1 ***************** */
 
 uvgrtp::crypto::hmac::sha1::sha1(uint8_t *key, size_t key_size)

src/dispatch.cc

@@ -1,6 +1,8 @@
-#include "debug.hh"
 #include "dispatch.hh"
+
 #include "socket.hh"
+#include "debug.hh"
+
 
 #ifndef _WIN32
 uvgrtp::dispatcher::dispatcher(uvgrtp::socket *socket):

src/formats/h264.cc

@@ -1,7 +1,7 @@
-#ifdef _WIN32
+#include "formats/h264.hh"
-#else
+
-#include <sys/socket.h>
+#include "queue.hh"
-#endif
+#include "debug.hh"
 
 #include <cstdint>
 #include <cstring>
@@ -9,10 +9,10 @@
 #include <unordered_map>
 #include <queue>
 
-#include "debug.hh"
+#ifndef _WIN32
-#include "queue.hh"
+#include <sys/socket.h>
+#endif
 
-#include "formats/h264.hh"
 
 void uvgrtp::formats::h264::clear_aggregation_info()
 {

src/formats/h264_pkt_handler.cc

@@ -1,14 +1,14 @@
+#include "formats/h264.hh"
+
+#include "queue.hh"
+#include "debug.hh"
+
 #include <cstdint>
 #include <cstring>
 #include <iostream>
 #include <map>
 #include <unordered_set>
 
-#include "debug.hh"
-#include "queue.hh"
-
-#include "formats/h264.hh"
-
 #define RTP_FRAME_MAX_DELAY          100
 #define INVALID_SEQ           0x13371338
 #define INVALID_TS            0xffffffff

src/formats/h265.cc

@@ -1,7 +1,7 @@
-#ifdef _WIN32
+#include "formats/h265.hh"
-#else
+
-#include <sys/socket.h>
+#include "debug.hh"
-#endif
+#include "queue.hh"
 
 #include <cstdint>
 #include <cstring>
@@ -9,10 +9,9 @@
 #include <unordered_map>
 #include <queue>
 
-#include "debug.hh"
+#ifndef _WIN32
-#include "queue.hh"
+#include <sys/socket.h>
-
+#endif
-#include "formats/h265.hh"
 
 void uvgrtp::formats::h265::clear_aggregation_info()
 {

src/formats/h265_pkt_handler.cc

@@ -1,14 +1,14 @@
+#include "formats/h265.hh"
+
+#include "debug.hh"
+#include "queue.hh"
+
 #include <cstdint>
 #include <cstring>
 #include <iostream>
 #include <map>
 #include <unordered_set>
 
-#include "debug.hh"
-#include "queue.hh"
-
-#include "formats/h265.hh"
-
 #define INVALID_SEQ           0x13371338
 #define INVALID_TS            0xffffffff
 

src/formats/h266.cc

@@ -1,7 +1,7 @@
-#ifdef _WIN32
+#include "formats/h266.hh"
-#else
+
-#include <sys/socket.h>
+#include "queue.hh"
-#endif
+#include "debug.hh"
 
 #include <cstdint>
 #include <cstring>
@@ -9,10 +9,10 @@
 #include <unordered_map>
 #include <queue>
 
-#include "debug.hh"
-#include "queue.hh"
 
-#include "formats/h266.hh"
+#ifndef _WIN32
+#include <sys/socket.h>
+#endif
 
 rtp_error_t uvgrtp::formats::h266::push_nal_unit(uint8_t *data, size_t data_len, bool more)
 {

src/formats/h266_pkt_handler.cc

@@ -1,14 +1,14 @@
+#include "formats/h266.hh"
+
+#include "debug.hh"
+#include "queue.hh"
+
 #include <cstdint>
 #include <cstring>
 #include <iostream>
 #include <map>
 #include <unordered_set>
 
-#include "debug.hh"
-#include "queue.hh"
-
-#include "formats/h266.hh"
-
 #define INVALID_SEQ           0x13371338
 #define INVALID_TS            0xffffffff
 

src/formats/h26x.cc

@@ -1,7 +1,7 @@
-#ifdef _WIN32
+#include "formats/h26x.hh"
-#else
+
-#include <sys/socket.h>
+#include "queue.hh"
-#endif
+#include "debug.hh"
 
 #include <cstdint>
 #include <cstring>
@@ -9,10 +9,11 @@
 #include <unordered_map>
 #include <queue>
 
-#include "debug.hh"
-#include "queue.hh"
 
-#include "formats/h26x.hh"
+#ifndef _WIN32
+#include <sys/socket.h>
+#endif
+
 
 #define PTR_DIFF(a, b)  ((ptrdiff_t)((char *)(a) - (char *)(b)))
 

src/formats/media.cc

@@ -1,12 +1,9 @@
-#ifdef __linux__
+#include "formats/media.hh"
-#else
-#endif
 
 #include <map>
 #include <unordered_map>
 
 #include "debug.hh"
-#include "formats/media.hh"
 
 #define INVALID_SEQ 0xffffffff
 

src/frame.cc

@@ -1,8 +1,10 @@
+#include "frame.hh"
+
+#include "util.hh"
+#include "debug.hh"
+
 #include <cstring>
 
-#include "debug.hh"
-#include "frame.hh"
-#include "util.hh"
 
 uvgrtp::frame::rtp_frame *uvgrtp::frame::alloc_rtp_frame()
 {

src/holepuncher.cc

@@ -1,6 +1,8 @@
+#include "holepuncher.hh"
+
 #include "clock.hh"
 #include "debug.hh"
-#include "holepuncher.hh"
+
 
 #define THRESHOLD 2000
 

src/hostname.cc

@@ -1,3 +1,7 @@
+#include "hostname.hh"
+
+#include "debug.hh"
+
 #ifdef _WIN32
 //#include <windows.h>
 //#include <winbase.h>
@@ -8,9 +12,6 @@
 #include <errno.h>
 #endif
 
-#include "debug.hh"
-#include "hostname.hh"
-
 #define NAME_MAXLEN 512
 
 std::string uvgrtp::hostname::get_hostname()

src/lib.cc

@@ -1,12 +1,13 @@
-#include <cstdlib>
+#include "lib.hh"
-#include <cstring>
-#include <iostream>
 
 #include "debug.hh"
 #include "hostname.hh"
-#include "lib.hh"
 #include "random.hh"
 
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+
 thread_local rtp_error_t rtp_errno;
 
 uvgrtp::context::context()

src/media_stream.cc

@@ -1,13 +1,13 @@
-#include <cstring>
-#include <errno.h>
-
-#include "debug.hh"
 #include "media_stream.hh"
-#include "random.hh"
 
 #include "formats/h264.hh"
 #include "formats/h265.hh"
 #include "formats/h266.hh"
+#include "debug.hh"
+#include "random.hh"
+
+#include <cstring>
+#include <errno.h>
 
 #define INVALID_TS UINT64_MAX
 

src/mingw_inet.cc

@@ -1,8 +1,8 @@
 #if defined(__MINGW32__) || defined(__MINGW64__)
-#include <winsock2.h>
-#include <cstdint>
 #include "mingw_inet.hh"
 
+#include <cstdint>
+
 #define NS_INADDRSZ  4
 #define NS_IN6ADDRSZ 16
 #define NS_INT16SZ   2

src/pkt_dispatch.cc

@@ -1,3 +1,9 @@
+#include "pkt_dispatch.hh"
+
+#include "debug.hh"
+#include "random.hh"
+#include "util.hh"
+
 #ifdef __linux__
 #include <errno.h>
 #else
@@ -6,11 +12,6 @@
 
 #include <cstring>
 
-#include "debug.hh"
-#include "pkt_dispatch.hh"
-#include "random.hh"
-#include "util.hh"
-
 uvgrtp::pkt_dispatcher::pkt_dispatcher():
     recv_hook_arg_(nullptr),
     recv_hook_(nullptr)

src/poll.cc

@@ -1,3 +1,8 @@
+#include "poll.hh"
+
+#include "multicast.hh"
+#include "debug.hh"
+
 #ifdef _WIN32
 #include <winsock2.h>
 #else
@@ -7,9 +12,8 @@
 
 #include <cstring>
 
-#include "debug.hh"
+
-#include "multicast.hh"
+
-#include "poll.hh"
 
 rtp_error_t uvgrtp::poll::blocked_recv(uvgrtp::socket *socket, uint8_t *buf, size_t buf_len, int timeout, int *bytes_read)
 {

src/queue.cc

@@ -1,3 +1,12 @@
+#include "queue.hh"
+
+#include "formats/h264.hh"
+#include "formats/h265.hh"
+#include "formats/h266.hh"
+
+#include "debug.hh"
+#include "random.hh"
+
 #ifdef _WIN32
 #include <winsock2.h>
 #include <windows.h>
@@ -8,13 +17,6 @@
 #include <cstring>
 #endif
 
-#include "debug.hh"
-#include "queue.hh"
-#include "random.hh"
-
-#include "formats/h264.hh"
-#include "formats/h265.hh"
-#include "formats/h266.hh"
 
 uvgrtp::frame_queue::frame_queue(uvgrtp::socket *socket, uvgrtp::rtp *rtp, int flags):
     rtp_(rtp), socket_(socket), flags_(flags)

src/random.cc

@@ -1,8 +1,12 @@
+#include "random.hh"
+
+#include "debug.hh"
+
 #ifdef _WIN32
 #include <winsock2.h>
 #include <windows.h>
 #include <wincrypt.h>
-#else // _WIN32
+#else // non _WIN32
 #ifdef HAVE_GETRANDOM
 #include <sys/random.h>
 #else // HAVE_GETRANDOM
@@ -11,12 +15,10 @@
 #endif // HAVE_GETRANDOM
 #endif // _WIN32
 
+
 #include <cstdlib>
 #include <ctime>
 
-#include "debug.hh"
-#include "random.hh"
-
 rtp_error_t uvgrtp::random::init()
 {
 #ifdef _WIN32

src/rtcp.cc

@@ -1,5 +1,11 @@
-#ifdef _WIN32
+#include "rtcp.hh"
-#else
+
+#include "hostname.hh"
+#include "poll.hh"
+#include "debug.hh"
+#include "util.hh"
+
+#ifndef _WIN32
 #include <sys/time.h>
 #endif
 
@@ -8,11 +14,6 @@
 #include <cstring>
 #include <iostream>
 
-#include "debug.hh"
-#include "hostname.hh"
-#include "poll.hh"
-#include "rtcp.hh"
-#include "util.hh"
 
 uvgrtp::rtcp::rtcp(uvgrtp::rtp *rtp, int flags):
     rtp_(rtp), flags_(flags), our_role_(RECEIVER),

src/rtcp/app.cc

@@ -1,7 +1,3 @@
-#ifdef _WIN32
-#else
-#endif
-
 #include "rtcp.hh"
 
 uvgrtp::frame::rtcp_app_packet *uvgrtp::rtcp::get_app_packet(uint32_t ssrc)

src/rtcp/bye.cc

@@ -1,7 +1,3 @@
-#ifdef _WIN32
-#else
-#endif
-
 #include "rtcp.hh"
 
 rtp_error_t uvgrtp::rtcp::handle_bye_packet(uint8_t *packet, size_t size)

src/rtcp/receiver.cc

@@ -1,7 +1,3 @@
-#ifdef _WIN32
-#else
-#endif
-
 #include "rtcp.hh"
 
 uvgrtp::frame::rtcp_receiver_report *uvgrtp::rtcp::get_receiver_packet(uint32_t ssrc)

src/rtcp/rtcp_runner.cc

@@ -1,7 +1,3 @@
-#ifdef _WIN32
-#else
-#endif
-
 #include "rtcp.hh"
 #include "poll.hh"
 

src/rtcp/sdes.cc

@@ -1,7 +1,3 @@
-#ifdef _WIN32
-#else
-#endif
-
 #include "rtcp.hh"
 
 uvgrtp::frame::rtcp_sdes_packet *uvgrtp::rtcp::get_sdes_packet(uint32_t ssrc)

src/rtcp/sender.cc

@@ -1,7 +1,3 @@
-#ifdef _WIN32
-#else
-#endif
-
 #include "rtcp.hh"
 
 uvgrtp::frame::rtcp_sender_report *uvgrtp::rtcp::get_sender_packet(uint32_t ssrc)

src/rtp.cc

@@ -1,3 +1,9 @@
+#include "rtp.hh"
+
+#include "clock.hh"
+#include "debug.hh"
+#include "random.hh"
+
 #ifdef __linux__
 #include <arpa/inet.h>
 #include <unistd.h>
@@ -5,10 +11,7 @@
 
 #include <chrono>
 
-#include "clock.hh"
+
-#include "debug.hh"
-#include "random.hh"
-#include "rtp.hh"
 
 #define INVALID_TS UINT64_MAX
 

src/session.cc

@@ -1,5 +1,6 @@
-#include "debug.hh"
 #include "session.hh"
+#include "debug.hh"
+
 
 uvgrtp::session::session(std::string addr):
 #ifdef __RTP_CRYPTO__

src/socket.cc

@@ -1,3 +1,8 @@
+#include "socket.hh"
+
+#include "debug.hh"
+#include "util.hh"
+
 #ifdef _WIN32
 #include <winsock2.h>
 #include <Ws2tcpip.h>
@@ -17,9 +22,6 @@ using namespace mingw;
 #include <cstring>
 #include <cassert>
 
-#include "debug.hh"
-#include "socket.hh"
-#include "util.hh"
 
 #define WSABUF_SIZE 32
 

src/srtp/base.cc

@@ -1,8 +1,9 @@
-#include <cstring>
+#include "srtp/base.hh"
-#include <iostream>
 
 #include "crypto.hh"
-#include "srtp/base.hh"
+
+#include <cstring>
+#include <iostream>
 
 uvgrtp::base_srtp::base_srtp():
     srtp_ctx_(new uvgrtp::srtp_ctx_t),

src/srtp/srtcp.cc

@@ -1,8 +1,10 @@
+#include "srtp/srtcp.hh"
+
+#include "crypto.hh"
+
 #include <cstring>
 #include <iostream>
 
-#include "crypto.hh"
-#include "srtp/srtcp.hh"
 
 uvgrtp::srtcp::srtcp()
 {

src/srtp/srtp.cc

@@ -1,9 +1,10 @@
+#include "srtp/srtp.hh"
+#include "srtp/base.hh"
+#include "crypto.hh"
+
 #include <cstring>
 #include <iostream>
 
-#include "crypto.hh"
-#include "srtp/base.hh"
-#include "srtp/srtp.hh"
 
 #define MAX_OFF 10000
 

src/zrtp.cc

@@ -1,14 +1,3 @@
-#ifdef _WIN32
-#define MSG_DONTWAIT 0
-#else
-#endif
-
-#include <cstring>
-#include <thread>
-
-#include "debug.hh"
-#include "crypto.hh"
-#include "random.hh"
 #include "zrtp.hh"
 
 #include "zrtp/commit.hh"
@@ -19,8 +8,20 @@
 #include "zrtp/hello_ack.hh"
 #include "zrtp/zrtp_receiver.hh"
 
+#include "debug.hh"
+#include "crypto.hh"
+#include "random.hh"
+
+#include <cstring>
+#include <thread>
+
 using namespace uvgrtp::zrtp_msg;
 
+#ifdef _WIN32
+#define MSG_DONTWAIT 0
+#endif
+
+
 #define ZRTP_VERSION 110
 
 uvgrtp::zrtp::zrtp():

src/zrtp/commit.cc

@@ -1,11 +1,11 @@
+#include "zrtp/commit.hh"
+
+#include "zrtp.hh"
+#include "debug.hh"
+
 #include <cassert>
 #include <cstring>
 
-#include "debug.hh"
-#include "zrtp.hh"
-
-#include "zrtp/commit.hh"
-
 #define ZRTP_COMMIT "Commit  "
 
 uvgrtp::zrtp_msg::commit::commit(zrtp_session_t& session)

src/zrtp/confack.cc

@@ -1,9 +1,9 @@
-#include <cstring>
+#include "zrtp/confack.hh"
 
 #include "debug.hh"
-#include "zrtp.hh"
 
-#include "zrtp/confack.hh"
+#include <cstring>
+
 
 #define ZRTP_CONFACK "Conf2ACK"
 

src/zrtp/confirm.cc

@@ -1,9 +1,8 @@
-#include <cstring>
+#include "zrtp/confirm.hh"
 
 #include "debug.hh"
-#include "zrtp.hh"
 
-#include "zrtp/confirm.hh"
+#include <cstring>
 
 #define ZRTP_CONFRIM1 "Confirm1"
 #define ZRTP_CONFRIM2 "Confirm2"

src/zrtp/dh_kxchng.cc

@@ -1,9 +1,10 @@
-#include <cstring>
-
-#include "debug.hh"
-#include "zrtp.hh"
 #include "zrtp/dh_kxchng.hh"
+
+#include "zrtp.hh"
 #include "zrtp/defines.hh"
+#include "debug.hh"
+
+#include <cstring>
 
 #define ZRTP_DH_PART1       "DHPart1 "
 #define ZRTP_DH_PART2       "DHPart2 "

src/zrtp/error.cc

@@ -1,9 +1,12 @@
-#include <cstring>
+#include "zrtp/error.hh"
+
+#include "zrtp/defines.hh"
+#include "zrtp.hh"
 
 #include "debug.hh"
-#include "zrtp.hh"
+
-#include "zrtp/defines.hh"
+
-#include "zrtp/error.hh"
+#include <cstring>
 
 #define ZRTP_ERROR "Error   "
 

src/zrtp/hello.cc

@@ -1,9 +1,10 @@
-#include <cstring>
-
-#include "debug.hh"
-#include "zrtp.hh"
 #include "zrtp/hello.hh"
+
 #include "zrtp/defines.hh"
+#include "zrtp.hh"
+#include "debug.hh"
+
+#include <cstring>
 
 #define ZRTP_VERSION     "1.10"
 #define ZRTP_HELLO       "Hello   "

src/zrtp/hello_ack.cc

@@ -1,9 +1,10 @@
-#include <cstring>
+#include "zrtp/hello_ack.hh"
 
-#include "debug.hh"
 #include "zrtp.hh"
 #include "zrtp/defines.hh"
-#include "zrtp/hello_ack.hh"
+#include "debug.hh"
+
+#include <cstring>
 
 #define ZRTP_HELLO_ACK "HelloACK"
 

src/zrtp/zrtp_receiver.cc

@@ -1,3 +1,18 @@
+#include "zrtp/zrtp_receiver.hh"
+
+#include "zrtp/defines.hh"
+#include "zrtp/dh_kxchng.hh"
+#include "zrtp/commit.hh"
+#include "zrtp/confack.hh"
+#include "zrtp/confirm.hh"
+#include "zrtp/hello.hh"
+#include "zrtp/hello_ack.hh"
+
+#include "crypto.hh"
+#include "poll.hh"
+#include "debug.hh"
+#include "util.hh"
+
 #ifdef _WIN32
 #include <winsock2.h>
 #include <mswsock.h>
@@ -10,18 +25,6 @@
 
 #include <cstring>
 
-#include "debug.hh"
-#include "util.hh"
-#include "crypto.hh"
-#include "poll.hh"
-#include "zrtp/defines.hh"
-#include "zrtp/dh_kxchng.hh"
-#include "zrtp/commit.hh"
-#include "zrtp/confack.hh"
-#include "zrtp/confirm.hh"
-#include "zrtp/hello.hh"
-#include "zrtp/hello_ack.hh"
-#include "zrtp/zrtp_receiver.hh"
 
 using namespace uvgrtp::zrtp_msg;