diff -r 9dca61a7df19 -r 369ebc2a11c2 src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp	Sun Sep 15 13:41:19 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp	Sun Sep 15 15:31:04 2019 +0200
@@ -27,13 +27,11 @@
 
 #include "jfr/metadata/jfrSerializer.hpp"
 
-class JfrThreadConstantSet : public JfrSerializer {
+class TypeSet : public JfrSerializer {
+ private:
+  JfrCheckpointWriter* _leakp_writer;
  public:
-  void serialize(JfrCheckpointWriter& writer);
-};
-
-class JfrThreadGroupConstant : public JfrSerializer {
- public:
+  explicit TypeSet(JfrCheckpointWriter* leakp_writer = NULL);
   void serialize(JfrCheckpointWriter& writer);
 };
 
@@ -48,6 +46,7 @@
   void serialize(JfrCheckpointWriter& writer);
   size_t elements() const;
 };
+
 class FlagValueOriginConstant : public JfrSerializer {
  public:
   void serialize(JfrCheckpointWriter& writer);
@@ -113,11 +112,13 @@
   void serialize(JfrCheckpointWriter& writer);
 };
 
-class TypeSet : public JfrSerializer {
- private:
-  JfrCheckpointWriter* _leakp_writer;
+class JfrThreadConstantSet : public JfrSerializer {
  public:
-  explicit TypeSet(JfrCheckpointWriter* leakp_writer = NULL);
+  void serialize(JfrCheckpointWriter& writer);
+};
+
+class JfrThreadGroupConstant : public JfrSerializer {
+ public:
   void serialize(JfrCheckpointWriter& writer);
 };