diff --git a/lqdetect.c b/lqdetect.c
index 81d7d710..9083759e 100644
--- a/lqdetect.c
+++ b/lqdetect.c
@@ -1,14 +1,13 @@
+#include "lqdetect.h"
+
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <string.h>
 #include <pthread.h>
 #include <sys/time.h>
 #include <assert.h>
-#include <memcached/util.h>
 
-#include "lqdetect.h"
+#include "memcached/util.h"
 
 #define LQ_THRESHOLD_DEFAULT 4000
 #define LQ_QUERY_SIZE  (64*2+64) /* bop get (longest query) : "<longest bkey>..<longest bkey> efilter <offset> <count> delete" */
diff --git a/lqdetect.h b/lqdetect.h
index afe0e0d1..78cdf7ce 100644
--- a/lqdetect.h
+++ b/lqdetect.h
@@ -1,8 +1,11 @@
 #ifndef LQDETECT_H
 #define LQDETECT_H
 
-#include "memcached/extension_loggers.h"
-#include "memcached/util.h"
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "memcached/types.h"
+#include "memcached/extension.h"
 
 #define DETECT_LONG_QUERY
 
diff --git a/memcached.c b/memcached.c
index 655bed60..1d8d0253 100644
--- a/memcached.c
+++ b/memcached.c
@@ -61,6 +61,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 
+#include "lqdetect.h"
 
 /* Lock for global stats */
 static pthread_mutex_t stats_lock = PTHREAD_MUTEX_INITIALIZER;
diff --git a/memcached.h b/memcached.h
index 18793949..cc2fa03a 100644
--- a/memcached.h
+++ b/memcached.h
@@ -32,7 +32,6 @@
 #include "topkeys.h"
 #include "mc_util.h"
 #include "cmdlog.h"
-#include "lqdetect.h"
 #include "engine_loader.h"
 #include "sasl_defs.h"