diff --git a/Jupiter/ArrayList.h b/Jupiter/ArrayList.h
index caba7c2..6680b6e 100644
--- a/Jupiter/ArrayList.h
+++ b/Jupiter/ArrayList.h
@@ -18,14 +18,14 @@
 #if !defined _ARRAYLIST_H_HEADER
 #define _ARRAYLIST_H_HEADER
 
+/**
+ * @file ArrayList.h
+ * @brief Provides an array-based list implementation using the List interface.
+ */
+
 #include "Jupiter.h"
 #include "List.h"
 
-/**
-* @file ArrayList.h
-* @brief Provides an array-based list implementation using the List interface.
-*/
-
 namespace Jupiter
 {
 	/**
diff --git a/Jupiter/Base64.h b/Jupiter/Base64.h
index 683150f..0b7792b 100644
--- a/Jupiter/Base64.h
+++ b/Jupiter/Base64.h
@@ -18,13 +18,13 @@
 #if !defined _BASE64_H_HEADER
 #define _BASE64_H_HEADER
 
-#include "Jupiter.h"
-
 /**
  * @file Base64.h
  * @brief Provides C and C++ functions to encode/decode using base64.
  */
 
+#include "Jupiter.h"
+
 #if defined __cplusplus
 
 #include <cstdint>
diff --git a/Jupiter/DLList.h b/Jupiter/DLList.h
index 681b75f..cba6744 100644
--- a/Jupiter/DLList.h
+++ b/Jupiter/DLList.h
@@ -18,14 +18,14 @@
 #if !defined _DLLIST_H_HEADER
 #define _DLLIST_H_HEADER
 
+/**
+ * @file DLList.h
+ * @brief Provides a generic Doubly Linked List implementation using the List interface.
+ */
+
 #include "Jupiter.h"
 #include "List.h"
 
-/**
-* @file DLList.h
-* @brief Provides a generic Doubly Linked List implementation using the List interface.
-*/
-
 namespace Jupiter
 {
 	/**
diff --git a/Jupiter/List.h b/Jupiter/List.h
index 7928c42..a833208 100644
--- a/Jupiter/List.h
+++ b/Jupiter/List.h
@@ -18,12 +18,12 @@
 #if !defined _LIST_H_HEADER
 #define _LIST_H_HEADER
 
-#include "Jupiter.h"
-
 /**
-* @file List.h
-* @brief Provides a generic List interface.
-*/
+ * @file List.h
+ * @brief Provides a generic List interface.
+ */
+
+#include "Jupiter.h"
 
 namespace Jupiter
 {
diff --git a/Jupiter/Queue.h b/Jupiter/Queue.h
index 6ae229c..7d2da6f 100644
--- a/Jupiter/Queue.h
+++ b/Jupiter/Queue.h
@@ -18,12 +18,12 @@
 #if !defined _QUEUE_H_HEADER
 #define _QUEUE_H_HEADER
 
-#include "Jupiter.h"
-
 /**
-* @file Queue.h
-* @brief Provides a simple and efficient queue.
-*/
+ * @file Queue.h
+ * @brief Provides a simple and efficient queue.
+ */
+
+#include "Jupiter.h"
 
 namespace Jupiter
 {
diff --git a/Jupiter/SLList.h b/Jupiter/SLList.h
index 76c1242..da6f173 100644
--- a/Jupiter/SLList.h
+++ b/Jupiter/SLList.h
@@ -18,14 +18,14 @@
 #if !defined _SLLIST_H_HEADER
 #define _SLLIST_H_HEADER
 
+/**
+ * @file SLList.h
+ * @brief Provides a generic Singly Linked List implementation using the List interface.
+ */
+
 #include "Jupiter.h"
 #include "List.h"
 
-/**
-* @file SLList.h
-* @brief Provides a generic Singly Linked List implementation using the List interface.
-*/
-
 namespace Jupiter
 {
 	/**
diff --git a/Jupiter/SecureSocket.h b/Jupiter/SecureSocket.h
index 5442d2d..3d84e84 100644
--- a/Jupiter/SecureSocket.h
+++ b/Jupiter/SecureSocket.h
@@ -18,13 +18,13 @@
 #if !defined _SECURESOCKET_H_HEADER
 #define _SECURESOCKET_H_HEADER
 
-#include "Socket.h"
-
 /**
  * @file SecureSocket.h
  * @brief Provides an OpenSSL implementation on the Socket interface.
  */
 
+#include "Socket.h"
+
 namespace Jupiter
 {
 	/**