diff --git a/contrib/croaring/CMakeLists.txt b/contrib/croaring/CMakeLists.txt
index c79f66a05d7..eeffb1e0a34 100644
--- a/contrib/croaring/CMakeLists.txt
+++ b/contrib/croaring/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_library(roaring
 	roaring.c
-	roaring.h
-	roaring.hh)
+	roaring/roaring.h
+	roaring/roaring.hh)
 
 target_include_directories (roaring PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/contrib/croaring/roaring.c b/contrib/croaring/roaring.c
index acf8ed9fee9..6327db7ade3 100644
--- a/contrib/croaring/roaring.c
+++ b/contrib/croaring/roaring.c
@@ -1,5 +1,5 @@
 /* auto-generated on Tue Dec 18 09:42:59 CST 2018. Do not edit! */
-#include "roaring.h"
+#include "roaring/roaring.h"
 
 /* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */
 #ifdef DMALLOC
diff --git a/contrib/croaring/roaring.h b/contrib/croaring/roaring/roaring.h
similarity index 100%
rename from contrib/croaring/roaring.h
rename to contrib/croaring/roaring/roaring.h
diff --git a/contrib/croaring/roaring.hh b/contrib/croaring/roaring/roaring.hh
similarity index 100%
rename from contrib/croaring/roaring.hh
rename to contrib/croaring/roaring/roaring.hh
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h b/dbms/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
index 7b711d712d0..e770dfee7fa 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <roaring.h>
+#include <roaring/roaring.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <boost/noncopyable.hpp>
-#include <roaring.hh>
+#include <roaring/roaring.hh>
 #include <Common/HashTable/SmallTable.h>
 #include <Common/PODArray.h>