diff --git a/include/cute.h b/include/cute.h
index e15ed7b1..7852c014 100644
--- a/include/cute.h
+++ b/include/cute.h
@@ -43,6 +43,7 @@
 #include "cute_guid.h"
 #include "cute_graphics.h"
 #include "cute_map.h"
+#include "cute_haptics.h"
 #include "cute_https.h"
 #include "cute_image.h"
 #include "cute_input.h"
diff --git a/include/cute_defer.h b/include/cute_defer.h
index 7259a4d6..8a822ac7 100644
--- a/include/cute_defer.h
+++ b/include/cute_defer.h
@@ -5,6 +5,9 @@
 	This software is dual-licensed with zlib or Unlicense, check LICENSE.txt for more info
 */
 
+#ifndef CF_DEFER_H
+#define CF_DEFER_H
+
 #include "cute_defines.h"
 
 #ifdef CF_CPP
@@ -61,3 +64,5 @@ static CF_ScopeExit<T> s_create_scope_helper(T func)
 #define CF_DEFER(L) const auto& CF_TOKEN_PASTE(CF_ScopeExit, __LINE__) = s_create_scope_helper([&]() { L; })
 
 #endif // CF_CPP
+
+#endif // CF_DEFER_H
diff --git a/include/cute_haptics.h b/include/cute_haptics.h
index 42bb3d6c..a0c44784 100644
--- a/include/cute_haptics.h
+++ b/include/cute_haptics.h
@@ -471,7 +471,7 @@ CF_INLINE const char* to_string(HapticWaveType type)
 	}
 }
 
-CF_INLINE Haptic haptic_open(Joypad joypad) { return cf_haptic_open(joypad); }
+CF_INLINE Haptic haptic_open(int player_index) { return cf_haptic_open(player_index); }
 CF_INLINE void haptic_close(Haptic haptic) { cf_haptic_close(haptic); }
 CF_INLINE bool haptic_supports(Haptic haptic, HapticType type) { return cf_haptic_supports(haptic,type); }
 CF_INLINE void haptic_set_gain(Haptic haptic, float gain) { cf_haptic_set_gain(haptic,gain); }
diff --git a/include/cute_networking.h b/include/cute_networking.h
index 4e75690a..b41bdc9b 100644
--- a/include/cute_networking.h
+++ b/include/cute_networking.h
@@ -8,12 +8,12 @@
 #ifndef CF_NETWORKING_H
 #define CF_NETWORKING_H
 
-#include <cute_defines.h>
+#include "cute_defines.h"
 
 // This entire file makes no sense for web builds, since web doesn't allow UDP.
 #ifndef CF_EMSCRIPTEN
 
-#include <cute_result.h>
+#include "cute_result.h"
 #include <cute/cute_net.h>
 
 //--------------------------------------------------------------------------------------------------
diff --git a/include/cute_noise.h b/include/cute_noise.h
index d0b31ff1..74145434 100644
--- a/include/cute_noise.h
+++ b/include/cute_noise.h
@@ -5,8 +5,8 @@
 	This software is dual-licensed with zlib or Unlicense, check LICENSE.txt for more info
 */
 
-#ifndef CUTE_PERLIN_H
-#define CUTE_PERLIN_H
+#ifndef CF_NOISE_H
+#define CF_NOISE_H
 
 #include "cute_defines.h"
 #include "cute_graphics.h"
@@ -211,4 +211,4 @@ CF_INLINE CF_Pixel* noise_fbm_pixels_wrapped(int w, int h, uint64_t seed, float
 
 #endif // CF_CPP
 
-#endif // CUTE_PERLIN_H
+#endif // CF_NOISE_H
diff --git a/include/cute_shader_bytecode.h b/include/cute_shader_bytecode.h
index 28166078..469146a0 100644
--- a/include/cute_shader_bytecode.h
+++ b/include/cute_shader_bytecode.h
@@ -8,7 +8,7 @@
 #ifndef CF_SHADER_BYTECODE_H
 #define CF_SHADER_BYTECODE_H
 
-#include <cute_defines.h>
+#include "cute_defines.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/cute_user_config.h b/include/cute_user_config.h
index 6c3c638e..28e04fe4 100644
--- a/include/cute_user_config.h
+++ b/include/cute_user_config.h
@@ -5,8 +5,8 @@
 	This software is dual-licensed with zlib or Unlicense, check LICENSE.txt for more info
 */
 
-#ifndef CUTE_USER_CONFIG_H
-#define CUTE_USER_CONFIG_H
+#ifndef CF_USER_CONFIG_H
+#define CF_USER_CONFIG_H
 
 /**
  * Feel free to override any macros in Cute Framework with your own. These are mainly to change the default
@@ -50,4 +50,4 @@
  * CF_FMODF
  */
 
-#endif // CUTE_USER_CONFIG_H
+#endif // CF_USER_CONFIG_H