diff --git a/src/sys/include/types.h b/src/sys/include/types.h
index a60a74b..bedf0df 100755
--- a/src/sys/include/types.h
+++ b/src/sys/include/types.h
@@ -3,11 +3,16 @@
 #ifndef _TYPES_H_
 #define _TYPES_H_
 
+#ifndef NULL
+#define NULL 0
+#endif
+
 #ifndef _BSD_TYPES_
 typedef unsigned char 	u_int8_t;
 typedef unsigned short	u_int16_t;
 typedef unsigned int 	u_int32_t;
 typedef unsigned long long int u_int64_t;
+#define _BSD_TYPES_
 #endif /* _BSD_TYPES_ */
 
 #ifndef _POSIX_TYPES_
@@ -16,9 +21,18 @@
 typedef unsigned int 	u_int;
 typedef unsigned long 	u_long;
 typedef unsigned short 	ushort;	/* Sys V */
-typedef unsigned int	uint;	/* Sys V */		
+typedef unsigned int	uint;	/* Sys V */	
+#define _POSIX_TYPES_	
 #endif /* POSIX_TYPES_ */
 
+#ifndef _ANSI_ISO_TYPES_
+typedef unsigned char	uint8_t;
+typedef unsigned short	uint16_t;
+typedef unsigned int	uint32_t;
+typedef unsigned long long int	uint64_t;
+#define _ANSI_ISO_TYPES_
+#endif /* ANSI_ISO_TYPES_ */
+
 typedef signed char	s8;
 typedef signed short 	s16;
 typedef signed long 	s32;
@@ -27,4 +41,26 @@
 typedef unsigned short 	u16;
 typedef unsigned long	u32;
 
+#ifndef _UBU_SPECIAL_TYPES_
+typedef unsigned char byte;
+typedef unsigned short word;
+typedef unsigned long dWord;
+typedef unsigned char uChar;
+typedef unsigned long uLong;
+typedef unsigned short uShort;
+#define _UBU_SPECIAL_TYPES_
+#endif /* Ubu's special types */
+typedef unsigned int uInt;
+
+#ifndef __PID_T
+#define __PID_T
+typedef int pid_t;
+#endif
+
+#ifndef _STDLIB_H
+#ifndef FALSE
+typedef enum { FALSE = 0, TRUE = 1 } bool;
+#endif
+#endif
+
 #endif /* _TYPES_H_ */
diff --git a/src/sys/include/ubixos/schedule.h b/src/sys/include/ubixos/schedule.h
index e6e678e..da16dc7 100755
--- a/src/sys/include/ubixos/schedule.h
+++ b/src/sys/include/ubixos/schedule.h
@@ -97,6 +97,8 @@
 extern struct taskStruct *_current,*_usedMath;
 extern int currentProc;
 
+void kpanic(char *);
+
 void initScheduler();
 int findTask();
 void timerInt();
diff --git a/src/sys/include/ubixos/types.h b/src/sys/include/ubixos/types.h
index 7b3a5ed..bbf62a7 100755
--- a/src/sys/include/ubixos/types.h
+++ b/src/sys/include/ubixos/types.h
@@ -21,6 +21,10 @@
 
 **************************************************************************************/
 
+#include <types.h>
+
+#define _TYPES_H
+
 #ifndef _TYPES_H
 #define _TYPES_H
 
diff --git a/src/tools/ubixfs.h b/src/tools/ubixfs.h
index 1711371..0363b59 100755
--- a/src/tools/ubixfs.h
+++ b/src/tools/ubixfs.h
@@ -24,7 +24,7 @@
 #ifndef _UBIXFS_H
 #define _UBIXFS_H
 
-#include "../sys/include/ubixos/types.h"
+#include "../sys/include/types.h"
 
 struct fileTableEntry {
   uChar fileName[22];