diff --git a/examples/server/server.c b/examples/server/server.c
index 08843c539..99a2d150e 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -81,7 +81,11 @@ int catastrophic = 0; /* Use with -x flag to still exit when an error is
 static int lng_index = 0;
 
 #ifdef WOLFSSL_CALLBACKS
-    WOLFSSL_TIMEVAL srvTo;
+    #if !defined(NO_OLD_TIMEVAL_NAME)
+        Timeval srvTo;
+    #else
+        WOLFSSL_TIMEVAL srvTo;
+    #endif
     static int srvHandShakeCB(HandShakeInfo* info)
     {
         (void)info;
diff --git a/wolfssl/callbacks.h b/wolfssl/callbacks.h
index 3d1702a01..eed27293c 100644
--- a/wolfssl/callbacks.h
+++ b/wolfssl/callbacks.h
@@ -61,7 +61,9 @@ typedef struct handShakeInfo_st {
         long tv_usec; /* Microseconds. */
     } WOLFSSL_TIMEVAL;
 #endif /* HAVE_SYS_TIME_H */
-
+#if !defined(NO_OLD_TIMEVAL_NAME)
+    #define Timeval WOLFSSL_TIMEVAL
+#endif
 
 typedef struct packetInfo_st {
     char           packetName[MAX_PACKETNAME_SZ + 1]; /* SSL packet name */