diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8f43eead..2a7f4702b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -454,12 +454,6 @@ if(MSVC)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gd")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
 
-	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		add_definitions(-D_AMD64_)
-	else()
-		add_definitions(-D_X86_)
-	endif()
-
 	set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 	set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 
diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h
index 182c65dff..db6dc2a40 100644
--- a/winpr/include/winpr/collections.h
+++ b/winpr/include/winpr/collections.h
@@ -117,7 +117,7 @@ extern "C"
 
 	WINPR_API wObject* ArrayList_Object(wArrayList* arrayList);
 
-	typedef BOOL(ArrayList_ForEachFkt)(void* data, size_t index, va_list ap);
+	typedef BOOL (*ArrayList_ForEachFkt)(void* data, size_t index, va_list ap);
 
 	WINPR_API BOOL ArrayList_ForEach(wArrayList* arrayList, ArrayList_ForEachFkt fkt, ...);
 
diff --git a/winpr/libwinpr/utils/collections/ArrayList.c b/winpr/libwinpr/utils/collections/ArrayList.c
index 052f811fb..5480e860a 100644
--- a/winpr/libwinpr/utils/collections/ArrayList.c
+++ b/winpr/libwinpr/utils/collections/ArrayList.c
@@ -485,7 +485,7 @@ BOOL ArrayList_ForEach(wArrayList* arrayList, ArrayList_ForEachFkt fkt, ...)
 
 	ArrayList_Lock_Conditional(arrayList);
 	count = ArrayList_Count(arrayList);
-	va_start(ap, (void*)fkt);
+	va_start(ap, fkt);
 	for (index = 0; index < count; index++)
 	{
 		void* obj = ArrayList_GetItem(arrayList, index);