diff --git a/docs/api/build.hxml b/docs/api/build.hxml
index eb3c68ab5..3a91b4ab5 100644
--- a/docs/api/build.hxml
+++ b/docs/api/build.hxml
@@ -5,6 +5,7 @@
 -swf-version 17.0
 -D display
 -D doc_gen
+-D lime_opengl
 ImportAll
 -lib lime
 --no-output
@@ -128,6 +129,7 @@ ImportAll
 -D display
 -D html5
 -D doc_gen
+-D lime_opengl
 ImportAll
 -lib lime
 --no-output
diff --git a/src/lime/_internal/backend/native/NativeCFFI.hx b/src/lime/_internal/backend/native/NativeCFFI.hx
index 63f5887c0..404a070a3 100644
--- a/src/lime/_internal/backend/native/NativeCFFI.hx
+++ b/src/lime/_internal/backend/native/NativeCFFI.hx
@@ -729,8 +729,8 @@ class NativeCFFI {
 	#if (lime_cffi && !macro && lime_harfbuzz)
 	@:cffi private static function lime_hb_blob_create (data:DataPointer, length:Int, memoryMode:Int):CFFIPointer;
 	@:cffi private static function lime_hb_blob_create_sub_blob (parent:CFFIPointer, offset:Int, length:Int):CFFIPointer;
-	@:cffi private static function lime_hb_blob_get_data (blob:CFFIPointer):DataPointer;
-	@:cffi private static function lime_hb_blob_get_data_writable (blob:CFFIPointer):DataPointer;
+	@:cffi private static function lime_hb_blob_get_data (blob:CFFIPointer):Float;
+	@:cffi private static function lime_hb_blob_get_data_writable (blob:CFFIPointer):Float;
 	@:cffi private static function lime_hb_blob_get_empty ():CFFIPointer;
 	@:cffi private static function lime_hb_blob_get_length (blob:CFFIPointer):Int;
 	@:cffi private static function lime_hb_blob_is_immutable (blob:CFFIPointer):Bool;
diff --git a/src/lime/_internal/macros/DefineMacro.hx b/src/lime/_internal/macros/DefineMacro.hx
index f076482a4..56f6650d2 100644
--- a/src/lime/_internal/macros/DefineMacro.hx
+++ b/src/lime/_internal/macros/DefineMacro.hx
@@ -55,24 +55,6 @@ class DefineMacro {
 				
 			}
 			
-			
-			if (!Context.defined ("flash") && (!Context.defined ("js") || Context.defined ("nodejs"))) {
-				
-				Compiler.define ("lime-cffi");
-				Compiler.define ("native");
-				Compiler.define ("lime-curl");
-				Compiler.define ("lime-vorbis");
-				
-			}
-			
-			if (Context.defined ("js") && !Context.defined ("nodejs") && !Context.defined ("display")) {
-				
-				Compiler.define ("html5");
-				Compiler.define ("web");
-				Compiler.define ("lime-opengl");
-				
-			}
-			
 		}
 		
 	}