diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt
index fac7d362f..5e4898b79 100644
--- a/apps/openmw-mp/CMakeLists.txt
+++ b/apps/openmw-mp/CMakeLists.txt
@@ -74,10 +74,12 @@ set(SERVER
     Script/Script.cpp Script/ScriptFunction.cpp
     Script/ScriptFunctions.cpp
 
+    Script/Functions/Actors.cpp Script/Functions/World.cpp Script/Functions/Miscellaneous.cpp
+
     Script/Functions/CharClass.cpp Script/Functions/Chat.cpp Script/Functions/GUI.cpp
     Script/Functions/Items.cpp Script/Functions/Quests.cpp Script/Functions/Stats.cpp
     Script/Functions/Spells.cpp Script/Functions/Timer.cpp Script/Functions/Positions.cpp
-    Script/Functions/Cells.cpp Script/Functions/World.cpp Script/Functions/Miscellaneous.cpp
+    Script/Functions/Cells.cpp
 
     ProcessorInitializer.cpp PlayerProcessor.cpp ActorProcessor.cpp WorldProcessor.cpp
 
diff --git a/apps/openmw-mp/Script/Functions/Actors.hpp b/apps/openmw-mp/Script/Functions/Actors.hpp
index 9f607b966..e25d07770 100644
--- a/apps/openmw-mp/Script/Functions/Actors.hpp
+++ b/apps/openmw-mp/Script/Functions/Actors.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_ACTORFUNCTIONS_HPP
-#define OPENMW_ACTORFUNCTIONS_HPP
+#ifndef OPENMW_ACTORAPI_HPP
+#define OPENMW_ACTORAPI_HPP
 
 #define ACTORAPI \
     {"InitActorList",          ActorFunctions::InitActorList},\
@@ -16,4 +16,4 @@ public:
 };
 
 
-#endif //OPENMW_ACTORFUNCTIONS_HPP
+#endif //OPENMW_ACTORAPI_HPP
diff --git a/apps/openmw-mp/Script/Functions/CharClass.hpp b/apps/openmw-mp/Script/Functions/CharClass.hpp
index 42eda912a..83c5a1719 100644
--- a/apps/openmw-mp/Script/Functions/CharClass.hpp
+++ b/apps/openmw-mp/Script/Functions/CharClass.hpp
@@ -2,8 +2,8 @@
 // Created by koncord on 29.08.16.
 //
 
-#ifndef OPENMW_CHARCLASS_HPP
-#define OPENMW_CHARCLASS_HPP
+#ifndef OPENMW_CHARCLASSAPI_HPP
+#define OPENMW_CHARCLASSAPI_HPP
 
 #include "../Types.hpp"
 
@@ -79,4 +79,4 @@ public:
     static void SendClass(unsigned short pid) noexcept;
 };
 
-#endif //OPENMW_CHARCLASS_HPP
+#endif //OPENMW_CHARCLASSAPI_HPP
diff --git a/apps/openmw-mp/Script/Functions/GUI.hpp b/apps/openmw-mp/Script/Functions/GUI.hpp
index 8d51e4a3e..2bca9453b 100644
--- a/apps/openmw-mp/Script/Functions/GUI.hpp
+++ b/apps/openmw-mp/Script/Functions/GUI.hpp
@@ -2,8 +2,8 @@
 // Created by koncord on 30.08.16.
 //
 
-#ifndef OPENMW_GUI_HPP
-#define OPENMW_GUI_HPP
+#ifndef OPENMW_GUIAPI_HPP
+#define OPENMW_GUIAPI_HPP
 
 #define GUIAPI \
     {"MessageBox",          GUIFunctions::_MessageBox},\
@@ -32,4 +32,4 @@ public:
     static void SetConsoleAllow(unsigned short pid, bool state);
 };
 
-#endif //OPENMW_GUI_HPP
+#endif //OPENMW_GUIAPI_HPP
diff --git a/apps/openmw-mp/Script/Functions/Items.hpp b/apps/openmw-mp/Script/Functions/Items.hpp
index 4904d918a..e70c22a09 100644
--- a/apps/openmw-mp/Script/Functions/Items.hpp
+++ b/apps/openmw-mp/Script/Functions/Items.hpp
@@ -2,8 +2,8 @@
 // Created by koncord on 30.08.16.
 //
 
