diff --git a/src/gestures.h b/src/gestures.h
index 77c95c082..9cf535364 100644
--- a/src/gestures.h
+++ b/src/gestures.h
@@ -64,7 +64,7 @@
 // Boolean type
 #if defined(__STDC__) && __STDC_VERSION__ >= 199901L
     #include <stdbool.h>
-#elif !defined(__cplusplus) && !defined(bool)
+#elif !defined(__cplusplus) && !defined(bool) && !defined(RL_BOOL_TYPE)
     typedef enum bool { false, true } bool;
 #endif
 
diff --git a/src/raylib.h b/src/raylib.h
index bb698a459..e698ec7de 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -1108,7 +1108,6 @@ RLAPI Vector2 GetTouchPosition(int index);                    // Get touch posit
 RLAPI int GetTouchPointId(int index);                         // Get touch point identifier for given index
 RLAPI int GetTouchPointCount(void);                           // Get number of touch points
 
-
 //------------------------------------------------------------------------------------
 // Gestures and Touch Handling Functions (Module: gestures)
 //------------------------------------------------------------------------------------
@@ -1337,9 +1336,9 @@ RLAPI Rectangle GetGlyphAtlasRec(Font font, int codepoint);
 // Text codepoints management functions (unicode characters)
 RLAPI int *LoadCodepoints(const char *text, int *count);              // Load all codepoints from a UTF-8 text string, codepoints count returned by parameter
 RLAPI void UnloadCodepoints(int *codepoints);                         // Unload codepoints data from memory
-RLAPI int GetCodepointCount(const char *text);                       // Get total number of codepoints in a UTF-8 encoded string
+RLAPI int GetCodepointCount(const char *text);                        // Get total number of codepoints in a UTF-8 encoded string
 RLAPI int GetCodepoint(const char *text, int *bytesProcessed);        // Get next codepoint in a UTF-8 encoded string, 0x3f('?') is returned on failure
-RLAPI const char *CodepointToUTF8(int codepoint, int *byteSize);    // Encode one codepoint into UTF-8 byte array (array length returned as parameter)
+RLAPI const char *CodepointToUTF8(int codepoint, int *byteSize);      // Encode one codepoint into UTF-8 byte array (array length returned as parameter)
 RLAPI char *TextCodepointsToUTF8(int *codepoints, int length);        // Encode text as codepoints array into UTF-8 text string (WARNING: memory must be freed!)
 
 // Text strings management functions (no UTF-8 strings, only byte chars)
diff --git a/src/raymath.h b/src/raymath.h
index 3addc25de..43e81135e 100644
--- a/src/raymath.h
+++ b/src/raymath.h
@@ -88,7 +88,6 @@
 //----------------------------------------------------------------------------------
 // Types and Structures Definition
 //----------------------------------------------------------------------------------
-
 #if !defined(RL_VECTOR2_TYPE)
 // Vector2 type
 typedef struct Vector2 {