diff --git a/configure-cflags.sh b/configure-cflags.sh
index 223869ff..2d9de182 100644
--- a/configure-cflags.sh
+++ b/configure-cflags.sh
@@ -37,6 +37,9 @@ strictImageMagickVersions+=("dev")
 strictImageMagickVersions+=("6.8.7-0")
 strictImageMagickVersions+=("6.7.5-3")
 strictImageMagickVersions+=("6.6.0-9")
+strictImageMagickVersions+=("7.0.8-4")
+strictImageMagickVersions+=("7.0.1-0")
+
 
 echo "TRAVIS_PHP_VERSION is ${TRAVIS_PHP_VERSION}"
 echo "IMAGEMAGICK_VERSION is ${IMAGEMAGICK_VERSION}"
@@ -51,7 +54,7 @@ echo "strictPHP is ${strictPHP}"
 # -Wmaybe-uninitialized
 
 if [[ $strictPHP = '1' ]] && [[ $strictImageMagick = '1' ]]; then 
-	CFLAGS="-Wno-deprecated-declarations -Wdeclaration-after-statement -Werror -Wall -Wimplicit-function-declaration"; 
+	CFLAGS="-Wno-deprecated-declarations -Wdeclaration-after-statement -Werror -Wall -Wextra -Wimplicit-function-declaration";
 else 
 	CFLAGS="-Wno-deprecated-declarations";
 fi
diff --git a/imagick.c b/imagick.c
index 0990e1c1..fd3c5bb4 100644
--- a/imagick.c
+++ b/imagick.c
@@ -171,6 +171,7 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 		ZEND_ARG_INFO(0, LAYER)
 	ZEND_END_ARG_INFO()
 
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_roundcornersimage_args, 0, 0, 2)
 		ZEND_ARG_INFO(0, xRounding)
 		ZEND_ARG_INFO(0, yRounding)
@@ -178,16 +179,19 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 		ZEND_ARG_INFO(0, displace)
 		ZEND_ARG_INFO(0, sizeCorrection)
 	ZEND_END_ARG_INFO()
+#endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setiteratorindex_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, index)
 	ZEND_END_ARG_INFO()
 
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_transformimage_args, 0, 0, 2)
 		ZEND_ARG_INFO(0, crop)
 		ZEND_ARG_INFO(0, geometry)
 	ZEND_END_ARG_INFO()
 #endif
+#endif
 
 #if MagickLibVersion > 0x631
 	ZEND_BEGIN_ARG_INFO_EX(imagick_polaroidimage_args, 0, 0, 2)
@@ -235,7 +239,7 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 	ZEND_END_ARG_INFO()
 #endif
 
-#if MagickLibVersion > 0x634
+#if MagickLibVersion > 0x634 && MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_paintfloodfillimage_args, 0, 0, 6)
 		ZEND_ARG_INFO(0, CHANNEL)
 		ZEND_ARG_INFO(0, fill)
@@ -247,15 +251,19 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 #endif
 
 #if MagickLibVersion > 0x630
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setimageopacity_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, opacity)
 	ZEND_END_ARG_INFO()
+#endif
 
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_orderedposterizeimage_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, threshold_map)
 		ZEND_ARG_INFO(0, CHANNEL)
 	ZEND_END_ARG_INFO()
 #endif
+#endif
 
 #if MagickLibVersion > 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setimagealpha_args, 0, 0, 1)
@@ -302,19 +310,23 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 		ZEND_ARG_INFO(0, page)
 	ZEND_END_ARG_INFO()
 
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setimageclipmask_args, 0, 0, 1)
 		ZEND_ARG_OBJ_INFO(0, Imagick, Imagick, 0)
 	ZEND_END_ARG_INFO()
+#endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_animateimages_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, server_name)
 	ZEND_END_ARG_INFO()
 #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_recolorimage_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, matrix)
 	ZEND_END_ARG_INFO()
 #endif
 #endif
+#endif
 
 #if MagickLibVersion > 0x636
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setfont_args, 0, 0, 1)
@@ -580,9 +592,11 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 		ZEND_ARG_INFO(0, filename)
 	ZEND_END_ARG_INFO()
 
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setimageindex_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, index)
 	ZEND_END_ARG_INFO()
