diff --git a/shared_memory/CMakeLists.txt b/shared_memory/CMakeLists.txt
index 4ef414693..6284291d0 100644
--- a/shared_memory/CMakeLists.txt
+++ b/shared_memory/CMakeLists.txt
@@ -16,6 +16,7 @@ add_executable(shared_memory ${shared_memory_sources} ${shared_memory_headers})
 install(TARGETS shared_memory RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(shared_memory common)
+target_include_directories(shared_memory PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET shared_memory PROPERTY FOLDER executables/servers)
diff --git a/shared_memory/items.cpp b/shared_memory/items.cpp
index b1052730c..ebd3bc8dc 100644
--- a/shared_memory/items.cpp
+++ b/shared_memory/items.cpp
@@ -17,12 +17,13 @@
 */
 
 #include "items.h"
-#include "../common/global_define.h"
-#include "../common/shareddb.h"
-#include "../common/ipc_mutex.h"
-#include "../common/memory_mapped_file.h"
-#include "../common/eqemu_exception.h"
-#include "../common/item_data.h"
+
+#include "common/eqemu_exception.h"
+#include "common/global_define.h"
+#include "common/ipc_mutex.h"
+#include "common/item_data.h"
+#include "common/memory_mapped_file.h"
+#include "common/shareddb.h"
 
 void LoadItems(SharedDatabase *database, const std::string &prefix) {
 	EQ::IPCMutex mutex("items");
diff --git a/shared_memory/items.h b/shared_memory/items.h
index 47dcbaac9..4bc891d90 100644
--- a/shared_memory/items.h
+++ b/shared_memory/items.h
@@ -16,13 +16,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef __EQEMU_SHARED_MEMORY_ITEMS_H
-#define __EQEMU_SHARED_MEMORY_ITEMS_H
+#pragma once
+
+#include "common/eqemu_config.h"
 
 #include <string>
-#include "../common/eqemu_config.h"
 
 class SharedDatabase;
 void LoadItems(SharedDatabase *database, const std::string &prefix);
-
-#endif
diff --git a/shared_memory/main.cpp b/shared_memory/main.cpp
index d29bd31e4..b3f1d83af 100644
--- a/shared_memory/main.cpp
+++ b/shared_memory/main.cpp
@@ -16,33 +16,29 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include <stdio.h>
-
-#include "../common/eqemu_logsys.h"
-#include "../common/global_define.h"
-#include "../common/shareddb.h"
-#include "../common/eqemu_config.h"
-#include "../common/platform.h"
-#include "../common/crash.h"
-#include "../common/rulesys.h"
-#include "../common/eqemu_exception.h"
-#include "../common/strings.h"
-#include "items.h"
-#include "spells.h"
-#include "../common/content/world_content_service.h"
-#include "../common/zone_store.h"
-#include "../common/path_manager.h"
-#include "../common/events/player_event_logs.h"
-#include "../common/evolving_items.h"
+#include "shared_memory/items.h"
+#include "shared_memory/spells.h"
+#include "common/content/world_content_service.h"
+#include "common/crash.h"
+#include "common/eqemu_config.h"
+#include "common/eqemu_exception.h"
+#include "common/eqemu_logsys.h"
+#include "common/events/player_event_logs.h"
+#include "common/evolving_items.h"
+#include "common/global_define.h"
+#include "common/path_manager.h"
+#include "common/platform.h"
+#include "common/rulesys.h"
+#include "common/shareddb.h"
+#include "common/strings.h"
+#include "common/zone_store.h"
 
+#include <cstdio>
 #ifdef _WINDOWS
 #include <direct.h>
 #else
-
 #include <unistd.h>
-
 #endif
-
 #include <sys/stat.h>
 
 inline bool MakeDirectory(const std::string &directory_name)
diff --git a/shared_memory/spells.cpp b/shared_memory/spells.cpp
index 0faf5d764..e5db69cdc 100644
--- a/shared_memory/spells.cpp
+++ b/shared_memory/spells.cpp
@@ -17,12 +17,13 @@
 */
 
 #include "spells.h"
-#include "../common/global_define.h"
-#include "../common/shareddb.h"
-#include "../common/ipc_mutex.h"
-#include "../common/memory_mapped_file.h"
-#include "../common/eqemu_exception.h"
-#include "../common/spdat.h"
+
+#include "common/eqemu_exception.h"
+#include "common/global_define.h"
+#include "common/ipc_mutex.h"
+#include "common/memory_mapped_file.h"
+#include "common/shareddb.h"
+#include "common/spdat.h"
 
 void LoadSpells(SharedDatabase *database, const std::string &prefix) {
 	EQ::IPCMutex mutex("spells");
diff --git a/shared_memory/spells.h b/shared_memory/spells.h
index bdda1eac4..f6fd19653 100644
--- a/shared_memory/spells.h
+++ b/shared_memory/spells.h
@@ -16,13 +16,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef __EQEMU_SHARED_MEMORY_SPELLS_H
-#define __EQEMU_SHARED_MEMORY_SPELLS_H
+#pragma once
+
+#include "common/eqemu_config.h"
 
 #include <string>
-#include "../common/eqemu_config.h"
 
 class SharedDatabase;
 void LoadSpells(SharedDatabase *database, const std::string &prefix);
-
-#endif