Reorganise some files

Source/Base/dn_base.h

@@ -2,7 +2,7 @@
 #define DN_BASE_H
 
 #if defined(_CLANGD)
-  #include "../dn_base_inc.h"
+  #include "../dn.h"
 #endif
 
 // NOTE: Macros

Source/Base/dn_base_containers.cpp

@@ -1,6 +1,7 @@
-#define DN_CONTAINERS_CPP
-
-#include "../dn_base_inc.h"
+#define DN_BASE_CONTAINERS_CPP
+#if defined(_CLANGD)
+#include "../dn.h"
+#endif
 
 DN_API void *DN_CArray2_InsertArray(void *data, DN_USize *size, DN_USize max, DN_USize elem_size, DN_USize index, void const *items, DN_USize count)
 {
@@ -1439,8 +1440,7 @@ DN_API DN_Str16 DN_Slice_Str16RenderSpaceSeparated(DN_Arena *arena, DN_Slice<DN_
   return result;
 }
 
-#if !defined(DN_NO_DSMAP)
-// NOTE: DN_DSMap //////////////////////////////////////////////////////////////////////////////////
+// NOTE: DN_DSMap
 DN_API DN_DSMapKey DN_DSMap_KeyU64NoHash(DN_U64 u64)
 {
   DN_DSMapKey result = {};
@@ -1474,4 +1474,3 @@ DN_API bool operator==(DN_DSMapKey lhs, DN_DSMapKey rhs)
   bool result = DN_DSMap_KeyEquals(lhs, rhs);
   return result;
 }
-#endif // !defined(DN_NO_DSMAP)

Source/Base/dn_base_containers.h

@@ -1,7 +1,9 @@
 #if !defined(DN_CONTAINERS_H)
 #define DN_CONTAINERS_H
 
-#include "../dn_base_inc.h"
+#if defined(_CLANGD)
+#include "../dn.h"
+#endif
 
 struct DN_Ring
 {

Source/Base/dn_base_leak.cpp

@@ -1,6 +1,8 @@
 #define DN_BASE_LEAK_CPP
 
-#include "../dn_base_inc.h"
+#if defined(_CLANGD)
+#include "../dn.h"
+#endif
 
 DN_API void DN_LeakTrackAlloc_(DN_LeakTracker *leak, void *ptr, DN_USize size, bool leak_permitted)
 {

Source/Base/dn_base_leak.h

@@ -1,4 +1,9 @@
-#include "../dn_base_inc.h"
+#if !defined(DN_BASE_LEAK_H)
+#define DN_BASE_LEAK_H
+
+#if defined(_CLANGD)
+  #include "../dn_base_inc.h"
+#endif
 
 enum DN_LeakAllocFlag
 {
@@ -41,4 +46,4 @@ DN_API void DN_LeakDump_        (DN_LeakTracker *leak);
 #define     DN_LeakTrackDealloc(leak, ptr)                     do { (void)ptr;                                   } while (0)
 #define     DN_LeakDump(leak)                                  do {                                              } while (0)
 #endif
-
+#endif // DN_BASE_LEAK_H

Source/Base/dn_base_log.cpp

@@ -1,6 +1,8 @@
 #define DN_BASE_LOG_CPP
 
-#include "../dn_base_inc.h"
+#if defined(_CLANDG)
+#include "../dn.h"
+#endif
 
 static DN_LOGEmitFromTypeFVFunc *g_dn_base_log_emit_from_type_fv_func_;
 static void                     *g_dn_base_log_emit_from_type_fv_user_context_;

Source/Base/dn_base_log.h

@@ -1,7 +1,9 @@
 #if !defined(DN_BASE_LOG_H)
 #define DN_BASE_LOG_H
 
-#include "../dn_base_inc.h"
+#if defined(_CLANGD)
+#include "../dn.h"
+#endif
 
 enum DN_LOGType
 {

Source/Base/dn_base_os.h

@@ -1,7 +1,9 @@
 #if !defined(DN_BASE_OS_H)
 #define DN_BASE_OS_H
 
-#include "../dn_base_inc.h"
+#if defined(_CLANGD)
+#include "../dn.h"
+#endif
 
 // NOTE: OS primitives that the OS layer can provide for the base layer but is optional.