diff --git a/include.xml b/include.xml
index a3c5e8170..30610e842 100644
--- a/include.xml
+++ b/include.xml
@@ -9,6 +9,8 @@
 	<set name="included" value="1" if="windows || mac || linux || ios || android || blackberry || tizen || firefoxos || html5 || flash" />
 	
 	<include path="legacy/include.xml" if="legacy" />
+	<templatePath name="templates" unless="legacy" />
+	<sample path="samples" unless="openfl" />
 	
 	<section unless="display || legacy">
 		
@@ -50,9 +52,6 @@
 		
 	</section>
 	
-	<templatePath name="templates" unless="legacy" />
-	<sample path="samples" unless="openfl" />
-	
 	<haxelib name="hxcpp" if="setup" />
 	
 	<section if="rebuild">
diff --git a/lime/audio/ALAudioContext.hx b/lime/audio/ALAudioContext.hx
index 282155166..3e181e4e4 100644
--- a/lime/audio/ALAudioContext.hx
+++ b/lime/audio/ALAudioContext.hx
@@ -9,10 +9,8 @@ class ALAudioContext {
 	
 	
 	public var NONE:Int = 0;
-	#if !console_pc
 	public var FALSE:Int = 0;
 	public var TRUE:Int = 1;
-	#end
 	public var SOURCE_RELATIVE:Int = 0x202;
 	public var CONE_INNER_ANGLE:Int = 0x1001;
 	public var CONE_OUTER_ANGLE:Int = 0x1002;
@@ -52,9 +50,7 @@ class ALAudioContext {
 	public var BITS:Int = 0x2002;
 	public var CHANNELS:Int = 0x2003;
 	public var SIZE:Int = 0x2004;
-	#if !console_pc
 	public var NO_ERROR:Int = 0;
-	#end
 	public var INVALID_NAME:Int = 0xA001;
 	public var INVALID_ENUM:Int = 0xA002;
 	public var INVALID_VALUE:Int = 0xA003;
diff --git a/lime/audio/ALCAudioContext.hx b/lime/audio/ALCAudioContext.hx
index 8ca2e8e54..4a824dc57 100644
--- a/lime/audio/ALCAudioContext.hx
+++ b/lime/audio/ALCAudioContext.hx
@@ -9,18 +9,14 @@ import lime.audio.openal.ALDevice;
 class ALCAudioContext {
 	
 	
-	#if !console_pc
 	public var FALSE:Int = 0;
 	public var TRUE:Int = 1;
-	#end
 	public var FREQUENCY:Int = 0x1007;
 	public var REFRESH:Int = 0x1008;
 	public var SYNC:Int = 0x1009;
 	public var MONO_SOURCES:Int = 0x1010;
 	public var STEREO_SOURCES:Int = 0x1011;
-	#if !console_pc
 	public var NO_ERROR:Int = 0;
-	#end
 	public var INVALID_DEVICE:Int = 0xA001;
 	public var INVALID_CONTEXT:Int = 0xA002;
 	public var INVALID_ENUM:Int = 0xA003;
diff --git a/lime/audio/openal/AL.hx b/lime/audio/openal/AL.hx
index d28393865..d8a5de0c1 100644
--- a/lime/audio/openal/AL.hx
+++ b/lime/audio/openal/AL.hx
@@ -9,10 +9,8 @@ class AL {
 	
 	
 	public static inline var NONE:Int = 0;
-	#if !console_pc
 	public static inline var FALSE:Int = 0;
 	public static inline var TRUE:Int = 1;
-	#end
 	public static inline var SOURCE_RELATIVE:Int = 0x202;
 	public static inline var CONE_INNER_ANGLE:Int = 0x1001;
 	public static inline var CONE_OUTER_ANGLE:Int = 0x1002;
@@ -52,9 +50,7 @@ class AL {
 	public static inline var BITS:Int = 0x2002;
 	public static inline var CHANNELS:Int = 0x2003;
 	public static inline var SIZE:Int = 0x2004;
-	#if !console_pc
 	public static inline var NO_ERROR:Int = 0;
-	#end
 	public static inline var INVALID_NAME:Int = 0xA001;
 	public static inline var INVALID_ENUM:Int = 0xA002;
 	public static inline var INVALID_VALUE:Int = 0xA003;
diff --git a/lime/audio/openal/ALC.hx b/lime/audio/openal/ALC.hx
index 2f0262f08..48d7ef7b2 100644
--- a/lime/audio/openal/ALC.hx
+++ b/lime/audio/openal/ALC.hx
@@ -7,18 +7,14 @@ import lime.system.System;
 class ALC {
 	
 	
-	#if !console_pc
 	public static inline var FALSE:Int = 0;
 	public static inline var TRUE:Int = 1;
-	#end
 	public static inline var FREQUENCY:Int = 0x1007;
 	public static inline var REFRESH:Int = 0x1008;
 	public static inline var SYNC:Int = 0x1009;
 	public static inline var MONO_SOURCES:Int = 0x1010;
 	public static inline var STEREO_SOURCES:Int = 0x1011;
-	#if !console_pc
 	public static inline var NO_ERROR:Int = 0;
-	#end
 	public static inline var INVALID_DEVICE:Int = 0xA001;
 	public static inline var INVALID_CONTEXT:Int = 0xA002;
 	public static inline var INVALID_ENUM:Int = 0xA003;
diff --git a/lime/graphics/GLRenderContext.hx b/lime/graphics/GLRenderContext.hx
index 024f8956b..9c4327610 100644
--- a/lime/graphics/GLRenderContext.hx
+++ b/lime/graphics/GLRenderContext.hx
@@ -83,9 +83,7 @@ class GLRenderContext {
 	public var SAMPLE_ALPHA_TO_COVERAGE = 0x809E;
 	public var SAMPLE_COVERAGE = 0x80A0;
 	
-	#if !console_pc
 	public var NO_ERROR = 0;
-	#end
 	public var INVALID_ENUM = 0x0500;
 	public var INVALID_VALUE = 0x0501;
 	public var INVALID_OPERATION = 0x0502;
diff --git a/lime/graphics/opengl/GL.hx b/lime/graphics/opengl/GL.hx
index 6fc166130..97940a591 100644
--- a/lime/graphics/opengl/GL.hx
+++ b/lime/graphics/opengl/GL.hx
@@ -88,9 +88,7 @@ class GL {
 	public static inline var SAMPLE_ALPHA_TO_COVERAGE = 0x809E;
 	public static inline var SAMPLE_COVERAGE = 0x80A0;
 	
-	#if !console_pc
 	public static inline var NO_ERROR = 0;
-	#end
 	public static inline var INVALID_ENUM = 0x0500;
 	public static inline var INVALID_VALUE = 0x0501;
 	public static inline var INVALID_OPERATION = 0x0502;
diff --git a/lime/net/URLRequestMethod.hx b/lime/net/URLRequestMethod.hx
index 14ad5de0b..6a2a0a7a8 100644
--- a/lime/net/URLRequestMethod.hx
+++ b/lime/net/URLRequestMethod.hx
@@ -3,14 +3,10 @@ package lime.net; #if !flash
 
 @:enum abstract URLRequestMethod(String) {
 	
-	#if !console_pc
 	var DELETE = "DELETE";
-	#end
 	var GET = "GET";
 	var HEAD = "HEAD";
-	#if !console_pc
 	var OPTIONS = "OPTIONS";
-	#end
 	var POST = "POST";
 	var PUT = "PUT";
 	
diff --git a/lime/ui/KeyCode.hx b/lime/ui/KeyCode.hx
index b10e66f53..52a00d571 100644
--- a/lime/ui/KeyCode.hx
+++ b/lime/ui/KeyCode.hx
@@ -74,9 +74,7 @@ package lime.ui;
 	var X = 0x78;
 	var Y = 0x79;
 	var Z = 0x7A;
-	#if !console_pc
 	var DELETE = 0x7F;
-	#end
 	var CAPS_LOCK = 0x40000039;
 	var F1 = 0x4000003A;
 	var F2 = 0x4000003B;
@@ -157,9 +155,7 @@ package lime.ui;
 	var PRIOR = 0x4000009D;
 	var RETURN2 = 0x4000009E;
 	var SEPARATOR = 0x4000009F;
-	#if !console_pc
 	var OUT = 0x400000A0;
-	#end
 	var OPER = 0x400000A1;
 	var CLEAR_AGAIN = 0x400000A2;
 	var CRSEL = 0x400000A3;