diff --git a/src/cli_commands.h b/src/cli_commands.h
index d8455116d..3b24dfa4d 100644
--- a/src/cli_commands.h
+++ b/src/cli_commands.h
@@ -2,8 +2,8 @@
  * It contains alternative structs which omit the parts of the commands table
  * that are not suitable for redis-cli, e.g. the command proc. */
 
-#ifndef __REDIS_CLI_COMMANDS_H
-#define __REDIS_CLI_COMMANDS_H
+#ifndef VALKEY_CLI_COMMANDS_H
+#define VALKEY_CLI_COMMANDS_H
 
 #include <stddef.h>
 #include "commands.h"
diff --git a/src/commands.h b/src/commands.h
index f09378116..fe8bb680c 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -1,5 +1,5 @@
-#ifndef __REDIS_COMMANDS_H
-#define __REDIS_COMMANDS_H
+#ifndef VALKEY_COMMANDS_H
+#define VALKEY_COMMANDS_H
 
 /* Must be synced with ARG_TYPE_STR and generate-command-code.py */
 typedef enum {
diff --git a/src/connection.h b/src/connection.h
index d0340d18f..ac4821423 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -28,8 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __REDIS_CONNECTION_H
-#define __REDIS_CONNECTION_H
+#ifndef VALKEY_CONNECTION_H
+#define VALKEY_CONNECTION_H
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/connhelpers.h b/src/connhelpers.h
index b32e44dba..28be1109b 100644
--- a/src/connhelpers.h
+++ b/src/connhelpers.h
@@ -28,8 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __REDIS_CONNHELPERS_H
-#define __REDIS_CONNHELPERS_H
+#ifndef VALKEY_CONNHELPERS_H
+#define VALKEY_CONNHELPERS_H
 
 #include "connection.h"
 
@@ -85,4 +85,4 @@ static inline int callHandler(connection *conn, ConnectionCallbackFunc handler)
     return 1;
 }
 
-#endif  /* __REDIS_CONNHELPERS_H */
+#endif  /* VALKEY_CONNHELPERS_H */
diff --git a/src/rand.h b/src/rand.h
index 9884915a9..eb885803c 100644
--- a/src/rand.h
+++ b/src/rand.h
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef REDIS_RANDOM_H
-#define REDIS_RANDOM_H
+#ifndef VALKEY_RANDOM_H
+#define VALKEY_RANDOM_H
 
 int32_t redisLrand48(void);
 void redisSrand48(int32_t seedval);
diff --git a/src/rio.h b/src/rio.h
index 2b71c5881..edad7e795 100644
--- a/src/rio.h
+++ b/src/rio.h
@@ -29,8 +29,8 @@
  */
 
 
-#ifndef __REDIS_RIO_H
-#define __REDIS_RIO_H
+#ifndef VALKEY_RIO_H
+#define VALKEY_RIO_H
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/src/server.h b/src/server.h
index ef492763b..1ea1bd7f5 100644
--- a/src/server.h
+++ b/src/server.h
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __REDIS_H
-#define __REDIS_H
+#ifndef VALKEY_H
+#define VALKEY_H
 
 #include "fmacros.h"
 #include "config.h"
diff --git a/src/serverassert.h b/src/serverassert.h
index 1cbc9fb6c..da1b7c7fa 100644
--- a/src/serverassert.h
+++ b/src/serverassert.h
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __REDIS_ASSERT_H__
-#define __REDIS_ASSERT_H__
+#ifndef VALKEY_ASSERT_H
+#define VALKEY_ASSERT_H
 
 #include "config.h"
 
diff --git a/src/util.h b/src/util.h
index e924ba8cf..727a7a909 100644
--- a/src/util.h
+++ b/src/util.h
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __REDIS_UTIL_H
-#define __REDIS_UTIL_H
+#ifndef VALKEY_UTIL_H
+#define VALKEY_UTIL_H
 
 #include <stdint.h>
 #include "sds.h"