+#endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_commentimage_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, comment)
@@ -645,10 +659,12 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 		ZEND_ARG_INFO(0, CHANNEL)
 	ZEND_END_ARG_INFO()
 
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_filter_args, 0, 0, 1)
 		ZEND_ARG_OBJ_INFO(0, ImagickKernel, ImagickKernel, 0)
 		ZEND_ARG_INFO(0, CHANNEL)
 	ZEND_END_ARG_INFO()
+#endif
 #endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_identifyimage_args, 0, 0, 0)
@@ -697,10 +713,12 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 	ZEND_END_ARG_INFO()
 
 #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_radialblurimage_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, angle)
 		ZEND_ARG_INFO(0, CHANNEL)
 	ZEND_END_ARG_INFO()
+#endif
 #endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_raiseimage_args, 0, 0, 5)
@@ -754,14 +772,18 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 	ZEND_END_ARG_INFO()
 
 #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setimageattribute_args, 0, 0, 2)
 		ZEND_ARG_INFO(0, key)
 		ZEND_ARG_INFO(0, value)
 	ZEND_END_ARG_INFO()
+#endif
 
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_getimageattribute_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, key)
 	ZEND_END_ARG_INFO()
+#endif
 #endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setimagebackgroundcolor_args, 0, 0, 1)
@@ -798,9 +820,11 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 		ZEND_ARG_INFO(0, iterations)
 	ZEND_END_ARG_INFO()
 
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setimagemattecolor_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, color)
 	ZEND_END_ARG_INFO()
+#endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setimagepage_args, 0, 0, 4)
 		ZEND_ARG_INFO(0, width)
@@ -952,6 +976,7 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 	ZEND_END_ARG_INFO()
 
 #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_colorfloodfillimage_args, 0, 0, 5)
 		ZEND_ARG_INFO(0, fill_color)
 		ZEND_ARG_INFO(0, fuzz)
@@ -959,6 +984,7 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 		ZEND_ARG_INFO(0, y)
 		ZEND_ARG_INFO(0, x)
 	ZEND_END_ARG_INFO()
+#endif
 #endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_colorizeimage_args, 0, 0, 2)
@@ -1053,9 +1079,11 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 	ZEND_END_ARG_INFO()
 
 #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_getimagechannelextrema_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, CHANNEL)
 	ZEND_END_ARG_INFO()
+#endif
 #endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_getimagechannelmean_args, 0, 0, 1)
@@ -1106,11 +1134,14 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 	ZEND_END_ARG_INFO()
 
 #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_mapimage_args, 0, 0, 2)
 		ZEND_ARG_OBJ_INFO(0, Imagick, Imagick, 0)
 		ZEND_ARG_INFO(0, dither)
 	ZEND_END_ARG_INFO()
+#endif
 
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_mattefloodfillimage_args, 0, 0, 5)
 		ZEND_ARG_INFO(0, alpha)
 		ZEND_ARG_INFO(0, fuzz)
@@ -1119,11 +1150,14 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 		ZEND_ARG_INFO(0, y)
 	ZEND_END_ARG_INFO()
 #endif
+#endif
 
 #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_medianfilterimage_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, radius)
 	ZEND_END_ARG_INFO()
+#endif
 #endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_negateimage_args, 0, 0, 1)
@@ -1132,18 +1166,22 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 	ZEND_END_ARG_INFO()
 
 #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_paintopaqueimage_args, 0, 0, 3)
 		ZEND_ARG_INFO(0, target_color)
 		ZEND_ARG_INFO(0, fill_color)
 		ZEND_ARG_INFO(0, fuzz)
 		ZEND_ARG_INFO(0, CHANNEL)
 	ZEND_END_ARG_INFO()
+#endif
 
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_painttransparentimage_args, 0, 0, 3)
 		ZEND_ARG_INFO(0, target_color)
 		ZEND_ARG_INFO(0, alpha)
 		ZEND_ARG_INFO(0, fuzz)
 	ZEND_END_ARG_INFO()
+#endif
 #endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_previewimages_args, 0, 0, 1)
@@ -1172,9 +1210,11 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 	ZEND_END_ARG_INFO()
 
 #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_reducenoiseimage_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, radius)
 	ZEND_END_ARG_INFO()
+#endif
 #endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_removeimageprofile_args, 0, 0, 1)
@@ -1189,13 +1229,17 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 		ZEND_ARG_INFO(0, threshold)
 	ZEND_END_ARG_INFO()
 
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setimagebias_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, bias)
 	ZEND_END_ARG_INFO()
