diff --git a/src/gestures.c b/src/gestures.c
index 61660571a..60542ed45 100644
--- a/src/gestures.c
+++ b/src/gestures.c
@@ -40,6 +40,7 @@
 int __stdcall QueryPerformanceCounter(unsigned long long int *lpPerformanceCount);
 int __stdcall QueryPerformanceFrequency(unsigned long long int *lpFrequency);
 #elif defined(__linux)
+    #include <sys/time.h>       // Declares storage size of ‘now’
     #include <time.h>           // Used for clock functions
 #endif
 
@@ -685,4 +686,4 @@ static EM_BOOL EmscriptenInputCallback(int eventType, const EmscriptenTouchEvent
 
     return 1;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/makefile b/src/makefile
index 70fbca7cc..5f7a9e17b 100644
--- a/src/makefile
+++ b/src/makefile
@@ -67,12 +67,23 @@ else
 endif
 
 # define compiler flags:
+<<<<<<< HEAD
 #  -O1              defines optimization level
 #  -Wall            turns on most, but not all, compiler warnings
 #  -std=c99         defines C language mode (standard C from 1999 revision)
 #  -std=gnu99       defines C language mode (GNU C from 1999 revision)
 #  -fgnu89-inline   declaring inline functions support (GCC optimized, faster)
 CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline
+=======
+#  -O2         defines optimization level
+#  -Wall       turns on most, but not all, compiler warnings
+#  -std=c99    use standard C from 1999 revision
+ifeq ($(PLATFORM),PLATFORM_RPI)
+    CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline
+else
+    CFLAGS = -O1 -Wall -std=gnu99
+endif
+>>>>>>> refs/remotes/raysan5/master
 
 #CFLAGSEXTRA = -Wextra -Wmissing-prototypes -Wstrict-prototypes