--- old/src/share/vm/classfile/systemDictionary.cpp	2016-11-03 04:05:44.193293977 -0700
+++ new/src/share/vm/classfile/systemDictionary.cpp	2016-11-03 04:05:44.102289939 -0700
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "aot/aotLoader.hpp"
 #include "classfile/classFileParser.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.hpp"
@@ -81,7 +82,6 @@
 #if INCLUDE_TRACE
 #include "trace/tracing.hpp"
 #endif
-#include "aot/aotLoader.hpp"
 
 Dictionary*            SystemDictionary::_dictionary          = NULL;
 PlaceholderTable*      SystemDictionary::_placeholders        = NULL;
@@ -1427,7 +1427,7 @@
       ik->set_has_passed_fingerprint_check(true);
     } else {
       ResourceMark rm;
-      log_info(classfingerprint)("%s :  expected = " PTR64_FORMAT " actual = " PTR64_FORMAT, ik->external_name(), aot_fp, cds_fp);
+      log_info(class, fingerprint)("%s :  expected = " PTR64_FORMAT " actual = " PTR64_FORMAT, ik->external_name(), aot_fp, cds_fp);
     }
   }
   return ik;