-	
+#endif
+
+#if MagickLibVersion < 0x700
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setimagebiasquantum_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, bias)
 	ZEND_END_ARG_INFO()
+#endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_setimageblueprimary_args, 0, 0, 2)
 		ZEND_ARG_INFO(0, x)
@@ -1973,9 +2017,6 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 	ZEND_END_ARG_INFO()
 
 #ifdef IMAGICK_WITH_KERNEL
-	ZEND_BEGIN_ARG_INFO_EX(imagickkernel_zero_args, 0, 0, 0)
-	ZEND_END_ARG_INFO()
-
 	ZEND_BEGIN_ARG_INFO_EX(imagickkernel_frommatrix_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, array)
 		ZEND_ARG_INFO(0, array)
@@ -2002,7 +2043,7 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 
 static zend_function_entry php_imagick_functions[] =
 {
-	{ NULL, NULL, NULL }
+	{ NULL, NULL, NULL, 0, 0 }
 };
 
 static zend_function_entry php_imagickdraw_class_methods[] =
@@ -2162,7 +2203,7 @@ static zend_function_entry php_imagickdraw_class_methods[] =
 	PHP_ME(imagickdraw, settextdirection, imagickdraw_settextdirection_args, ZEND_ACC_PUBLIC)
 #endif //#if MagickLibVersion >= 0x692
 	
-	{ NULL, NULL, NULL }
+	{ NULL, NULL, NULL, 0, 0 }
 };
 
 ZEND_BEGIN_ARG_INFO_EX(imagickpixeliterator_getpixeliterator_args, 0, 0, 6)
@@ -2205,7 +2246,7 @@ zend_function_entry php_imagickpixeliterator_class_methods[] =
 	PHP_MALIAS(imagickpixeliterator, current, getcurrentiteratorrow, imagickpixeliterator_zero_args, ZEND_ACC_PUBLIC)
 
 	PHP_ME(imagickpixeliterator, valid, imagickpixeliterator_zero_args, ZEND_ACC_PUBLIC)
-	{ NULL, NULL, NULL }
+	{ NULL, NULL, NULL, 0, 0 }
 };
 
 
@@ -2238,7 +2279,7 @@ static zend_function_entry php_imagickpixel_class_methods[] =
 	PHP_ME(imagickpixel, setcolorfrompixel, imagickpixel_setcolorfrompixel_args, ZEND_ACC_PUBLIC)
 #endif //#if MagickLibVersion >= 0x693
 
-	{ NULL, NULL, NULL }
+	{ NULL, NULL, NULL, 0, 0 }
 };
 
 static zend_function_entry php_imagick_class_methods[] =
@@ -2803,7 +2844,7 @@ static zend_function_entry php_imagick_class_methods[] =
 	PHP_ME(imagick, identifyimagetype, imagick_zero_args, ZEND_ACC_PUBLIC)
 #endif // #if MagickLibVersion >= 0x700
 
-	{ NULL, NULL, NULL }
+	{ NULL, NULL, NULL, 0, 0 }
 };
 
 #ifdef IMAGICK_WITH_KERNEL
@@ -2815,9 +2856,9 @@ static zend_function_entry php_imagickkernel_class_methods[] =
 	PHP_ME(imagickkernel, addkernel, imagickkernel_addkernel_args, ZEND_ACC_PUBLIC)
 	PHP_ME(imagickkernel, getmatrix, imagick_zero_args, ZEND_ACC_PUBLIC)
 	PHP_ME(imagickkernel, separate, imagick_zero_args, ZEND_ACC_PUBLIC)
-	PHP_ME(imagickkernel, scale, imagick_zero_args, ZEND_ACC_PUBLIC)
-	PHP_ME(imagickkernel, addunitykernel, imagick_zero_args, ZEND_ACC_PUBLIC)
-	{ NULL, NULL, NULL }
+	PHP_ME(imagickkernel, scale, imagickkernel_scale_args, ZEND_ACC_PUBLIC)
+	PHP_ME(imagickkernel, addunitykernel, imagickkernel_addunitykernel_args, ZEND_ACC_PUBLIC)
+	{ NULL, NULL, NULL, 0, 0 }
 };
 #endif
 
