--- old/src/share/vm/runtime/commandLineFlagConstraintsRuntime.cpp	2015-06-16 15:48:03.000000000 -0500
+++ new/src/share/vm/runtime/commandLineFlagConstraintsRuntime.cpp	2015-06-16 15:48:03.000000000 -0500
@@ -26,25 +26,23 @@
 #include "runtime/arguments.hpp"
 #include "runtime/commandLineFlagConstraintsRuntime.hpp"
 #include "runtime/globals.hpp"
-#include "runtime/java.hpp"
-#include "runtime/os.hpp"
 #include "utilities/defaultStream.hpp"
 
 Flag::Error ObjectAlignmentInBytesConstraintFunc(bool verbose, intx* value) {
   if (!is_power_of_2(*value)) {
     if (verbose == true) {
       jio_fprintf(defaultStream::error_stream(),
-                "ObjectAlignmentInBytes=%d must be power of 2\n",
-                (int)*value);
+                "ObjectAlignmentInBytes=" INTX_FORMAT " must be power of 2\n",
+                *value);
     }
     return Flag::VIOLATES_CONSTRAINT;
   }
   // In case page size is very small.
-  if (*value >= (int)os::vm_page_size()) {
+  if (*value >= (intx)os::vm_page_size()) {
     if (verbose == true) {
       jio_fprintf(defaultStream::error_stream(),
-                "ObjectAlignmentInBytes=%d must be less than page size "INTX_FORMAT"\n",
-                *value, os::vm_page_size());
+                "ObjectAlignmentInBytes=" INTX_FORMAT " must be less than page size " INTX_FORMAT "\n",
+                *value, (intx)os::vm_page_size());
     }
     return Flag::VIOLATES_CONSTRAINT;
   }