Index: kernel/genarch/include/softint/division.h
===================================================================
--- kernel/genarch/include/softint/division.h	(revision 5a6a42f4d0f7e33bc079117b49c6e2ad4840ea1c)
+++ kernel/genarch/include/softint/division.h	(revision 795448f8063376ee6a3c51df46d8ed2f4efaf83e)
@@ -48,5 +48,8 @@
 extern unsigned long long __umoddi3(unsigned long long, unsigned long long);
 
+extern int __divmodsi3(int, int, int *);
 extern unsigned int __udivmodsi3(unsigned int, unsigned int, unsigned int *);
+
+extern long long __divmoddi3(long long, long long, long long *);
 extern unsigned long long __udivmoddi3(unsigned long long, unsigned long long,
     unsigned long long *);
Index: kernel/genarch/include/softint/multiplication.h
===================================================================
--- kernel/genarch/include/softint/multiplication.h	(revision 5a6a42f4d0f7e33bc079117b49c6e2ad4840ea1c)
+++ kernel/genarch/include/softint/multiplication.h	(revision 795448f8063376ee6a3c51df46d8ed2f4efaf83e)
@@ -29,14 +29,14 @@
 /** @addtogroup genarch
  * @{
- */ 
+ */
 /**
  * @file
  */
 
-#ifndef __SOFTINT_MULTIPLICATION_H__
-#define __SOFTINT_MULTIPLICATION_H__
+#ifndef KERN_MULTIPLICATION_H_
+#define KERN_MULTIPLICATION_H_
 
 /* 64 bit multiplication */
-long long __muldi3(long long a, long long b);
+extern long long __muldi3(long long, long long);
 
 #endif
@@ -44,4 +44,2 @@
 /** @}
  */
-
-