diff --git a/include/libmes.h b/include/libmes.h
index 7f01c9fa..65a85a0f 100644
--- a/include/libmes.h
+++ b/include/libmes.h
@@ -21,6 +21,7 @@
 #ifndef __MES_LIBMES_H
 #define __MES_LIBMES_H
 
+int __mes_debug ();
 char const* number_to_ascii (int number, int base, int signed_p);
 char const* itoa (int number);
 char const* utoa (unsigned number);
diff --git a/lib/libmes.c b/lib/libmes.c
index 870c2293..afa9dc8b 100644
--- a/lib/libmes.c
+++ b/lib/libmes.c
@@ -32,7 +32,7 @@ isdigit (int c)
 int
 isxdigit (int c)
 {
-  return isdigit (c) || c >= 'a' && c <= 'f';
+  return isdigit (c) || (c >= 'a' && c <= 'f');
 }
 
 int
diff --git a/lib/libtcc1.c b/lib/libtcc1.c
index 8b0e5e34..fa64bb2d 100644
--- a/lib/libtcc1.c
+++ b/lib/libtcc1.c
@@ -18,6 +18,8 @@
  * along with Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <libmes.h>
+
 double
 __divdi3 (double a, double b)
 {
@@ -112,15 +114,13 @@ __fixunsxfdi (double a1)
   return 0;
 }
 
-#if __TINYC__ == 9227
-int
 #if __TINYC__ == 9226
 long
-#else
-long long
+#elif __TINYC__
 int
-#endif // __TINYC__ == 9226
-#endif // __TINYC__ == 9227
+#else // !__TINYCC_
+long long
+#endif // !__TINYCC_
 __fixdfdi (double a1)
 {
   static int stub = 0;
diff --git a/lib/linux+gnu.c b/lib/linux+gnu.c
index b994c624..80eb8746 100644
--- a/lib/linux+gnu.c
+++ b/lib/linux+gnu.c
@@ -36,6 +36,7 @@
 #define SYS_fstat     0x6c
 #define SYS_nanosleep 0xa2
 
+#include <sys/resource.h>
 
 int
 link (char const *old_name, char const *new_name)
diff --git a/lib/m4.c b/lib/m4.c
index d37f0c15..b9c79ac0 100644
--- a/lib/m4.c
+++ b/lib/m4.c
@@ -18,6 +18,8 @@
  * along with Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <ctype.h>
+
 int
 abort ()
 {