diff --git a/src/cn-cbor.c b/src/cn-cbor.c
index b3f68ae..dd2728d 100644
--- a/src/cn-cbor.c
+++ b/src/cn-cbor.c
@@ -1,6 +1,3 @@
-#ifndef CN_CBOR_C
-#define CN_CBOR_C
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -388,5 +385,3 @@
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* CN_CBOR_C */
diff --git a/test/ctest.h b/test/ctest.h
index 16ed095..2d9cbae 100644
--- a/test/ctest.h
+++ b/test/ctest.h
@@ -265,7 +265,7 @@
 	const char* caller,
 	int line)
 {
-	int i;
+	size_t i;
 	if (expsize != realsize) {
 		CTEST_ERR("%s:%d  expected %d bytes, got %d", caller, line, expsize, realsize);
 	}
diff --git a/test/memory_test.c b/test/memory_test.c
index e370bd5..d565a6e 100644
--- a/test/memory_test.c
+++ b/test/memory_test.c
@@ -44,7 +44,7 @@
 	cbor = cn_cbor_int_create(20, context, NULL);
 	cn_cbor_free(cbor, context);
 
-#ifndef CBOR_NO_FLOATS
+#ifndef CBOR_NO_FLOAT
 	cbor = cn_cbor_float_create((float)20.2, context, NULL);
 	cn_cbor_free(cbor, context);
 
@@ -274,7 +274,7 @@
 		cn_cbor_array_append(cborRoot, cbor2, NULL);
 		cbor2 = NULL;
 
-#ifndef CBOR_NO_FLOATS
+#ifndef CBOR_NO_FLOAT
 		cbor = cn_cbor_float_create(9, context, NULL);
 		if (cbor == NULL) {
 			goto errorReturn;