-#ifndef OPENMW_ITEMS_HPP
-#define OPENMW_ITEMS_HPP
+#ifndef OPENMW_ITEMAPI_HPP
+#define OPENMW_ITEMAPI_HPP
 
 #define ITEMAPI \
     {"GetEquipmentSize",        ItemFunctions::GetEquipmentSize},\
@@ -59,4 +59,4 @@ private:
 
 };
 
-#endif //OPENMW_ITEMS_HPP
+#endif //OPENMW_ITEMAPI_HPP
diff --git a/apps/openmw-mp/Script/Functions/Quests.hpp b/apps/openmw-mp/Script/Functions/Quests.hpp
index d8fa18286..21219def1 100644
--- a/apps/openmw-mp/Script/Functions/Quests.hpp
+++ b/apps/openmw-mp/Script/Functions/Quests.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_QUESTS_HPP
-#define OPENMW_QUESTS_HPP
+#ifndef OPENMW_QUESTAPI_HPP
+#define OPENMW_QUESTAPI_HPP
 
 #define QUESTAPI \
     {"GetJournalChangesSize",   QuestFunctions::GetJournalChangesSize},\
@@ -31,4 +31,4 @@ private:
 
 };
 
-#endif //OPENMW_QUESTS_HPP
+#endif //OPENMW_QUESTAPI_HPP
diff --git a/apps/openmw-mp/Script/Functions/Spells.hpp b/apps/openmw-mp/Script/Functions/Spells.hpp
index b163b1e9f..82553c28a 100644
--- a/apps/openmw-mp/Script/Functions/Spells.hpp
+++ b/apps/openmw-mp/Script/Functions/Spells.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_SPELLS_HPP
-#define OPENMW_SPELLS_HPP
+#ifndef OPENMW_SPELLAPI_HPP
+#define OPENMW_SPELLAPI_HPP
 
 #define SPELLAPI \
     {"GetSpellbookChangesSize", SpellFunctions::GetSpellbookChangesSize},\
@@ -31,4 +31,4 @@ private:
 
 };
 
-#endif //OPENMW_SPELLS_HPP
+#endif //OPENMW_SPELLAPI_HPP
diff --git a/apps/openmw-mp/Script/Functions/Stats.hpp b/apps/openmw-mp/Script/Functions/Stats.hpp
index 47d13ebb1..b08980362 100644
--- a/apps/openmw-mp/Script/Functions/Stats.hpp
+++ b/apps/openmw-mp/Script/Functions/Stats.hpp
@@ -2,10 +2,10 @@
 // Created by koncord on 30.08.16.
 //
 
-#ifndef OPENMW_STATS_HPP
-#define OPENMW_STATS_HPP
+#ifndef OPENMW_STATAPI_HPP
+#define OPENMW_STATAPI_HPP
 
-#define STATSAPI \
+#define STATAPI \
     {"GetName",                 StatsFunctions::GetName},\
     {"SetName",                 StatsFunctions::SetName},\
     \
@@ -148,4 +148,4 @@ public:
     static void SendLevel(unsigned short pid) noexcept;
 };
 
-#endif //OPENMW_STATS_HPP
+#endif //OPENMW_STATAPI_HPP
diff --git a/apps/openmw-mp/Script/Functions/World.hpp b/apps/openmw-mp/Script/Functions/World.hpp
index 1eae2b571..85099aa0a 100644
--- a/apps/openmw-mp/Script/Functions/World.hpp
+++ b/apps/openmw-mp/Script/Functions/World.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_WORLD_HPP
-#define OPENMW_WORLD_HPP
+#ifndef OPENMW_WORLDAPI_HPP
+#define OPENMW_WORLDAPI_HPP
 
 #define WORLDAPI \
     {"InitScriptEvent",             WorldFunctions::InitScriptEvent},\
@@ -134,4 +134,4 @@ public:
 };
 
 
-#endif //OPENMW_WORLD_HPP
+#endif //OPENMW_WORLDAPI_HPP
diff --git a/apps/openmw-mp/Script/ScriptFunctions.hpp b/apps/openmw-mp/Script/ScriptFunctions.hpp
index b0e61a91b..01635ce4a 100644
--- a/apps/openmw-mp/Script/ScriptFunctions.hpp
+++ b/apps/openmw-mp/Script/ScriptFunctions.hpp
@@ -95,7 +95,7 @@ public:
 
             POSITIONAPI,
             CELLAPI,
-            STATSAPI,
+            STATAPI,
             ITEMAPI,
             QUESTAPI,
             SPELLAPI,