diff --git a/.gitignore b/.gitignore
index de9fdb99a..3135285c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,8 @@ Desktop.ini
 # Projects/IDE files
 # ==============================================================================
 
+*~
+
 # Sublime Text
 *.sublime-project
 *.sublime-workspace
diff --git a/src/xenia/base/threading.h b/src/xenia/base/threading.h
index 3903d1099..0dbee5988 100644
--- a/src/xenia/base/threading.h
+++ b/src/xenia/base/threading.h
@@ -12,6 +12,7 @@
 
 #include <atomic>
 #include <chrono>
+#include <climits>
 #include <condition_variable>
 #include <cstdint>
 #include <memory>
diff --git a/src/xenia/cpu/hir/hir_builder.cc b/src/xenia/cpu/hir/hir_builder.cc
index 4fb2a3c2f..2d14dd180 100644
--- a/src/xenia/cpu/hir/hir_builder.cc
+++ b/src/xenia/cpu/hir/hir_builder.cc
@@ -27,20 +27,16 @@ namespace cpu {
 namespace hir {
 
 #define ASSERT_ADDRESS_TYPE(value) \
-  \
-assert_true((value->type) == INT32_TYPE || (value->type) == INT64_TYPE)
+  assert_true((value->type) == INT32_TYPE || (value->type) == INT64_TYPE)
 #define ASSERT_CALL_ADDRESS_TYPE(value) \
-  \
-assert_true((value->type) == INT32_TYPE || (value->type) == INT64_TYPE)
-#define ASSERT_INTEGER_TYPE(value)                                       \
-  \
-assert_true((value->type) == INT8_TYPE || (value->type) == INT16_TYPE || \
-            (value->type) == INT32_TYPE || (value->type) == INT64_TYPE)
+  assert_true((value->type) == INT32_TYPE || (value->type) == INT64_TYPE)
+#define ASSERT_INTEGER_TYPE(value)                                         \
+  assert_true((value->type) == INT8_TYPE || (value->type) == INT16_TYPE || \
+              (value->type) == INT32_TYPE || (value->type) == INT64_TYPE)
 #define ASSERT_FLOAT_TYPE(value) \
   assert_true((value->type) == FLOAT32_TYPE || (value->type) == FLOAT64_TYPE)
 #define ASSERT_NON_FLOAT_TYPE(value) \
-  \
-assert_true((value->type) != FLOAT32_TYPE && (value->type) != FLOAT64_TYPE)
+  assert_true((value->type) != FLOAT32_TYPE && (value->type) != FLOAT64_TYPE)
 #define ASSERT_NON_VECTOR_TYPE(value) assert_false((value->type) == VEC128_TYPE)
 #define ASSERT_VECTOR_TYPE(value) assert_true((value->type) == VEC128_TYPE)
 #define ASSERT_FLOAT_OR_VECTOR_TYPE(value)     \
diff --git a/src/xenia/gpu/register_file.cc b/src/xenia/gpu/register_file.cc
index 651fc4231..3da80a4ac 100644
--- a/src/xenia/gpu/register_file.cc
+++ b/src/xenia/gpu/register_file.cc
@@ -26,8 +26,7 @@ const RegisterInfo* RegisterFile::GetRegisterInfo(uint32_t index) {
         RegisterInfo::Type::type, #name,   \
     };                                     \
     return &reg_info;                      \
-  \
-}
+  }
 #include "xenia/gpu/register_table.inc"
 #undef XE_GPU_REGISTER
     default:
diff --git a/third_party/elemental-forms b/third_party/elemental-forms
index c0725a31c..66048454a 160000
--- a/third_party/elemental-forms
+++ b/third_party/elemental-forms
@@ -1 +1 @@
-Subproject commit c0725a31caa3727cbdad03b707ab764ca3a8df15
+Subproject commit 66048454a5b720eb32f6d1a117038a507001b975
diff --git a/xenia-build b/xenia-build
index d1cc67481..0db45735b 100755
--- a/xenia-build
+++ b/xenia-build
@@ -275,6 +275,7 @@ def run_platform_premake():
     run_premake('windows', 'vs2015')
   else:
     run_premake('linux', 'gmake')
+    run_premake('linux', 'codelite')
 
 
 def get_build_bin_path(args):