@@ -3551,6 +3592,10 @@ PHP_MINIT_FUNCTION(imagick)
 	/* Initialize globals */
 	ZEND_INIT_MODULE_GLOBALS(imagick, php_imagick_init_globals, NULL);
 
+
+	// This suppresses an 'unused parameter' warning.
+	(void)type;
+
 	/*
 		Allocate some memory
 	*/
@@ -3781,6 +3826,10 @@ PHP_MINFO_FUNCTION(imagick)
 
 PHP_MSHUTDOWN_FUNCTION(imagick)
 {
+// This suppresses an 'unused parameter' warning.
+	(void)type;
+
+
 	MagickWandTerminus();
 
 #if defined(ZTS) && defined(PHP_WIN32)
@@ -3792,13 +3841,20 @@ PHP_MSHUTDOWN_FUNCTION(imagick)
 
 PHP_RINIT_FUNCTION(imagick)
 {
+	// This suppresses an 'unused parameter' warning.
+	(void)type;
+	(void)module_number;
+
 	IMAGICK_G(progress_callback) = NULL;
 	return SUCCESS;
 }
 
 PHP_RSHUTDOWN_FUNCTION(imagick)
 {
-	php_imagick_callback* progress_callback = IMAGICK_G(progress_callback); 
+	php_imagick_callback* progress_callback = IMAGICK_G(progress_callback);
+	// This suppresses an 'unused parameter' warning.
+	(void)type;
+	(void)module_number;
 
 	if (progress_callback) {
 		php_imagick_cleanup_progress_callback(progress_callback TSRMLS_CC);
diff --git a/imagick_class.c b/imagick_class.c
index 6011ff72..8de11b39 100644
--- a/imagick_class.c
+++ b/imagick_class.c
@@ -6766,7 +6766,7 @@ PHP_METHOD(imagick, getimagechannelstatistics)
 	};
 	php_imagick_object *intern;
 	ChannelStatistics *statistics;
-	int i;
+	unsigned int i;
 #if MagickLibVersion < 0x700
 	int elements = 10;
 #endif // #if MagickLibVersion >= 0x700
@@ -8450,7 +8450,7 @@ PHP_METHOD(imagick, getimagemimetype)
 
 
 static
-void s_add_assoc_str (zval *array, const char *key, const char *value, int copy)
+void s_add_assoc_str (zval *array, const char *key, const char *value)
 {
     //add_assoc_string (array, key, (char *)(value ? value : ""), copy);
     IM_add_assoc_string (array, key, (char *)(value ? value : ""));
@@ -8460,7 +8460,7 @@ void s_add_assoc_str (zval *array, const char *key, const char *value, int copy)
 static
 void s_add_named_strings (zval *array, const char *haystack TSRMLS_DC)
 {
-	int i, found;
+	unsigned int i, found;
 	char *last_ptr = NULL, *buffer;
 	size_t num_keys;
 
@@ -8572,22 +8572,22 @@ PHP_METHOD(imagick, identifyimage)
 
     // Name of the image
 	filename = MagickGetImageFilename (intern->magick_wand);
-	s_add_assoc_str (return_value, "imageName", filename, 1);
+	s_add_assoc_str (return_value, "imageName", filename);
 	IMAGICK_FREE_MAGICK_MEMORY(filename);
 
 	format = MagickGetImageFormat (intern->magick_wand);
 	if (format) {
 		char *mime_type = MagickToMime(format);
 		if (mime_type) {
-			s_add_assoc_str (return_value, "mimetype", mime_type, 1);
+			s_add_assoc_str (return_value, "mimetype", mime_type);
 			IMAGICK_FREE_MAGICK_MEMORY(mime_type);
 		} else
-			s_add_assoc_str (return_value, "mimetype", "unknown", 1);
+			s_add_assoc_str (return_value, "mimetype", "unknown");
 
 		IMAGICK_FREE_MAGICK_MEMORY(format);
 	}
 	else
-		s_add_assoc_str (return_value, "mimetype", "unknown", 1);
+		s_add_assoc_str (return_value, "mimetype", "unknown");
 
 	s_add_named_strings (return_value, identify TSRMLS_CC);
 
@@ -8625,7 +8625,7 @@ PHP_METHOD(imagick, identifyimage)
 	}
 
 	signature = MagickGetImageSignature(intern->magick_wand);
-	s_add_assoc_str (return_value, "signature", signature, 1);
+	s_add_assoc_str (return_value, "signature", signature);
 	IMAGICK_FREE_MAGICK_MEMORY(signature);
 
 	if (append_raw_string == 1)
@@ -11319,7 +11319,7 @@ PHP_METHOD(imagick, getconfigureoptions)
 	IM_LEN_TYPE pattern_len;
 	char **result;
 	char *option_value;
-	int i;
+	unsigned int i;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &pattern, &pattern_len) == FAILURE) {
 		return;
@@ -12225,7 +12225,7 @@ static KernelInfo *php_imagick_getKernelInfo(const double *color_matrix, const s
 	kernel_info->height = order;
 #if MagickLibVersion >= 0x700
 	{
-		int i;
+		unsigned int i;
 		kernel_info->values = (MagickRealType *)AcquireAlignedMemory(order, order*sizeof(MagickRealType));
 		for (i=0 ; i<order*order ; i++) {
 			kernel_info->values[i] = color_matrix[i];
@@ -12567,6 +12567,9 @@ PHP_METHOD(imagick, listregistry)
 	char *registry = NULL;
 	char *value = NULL;
 
+    // This suppresses an 'unused parameter' warning.
+	(void)execute_data;
+
 	array_init(return_value);
 
 	ResetImageRegistryIterator();
diff --git a/imagick_helpers.c b/imagick_helpers.c
index d64c7e03..2256c674 100644
--- a/imagick_helpers.c
+++ b/imagick_helpers.c
@@ -81,6 +81,10 @@ MagickBooleanType php_imagick_progress_monitor_callable(const char *text, const
 	//IMAGICK_G(progress_callback) - this should be quicker
 	php_imagick_callback *callback = (php_imagick_callback*)userData;
 
+	// This suppresses an 'unused parameter' warning.
+	// We could maybe use text.
+	(void)text;
+
 #if defined(ZEND_ENGINE_3) && defined(ZTS)
 	if( NULL == tsrm_get_ls_cache() ) {
 		return MagickTrue;
diff --git a/imagickdraw_class.c b/imagickdraw_class.c
index 1388ceae..d3eb2eac 100644
--- a/imagickdraw_class.c
+++ b/imagickdraw_class.c
@@ -154,6 +154,9 @@ PHP_METHOD(imagickdraw, settextinterlinespacing)
 PHP_METHOD(imagickdraw, __construct)
 {
 	/* Empty constructor for possible future uses */
+	// This suppresses an 'unused parameter' warning.
+	(void)execute_data;
+	(void)return_value;
 }
 /* }}} */
 
diff --git a/imagickkernel_class.c b/imagickkernel_class.c
index 402568ba..740c97f0 100644
--- a/imagickkernel_class.c
+++ b/imagickkernel_class.c
@@ -40,7 +40,7 @@ void
 static void php_imagickkernelvalues_to_zval(zval *zv, KernelInfo *kernel_info) {
 	int count;
 	double value;
-	int x, y;
+	unsigned int x, y;
 #ifdef ZEND_ENGINE_3
 	zval row;
 #else
@@ -151,7 +151,7 @@ static KernelInfo *imagick_createKernel(KernelValueType *values, size_t width, s
 	KernelInfo *kernel_info;
 
 #if MagickLibVersion >= 0x700
-	int i;
+	unsigned int i;
 	ExceptionInfo *_exception_info = (ExceptionInfo *) NULL;
 	//TODO - inspect exception info
 	kernel_info=AcquireKernelInfo(NULL, _exception_info);
@@ -204,6 +204,9 @@ static void createKernelZval(zval *pzval, KernelInfo *kernel_info TSRMLS_DC) {
 */
 PHP_METHOD(imagickkernel, __construct)
 {
+	// This suppresses an 'unused parameter' warning.
+	(void)return_value;
+
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
diff --git a/imagickpixel_class.c b/imagickpixel_class.c
index 857f387c..08a49089 100644
--- a/imagickpixel_class.c
+++ b/imagickpixel_class.c
@@ -277,6 +277,9 @@ PHP_METHOD(imagickpixel, __construct)
 	char *color_name = NULL;
 	IM_LEN_TYPE color_name_len = 0;
 
+	// This suppresses an 'unused parameter' warning.
+	(void)return_value;
+
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &color_name, &color_name_len) == FAILURE) {
 		return;
 	}