diff --git a/client/Android/.gitignore b/client/Android/.gitignore
index 1eee223a1..31b2e3c80 100644
--- a/client/Android/.gitignore
+++ b/client/Android/.gitignore
@@ -8,3 +8,7 @@ libs/armeabi*
 AndroidManifest.xml
 local.properties
 !.project
+
+FreeRDPCore/project.properties
+FreeRDPCore/src/com/freerdp/freerdpcore/utils/BuildConfiguration.java
+aFreeRDP/project.properties
diff --git a/client/Android/FreeRDPCore/.gitignore b/client/Android/FreeRDPCore/.gitignore
new file mode 100644
index 000000000..2d8df2acd
--- /dev/null
+++ b/client/Android/FreeRDPCore/.gitignore
@@ -0,0 +1,4 @@
+ant.properties
+build.xml
+jni/Android.mk
+jni/Application.mk
diff --git a/client/Android/aFreeRDP/.gitignore b/client/Android/aFreeRDP/.gitignore
new file mode 100644
index 000000000..2d8df2acd
--- /dev/null
+++ b/client/Android/aFreeRDP/.gitignore
@@ -0,0 +1,4 @@
+ant.properties
+build.xml
+jni/Android.mk
+jni/Application.mk
diff --git a/winpr/libwinpr/io/io.c b/winpr/libwinpr/io/io.c
index ad2c3930c..3fa4fc207 100644
--- a/winpr/libwinpr/io/io.c
+++ b/winpr/libwinpr/io/io.c
@@ -57,7 +57,7 @@ BOOL GetOverlappedResult(HANDLE hFile, LPOVERLAPPED lpOverlapped, LPDWORD lpNumb
 
 	else if (Type == HANDLE_TYPE_NAMED_PIPE)
 	{
-		int status;
+		int status = -1;
 		DWORD request;
 		PVOID lpBuffer;
 		DWORD nNumberOfBytes;
diff --git a/winpr/libwinpr/synch/synch.h b/winpr/libwinpr/synch/synch.h
index 2b326ad9b..fbde1d4a8 100644
--- a/winpr/libwinpr/synch/synch.h
+++ b/winpr/libwinpr/synch/synch.h
@@ -99,9 +99,6 @@ struct winpr_timer
 	
 #ifdef WITH_POSIX_TIMER
 	timer_t tid;
-#endif
-
-#ifdef HAVE_TIMERFD_H
 	struct itimerspec timeout;
 #endif
 };