diff --git a/arch/x86/scc/Makefile b/arch/x86/scc/Makefile
index 2003a259..74d355a4 100644
--- a/arch/x86/scc/Makefile
+++ b/arch/x86/scc/Makefile
@@ -1,4 +1,4 @@
-C_source := icc.c SCC_API.c iRCCE_admin.c iRCCE_send.c iRCCE_isend.c iRCCE_irecv.c iRCCE_recv.c iRCCE_get.c iRCCE_put.c iRCCE_synch.c RCCE_malloc.c RCCE_shmalloc.c RCCE_debug.c RCCE_qsort.c RCCE_DCMflush.c RCCE_send.c RCCE_recv.c RCCE_flags.c RCCE_comm.c RCCE_put.c RCCE_get.c RCCE_synch.c RCCE_bcast.c RCCE_admin.c # RCCE_power_management.c
+C_source := icc.c SCC_API.c  iRCCE_admin.c iRCCE_send.c iRCCE_isend.c iRCCE_irecv.c iRCCE_recv.c iRCCE_get.c iRCCE_put.c iRCCE_synch.c iRCCE_mailbox.c RCCE_malloc.c RCCE_shmalloc.c RCCE_debug.c RCCE_qsort.c RCCE_DCMflush.c RCCE_send.c RCCE_recv.c RCCE_flags.c RCCE_comm.c RCCE_put.c RCCE_get.c RCCE_synch.c RCCE_bcast.c RCCE_admin.c # RCCE_power_management.c
 ASM_source := 
 MODULE := arch_x86_scc
 
diff --git a/arch/x86/scc/iRCCE_mailbox.c b/arch/x86/scc/iRCCE_mailbox.c
index 107b56a6..cd8783d8 100644
--- a/arch/x86/scc/iRCCE_mailbox.c
+++ b/arch/x86/scc/iRCCE_mailbox.c
@@ -26,9 +26,12 @@
 //                 by Simon Pickartz, Chair for Operating Systems,
 //                                    RWTH Aachen University
 //
-#include "iRCCE_lib.h"
-#include <stdlib.h>
-#include <string.h>
+#include <metalsvm/stdlib.h>
+#include <metalsvm/string.h>
+
+
+#ifdef CONFIG_ROCKCREEK
+#include <asm/iRCCE_lib.h>
 
 //------------------------------------------------------------------------------
 // FUNCTION: iRCCE_mailbox_print_header
@@ -37,7 +40,7 @@
 //------------------------------------------------------------------------------
 void iRCCE_mailbox_print_header(iRCCE_MAIL_HEADER* header) {
 
-                printf( "\n"
+                kprintf( "\n"
 			"-------------------------\n"
 			"| RCK%d\n"
 			"-------------------------\n"
@@ -358,3 +361,5 @@ int iRCCE_mailbox_close(int rank) {
 
 	return iRCCE_SUCCESS;
 }
+
+#endif