diff --git a/misc/symbian/ClassiCube_common.mmh b/misc/symbian/ClassiCube_common.mmh
index c3e13a87d..1fe351756 100644
--- a/misc/symbian/ClassiCube_common.mmh
+++ b/misc/symbian/ClassiCube_common.mmh
@@ -44,7 +44,7 @@ OPTION_REPLACE ARMCC -O2 -O3
 #endif
 
 SOURCEPATH ../../src
-SOURCE Animations.c Audio.c Audio_Null.c AxisLinesRenderer.c Bitmap.c Block.c BlockPhysics.c Builder.c Camera.c Chat.c Commands.c Deflate.c Drawer.c Drawer2D.c Entity.c EntityComponents.c EntityRenderers.c EnvRenderer.c Event.c ExtMath.c FancyLighting.c Formats.c Game.c GameVersion.c Generator.c Graphics_GL1.c Graphics_SoftGPU.c Gui.c HeldBlockRenderer.c Http_Web.c Http_Worker.c Input.c InputHandler.c Inventory.c IsometricDrawer.c LBackend.c LScreens.c LWeb.c LWidgets.c Launcher.c Lighting.c Logger.c MapRenderer.c MenuOptions.c Menus.c Model.c Options.c PackedCol.c Particle.c Physics.c Picking.c Platform_Posix.c Protocol.c Queue.c Resources.c SSL.c Screens.c SelOutlineRenderer.c SelectionBox.c Server.c Stream.c String.c SystemFonts.c TexturePack.c TouchUI.c Utils.c Vectors.c Widgets.c World.c _autofit.c _cff.c _ftbase.c _ftbitmap.c _ftglyph.c _ftinit.c _ftsynth.c _psaux.c _pshinter.c _psmodule.c _sfnt.c _smooth.c _truetype.c _type1.c Vorbis.c Platform_Symbian.cpp Graphics_GL2.c Window_Symbian.cpp Audio_Symbian.cpp
+SOURCE Animations.c Audio.c Audio_Null.c AxisLinesRenderer.c Bitmap.c Block.c BlockPhysics.c Builder.c Camera.c Certs.c Chat.c Commands.c Deflate.c Drawer.c Drawer2D.c Entity.c EntityComponents.c EntityRenderers.c EnvRenderer.c Event.c ExtMath.c FancyLighting.c Formats.c Game.c GameVersion.c Generator.c Graphics_GL1.c Graphics_SoftGPU.c Gui.c HeldBlockRenderer.c Http_Web.c Http_Worker.c Input.c InputHandler.c Inventory.c IsometricDrawer.c LBackend.c LScreens.c LWeb.c LWidgets.c Launcher.c Lighting.c Logger.c MapRenderer.c MenuOptions.c Menus.c Model.c Options.c PackedCol.c Particle.c Physics.c Picking.c Platform_Posix.c Protocol.c Queue.c Resources.c SSL.c Screens.c SelOutlineRenderer.c SelectionBox.c Server.c Stream.c String.c SystemFonts.c TexturePack.c TouchUI.c Utils.c Vectors.c Widgets.c World.c _autofit.c _cff.c _ftbase.c _ftbitmap.c _ftglyph.c _ftinit.c _ftsynth.c _psaux.c _pshinter.c _psmodule.c _sfnt.c _smooth.c _truetype.c _type1.c Vorbis.c Platform_Symbian.cpp Graphics_GL2.c Window_Symbian.cpp Audio_Symbian.cpp
 
 SOURCEPATH ../../third_party/bearssl/src
 SOURCE aes_big_cbcdec.c aes_big_cbcenc.c aes_big_ctr.c aes_big_ctrcbc.c aes_big_dec.c aes_big_enc.c aes_common.c aes_ct64.c aes_ct64_cbcdec.c aes_ct64_cbcenc.c aes_ct64_ctr.c aes_ct64_ctrcbc.c aes_ct64_dec.c aes_ct64_enc.c aes_ct.c aes_ct_cbcdec.c aes_ct_cbcenc.c aes_ct_ctr.c aes_ct_ctrcbc.c aes_ct_dec.c aes_ct_enc.c aesctr_drbg.c aes_small_cbcdec.c aes_small_cbcenc.c aes_small_ctr.c aes_small_ctrcbc.c aes_small_dec.c aes_small_enc.c aes_x86ni.c aes_x86ni_cbcdec.c aes_x86ni_cbcenc.c aes_x86ni_ctr.c aes_x86ni_ctrcbc.c asn1enc.c ccm.c ccopy.c chacha20_ct.c chacha20_sse2.c dec32be.c dec32le.c dec64be.c dec64le.c dig_oid.c dig_size.c ec_all_m31.c ec_c25519_i31.c ec_c25519_m31.c ec_c25519_m62.c ec_c25519_m64.c ec_curve25519.c ec_default.c ecdsa_atr.c ecdsa_default_vrfy_asn1.c ecdsa_default_vrfy_raw.c ecdsa_i31_bits.c ecdsa_i31_vrfy_asn1.c ecdsa_i31_vrfy_raw.c ec_p256_m31.c ec_p256_m62.c ec_p256_m64.c ec_prime_i31.c ec_secp256r1.c ec_secp384r1.c ec_secp521r1.c enc32be.c enc32le.c enc64be.c enc64le.c gcm.c ghash_ctmul64.c ghash_ctmul.c ghash_pclmul.c hmac.c hmac_ct.c hmac_drbg.c i31_add.c i31_bitlen.c i31_decmod.c i31_decode.c i31_decred.c i31_encode.c i31_fmont.c i31_iszero.c i31_moddiv.c i31_modpow2.c i31_modpow.c i31_montmul.c i31_mulacc.c i31_muladd.c i31_ninv31.c i31_reduce.c i31_rshift.c i31_sub.c i31_tmont.c i32_div32.c i62_modpow2.c md5.c md5sha1.c multihash.c poly1305_ctmul.c poly1305_ctmulq.c prf.c prf_md5sha1.c prf_sha256.c prf_sha384.c rsa_default_pkcs1_vrfy.c rsa_default_priv.c rsa_default_pub.c rsa_i31_pkcs1_vrfy.c rsa_i31_priv.c rsa_i31_pub.c rsa_i62_pkcs1_vrfy.c rsa_i62_priv.c rsa_i62_pub.c rsa_pkcs1_sig_unpad.c sha1.c sha2big.c sha2small.c ssl_client.c ssl_client_default_rsapub.c ssl_client_full.c ssl_engine.c ssl_engine_default_aescbc.c ssl_engine_default_aesccm.c ssl_engine_default_aesgcm.c ssl_engine_default_chapol.c ssl_engine_default_ec.c ssl_engine_default_ecdsa.c ssl_engine_default_rsavrfy.c ssl_hashes.c ssl_hs_client.c ssl_io.c ssl_rec_cbc.c ssl_rec_ccm.c ssl_rec_chapol.c ssl_rec_gcm.c x509_minimal.c x509_minimal_full.c
