From 25437bd2bdbd35c7526e948d1cd14e1e7f0bc58a Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 30 Apr 2018 17:44:01 +0200
Subject: [PATCH] move includes around to avoid boost L conflict

---
 pdns/protobuf.cc | 1 -
 pdns/protobuf.hh | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pdns/protobuf.cc b/pdns/protobuf.cc
index 3c9b49a0b..3359c789a 100644
--- a/pdns/protobuf.cc
+++ b/pdns/protobuf.cc
@@ -1,6 +1,5 @@
 
 #include "gettime.hh"
-#include "dnsparser.hh"
 #include "protobuf.hh"
 #include "dnsparser.hh"
 #include "gettime.hh"
diff --git a/pdns/protobuf.hh b/pdns/protobuf.hh
index 0fab8fa3a..9c3785151 100644
--- a/pdns/protobuf.hh
+++ b/pdns/protobuf.hh
@@ -26,15 +26,15 @@
 
 #include "config.h"
 
-#include "dnsname.hh"
-#include "iputils.hh"
-
 #ifdef HAVE_PROTOBUF
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>
 #include "dnsmessage.pb.h"
 #endif /* HAVE_PROTOBUF */
 
+#include "dnsname.hh"
+#include "iputils.hh"
+
 class DNSProtoBufMessage
 {
 public:
-- 
2.40.0