diff --git a/source/base/namespace.h b/source/base/namespace.h
index a2d009b..88d5936 100644
--- a/source/base/namespace.h
+++ b/source/base/namespace.h
@@ -4,7 +4,7 @@
 #endif
 
 // C++ namespace support
-#if defined(MD_DONT_USE_NAMESPACE) || LANG_C
+#if defined(MD_DONT_USE_NAMESPACE) || MD_LANG_C
 #	if LANG_C
 #		define MD_NS
 #		define MD_NS_BEGIN
diff --git a/source/metadesk.c b/source/metadesk.c
index dad100f..d42c59d 100644
--- a/source/metadesk.c
+++ b/source/metadesk.c
@@ -25,9 +25,9 @@ MD_NS_BEGIN
 #include "base/entry_point.c"
 #include "base/time.c"
 
-#if OS_WINDOWS
+#if MD_OS_WINDOWS
 #	include "os/win32/os_win32.c"
-#elif OS_LINUX
+#elif MD_OS_LINUX
 #	include "os/win32/os_win32.c"
 #endif
 
diff --git a/source/os/os.h b/source/os/os.h
index 41805c3..600be7b 100644
--- a/source/os/os.h
+++ b/source/os/os.h
@@ -208,7 +208,7 @@ md_force_inline MD_String8List md_os_string_list_from_argcv__arena(MD_Arena* are
 
 //- rjf: files
 MD_API MD_OS_Handle      md_os_file_open                 (MD_OS_AccessFlags flags, MD_String8 path);
-MD_API void           md_os_file_close                (MD_OS_Handle file);
+MD_API void              md_os_file_close                (MD_OS_Handle file);
 MD_API MD_U64            md_os_file_read                 (MD_OS_Handle file, MD_Rng1U64 rng, void *out_data);
 MD_API MD_U64            md_os_file_write                (MD_OS_Handle file, MD_Rng1U64 rng, void *data);
 MD_API MD_B32            md_os_file_set_times            (MD_OS_Handle file, MD_DateTime time);
@@ -227,10 +227,10 @@ md_force_inline MD_String8 md_os_full_path_from_path__arena(MD_Arena* arena, MD_
 
 //- rjf: file maps
 MD_API MD_OS_Handle md_os_file_map_open      (MD_OS_AccessFlags flags, MD_OS_Handle file);
-MD_API void      md_os_file_map_close     (MD_OS_Handle map);
-MD_API void*     md_os_file_map_view_open (MD_OS_Handle map, MD_OS_AccessFlags flags, MD_Rng1U64 range);
-MD_API void      md_os_file_map_view_close(MD_OS_Handle map, void* ptr, MD_Rng1U64 range);
-
+MD_API void         md_os_file_map_close     (MD_OS_Handle map);
+MD_API void*        md_os_file_map_view_open (MD_OS_Handle map, MD_OS_AccessFlags flags, MD_Rng1U64 range);
+MD_API void         md_os_file_map_view_close(MD_OS_Handle map, void* ptr, MD_Rng1U64 range);
+   
 //- rjf: directory iteration
        MD_OS_FileIter* md_os_file_iter_begin__arena(MD_Arena*        arena, MD_String8      path, MD_OS_FileIterFlags flags);
 MD_API MD_OS_FileIter* md_os_file_iter_begin__ainfo(MD_AllocatorInfo ainfo, MD_String8      path, MD_OS_FileIterFlags flags);
diff --git a/source/os/os_resolve.h b/source/os/os_resolve.h
index 96b5566..aea81d8 100644
--- a/source/os/os_resolve.h
+++ b/source/os/os_resolve.h
@@ -3,22 +3,22 @@
 #	include "base/namespace.h"
 #endif
 
-#if !defined(OS_FEATURE_GRAPHICAL)
-#	define OS_FEATURE_GRAPHICAL 0
+#if !defined(MD_OS_FEATURE_GRAPHICAL)
+#	define MD_OS_FEATURE_GRAPHICAL 0
 #endif
 
-#if !defined(OS_GFX_STUB)
-#	define OS_GFX_STUB 0
+#if !defined(MD_OS_GFX_STUB)
+#	define MD_OS_GFX_STUB 0
 #endif
 
-#if OS_WINDOWS
+#if MD_OS_WINDOWS
 #	include "os/win32/os_win32_includes.h"
 
 	MD_NS_BEGIN
 #	include "os/win32/os_win32.h"
 	MD_NS_END
 
-#elif OS_LINUX
+#elif MD_OS_LINUX
 #	include "os/linux/os_linux_includes.h"
 
 	MD_NS_BEGIN