Cleaning up asserts and file/line macros.

src/alloy/core.h

@@ -11,7 +11,15 @@
 #define ALLOY_CORE_H_
 
 // TODO(benvanik): move the common stuff into here?
-#include <xenia/common.h>
+#include <xenia/atomic.h>
+#include <xenia/byte_order.h>
+#include <xenia/config.h>
+#include <xenia/logging.h>
+#include <xenia/malloc.h>
+#include <xenia/platform.h>
+#include <xenia/profiling.h>
+#include <xenia/string.h>
+#include <xenia/types.h>
 
 #include <poly/poly.h>