more header fixes

-despair86

include/llarp/ip.hpp

@@ -36,8 +36,8 @@ typedef struct ip_hdr
 #define iphdr IPV4_HDR
 #define saddr ip_srcaddr
 #define daddr ip_destaddr
-#define ihl ip_header_len
 #define check ip_checksum
+#define ihl ip_header_len
 #endif
 #include <memory>
 #if !defined(__linux__) && !defined(_WIN32)

include/tuntap.h

@@ -37,8 +37,9 @@
 #else
 #include <net/if.h>
 #endif
-#include <netinet/if_ether.h>
+/* Does linux require if_ether.h first? */
 #include <netinet/in.h>
+#include <netinet/if_ether.h>
 #endif
 
 #include <stdint.h>

llarp/ip.cpp

@@ -1,6 +1,6 @@
 #include <llarp/endian.h>
 #include <llarp/ip.hpp>
-#include "buffer.hpp"
+#include <algorithm>
 #include "mem.hpp"
 
 namespace llarp