diff --git a/frontend/src/main.c b/frontend/src/main.c
index 50b4588..7ac66eb 100644
--- a/frontend/src/main.c
+++ b/frontend/src/main.c
@@ -9,18 +9,23 @@
 #	define _GNU_SOURCE 1
 #endif
 
+/* Internal */
 #include <slunkcrypt.h>
 #include "utils.h"
 #include "crc.h"
 #include "test.h"
+
+/* CRT */
 #include <string.h>
 #include <time.h>
 #include <inttypes.h>
 #include <ctype.h>
 #include <signal.h>
 
+/* Const */
 #define BUFFER_SIZE 4096U
 
+/* Op-mode */
 #define SLUNK_MODE_HELP 0
 #define SLUNK_MODE_VERS 1
 #define SLUNK_MODE_ENCR 2
diff --git a/frontend/src/utils.c b/frontend/src/utils.c
index dd033e9..016db2d 100644
--- a/frontend/src/utils.c
+++ b/frontend/src/utils.c
@@ -10,8 +10,11 @@
 #	define _GNU_SOURCE 1
 #endif
 
-#include "utils.h"
+/* Internal */
 #include <slunkcrypt.h>
+#include "utils.h"
+
+/* CRT */
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <signal.h>
diff --git a/libslunkcrypt/src/junk.c b/libslunkcrypt/src/junk.c
index 3f8658b..2c8b7f2 100644
--- a/libslunkcrypt/src/junk.c
+++ b/libslunkcrypt/src/junk.c
@@ -3,6 +3,13 @@
 /* This work has been released under the CC0 1.0 Universal license!           */
 /******************************************************************************/
 
+#ifdef _WIN32
+#	define WIN32_LEAN_AND_MEAN 1
+#	define _CRT_SECURE_NO_WARNINGS 1
+#else
+#	define _GNU_SOURCE 1
+#endif
+
 /* Internal */
 #include "../include/slunkcrypt.h"
 
@@ -13,7 +20,6 @@
 
 /* Platform compatibility */
 #ifdef _WIN32
-#	define WIN32_LEAN_AND_MEAN 1
 #	include <Windows.h>
 #else
 #	include <unistd.h>
diff --git a/libslunkcrypt/src/slunkcrypt.c b/libslunkcrypt/src/slunkcrypt.c
index 7705957..3b56270 100644
--- a/libslunkcrypt/src/slunkcrypt.c
+++ b/libslunkcrypt/src/slunkcrypt.c
@@ -3,10 +3,6 @@
 /* This work has been released under the CC0 1.0 Universal license!           */
 /******************************************************************************/
 
-#ifdef _WIN32
-#define  _CRT_RAND_S 1
-#endif
-
 /* Internal */
 #include "../include/slunkcrypt.h"
 #include "version.h"