diff --git a/include/cia_definitions.h b/include/cia_definitions.h
index 85c972c..89551bf 100644
--- a/include/cia_definitions.h
+++ b/include/cia_definitions.h
@@ -7,39 +7,39 @@
 #define NULL ((void *)0)
 
 // Platform macros
-#define CIA_LINUX 1
-#define CIA_WINDOWS 2
-#define CIA_ANDROID 3
+#define _CIA_LINUX   1
+#define _CIA_WINDOWS 2
+#define _CIA_ANDROID 3
 
 // Platform detection
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
-   #define CIA_OS CIA_WINDOWS
+   #define _CIA_OS _CIA_WINDOWS
    #if !defined(_WIN64)
       #error "32-bit windows is not supported"
    #endif
 #elif __APPLE__
     #error "Apple OS's not supported and will never be unless you want to write the support for it"
 #elif __ANDROID__
-    #define CIA_OS CIA_ANDROID
+    #define _CIA_OS _CIA_ANDROID
 #elif __linux__
-    #define CIA_OS CIA_LINUX
+    #define _CIA_OS _CIA_LINUX
 #else
     #error "Unable to detect the OS"
 #endif
 
 // Convenience platform checking macros
-#define os_is_linux() (CIA_OS == CIA_LINUX)
-#define os_is_windows() (CIA_OS == CIA_WINDOWS)
-#define os_is_android() (CIA_OS == CIA_ANDROID)
+#define _CIA_OS_LINUX()   (_CIA_OS == _CIA_LINUX)
+#define _CIA_OS_WINDOWS() (_CIA_OS == _CIA_WINDOWS)
+#define _CIA_OS_ANDROID() (_CIA_OS == _CIA_ANDROID)
 
 // Assert commonly-accepted platform-invariant sizes
 static_assert(sizeof(char) == 1, "Char isn't 1 bytes long");
 static_assert(sizeof(short) == 2, "Short isn't 2 bytes long");
 static_assert(sizeof(int) == 4, "Int isn't 4 bytes long");
 static_assert(sizeof(long long int) == 8, "Long long isn't 8 bytes long");
-#if os_is_linux()
+#if _CIA_OS_LINUX()
     static_assert(sizeof(long) == 8, "Long on linux isn't 8 bytes");
-#elif os_is_windows()
+#elif _CIA_OS_WINDOWS()
     static_assert(sizeof(long) == 4, "Long on windows isn't 4 bytes");
 #endif
 
@@ -50,16 +50,16 @@ typedef signed short int16_t;
 typedef unsigned short uint16_t;
 typedef signed int int32_t;
 typedef unsigned int uint32_t;
-#if os_is_linux()
+#if _CIA_OS_LINUX()
     typedef signed long int64_t;
     typedef unsigned long uint64_t;
-#elif os_is_windows()
+#elif _CIA_OS_WINDOWS()
     typedef signed long long int64_t;
     typedef unsigned long long uint64_t;
 #else
     #error "Platform not implemented"
 #endif
-    
+
 // stdbool.h
 typedef _Bool bool;
 #define true ((bool)1)
diff --git a/src/ciabatta.c b/src/ciabatta.c
index 8088848..f829f9c 100644
--- a/src/ciabatta.c
+++ b/src/ciabatta.c
@@ -1,7 +1,7 @@
 
 #include <cia_definitions.h>
 
-#if os_is_linux()
+#if _CIA_OS_LINUX()
     #include "linux/syscall.c"
     #include "linux/errno.c"
     #include "linux/entry.c"
@@ -9,6 +9,6 @@
     #include "linux/tinyrt.iface.h"
     #include "tinyrt.h"
     #include "linux/tinyrt.c"
-#elif os_is_windows()
+#elif _CIA_OS_WINDOWS()
     #error "Not implemented yet"
 #endif
diff --git a/src/linux/syscall.c b/src/linux/syscall.c
index 8335853..06c144f 100644
--- a/src/linux/syscall.c
+++ b/src/linux/syscall.c
@@ -1,6 +1,4 @@
 
-#if os_is_linux()
-
 // Standard handles file descriptors
 #define STDIN_FILENO  0
 #define STDOUT_FILENO 1
@@ -179,7 +177,3 @@ static inline i64 syscall_arch_prctl_set(int code, u64 value) {
 static inline i64 syscall_arch_prctl_get(int code, u64 *value) {
     return __syscall2(SYS_arch_prctl, code, (i64)value);
 }
-
-#else
-#error "syscall.h should only be included in LINUX code"
-#endif
\ No newline at end of file