diff --git a/firmware/core/sysdefs.h b/firmware/core/sysdefs.h
index bf79c8e..018c147 100644
--- a/firmware/core/sysdefs.h
+++ b/firmware/core/sysdefs.h
@@ -39,20 +39,12 @@
 #ifndef _SYSDEFS_H_
 #define _SYSDEFS_H_
 
+#include "../sysdefs.h"
+
 #include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
 
-// Stay compatible with ugly "windows" style
-#define BOOL bool
-#define TRUE true
-#define FALSE false
-
-typedef volatile uint8_t REG8;
-typedef volatile uint16_t REG16;
-typedef volatile uint32_t REG32;
-typedef unsigned char byte_t;
-
 #define pREG8  (REG8 *)
 #define pREG16 (REG16 *)
 #define pREG32 (REG32 *)
diff --git a/firmware/sysdefs.h b/firmware/sysdefs.h
index 10ebfb4..d17cb54 100644
--- a/firmware/sysdefs.h
+++ b/firmware/sysdefs.h
@@ -36,10 +36,10 @@
 */
 /**************************************************************************/
 
-#ifndef _SYSDEFS_H_
-#define _SYSDEFS_H_
+#ifndef _GLOBAL_SYSDEFS_H_
+#define _GLOBAL_SYSDEFS_H_
 
-#include <stdio.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
 
@@ -53,18 +53,9 @@ typedef volatile uint16_t REG16;
 typedef volatile uint32_t REG32;
 typedef unsigned char byte_t;
 
-#define pREG8  (REG8 *)
-#define pREG16 (REG16 *)
-#define pREG32 (REG32 *)
-
-#ifndef NULL
-#define NULL ((void *) 0)
-#endif
-
 // Save some space
 #ifndef SIMULATOR
 #define memcpy memmove
 #endif
 
 #endif
-