diff --git a/headers/private/kernel/khash.h b/headers/private/kernel/khash.h
index e265f8a018..18249962df 100755
--- a/headers/private/kernel/khash.h
+++ b/headers/private/kernel/khash.h
@@ -13,6 +13,10 @@ typedef struct hash_iterator {
 
 typedef struct hash_table hash_table;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct hash_table *hash_init(uint32 table_size, int next_ptr_offset,
 	int compare_func(void *element, const void *key),
 	uint32 hash_func(void *element, const void *key, uint32 range));
@@ -41,4 +45,8 @@ void hash_rewind(struct hash_table *table, struct hash_iterator *i);
 
 uint32 hash_hash_string(const char *str);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* _KERNEL_KHASH_H */
diff --git a/headers/private/kernel/vm.h b/headers/private/kernel/vm.h
index 6b8df3a2ae..71b3540d56 100755
--- a/headers/private/kernel/vm.h
+++ b/headers/private/kernel/vm.h
@@ -15,6 +15,10 @@
 struct kernel_args;
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //void vm_dump_areas(vm_address_space *aspace);
 int vm_init(kernel_args *ka);
 int vm_init_postsem(struct kernel_args *ka);
@@ -74,5 +78,8 @@ void forbid_page_faults(void);
 // XXX remove later
 void vm_test(void);
 
+#ifdef __cplusplus
+}
 #endif
 
+#endif	/* _KERNEL_VM_H */