--- old/src/hotspot/share/classfile/classLoaderDataShared.hpp	2020-08-31 08:10:33.838421734 -0700
+++ new/src/hotspot/share/classfile/classLoaderDataShared.hpp	2020-08-31 08:10:33.602412850 -0700
@@ -22,7 +22,10 @@
  *
  */
 
-#if INCLUDE_CDS_JAVA_HEAP
+#ifndef SHARE_CLASSFILE_CLASSLOADERDATASHARED_HPP
+#define SHARE_CLASSFILE_CLASSLOADERDATASHARED_HPP
+
+#include "utilities/exceptions.hpp"
 
 class SerializeClosure;
 class ClassLoaderData;
@@ -37,9 +40,9 @@
   static void init_archived_tables();
   static void init_archived_oops();
   static void serialize(SerializeClosure* f);
-  static void restore_archived_oops_for_null_class_loader_data();
+  static oop  restore_archived_oops_for_null_class_loader_data();
   static void restore_java_platform_loader_from_archive(ClassLoaderData* loader_data);
   static void restore_java_system_loader_from_archive(ClassLoaderData* loader_data);
 };
 
-#endif // INCLUDE_CDS_JAVA_HEAP
+#endif // SHARE_CLASSFILE_CLASSLOADERDATASHARED_HPP