--- a/jdk/src/share/instrument/JarFacade.c	Thu Feb 13 00:01:07 2014 +0100
+++ b/jdk/src/share/instrument/JarFacade.c	Thu Feb 13 14:08:12 2014 +0000
@@ -33,6 +33,7 @@
 #endif /* _WIN32 */
 #include <string.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #include "jni.h"
 #include "manifest_info.h"

--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h	Thu Feb 13 00:01:07 2014 +0100
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h	Thu Feb 13 14:08:12 2014 +0000
@@ -55,6 +55,9 @@
  * @author Martin Schlaeffer <schlaeff@sbox.tugraz.at>
  */
 
+#ifndef _PKCS11WRAPPER_H
+#define _PKCS11WRAPPER_H 1
+
 /* disable asserts in product mode */
 #ifndef DEBUG
   #ifndef NDEBUG
@@ -461,3 +464,5 @@
 #define free(c)         (p11free((c), THIS_FILE, __LINE__))
 
 #endif
+
+#endif /* _PKCS11WRAPPER_H */

--- a/jdk/src/solaris/native/sun/management/LinuxOperatingSystem.c	Thu Feb 13 00:01:07 2014 +0100
+++ b/jdk/src/solaris/native/sun/management/LinuxOperatingSystem.c	Thu Feb 13 14:08:12 2014 +0000
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 #include <pthread.h>
+#include <inttypes.h>
 #include "sun_management_OperatingSystemImpl.h"
 
 struct ticks {
@@ -57,7 +58,7 @@
     ticks *cpus;
 } counters;
 
-#define DEC_64 "%lld"
+#define DEC_64 "%"SCNd64
 
 static void next_line(FILE *f) {
     while (fgetc(f) != '\n');

--- a/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Thu Feb 13 00:01:07 2014 +0100
+++ b/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Thu Feb 13 14:08:12 2014 +0000
@@ -32,6 +32,7 @@
 #include <jni_util.h>
 
 #include "j2secmod.h"
+#include "wrapper/pkcs11wrapper.h"
 
 void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
     void *hModule = (void*)jlong_to_ptr(jHandle);

--- a/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h	Thu Feb 13 00:01:07 2014 +0100
+++ b/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h	Thu Feb 13 14:08:12 2014 +0000
@@ -56,6 +56,9 @@
 
 /* defines for UNIX platforms *************************************************/
 
+#ifndef _P11_MD_H
+#define _P11_MD_H 1
+
 #define CK_PTR *
 #define CK_DEFINE_FUNCTION(returnType, name) returnType name
 #define CK_DECLARE_FUNCTION(returnType, name) returnType name
@@ -83,3 +86,5 @@
 
 };
 typedef struct ModuleData ModuleData;
+
+#endif  /* _P11_MD_H */