diff --git a/src/Builder.c b/src/Builder.c
index 41e457710..005e9352e 100644
--- a/src/Builder.c
+++ b/src/Builder.c
@@ -263,7 +263,6 @@ for (yy = -1; yy < 17; ++yy) {\
 
 static cc_bool ReadChunkData(int x1, int y1, int z1, cc_bool* outAllAir) {
 	BlockRaw* blocks = World.Blocks;
-	BlockRaw* blocks2;
 	cc_bool allAir = true, allSolid = true;
 	int index, cIndex;
 	BlockID block;
@@ -272,6 +271,8 @@ static cc_bool ReadChunkData(int x1, int y1, int z1, cc_bool* outAllAir) {
 #ifndef EXTENDED_BLOCKS
 	ReadChunkBody(blocks[index]);
 #else
+	BlockRaw* blocks2;
+
 	if (World.IDMask <= 0xFF) {
 		ReadChunkBody(blocks[index]);
 	} else {
diff --git a/src/LScreens.c b/src/LScreens.c
index f83b7563f..24ff3a91d 100644
--- a/src/LScreens.c
+++ b/src/LScreens.c
@@ -24,6 +24,12 @@
 #define LAYOUTS static const struct LLayout
 #define IsBackButton(btn) (btn == CCKEY_ESCAPE || btn == CCPAD_SELECT || btn == CCPAD_2)
 
+static cc_bool IsValidPort(const cc_string* str) {
+	int port;
+	return Convert_ParseInt(str, &port) && port >= 0 && port <= 65535;
+}
+
+
 /*########################################################################################################################*
 *---------------------------------------------------------Screen base-----------------------------------------------------*
 *#########################################################################################################################*/
@@ -474,11 +480,6 @@ static void DirectConnectScreen_UrlFilter(cc_string* str) {
 	str->length = 0;
 }
 
-static cc_bool DirectConnectScreen_ParsePort(const cc_string* str) {
-	int port;
-	return Convert_ParseInt(str, &port) && port >= 0 && port <= 65535;
-}
-
 static void DirectConnectScreen_StartClient(void* w) {
 	static const cc_string defMppass = String_FromConst("(none)");
 	const cc_string* user   = &DirectConnectScreen.iptUsername.text;
@@ -488,7 +489,7 @@ static void DirectConnectScreen_StartClient(void* w) {
 
 	cc_string ip, port;
 	cc_sockaddr addrs[SOCKET_MAX_ADDRS];
-	int numAddrs, raw_port;
+	int numAddrs;
 
 	int index = String_LastIndexOf(addr, ':');
 	if (index == 0 || index == addr->length - 1) {
@@ -499,7 +500,7 @@ static void DirectConnectScreen_StartClient(void* w) {
 		LLabel_SetConst(status, "&cUsername required"); return;
 	}
 	DirectUrl_ExtractAddress(addr, &ip, &port);
-	if (!DirectConnectScreen_ParsePort(&port)) {
+	if (!IsValidPort(&port)) {
 		LLabel_SetConst(status, "&cInvalid port"); return;
 	}
 	if (Socket_ParseAddress(&ip, 25565, addrs, &numAddrs)) {
diff --git a/src/gcwii/Audio_GCWii.c b/src/gcwii/Audio_GCWii.c
index 7025945cd..d6d3d65ea 100644
--- a/src/gcwii/Audio_GCWii.c
+++ b/src/gcwii/Audio_GCWii.c
@@ -1,11 +1,10 @@
-#include "Core.h"
+#include "../Core.h"
+#include "../Audio.h"
 
-#if defined CC_BUILD_GCWII
 #include <asndlib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
-#include "Audio.h"
 
 struct AudioBuffer {
 	int available;
@@ -20,7 +19,7 @@ struct AudioContext {
 	cc_bool makeAvailable;
 };
 #define AUDIO_OVERRIDE_ALLOC
-#include "_AudioBase.h"
+#include "../_AudioBase.h"
 
 cc_bool AudioBackend_Init(void) {
 	ASND_Init();
@@ -216,5 +215,4 @@ cc_result Audio_AllocChunks(cc_uint32 size, struct AudioChunk* chunks, int numCh
 void Audio_FreeChunks(struct AudioChunk* chunks, int numChunks) {
 	free(chunks[0].data);
 }
-#endif
 
diff --git a/src/gcwii/Graphics_GCWii.c b/src/gcwii/Graphics_GCWii.c
index ac05b489b..ec73f3dd4 100644
--- a/src/gcwii/Graphics_GCWii.c
+++ b/src/gcwii/Graphics_GCWii.c
@@ -1,9 +1,9 @@
-#include "Core.h"
-#if defined CC_BUILD_GCWII
-#include "_GraphicsBase.h"
-#include "Errors.h"
-#include "Logger.h"
-#include "Window.h"
+#include "../Core.h"
+#include "../_GraphicsBase.h"
+#include "../Errors.h"
+#include "../Logger.h"
+#include "../Window.h"
+
 #include <malloc.h>
 #include <string.h>
 #include <gccore.h>
@@ -645,4 +645,4 @@ void Gfx_DrawVb_IndexedTris(int verticesCount) {
 void Gfx_DrawIndexedTris_T2fC4b(int verticesCount, int startVertex) {
 	Draw_TexturedTriangles(verticesCount, startVertex);
 }
-#endif
+
diff --git a/src/gcwii/Platform_GCWii.c b/src/gcwii/Platform_GCWii.c
index 039900621..64edd06aa 100644
--- a/src/gcwii/Platform_GCWii.c
+++ b/src/gcwii/Platform_GCWii.c
@@ -1,15 +1,14 @@
-#include "Core.h"
-#if defined CC_BUILD_GCWII
-
+#include "../Core.h"
 #define CC_XTEA_ENCRYPTION
-#include "_PlatformBase.h"
-#include "Stream.h"
-#include "ExtMath.h"
-#include "Funcs.h"
-#include "Window.h"
-#include "Utils.h"
-#include "Errors.h"
-#include "PackedCol.h"
+#include "../_PlatformBase.h"
+#include "../Stream.h"
+#include "../ExtMath.h"
+#include "../Funcs.h"
+#include "../Window.h"
+#include "../Utils.h"
+#include "../Errors.h"
+#include "../PackedCol.h"
+#include "../_PlatfromConsole.h"
 
 #include <errno.h>
 #include <stdlib.h>
@@ -28,7 +27,6 @@
 #ifdef HW_RVL
 #include <ogc/wiilaunch.h>
 #endif
-#include "_PlatformConsole.h"
 
 const cc_result ReturnCode_FileShareViolation = 1000000000; /* TODO: not used apparently */
 const cc_result ReturnCode_FileNotFound     = ENOENT;
@@ -646,4 +644,4 @@ static cc_result GetMachineID(cc_uint32* key) {
 	Mem_Copy(key, MACHINE_KEY, sizeof(MACHINE_KEY) - 1);
 	return 0;
 }
-#endif
+
diff --git a/src/gcwii/Window_GCWii.c b/src/gcwii/Window_GCWii.c
index 41edc0330..183c38f0e 100644
--- a/src/gcwii/Window_GCWii.c
+++ b/src/gcwii/Window_GCWii.c
@@ -1,17 +1,17 @@
-#include "Core.h"
-#if defined CC_BUILD_GCWII
-#include "Window.h"
-#include "Platform.h"
-#include "Input.h"
-#include "InputHandler.h"
-#include "Event.h"
-#include "String.h"
-#include "Funcs.h"
-#include "Bitmap.h"
-#include "Errors.h"
-#include "ExtMath.h"
-#include "Graphics.h"
-#include "VirtualKeyboard.h"
+#include "../Core.h"
+#include "../Window.h"
+#include "../Platform.h"
+#include "../Input.h"
+#include "../InputHandler.h"
+#include "../Event.h"
+#include "../String.h"
+#include "../Funcs.h"
+#include "../Bitmap.h"
+#include "../Errors.h"
+#include "../ExtMath.h"
+#include "../Graphics.h"
+#include "../VirtualKeyboard.h"
+
 #include <gccore.h>
 #if defined HW_RVL
 #include <ogc/usbmouse.h>
@@ -609,4 +609,4 @@ cc_result Window_OpenFileDialog(const struct OpenFileDialogArgs* args) {
 cc_result Window_SaveFileDialog(const struct SaveFileDialogArgs* args) {
 	return ERR_NOT_SUPPORTED;
 }
-#endif
+
diff --git a/src/ps2/Graphics_PS2.c b/src/ps2/Graphics_PS2.c
index 1d41a0ce7..6899b8128 100644
--- a/src/ps2/Graphics_PS2.c
+++ b/src/ps2/Graphics_PS2.c
@@ -1,8 +1,8 @@
-#include "Core.h"
-#if defined CC_BUILD_PS2
-#include "_GraphicsBase.h"
-#include "Errors.h"
-#include "Window.h"
+#include "../Core.h"
+#include "../_GraphicsBase.h"
+#include "../Errors.h"
+#include "../Window.h"
+
 #include <packet.h>
 #include <dma_tags.h>
 #include <gif_tags.h>
@@ -1000,4 +1000,4 @@ void Gfx_GetApiInfo(cc_string* info) {
 }
 
 cc_bool Gfx_TryRestoreContext(void) { return true; }
-#endif
+
diff --git a/src/ps2/Platform_PS2.c b/src/ps2/Platform_PS2.c
index a40b6bea0..b7c1d81e6 100644
--- a/src/ps2/Platform_PS2.c
+++ b/src/ps2/Platform_PS2.c
@@ -1,18 +1,18 @@
-#include "Core.h"
-#if defined PLAT_PS2
-
+#include "../Core.h"
 #define CC_XTEA_ENCRYPTION
+#include "../_PlatformBase.h"
+#include "../Stream.h"
+#include "../ExtMath.h"
+#include "../Funcs.h"
+#include "../Window.h"
+#include "../Utils.h"
+#include "../Errors.h"
+#include "../PackedCol.h"
+#include "../_PlatformConsole.h"
+
 #define LIBCGLUE_SYS_SOCKET_ALIASES 0
 #define LIBCGLUE_SYS_SOCKET_NO_ALIASES
 #define LIBCGLUE_ARPA_INET_NO_ALIASES
-#include "_PlatformBase.h"
-#include "Stream.h"
-#include "ExtMath.h"
-#include "Funcs.h"
-#include "Window.h"
-#include "Utils.h"
-#include "Errors.h"
-#include "PackedCol.h"
 #include <errno.h>
 #include <time.h>
 #include <stdlib.h>
@@ -39,7 +39,6 @@
 #include <io_common.h>
 #include <iox_stat.h>
 #include <libcdvd.h>
-#include "_PlatformConsole.h"
 
 const cc_result ReturnCode_FileShareViolation = 1000000000; // not used
 const cc_result ReturnCode_FileNotFound       = -4;
@@ -760,4 +759,4 @@ static cc_result GetMachineID(cc_uint32* key) {
 	Mem_Copy(key, MACHINE_KEY, sizeof(MACHINE_KEY) - 1);
 	return 0;
 }
-#endif
+
diff --git a/src/ps2/Window_PS2.c b/src/ps2/Window_PS2.c
index dfe1b8894..77ee5fe5f 100644
--- a/src/ps2/Window_PS2.c
+++ b/src/ps2/Window_PS2.c
@@ -1,17 +1,17 @@
-#include "Core.h"
-#if defined CC_BUILD_PS2
-#include "Window.h"
-#include "Platform.h"
-#include "Input.h"
-#include "Event.h"
-#include "Graphics.h"
-#include "String.h"
-#include "Funcs.h"
-#include "Bitmap.h"
-#include "Errors.h"
-#include "ExtMath.h"
-#include "Logger.h"
-#include "VirtualKeyboard.h"
+#include "../Core.h"
+#include "../Window.h"
+#include "../Platform.h"
+#include "../Input.h"
+#include "../Event.h"
+#include "../Graphics.h"
+#include "../String.h"
+#include "../Funcs.h"
+#include "../Bitmap.h"
+#include "../Errors.h"
+#include "../ExtMath.h"
+#include "../Logger.h"
+#include "../VirtualKeyboard.h"
+
 #include <libpad.h>
 #include <packet.h>
 #include <dma_tags.h>
@@ -378,4 +378,4 @@ cc_result Window_OpenFileDialog(const struct OpenFileDialogArgs* args) {
 cc_result Window_SaveFileDialog(const struct SaveFileDialogArgs* args) {
 	return ERR_NOT_SUPPORTED;
 }
-#endif
+
diff --git a/src/xbox/Graphics_Xbox.c b/src/xbox/Graphics_Xbox.c
index 9947b01c9..9cba284aa 100644
--- a/src/xbox/Graphics_Xbox.c
+++ b/src/xbox/Graphics_Xbox.c
@@ -1,9 +1,9 @@
-#include "Core.h"
-#if defined CC_BUILD_XBOX
-#include "_GraphicsBase.h"
-#include "Errors.h"
-#include "Logger.h"
-#include "Window.h"
+#include "../Core.h"
+#include "../_GraphicsBase.h"
+#include "../Errors.h"
+#include "../Logger.h"
+#include "../Window.h"
+
 #include <pbkit/pbkit.h>
 
 #define MAX_RAM_ADDR 0x03FFAFFF
@@ -701,4 +701,4 @@ void Gfx_DrawVb_IndexedTris(int verticesCount) {
 void Gfx_DrawIndexedTris_T2fC4b(int verticesCount, int startVertex) {
 	DrawIndexedVertices(verticesCount, startVertex);
 }
-#endif
+
diff --git a/src/xbox/Platform_Xbox.c b/src/xbox/Platform_Xbox.c
index dc69e1254..5522c769f 100644
--- a/src/xbox/Platform_Xbox.c
+++ b/src/xbox/Platform_Xbox.c
@@ -1,12 +1,10 @@
-#include "Core.h"
-#if defined CC_BUILD_XBOX
-
+#include "../Core.h"
 #define CC_XTEA_ENCRYPTION
-#include "_PlatformBase.h"
-#include "Stream.h"
-#include "Funcs.h"
-#include "Utils.h"
-#include "Errors.h"
+#include "../_PlatformBase.h"
+#include "../Stream.h"
+#include "../Funcs.h"
+#include "../Utils.h"
+#include "../Errors.h"
 
 #include <windows.h>
 #include <hal/debug.h>
@@ -474,4 +472,4 @@ static cc_result GetMachineID(cc_uint32* key) {
 	Mem_Copy(key, MACHINE_KEY, sizeof(MACHINE_KEY) - 1);
 	return 0;
 }
-#endif
+
diff --git a/src/xbox/Window_Xbox.c b/src/xbox/Window_Xbox.c
index 9edf590b8..4dc63e4fb 100644
--- a/src/xbox/Window_Xbox.c
+++ b/src/xbox/Window_Xbox.c
@@ -1,16 +1,16 @@
-#include "Core.h"
-#if defined CC_BUILD_XBOX
-#include "Window.h"
-#include "Platform.h"
-#include "Input.h"
-#include "Event.h"
-#include "Graphics.h"
-#include "String.h"
-#include "Funcs.h"
-#include "Bitmap.h"
-#include "Errors.h"
-#include "ExtMath.h"
-#include "VirtualKeyboard.h"
+#include "../Core.h"
+#include "../Window.h"
+#include "../Platform.h"
+#include "../Input.h"
+#include "../Event.h"
+#include "../Graphics.h"
+#include "../String.h"
+#include "../Funcs.h"
+#include "../Bitmap.h"
+#include "../Errors.h"
+#include "../ExtMath.h"
+#include "../VirtualKeyboard.h"
+
 #include <hal/video.h>
 #include <usbh_lib.h>
 #include <xid_driver.h>
@@ -253,4 +253,4 @@ cc_result Window_OpenFileDialog(const struct OpenFileDialogArgs* args) {
 cc_result Window_SaveFileDialog(const struct SaveFileDialogArgs* args) {
 	return ERR_NOT_SUPPORTED;
 }
-#endif
+