diff --git a/src/segment-cache.c b/src/segment-cache.c
index d93fd644..4a16a18a 100644
--- a/src/segment-cache.c
+++ b/src/segment-cache.c
@@ -11,10 +11,10 @@ terms of the MIT license. A copy of the license can be found in the file
   The full memory map of all segments is also implemented here.
 -----------------------------------------------------------------------------*/
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/atomic.h"
 
-#include "bitmap.h"  // atomic bitmap
+#include "./bitmap.h"  // atomic bitmap
 
 //#define MI_CACHE_DISABLE 1    // define to completely disable the segment cache
 
diff --git a/src/static.c b/src/static.c
index a71cddca..d992f4da 100644
--- a/src/static.c
+++ b/src/static.c
@@ -29,15 +29,8 @@ terms of the MIT license. A copy of the license can be found in the file
 #include "init.c"
 #include "options.c"
 #include "os.c"
-<<<<<<< HEAD
-#include "page.c"
-#include "prim/prim.c"
-#include "random.c"
-=======
 #include "page.c"           // includes page-queue.c
 #include "random.c" 
-#include "region.c"
->>>>>>> dev-platform
 #include "segment.c"
 #include "segment-cache.c"
 #include "stats.c"