--- old/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	2018-04-04 15:24:05.994039171 +0200
+++ new/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	2018-04-04 15:24:05.778039178 +0200
@@ -29,6 +29,7 @@
 #include "classfile/systemDictionary.hpp"
 #include "code/codeCache.hpp"
 #include "gc/cms/cmsCollectorPolicy.hpp"
+#include "gc/cms/cmsGCStats.hpp"
 #include "gc/cms/cmsHeap.hpp"
 #include "gc/cms/cmsOopClosures.inline.hpp"
 #include "gc/cms/compactibleFreeListSpace.hpp"
--- old/src/hotspot/share/gc/shared/gcStats.cpp	2018-04-04 15:24:06.466039154 +0200
+++ new/src/hotspot/share/gc/shared/gcStats.cpp	2018-04-04 15:24:06.254039161 +0200
@@ -31,9 +31,3 @@
                                                   AdaptiveSizePolicyWeight,
                                                   PromotedPadding);
 }
-
-CMSGCStats::CMSGCStats() {
-    _avg_promoted       = new AdaptivePaddedNoZeroDevAverage(
-                                                  CMSExpAvgFactor,
-                                                  PromotedPadding);
-}
--- old/src/hotspot/share/gc/shared/gcStats.hpp	2018-04-04 15:24:06.806039142 +0200
+++ new/src/hotspot/share/gc/shared/gcStats.hpp	2018-04-04 15:24:06.594039150 +0200
@@ -58,13 +58,4 @@
   }
 };
 
-class CMSGCStats : public GCStats {
- public:
-  CMSGCStats();
-
-  virtual Name kind() {
-    return CMSGCStatsKind;
-  }
-};
-
 #endif // SHARE_VM_GC_SHARED_GCSTATS_HPP
--- /dev/null	2018-03-12 09:19:30.040007636 +0100
+++ new/src/hotspot/share/gc/cms/cmsGCStats.cpp	2018-04-04 15:24:06.934039138 +0200
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/cms/cmsGCStats.hpp"
+#include "gc/shared/gcUtil.inline.hpp"
+#include "runtime/globals.hpp"
+
+CMSGCStats::CMSGCStats() {
+    _avg_promoted       = new AdaptivePaddedNoZeroDevAverage(
+                                                  CMSExpAvgFactor,
+                                                  PromotedPadding);
+}
--- /dev/null	2018-03-12 09:19:30.040007636 +0100
+++ new/src/hotspot/share/gc/cms/cmsGCStats.hpp	2018-04-04 15:24:07.274039126 +0200
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_CMS_CMSGCSTATS_HPP
+#define SHARE_GC_CMS_CMSGCSTATS_HPP
+
+#include "gc/shared/gcStats.hpp"
+
+class CMSGCStats : public GCStats {
+ public:
+  CMSGCStats();
+
+  virtual Name kind() {
+    return CMSGCStatsKind;
+  }
+};
+
+#endif // SHARE_GC_CMS_CMSGCSTATS_HPP