--- php_imlib2.h	2004-01-01 18:01:13.000000000 -0500
+++ php_imlib2.h	2015-04-09 13:10:05.000000000 -0400
@@ -2,5 +2,4 @@
 #define PHP_IMLIB2_H
 
-#include "X11/Xlib.h"
 #include <Imlib2.h>
 
@@ -86,5 +85,5 @@
 	int font_cache_max_size;
 	int font_cache_status;
-	char *font_path;
+	const char *font_path;
 ZEND_END_MODULE_GLOBALS(imlib2)
 
@@ -104,5 +103,5 @@
 #ifdef ZTS
 #define IMLIB2_G(v) TSRMG(imlib2_globals_id, zend_imlib2_globals *, v)
-#define IMLIB2_LS_FETCH() imlib2_globals *imlib2_globals = ts_resource(gd_imlib_id)
+#define IMLIB2_LS_FETCH() zend_imlib2_globals *imlib2_globals = ts_resource(imlib2_globals_id)
 #else
 #define IMLIB2_G(v) (imlib2_globals.v)