--- a/src/hotspot/share/memory/metaspace/chunkManager.hpp	Mon Jun 04 11:19:54 2018 +0200
+++ b/src/hotspot/share/memory/metaspace/chunkManager.hpp	Mon Jun 04 10:18:43 2018 -0400
@@ -27,7 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "memory/binaryTreeDictionary.hpp"
-#include "memory/freeList.inline.hpp"
+#include "memory/freeList.hpp"
 #include "memory/metaspace/metachunk.hpp"
 #include "memory/metaspace/metaspaceStatistics.hpp"
 #include "memory/metaspaceChunkFreeListSummary.hpp"
@@ -115,12 +115,7 @@
 
  public:
 
-  ChunkManager(bool is_class)
-      : _is_class(is_class), _free_chunks_total(0), _free_chunks_count(0) {
-    _free_chunks[SpecializedIndex].set_size(get_size_for_nonhumongous_chunktype(SpecializedIndex, is_class));
-    _free_chunks[SmallIndex].set_size(get_size_for_nonhumongous_chunktype(SmallIndex, is_class));
-    _free_chunks[MediumIndex].set_size(get_size_for_nonhumongous_chunktype(MediumIndex, is_class));
-  }
+  ChunkManager(bool is_class);
 
   // Add or delete (return) a chunk to the global freelist.
   Metachunk* chunk_freelist_allocate(size_t word_size);