diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72fc73522..0eb146dcb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,8 @@ option(USE_STD_MALLOC       "Use standard malloc instead of TBB"     ON)
 option(ACE_USE_EXTERNAL     "Use external ACE"                       OFF)
 option(POSTGRESQL           "Use PostgreSQL"                         OFF)
 option(BUILD_TOOLS          "Build tools (map/vmap/mmap extractors)" OFF)
+option(SCRIPT_LIB_ELUNA     "Use Eluna as the scripting engine"      ON)
+option(SCRIPT_LIB_SD2       "Use ScriptDev2 as the scripting engine" ON)
 
 if(PCHSupport_FOUND AND WIN32) # TODO: why only enable it on windows by default?
   option(PCH                "Use precompiled headers"               ON)
@@ -49,12 +51,16 @@ message("")
 message(
   "This script builds the MaNGOS server.
   Options that can be used in order to configure the process:
+   General:
     CMAKE_INSTALL_PREFIX    Path where the server should be installed to
     PCH                     Use precompiled headers
     DEBUG                   Debug mode
     USE_STD_MALLOC          Use standard malloc instead of TBB
     ACE_USE_EXTERNAL        Use external ACE
     BUILD_TOOLS             Build map/vmap/mmap extractors
+   Scripting engines:
+    SCRIPT_LIB_ELUNA        Compile with support for Eluna scripts
+    SCRIPT_LIB_SD2          Compile with support for ScriptDev2 scripts
 
   To set an option simply type -D<OPTION>=<VALUE> after 'cmake <srcs>'.
   Also, you can specify the generator with -G. see 'cmake --help' for more details
@@ -355,6 +361,17 @@ else()
   set(ENABLE_SOAP OFF)
 endif()
 
+set(ENABLE_ELUNA OFF)
+set(ENABLE_SD2 OFF)
+
+if (SCRIPT_LIB_ELUNA)
+   set(ENABLE_ELUNA ON)
+endif()
+
+if (SCRIPT_LIB_SD2)
+   set(ENABLE_SD2 ON)
+endif()
+
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h")
 
 add_subdirectory(dep)
diff --git a/config.h.cmake b/config.h.cmake
index bff68024f..ebfceac70 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -31,6 +31,10 @@
 
 #cmakedefine ENABLE_SOAP
 
+#cmakedefine ENABLE_ELUNA
+
+#cmakedefine ENABLE_SD2
+
 #define VERSION "${MANGOS_VERSION}"
 
 #endif /* HAVE_CONFIG_H */
diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
index 016208825..fe403984f 100644
--- a/dep/CMakeLists.txt
+++ b/dep/CMakeLists.txt
@@ -21,4 +21,7 @@ endif()
 add_subdirectory(recastnavigation)
 add_subdirectory(src)
 add_subdirectory(libmpq)
-add_subdirectory(lualib)
+
+if(SCRIPT_LIB_ELUNA)
+    add_subdirectory(lualib)
+endif()
\ No newline at end of file
diff --git a/src/game/AuctionHouseHandler.cpp b/src/game/AuctionHouseHandler.cpp
index fe428979a..777984259 100644
--- a/src/game/AuctionHouseHandler.cpp
+++ b/src/game/AuctionHouseHandler.cpp
@@ -35,7 +35,9 @@
 #include "Mail.h"
 #include "Util.h"
 #include "Chat.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 /** \addtogroup auctionhouse
  * @{
@@ -338,7 +340,9 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recv_data)
     SendAuctionCommandResult(AH, AUCTION_STARTED, AUCTION_OK);
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnAdd(auctionHouse);
+#endif /* ENABLE_ELUNA */
 }
 
 // this function is called when client bids or buys out auction
@@ -490,7 +494,9 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket& recv_data)
     sAuctionMgr.RemoveAItem(auction->itemGuidLow);
     auctionHouse->RemoveAuction(auction->Id);
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnRemove(auctionHouse);
+#endif /* ENABLE_ELUNA */
     delete auction;
 }
 
diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp
index fb5cf8ad8..8ee20c55f 100644
--- a/src/game/AuctionHouseMgr.cpp
+++ b/src/game/AuctionHouseMgr.cpp
@@ -39,7 +39,9 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Mail.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 #include "Policies/Singleton.h"
 
@@ -62,7 +64,9 @@ AuctionHouseMgr::~AuctionHouseMgr()
 
 AuctionHouseObject::~AuctionHouseObject()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 
     for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr)
         delete itr->second;
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index 61f4a0159..3c27ee056 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -26,7 +26,6 @@ include_directories(
   "${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour"
   "${CMAKE_SOURCE_DIR}/dep/recastnavigation/"
   "${CMAKE_SOURCE_DIR}/dep/include"
-  "${CMAKE_SOURCE_DIR}/dep/lualib"
   "${CMAKE_SOURCE_DIR}/src/shared"
   "${CMAKE_SOURCE_DIR}/src/framework"
   "${CMAKE_SOURCE_DIR}/src/game/LuaEngine"
@@ -36,6 +35,10 @@ include_directories(
   "${ACE_INCLUDE_DIR}"
 )
 
+if(SCRIPT_LIB_ELUNA)
+    include_directories("${CMAKE_SOURCE_DIR}/dep/lualib")
+endif()
+
 set(SRC_GRP_AHBOT
     AuctionHouseBot/AuctionHouseBot.cpp
     AuctionHouseBot/AuctionHouseBot.h
@@ -55,10 +58,12 @@ set(SRC_GRP_BATTLEGROUND
     BattleGround/BattleGroundWS.h
 )
 
-file(GLOB SRC_FILES_LUAENGINE LuaEngine/*.cpp LuaEngine/*.h)
-set(SRC_GRP_LUAENGINE
-    ${SRC_FILES_LUAENGINE}
-)
+if (SCRIPT_LIB_ELUNA)
+    file(GLOB SRC_FILES_LUAENGINE LuaEngine/*.cpp LuaEngine/*.h)
+    set(SRC_GRP_LUAENGINE
+        ${SRC_FILES_LUAENGINE}
+    )
+endif()
 
 set(SRC_GRP_CHAT_COMMANDS
     debugcmds.cpp
@@ -375,7 +380,6 @@ set(SRC_GRP_WORLD_HANDLERS
 set(LIBRARY_SRCS
     ${SRC_GRP_AHBOT}
     ${SRC_GRP_BATTLEGROUND}
-    ${SRC_GRP_LUAENGINE}
     ${SRC_GRP_CHAT_COMMANDS}
     ${SRC_GRP_MOTION_GEN}
     ${SRC_GRP_MOVEMENT}
@@ -390,6 +394,10 @@ set(LIBRARY_SRCS
     pchdef.h
 )
 
+if(SCRIPT_LIB_ELUNA)
+    list(APPEND LIBRARY_SRCS ${SRC_GRP_LUAENGINE})
+endif()
+
 source_group("AhBot"
   FILES
     ${SRC_GRP_AHBOT}
@@ -400,10 +408,12 @@ source_group("BattleGround"
     ${SRC_GRP_BATTLEGROUND}
 )
 
-source_group("LuaEngine"
-  FILES
-    ${SRC_GRP_LUAENGINE}
-)
+if(SCRIPT_LIB_ELUNA)
+    source_group("LuaEngine"
+      FILES
+        ${SRC_GRP_LUAENGINE}
+    )
+endif()
 
 source_group("Chat Commands"
   FILES
@@ -466,9 +476,12 @@ add_library(${LIBRARY_NAME} STATIC
 target_link_libraries(${LIBRARY_NAME}
   shared
   detour
-  lualib
 )
 
+if(SCRIPT_LIB_ELUNA)
+    target_link_libraries(${LIBRARY_NAME} lualib)
+endif()
+
 if(UNIX)
   # Both systems don't have libdl and don't need them
   if (NOT (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD"))
@@ -479,9 +492,12 @@ if(UNIX)
 endif()
 
 add_dependencies(${LIBRARY_NAME} revision.h)
-add_dependencies(${LIBRARY_NAME} lualib)
+if(SCRIPT_LIB_ELUNA)
+    add_dependencies(${LIBRARY_NAME} lualib)
+endif()
+
 if(NOT ACE_USE_EXTERNAL)
-  add_dependencies(${LIBRARY_NAME} ACE_Project)
+    add_dependencies(${LIBRARY_NAME} ACE_Project)
 endif()
 
 # Generate precompiled header
@@ -500,4 +516,6 @@ if(PCH)
 endif()
 
 add_subdirectory(AuctionHouseBot)
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/extensions DESTINATION ${BIN_DIR}/lua_scripts/)
+if(SCRIPT_LIB_ELUNA)
+    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/extensions DESTINATION ${BIN_DIR}/lua_scripts/)
+endif()
diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index c47500c80..931225ba5 100644
--- a/src/game/CharacterHandler.cpp
+++ b/src/game/CharacterHandler.cpp
@@ -45,7 +45,9 @@
 #include "Language.h"
 #include "Chat.h"
 #include "SpellMgr.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 // config option SkipCinematics supported values
 enum CinematicsSkipMode
@@ -366,7 +368,9 @@ void WorldSession::HandleCharCreateOpcode(WorldPacket& recv_data)
     sLog.outChar("Account: %d (IP: %s) Create Character:[%s] (guid: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), pNewChar->GetGUIDLow());
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnCreate(pNewChar);
+#endif /* ENABLE_ELUNA */
 
     delete pNewChar;                                        // created only to call SaveToDB()
 }
@@ -412,7 +416,9 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket& recv_data)
     sLog.outChar("Account: %d (IP: %s) Delete Character:[%s] (guid: %u)", GetAccountId(), IP_str.c_str(), name.c_str(), lowguid);
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnDelete(lowguid);
+#endif /* ENABLE_ELUNA */
 
     if (sLog.IsOutCharDump())                               // optimize GetPlayerDump call
     {
@@ -711,8 +717,10 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
     }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (pCurrChar->HasAtLoginFlag(AT_LOGIN_FIRST))
         sEluna->OnFirstLogin(pCurrChar);
+#endif /* ENABLE_ELUNA */
 
 
     /* We've done what we need to, remove the flag */
@@ -758,7 +766,9 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
     m_playerLoading = false;
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnLogin(pCurrChar);
+#endif /* ENABLE_ELUNA */
 
     /* Used for movement */
     m_clientTimeDelay = 0;
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
index 90aa99f6a..bf52c5b50 100644
--- a/src/game/Chat.cpp
+++ b/src/game/Chat.cpp
@@ -41,7 +41,9 @@
 #include "PoolManager.h"
 #include "GameEventMgr.h"
 #include "AuctionHouseBot/AuctionHouseBot.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 // Supported shift-links (client generated and server side)
 // |color|Harea:area_id|h[name]|h|r
@@ -1200,8 +1202,10 @@ void ChatHandler::ExecuteCommand(const char* text)
         }
         case CHAT_COMMAND_UNKNOWN_SUBCOMMAND:
         {
+#ifdef ENABLE_ELUNA
             if (!sEluna->OnCommand(m_session ? m_session->GetPlayer() : NULL, fullcmd.c_str()))
                 return;
+#endif /* ENABLE_ELUNA */
             SendSysMessage(LANG_NO_SUBCMD);
             ShowHelpForCommand(command->ChildCommands, text);
             SetSentErrorMessage(true);
@@ -1209,8 +1213,10 @@ void ChatHandler::ExecuteCommand(const char* text)
         }
         case CHAT_COMMAND_UNKNOWN:
         {
+#ifdef ENABLE_ELUNA
             if (!sEluna->OnCommand(m_session ? m_session->GetPlayer() : NULL, fullcmd.c_str()))
                 return;
+#endif /* ENABLE_ELUNA */
             SendSysMessage(LANG_NO_CMD);
             SetSentErrorMessage(true);
             break;
diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp
index b1b2debc1..26008e778 100644
--- a/src/game/ChatHandler.cpp
+++ b/src/game/ChatHandler.cpp
@@ -41,7 +41,9 @@
 #include "Util.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 bool WorldSession::processChatmessageFurtherAfterSecurityChecks(std::string& msg, uint32 lang)
 {
@@ -174,20 +176,26 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
 
             if (type == CHAT_MSG_SAY)
             {
+#ifdef ENABLE_ELUNA
                 if (!sEluna->OnChat(GetPlayer(), type, lang, msg))
                     return;
+#endif /* ENABLE_ELUNA */
                  GetPlayer()->Say(msg, lang);
             }
             else if (type == CHAT_MSG_EMOTE)
             {
+#ifdef ENABLE_ELUNA
                 if (!sEluna->OnChat(GetPlayer(), type, LANG_UNIVERSAL, msg))
                     return;
+#endif /* ENABLE_ELUNA */
                  GetPlayer()->TextEmote(msg);
             }
             else if (type == CHAT_MSG_YELL)
             {
+#ifdef ENABLE_ELUNA
                 if (!sEluna->OnChat(GetPlayer(), type, lang, msg))
                     return;
+#endif /* ENABLE_ELUNA */
                  GetPlayer()->Yell(msg, lang);
             }
          } break;
@@ -229,7 +237,9 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
             }
 
             // Used by Eluna
+#ifdef ENABLE_ELUNA
             sEluna->OnChat(GetPlayer(), type, lang, msg, player);
+#endif /* ENABLE_ELUNA */
             GetPlayer()->Whisper(msg, lang, player->GetObjectGuid());
         } break;
 
@@ -260,8 +270,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
             }
 
             // Used by Eluna
+#ifdef ENABLE_ELUNA
             if (!sEluna->OnChat(GetPlayer(), type, lang, msg, group))
                 return;
+#endif /* ENABLE_ELUNA */
 
             WorldPacket data;
             ChatHandler::BuildChatPacket(data, ChatMsg(type), msg.c_str(), Language(lang), _player->GetChatTag(), _player->GetObjectGuid(), _player->GetName());
@@ -290,8 +302,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
                 if (Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId()))
                 {
                     // Used by Eluna
+#ifdef ENABLE_ELUNA
                     if (!sEluna->OnChat(GetPlayer(), type, lang, msg, guild))
                         return;
+#endif /* ENABLE_ELUNA */
 
                     guild->BroadcastToGuild(this, msg, lang == LANG_ADDON ? LANG_ADDON : LANG_UNIVERSAL);
                 }
@@ -319,8 +333,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
                 if (Guild* guild = sGuildMgr.GetGuildById(GetPlayer()->GetGuildId()))
                 {
                     // Used by Eluna
+#ifdef ENABLE_ELUNA
                     if (!sEluna->OnChat(GetPlayer(), type, lang, msg, guild))
                         return;
+#endif /* ENABLE_ELUNA */
 
                     guild->BroadcastToOfficers(this, msg, lang == LANG_ADDON ? LANG_ADDON : LANG_UNIVERSAL);
                 }
@@ -354,8 +370,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
             }
 
             // Used by Eluna
+#ifdef ENABLE_ELUNA
             if (!sEluna->OnChat(GetPlayer(), type, lang, msg, group))
                 return;
+#endif /* ENABLE_ELUNA */
 
             WorldPacket data;
             ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID, msg.c_str(), Language(lang), _player->GetChatTag(), _player->GetObjectGuid(), _player->GetName());
@@ -388,8 +406,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
             }
 
             // Used by Eluna
+#ifdef ENABLE_ELUNA
             if (!sEluna->OnChat(GetPlayer(), type, lang, msg, group))
                 return;
+#endif /* ENABLE_ELUNA */
 
             WorldPacket data;
             ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_LEADER, msg.c_str(), Language(lang), _player->GetChatTag(), _player->GetObjectGuid(), _player->GetName());
@@ -413,8 +433,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
                 { return; }
 
             // Used by Eluna
+#ifdef ENABLE_ELUNA
             if (!sEluna->OnChat(GetPlayer(), type, lang, msg, group))
                 return;
+#endif /* ENABLE_ELUNA */
 
             WorldPacket data;
             // in battleground, raid warning is sent only to players in battleground - code is ok
@@ -439,8 +461,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
                 { return; }
 
             // Used by Eluna
+#ifdef ENABLE_ELUNA
             if (!sEluna->OnChat(GetPlayer(), type, lang, msg, group))
                 return;
+#endif /* ENABLE_ELUNA */
 
             WorldPacket data;
             ChatHandler::BuildChatPacket(data, CHAT_MSG_BATTLEGROUND, msg.c_str(), Language(lang), _player->GetChatTag(), _player->GetObjectGuid(), _player->GetName());
@@ -464,8 +488,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
                 { return; }
 
             // Used by Eluna
+#ifdef ENABLE_ELUNA
             if (!sEluna->OnChat(GetPlayer(), type, lang, msg, group))
                 return;
+#endif /* ENABLE_ELUNA */
 
             WorldPacket data;
             ChatHandler::BuildChatPacket(data, CHAT_MSG_BATTLEGROUND_LEADER, msg.c_str(), Language(lang), _player->GetChatTag(), _player->GetObjectGuid(), _player->GetName());
@@ -489,8 +515,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
                 if (Channel* chn = cMgr->GetChannel(channel, _player))
                 {
                     // Used by Eluna
+#ifdef ENABLE_ELUNA
                     if (!sEluna->OnChat(GetPlayer(), type, lang, msg, chn))
                         return;
+#endif /* ENABLE_ELUNA */
 
                     chn->Say(_player, msg.c_str(), lang); 
                 }
@@ -521,8 +549,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
                     _player->ToggleAFK();
                 }
                 // Used by Eluna
+#ifdef ENABLE_ELUNA
                 if (!sEluna->OnChat(GetPlayer(), type, lang, msg))
                     return;
+#endif /* ENABLE_ELUNA */
             }
             break;
         }
@@ -548,8 +578,10 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recv_data)
                 _player->ToggleDND();
             }
             // Used by Eluna
+#ifdef ENABLE_ELUNA
             if (!sEluna->OnChat(GetPlayer(), type, lang, msg))
                 return;
+#endif /* ENABLE_ELUNA */
 
             break;
         }
@@ -569,7 +601,9 @@ void WorldSession::HandleEmoteOpcode(WorldPacket& recv_data)
     recv_data >> emote;
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnEmote(GetPlayer(), emote);
+#endif /* ENABLE_ELUNA */
     GetPlayer()->HandleEmoteCommand(emote);
 }
 
@@ -625,7 +659,9 @@ void WorldSession::HandleTextEmoteOpcode(WorldPacket& recv_data)
     recv_data >> guid;
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnTextEmote(GetPlayer(), text_emote, emoteNum, guid);
+#endif /* ENABLE_ELUNA */
 
     EmotesTextEntry const* em = sEmotesTextStore.LookupEntry(text_emote);
     if (!em)
diff --git a/src/game/Corpse.cpp b/src/game/Corpse.cpp
index d60188803..bd903a61c 100644
--- a/src/game/Corpse.cpp
+++ b/src/game/Corpse.cpp
@@ -32,7 +32,9 @@
 #include "GossipDef.h"
 #include "World.h"
 #include "ObjectMgr.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 Corpse::Corpse(CorpseType type) : WorldObject(),
     loot(this),
@@ -52,7 +54,9 @@ Corpse::Corpse(CorpseType type) : WorldObject(),
 
 Corpse::~Corpse()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 }
 
 void Corpse::AddToWorld()
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index c1f28f594..e20aea7c6 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -170,7 +170,9 @@ Creature::Creature(CreatureSubtype subtype) : Unit(),
 
 Creature::~Creature()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 
     CleanupsBeforeDelete();
 
@@ -182,8 +184,10 @@ Creature::~Creature()
 
 void Creature::AddToWorld()
 {
+#ifdef ENABLE_ELUNA
     if (!IsInWorld())
         sEluna->OnAddToWorld(this);
+#endif /* ENABLE_ELUNA */
 
     ///- Register the creature for guid lookup
     if (!IsInWorld() && GetObjectGuid().GetHigh() == HIGHGUID_UNIT)
@@ -194,8 +198,10 @@ void Creature::AddToWorld()
 
 void Creature::RemoveFromWorld()
 {
+#ifdef ENABLE_ELUNA
     if (IsInWorld())
         sEluna->OnRemoveFromWorld(this);
+#endif /* ENABLE_ELUNA */
 
     ///- Remove the creature from the accessor
     if (IsInWorld() && GetObjectGuid().GetHigh() == HIGHGUID_UNIT)
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index 4eea668aa..70ea204f7 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -48,7 +48,9 @@
 #include "vmap/GameObjectModel.h"
 #include "CreatureAISelector.h"
 #include "SQLStorages.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 GameObject::GameObject() : WorldObject(),
     loot(this),
@@ -77,15 +79,19 @@ GameObject::GameObject() : WorldObject(),
 
 GameObject::~GameObject()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 
     delete m_model;
 }
 
 void GameObject::AddToWorld()
 {
+#ifdef ENABLE_ELUNA
     if (!IsInWorld())
         sEluna->OnAddToWorld(this);
+#endif /* ENABLE_ELUNA */
 
     ///- Register the gameobject for guid lookup
     if (!IsInWorld())
@@ -105,7 +111,9 @@ void GameObject::RemoveFromWorld()
     ///- Remove the gameobject from the accessor
     if (IsInWorld())
     {
+#ifdef ENABLE_ELUNA
         sEluna->OnRemoveFromWorld(this);
+#endif /* ENABLE_ELUNA */
 
         // Notify the outdoor pvp script
         if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(GetZoneId()))
@@ -204,7 +212,9 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map* map, float x, float
     }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnSpawn(this);
+#endif /* ENABLE_ELUNA */
 
     // Notify the battleground or outdoor pvp script
     if (map->IsBattleGround())
@@ -231,7 +241,9 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
 
     m_Events.Update(p_time);
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->UpdateAI(this, p_time);
+#endif /* ENABLE_ELUNA */
 
     switch (m_lootState)
     {
@@ -1769,14 +1781,18 @@ bool GameObject::IsFriendlyTo(Unit const* unit) const
 void GameObject::SetLootState(LootState state)
 {
     m_lootState = state;
+#ifdef ENABLE_ELUNA
     sEluna->OnLootStateChanged(this, state);
+#endif /* ENABLE_ELUNA */
     UpdateCollisionState();
 }
 
 void GameObject::SetGoState(GOState state)
 {
     SetByteValue(GAMEOBJECT_STATE, 0, state);
+#ifdef ENABLE_ELUNA
     sEluna->OnGameObjectStateChanged(this, state);
+#endif /* ENABLE_ELUNA */
     UpdateCollisionState();
 }
 
diff --git a/src/game/Group.cpp b/src/game/Group.cpp
index 49e2bd173..1b180be52 100644
--- a/src/game/Group.cpp
+++ b/src/game/Group.cpp
@@ -38,7 +38,9 @@
 #include "MapPersistentStateMgr.h"
 #include "Util.h"
 #include "LootMgr.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 #define LOOT_ROLL_TIMEOUT  (1*MINUTE*IN_MILLISECONDS)
 
@@ -64,7 +66,9 @@ Group::Group() : m_Id(0), m_groupType(GROUPTYPE_NORMAL),
 
 Group::~Group()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 
     if (m_bgGroup)
     {
@@ -140,7 +144,9 @@ bool Group::Create(ObjectGuid guid, const char* name)
         { CharacterDatabase.CommitTransaction(); }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnCreate(this, m_leaderGuid, m_groupType);
+#endif /* ENABLE_ELUNA */
 
     return true;
 }
@@ -225,7 +231,9 @@ bool Group::AddInvite(Player* player)
     player->SetGroupInvite(this);
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnInviteMember(this, player->GetObjectGuid());
+#endif /* ENABLE_ELUNA */
 
     return true;
 }
@@ -294,7 +302,9 @@ bool Group::AddMember(ObjectGuid guid, const char* name)
         UpdatePlayerOutOfRange(player);
 
         // Used by Eluna
+#ifdef ENABLE_ELUNA
         sEluna->OnAddMember(this, player->GetObjectGuid());
+#endif /* ENABLE_ELUNA */
 
         // quest related GO state dependent from raid membership
         if (isRaidGroup())
@@ -354,7 +364,9 @@ uint32 Group::RemoveMember(ObjectGuid guid, uint8 method)
         { Disband(true); }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnRemoveMember(this, guid, method); // Kicker and Reason not a part of Mangos, implement?
+#endif /* ENABLE_ELUNA */
 
     return m_memberSlots.size();
 }
@@ -366,7 +378,9 @@ void Group::ChangeLeader(ObjectGuid guid)
         { return; }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnChangeLeader(this, guid, GetLeaderGuid());
+#endif /* ENABLE_ELUNA */
 
     _setLeader(guid);
 
@@ -442,7 +456,9 @@ void Group::Disband(bool hideDestroy)
     }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnDisband(this);
+#endif /* ENABLE_ELUNA */
 
     m_leaderGuid.Clear();
     m_leaderName = "";
diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp
index b2c5980cb..b9de85688 100644
--- a/src/game/Guild.cpp
+++ b/src/game/Guild.cpp
@@ -35,7 +35,9 @@
 #include "Util.h"
 #include "Language.h"
 #include "World.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 //// MemberSlot ////////////////////////////////////////////
 void MemberSlot::SetMemberStats(Player* player)
@@ -104,7 +106,9 @@ Guild::Guild()
 
 Guild::~Guild()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 }
 
 bool Guild::Create(Player* leader, std::string gname)
@@ -150,7 +154,9 @@ bool Guild::Create(Player* leader, std::string gname)
     CreateDefaultGuildRanks(lSession->GetSessionDbLocaleIndex());
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnCreate(this, leader, gname.c_str());
+#endif /* ENABLE_ELUNA */
 
     return AddMember(m_LeaderGuid, GR_GUILDMASTER);
 }
@@ -247,7 +253,9 @@ bool Guild::AddMember(ObjectGuid plGuid, uint32 plRank)
     UpdateAccountsNumber();
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnAddMember(this, pl, newmember.RankId);
+#endif /* ENABLE_ELUNA */
 
     return true;
 }
@@ -261,7 +269,9 @@ void Guild::SetMOTD(std::string motd)
     CharacterDatabase.PExecute("UPDATE guild SET motd='%s' WHERE guildid='%u'", motd.c_str(), m_Id);
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnMOTDChanged(this, motd);
+#endif /* ENABLE_ELUNA */
 }
 
 void Guild::SetGINFO(std::string ginfo)
@@ -273,7 +283,9 @@ void Guild::SetGINFO(std::string ginfo)
     CharacterDatabase.PExecute("UPDATE guild SET info='%s' WHERE guildid='%u'", ginfo.c_str(), m_Id);
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnInfoChanged(this, ginfo);
+#endif /* ENABLE_ELUNA */
 }
 
 bool Guild::LoadGuildFromDB(QueryResult* guildDataResult)
@@ -559,7 +571,9 @@ bool Guild::DelMember(ObjectGuid guid, bool isDisbanding)
         { UpdateAccountsNumber(); }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnRemoveMember(this, player, isDisbanding); // IsKicked not a part of Mangos, implement?
+#endif /* ENABLE_ELUNA */
 
     return members.empty();
 }
@@ -725,7 +739,9 @@ void Guild::Disband()
     CharacterDatabase.CommitTransaction();
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnDisband(this);
+#endif /* ENABLE_ELUNA */
 
     sGuildMgr.RemoveGuild(m_Id);
 }
diff --git a/src/game/Item.cpp b/src/game/Item.cpp
index 91db8471a..3326a35bd 100644
--- a/src/game/Item.cpp
+++ b/src/game/Item.cpp
@@ -29,7 +29,9 @@
 #include "Database/DatabaseEnv.h"
 #include "ItemEnchantmentMgr.h"
 #include "SQLStorages.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 void AddItemsSetItem(Player* player, Item* item)
 {
@@ -239,7 +241,9 @@ Item::Item() :
 
 Item::~Item()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 }
 
 bool Item::Create(uint32 guidlow, uint32 itemid, Player const* owner)
@@ -285,7 +289,9 @@ void Item::UpdateDuration(Player* owner, uint32 diff)
     if (GetUInt32Value(ITEM_FIELD_DURATION) <= diff)
     {
         // Used by Eluna
+#ifdef ENABLE_ELUNA
         sEluna->OnExpire(owner, GetProto());
+#endif /* ENABLE_ELUNA */
         owner->DestroyItem(GetBagSlot(), GetSlot(), true);
         return;
     }
diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp
index 955ca1fd2..7e99c31dc 100644
--- a/src/game/LootHandler.cpp
+++ b/src/game/LootHandler.cpp
@@ -37,7 +37,9 @@
 #include "World.h"
 #include "Util.h"
 #include "DBCStores.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket& recv_data)
 {
@@ -269,7 +271,9 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket& /*recv_data*/)
             { player->ModifyMoney(pLoot->gold); }
 
         // Used by Eluna
+#ifdef ENABLE_ELUNA
         sEluna->OnLootMoney(player, pLoot->gold);
+#endif /* ENABLE_ELUNA */
 
         pLoot->gold = 0;
 
@@ -563,7 +567,9 @@ void WorldSession::HandleLootMasterGiveOpcode(WorldPacket& recv_data)
     target->SendNewItem(newitem, uint32(item.count), false, false, true);
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnLootItem(target, newitem, item.count, lootguid);
+#endif /* ENABLE_ELUNA */
 
     // mark as looted
     item.count = 0;
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 95be9cea0..5528056b0 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -47,8 +47,10 @@
 
 Map::~Map()
 {
+#ifdef ENABLE_ELUNA
     sEluna->OnDestroy(this);
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 
     UnloadAll(true);
 
@@ -108,7 +110,9 @@ Map::Map(uint32 id, time_t expiry, uint32 InstanceId)
     m_persistentState = sMapPersistentStateMgr.AddPersistentState(i_mapEntry, GetInstanceId(), 0, IsDungeon());
     m_persistentState->SetUsedByMapState(this);
 
+#ifdef ENABLE_ELUNA
     sEluna->OnCreate(this);
+#endif /* ENABLE_ELUNA */
 }
 
 void Map::InitVisibilityDistance()
@@ -311,8 +315,10 @@ bool Map::Add(Player* player)
     player->GetViewPoint().Event_AddedToWorld(&(*grid)(cell.CellX(), cell.CellY()));
     UpdateObjectVisibility(player, cell, p);
 
+#ifdef ENABLE_ELUNA
     sEluna->OnMapChanged(player);
     sEluna->OnPlayerEnter(this, player);
+#endif /* ENABLE_ELUNA */
 
     if (i_data)
         { i_data->OnPlayerEnter(player); }
@@ -576,7 +582,9 @@ void Map::Update(const uint32& t_diff)
     if (!m_scriptSchedule.empty())
         { ScriptsProcess(); }
 
+#ifdef ENABLE_ELUNA
     sEluna->OnUpdate(this, t_diff);
+#endif /* ENABLE_ELUNA */
 
     if (i_data)
         { i_data->Update(t_diff); }
@@ -584,7 +592,9 @@ void Map::Update(const uint32& t_diff)
 
 void Map::Remove(Player* player, bool remove)
 {
+#ifdef ENABLE_ELUNA
     sEluna->OnPlayerLeave(this, player);
+#endif /* ENABLE_ELUNA */
 
     if (i_data)
         { i_data->OnPlayerLeave(player); }
@@ -978,10 +988,12 @@ void Map::AddObjectToRemoveList(WorldObject* obj)
 {
     MANGOS_ASSERT(obj->GetMapId() == GetId() && obj->GetInstanceId() == GetInstanceId());
 
+#ifdef ENABLE_ELUNA
     if (Creature* creature = obj->ToCreature())
         sEluna->OnRemove(creature);
     else if (GameObject* gameobject = obj->ToGameObject())
         sEluna->OnRemove(gameobject);
+#endif /* ENABLE_ELUNA */
 
     obj->CleanupsBeforeDelete();                            // remove or simplify at least cross referenced links
 
diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp
index 01e7780f1..7531d1b86 100644
--- a/src/game/MiscHandler.cpp
+++ b/src/game/MiscHandler.cpp
@@ -47,7 +47,9 @@
 #include "OutdoorPvP/OutdoorPvP.h"
 #include "Pet.h"
 #include "SocialMgr.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 void WorldSession::HandleRepopRequestOpcode(WorldPacket& recv_data)
 {
@@ -70,7 +72,9 @@ void WorldSession::HandleRepopRequestOpcode(WorldPacket& recv_data)
     }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnRepop(GetPlayer());
+#endif /* ENABLE_ELUNA */
 
     // this is spirit release confirm?
     GetPlayer()->RemovePet(PET_SAVE_REAGENTS);
diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp
index a34a184cb..5857e72ee 100644
--- a/src/game/NPCHandler.cpp
+++ b/src/game/NPCHandler.cpp
@@ -42,7 +42,9 @@
 #include "GuildMgr.h"
 #include "Chat.h"
 #include "Item.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 enum StableResultCode
 {
@@ -416,7 +418,9 @@ void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket& recv_data)
         }
 
         // Used by Eluna
+#ifdef ENABLE_ELUNA
         sEluna->HandleGossipSelectOption(GetPlayer(), item, GetPlayer()->PlayerTalkClass->GossipOptionSender(gossipListId), GetPlayer()->PlayerTalkClass->GossipOptionAction(gossipListId), code);
+#endif /* ENABLE_ELUNA */
     }
     else if (guid.IsPlayer())
     {
@@ -427,7 +431,9 @@ void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket& recv_data)
         }
 
         // Used by Eluna
+#ifdef ENABLE_ELUNA
         sEluna->HandleGossipSelectOption(GetPlayer(), GetPlayer()->PlayerTalkClass->GetGossipMenu().GetMenuId(), GetPlayer()->PlayerTalkClass->GossipOptionSender(gossipListId), GetPlayer()->PlayerTalkClass->GossipOptionAction(gossipListId), code);
+#endif /* ENABLE_ELUNA */
     }
 }
 
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 21470546e..4dd7ba74d 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -49,7 +49,9 @@
 #include "movement/packet_builder.h"
 #include "CreatureLinkingMgr.h"
 #include "Chat.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 Object::Object()
 {
@@ -65,7 +67,9 @@ Object::Object()
 
 Object::~Object()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 
     if (IsInWorld())
     {
@@ -915,7 +919,9 @@ WorldObject::WorldObject() :
 
 WorldObject::~WorldObject()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 }
 
 void WorldObject::CleanupsBeforeDelete()
@@ -1549,8 +1555,10 @@ Creature* WorldObject::SummonCreature(uint32 id, float x, float y, float z, floa
     if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->AI())
         { ((Creature*)this)->AI()->JustSummoned(pCreature); }
 
+#ifdef ENABLE_ELUNA
     if (Unit* summoner = ToUnit())
         sEluna->OnSummoned(pCreature, summoner);
+#endif /* ENABLE_ELUNA */
 
     // Creature Linking, Initial load is handled like respawn
     if (pCreature->IsLinkingEventTrigger())
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index a55cce7b5..5d06a98a2 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -66,7 +66,9 @@
 #include "Mail.h"
 #include "DBCStores.h"
 #include "SQLStorages.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 #include <cmath>
 
@@ -528,7 +530,9 @@ Player::Player(WorldSession* session): Unit(), m_mover(this), m_camera(this), m_
 
 Player::~Player()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 
     CleanupsBeforeDelete();
 
@@ -1237,7 +1241,9 @@ void Player::Update(uint32 update_diff, uint32 p_time)
         {
             // m_nextSave reseted in SaveToDB call
             // Used by Eluna
+#ifdef ENABLE_ELUNA
             sEluna->OnSave(this);
+#endif /* ENABLE_ELUNA */
             SaveToDB();
             DETAIL_LOG("Player '%s' (GUID: %u) saved", GetName(), GetGUIDLow());
         }
@@ -2233,7 +2239,9 @@ void Player::GiveXP(uint32 xp, Unit* victim)
     uint32 level = getLevel();
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnGiveXP(this, xp, victim);
+#endif /* ENABLE_ELUNA */
 
     // XP to money conversion processed in Player::RewardQuest
     if (level >= sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL))
@@ -2326,13 +2334,17 @@ void Player::GiveLevel(uint32 level)
         { pet->SynchronizeLevelWithOwner(); }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnLevelChanged(this, oldLevel);
+#endif /* ENABLE_ELUNA */
 }
 
 void Player::SetFreeTalentPoints(uint32 points)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnFreeTalentPointsChanged(this, points);
+#endif /* ENABLE_ELUNA */
     SetUInt32Value(PLAYER_CHARACTER_POINTS1, points);
 }
 
@@ -3397,7 +3409,9 @@ uint32 Player::resetTalentsCost() const
 bool Player::resetTalents(bool no_cost)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnTalentsReset(this, no_cost);
+#endif /* ENABLE_ELUNA */
 
     // not need after this call
     if (HasAtLoginFlag(AT_LOGIN_RESET_TALENTS))
@@ -4093,7 +4107,9 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
     // update visibility of player for nearby cameras
     UpdateObjectVisibility();
 
+#ifdef ENABLE_ELUNA
     sEluna->OnResurrect(this);
+#endif /* ENABLE_ELUNA */
 
     if (!applySickness)
         { return; }
@@ -6211,7 +6227,9 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
     }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnUpdateZone(this, newZone, newArea);
+#endif /* ENABLE_ELUNA */
 
     m_zoneUpdateId    = newZone;
     m_zoneUpdateTimer = ZONE_UPDATE_INTERVAL;
@@ -6369,7 +6387,9 @@ void Player::DuelComplete(DuelCompleteType type)
     }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnDuelEnd(duel->opponent, this, type);
+#endif /* ENABLE_ELUNA */
 
     // Remove Duel Flag object
     GameObject* obj = GetMap()->GetGameObject(GetUInt64Value(PLAYER_DUEL_ARBITER));
@@ -9747,12 +9767,16 @@ Item* Player::EquipItem(uint16 pos, Item* pItem, bool update)
         ApplyEquipCooldown(pItem2);
 
         // Used by Eluna
+#ifdef ENABLE_ELUNA
         sEluna->OnEquip(this, pItem2, bag, slot);
+#endif /* ENABLE_ELUNA */
 
         return pItem2;
     }
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnEquip(this, pItem, bag, slot);
+#endif /* ENABLE_ELUNA */
 
     return pItem;
 }
@@ -9952,7 +9976,9 @@ void Player::DestroyItem(uint8 bag, uint8 slot, bool update)
         RemoveItemDurations(pItem);
 
         ItemRemovedQuestCheck(pItem->GetEntry(), pItem->GetCount());
+#ifdef ENABLE_ELUNA
         sEluna->OnRemove(this, pItem);
+#endif /* ENABLE_ELUNA */
 
         if (bag == INVENTORY_SLOT_BAG_0)
         {
@@ -13143,12 +13169,14 @@ void Player::SendQuestReward(Quest const* pQuest, uint32 XP, Object* questGiver)
     GetSession()->SendPacket(&data);
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (Creature* pCreature = questGiver->ToCreature())
         sEluna->OnQuestComplete(pPlayer, pCreature, pQuest);
 
     // Used by Eluna
     if (GameObject* pGameObject = questGiver->ToGameObject())
         sEluna->OnQuestComplete(pPlayer, pGameObject, pQuest);
+#endif /* ENABLE_ELUNA */
 }
 
 void Player::SendQuestFailed(uint32 quest_id)
@@ -14717,7 +14745,9 @@ InstancePlayerBind* Player::BindToInstance(DungeonPersistentState* state, bool p
             DEBUG_LOG("Player::BindToInstance: %s(%d) is now bound to map %d, instance %d",
                       GetName(), GetGUIDLow(), state->GetMapId(), state->GetInstanceId());
         // Used by Eluna
+#ifdef ENABLE_ELUNA
         sEluna->OnBindToInstance(this, (Difficulty)0, state->GetMapId(), permanent);
+#endif /* ENABLE_ELUNA */
         return &bind;
     }
     else
@@ -15860,7 +15890,9 @@ void Player::UpdateDuelFlag(time_t currTime)
         { return; }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnDuelStart(this, duel->opponent);
+#endif /* ENABLE_ELUNA */
 
     SetUInt32Value(PLAYER_DUEL_TEAM, 1);
     duel->opponent->SetUInt32Value(PLAYER_DUEL_TEAM, 2);
@@ -19037,7 +19069,9 @@ void Player::_SaveBGData()
 void Player::ModifyMoney(int32 d)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnMoneyChanged(this, d);
+#endif /* ENABLE_ELUNA */
 
     if (d < 0)
         SetMoney(GetMoney() > uint32(-d) ? GetMoney() + d : 0);
diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp
index b76cb7879..d24a6babf 100644
--- a/src/game/QuestHandler.cpp
+++ b/src/game/QuestHandler.cpp
@@ -35,7 +35,9 @@
 #include "ObjectAccessor.h"
 #include "ScriptMgr.h"
 #include "Group.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket& recv_data)
 {
@@ -339,7 +341,9 @@ void WorldSession::HandleQuestLogRemoveQuest(WorldPacket& recv_data)
             _player->SetQuestStatus(quest, QUEST_STATUS_NONE);
 
             // Used by Eluna
+#ifdef ENABLE_ELUNA
             sEluna->OnQuestAbandon(_player, quest);
+#endif /* ENABLE_ELUNA */
         }
 
         _player->SetQuestSlot(slot, 0);
diff --git a/src/game/ReputationMgr.cpp b/src/game/ReputationMgr.cpp
index 63000f862..3a9d6ee63 100644
--- a/src/game/ReputationMgr.cpp
+++ b/src/game/ReputationMgr.cpp
@@ -27,7 +27,9 @@
 #include "Player.h"
 #include "WorldPacket.h"
 #include "ObjectMgr.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 const int32 ReputationMgr::PointsInRank[MAX_REPUTATION_RANK] = {36000, 3000, 3000, 3000, 6000, 12000, 21000, 1000};
 
@@ -236,7 +238,9 @@ void ReputationMgr::Initialize()
 bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standing, bool incremental)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnReputationChange(m_player, factionEntry->ID, standing, incremental);
+#endif /* ENABLE_ELUNA */
 
     bool res = false;
     // if spillover definition exists in DB
diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp
index c618933be..8ce74c94b 100644
--- a/src/game/ScriptMgr.cpp
+++ b/src/game/ScriptMgr.cpp
@@ -37,7 +37,9 @@
 #include "BattleGround/BattleGround.h"
 #include "OutdoorPvP/OutdoorPvP.h"
 #include "WaypointMovementGenerator.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 #include "revision_nr.h"
 
@@ -1991,8 +1993,10 @@ char const* ScriptMgr::GetScriptLibraryVersion() const
 CreatureAI* ScriptMgr::GetCreatureAI(Creature* pCreature)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (CreatureAI* luaAI = sEluna->GetAI(pCreature))
         return luaAI;
+#endif /* ENABLE_ELUNA */
 
     if (!m_pGetCreatureAI)
         { return NULL; }
@@ -2011,8 +2015,10 @@ InstanceData* ScriptMgr::CreateInstanceData(Map* pMap)
 bool ScriptMgr::OnGossipHello(Player* pPlayer, Creature* pCreature)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (sEluna->OnGossipHello(pPlayer, pCreature))
         return true;
+#endif /* ENABLE_ELUNA */
 
     return m_pOnGossipHello != NULL && m_pOnGossipHello(pPlayer, pCreature);
 }
@@ -2020,8 +2026,10 @@ bool ScriptMgr::OnGossipHello(Player* pPlayer, Creature* pCreature)
 bool ScriptMgr::OnGossipHello(Player* pPlayer, GameObject* pGameObject)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (sEluna->OnGossipHello(pPlayer, pGameObject))
         return true;
+#endif /* ENABLE_ELUNA */
 
     return m_pOnGOGossipHello != NULL && m_pOnGOGossipHello(pPlayer, pGameObject);
 }
@@ -2031,14 +2039,18 @@ bool ScriptMgr::OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 send
     if (code)
     {
         // Used by Eluna
+#ifdef ENABLE_ELUNA
         if (sEluna->OnGossipSelectCode(pPlayer, pCreature, sender, action, code))
             return true;
+#endif /* ENABLE_ELUNA */
     }
     else
     {
         // Used by Eluna
+#ifdef ENABLE_ELUNA
         if (sEluna->OnGossipSelect(pPlayer, pCreature, sender, action))
             return true;
+#endif /* ENABLE_ELUNA */
     }
 
     if (code)
@@ -2052,13 +2064,17 @@ bool ScriptMgr::OnGossipSelect(Player* pPlayer, GameObject* pGameObject, uint32
     if (code)
     {
         // Used by Eluna
+#ifdef ENABLE_ELUNA
         if (sEluna->OnGossipSelectCode(pPlayer, pGameObject, sender, action, code))
             return true;
+#endif /* ENABLE_ELUNA */
     }
     else
         // Used by Eluna
+#ifdef ENABLE_ELUNA
         if (sEluna->OnGossipSelect(pPlayer, pGameObject, sender, action))
             return true;
+#endif /* ENABLE_ELUNA */
 
     if (code)
         { return m_pOnGOGossipSelectWithCode != NULL && m_pOnGOGossipSelectWithCode(pPlayer, pGameObject, sender, action, code); }
@@ -2069,8 +2085,10 @@ bool ScriptMgr::OnGossipSelect(Player* pPlayer, GameObject* pGameObject, uint32
 bool ScriptMgr::OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* pQuest)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (sEluna->OnQuestAccept(pPlayer, pCreature, pQuest))
         return true;
+#endif /* ENABLE_ELUNA */
 
     return m_pOnQuestAccept != NULL && m_pOnQuestAccept(pPlayer, pCreature, pQuest);
 }
@@ -2078,8 +2096,10 @@ bool ScriptMgr::OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const*
 bool ScriptMgr::OnQuestAccept(Player* pPlayer, GameObject* pGameObject, Quest const* pQuest)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (sEluna->OnQuestAccept(pPlayer, pGameObject, pQuest))
         return true;
+#endif /* ENABLE_ELUNA */
 
     return m_pOnGOQuestAccept != NULL && m_pOnGOQuestAccept(pPlayer, pGameObject, pQuest);
 }
@@ -2087,8 +2107,10 @@ bool ScriptMgr::OnQuestAccept(Player* pPlayer, GameObject* pGameObject, Quest co
 bool ScriptMgr::OnQuestAccept(Player* pPlayer, Item* pItem, Quest const* pQuest)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (sEluna->OnQuestAccept(pPlayer, pItem, pQuest))
         return true;
+#endif /* ENABLE_ELUNA */
 
     return m_pOnItemQuestAccept != NULL && m_pOnItemQuestAccept(pPlayer, pItem, pQuest);
 }
@@ -2096,8 +2118,10 @@ bool ScriptMgr::OnQuestAccept(Player* pPlayer, Item* pItem, Quest const* pQuest)
 bool ScriptMgr::OnQuestRewarded(Player* pPlayer, Creature* pCreature, Quest const* pQuest)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (sEluna->OnQuestReward(pPlayer, pCreature, pQuest))
         return true;
+#endif /* ENABLE_ELUNA */
 
     return m_pOnQuestRewarded != NULL && m_pOnQuestRewarded(pPlayer, pCreature, pQuest);
 }
@@ -2105,8 +2129,10 @@ bool ScriptMgr::OnQuestRewarded(Player* pPlayer, Creature* pCreature, Quest cons
 bool ScriptMgr::OnQuestRewarded(Player* pPlayer, GameObject* pGameObject, Quest const* pQuest)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (sEluna->OnQuestReward(pPlayer, pGameObject, pQuest))
         return true;
+#endif /* ENABLE_ELUNA */
 
     return m_pOnGOQuestRewarded != NULL && m_pOnGOQuestRewarded(pPlayer, pGameObject, pQuest);
 }
@@ -2114,8 +2140,10 @@ bool ScriptMgr::OnQuestRewarded(Player* pPlayer, GameObject* pGameObject, Quest
 uint32 ScriptMgr::GetDialogStatus(Player* pPlayer, Creature* pCreature)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (uint32 dialogId = sEluna->GetDialogStatus(pPlayer, pCreature))
         return dialogId;
+#endif /* ENABLE_ELUNA */
 
     if (!m_pGetNPCDialogStatus)
         { return DIALOG_STATUS_UNDEFINED; }
@@ -2126,8 +2154,10 @@ uint32 ScriptMgr::GetDialogStatus(Player* pPlayer, Creature* pCreature)
 uint32 ScriptMgr::GetDialogStatus(Player* pPlayer, GameObject* pGameObject)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (uint32 dialogId = sEluna->GetDialogStatus(pPlayer, pGameObject))
         return dialogId;
+#endif /* ENABLE_ELUNA */
 
     if (!m_pGetGODialogStatus)
         { return DIALOG_STATUS_UNDEFINED; }
@@ -2143,8 +2173,10 @@ bool ScriptMgr::OnGameObjectUse(Player* pPlayer, GameObject* pGameObject)
 bool ScriptMgr::OnItemUse(Player* pPlayer, Item* pItem, SpellCastTargets const& targets)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (!sEluna->OnUse(pPlayer, pItem, targets))
         return true;
+#endif /* ENABLE_ELUNA */
 
     return m_pOnItemUse != NULL && m_pOnItemUse(pPlayer, pItem, targets);
 }
@@ -2152,8 +2184,10 @@ bool ScriptMgr::OnItemUse(Player* pPlayer, Item* pItem, SpellCastTargets const&
 bool ScriptMgr::OnAreaTrigger(Player* pPlayer, AreaTriggerEntry const* atEntry)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (sEluna->OnAreaTrigger(pPlayer, atEntry))
         return true;
+#endif /* ENABLE_ELUNA */
 
     return m_pOnAreaTrigger != NULL && m_pOnAreaTrigger(pPlayer, atEntry);
 }
@@ -2166,8 +2200,10 @@ bool ScriptMgr::OnProcessEvent(uint32 eventId, Object* pSource, Object* pTarget,
 bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Creature* pTarget, ObjectGuid originalCasterGuid)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (sEluna->OnDummyEffect(pCaster, spellId, effIndex, pTarget))
         return true;
+#endif /* ENABLE_ELUNA */
 
     return m_pOnEffectDummyCreature != NULL && m_pOnEffectDummyCreature(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
 }
@@ -2175,8 +2211,10 @@ bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex ef
 bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, GameObject* pTarget, ObjectGuid originalCasterGuid)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (sEluna->OnDummyEffect(pCaster, spellId, effIndex, pTarget))
         return true;
+#endif /* ENABLE_ELUNA */
 
     return m_pOnEffectDummyGO != NULL && m_pOnEffectDummyGO(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
 }
@@ -2184,8 +2222,10 @@ bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex ef
 bool ScriptMgr::OnEffectDummy(Unit* pCaster, uint32 spellId, SpellEffectIndex effIndex, Item* pTarget, ObjectGuid originalCasterGuid)
 {
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (sEluna->OnDummyEffect(pCaster, spellId, effIndex, pTarget))
         return true;
+#endif /* ENABLE_ELUNA */
 
     return m_pOnEffectDummyItem != NULL && m_pOnEffectDummyItem(pCaster, spellId, effIndex, pTarget, originalCasterGuid);
 }
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index d0c374099..96239fba7 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -51,7 +51,9 @@
 #include "Util.h"
 #include "Chat.h"
 #include "SQLStorages.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 extern pEffect SpellEffects[TOTAL_SPELL_EFFECTS];
 
@@ -353,7 +355,9 @@ Spell::Spell(Unit* caster, SpellEntry const* info, bool triggered, ObjectGuid or
 
 Spell::~Spell()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 }
 
 template<typename T>
@@ -2746,8 +2750,10 @@ void Spell::cast(bool skipCheck)
     m_targets.updateTradeSlotItem();
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (m_caster->GetTypeId() == TYPEID_PLAYER)
         sEluna->OnSpellCast(m_caster->ToPlayer(), this, skipCheck);
+#endif /* ENABLE_ELUNA */
 
     FillTargetMap();
 
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 1e6b5d232..6f6671ee8 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -52,7 +52,9 @@
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 #include "MapManager.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 #define NULL_AURA_SLOT 0xFF
 
@@ -295,7 +297,9 @@ Aura::Aura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBas
 
 Aura::~Aura()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 }
 
 AreaAura::AreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolder* holder, Unit* target,
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 96f869e43..c01441bd3 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -56,7 +56,9 @@
 #include "Util.h"
 #include "TemporarySummon.h"
 #include "ScriptMgr.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 pEffect SpellEffects[TOTAL_SPELL_EFFECTS] =
 {
@@ -2184,11 +2186,13 @@ void Spell::EffectSummon(SpellEffectIndex eff_idx)
         { ((Creature*)m_caster)->AI()->JustSummoned((Creature*)spawnCreature); }
     if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
         { ((Creature*)m_originalCaster)->AI()->JustSummoned((Creature*)spawnCreature); }
+#ifdef ENABLE_ELUNA
     if (Unit* summoner = m_caster->ToUnit())
         sEluna->OnSummoned(spawnCreature, summoner);
     else if (m_originalCaster)
         if (Unit* summoner = m_originalCaster->ToUnit())
             sEluna->OnSummoned(spawnCreature, summoner);
+#endif /* ENABLE_ELUNA */
 }
 
 void Spell::EffectLearnSpell(SpellEffectIndex eff_idx)
@@ -2516,9 +2520,11 @@ void Spell::EffectSummonWild(SpellEffectIndex eff_idx)
             // Notify original caster if not done already
             if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
                 { ((Creature*)m_originalCaster)->AI()->JustSummoned(summon); }
+#ifdef ENABLE_ELUNA
             if (m_originalCaster)
                 if (Unit* summoner = m_originalCaster->ToUnit())
                     sEluna->OnSummoned(summon, summoner);
+#endif /* ENABLE_ELUNA */
         }
     }
 }
@@ -2631,11 +2637,13 @@ void Spell::EffectSummonGuardian(SpellEffectIndex eff_idx)
             { ((Creature*)m_caster)->AI()->JustSummoned(spawnCreature); }
         if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
             { ((Creature*)m_originalCaster)->AI()->JustSummoned(spawnCreature); }
+#ifdef ENABLE_ELUNA
         if (Unit* summoner = m_caster->ToUnit())
             sEluna->OnSummoned(spawnCreature, summoner);
         if (m_originalCaster)
             if (Unit* summoner = m_originalCaster->ToUnit())
                 sEluna->OnSummoned(spawnCreature, summoner);
+#endif /* ENABLE_ELUNA */
     }
 }
 
@@ -3847,7 +3855,9 @@ void Spell::EffectDuel(SpellEffectIndex eff_idx)
     target->SetGuidValue(PLAYER_DUEL_ARBITER, pGameObj->GetObjectGuid());
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnDuelRequest(target, caster);
+#endif /* ENABLE_ELUNA */
 }
 
 void Spell::EffectStuck(SpellEffectIndex /*eff_idx*/)
@@ -4116,8 +4126,10 @@ void Spell::EffectSummonPossessed(SpellEffectIndex eff_idx)
     // Notify Summoner
     if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
         { ((Creature*)m_originalCaster)->AI()->JustSummoned(spawnCreature); }
+#ifdef ENABLE_ELUNA
     if (Unit* summoner = m_originalCaster->ToUnit())
         sEluna->OnSummoned(spawnCreature, summoner);
+#endif /* ENABLE_ELUNA */
 }
 
 void Spell::EffectEnchantHeldItem(SpellEffectIndex eff_idx)
@@ -4570,11 +4582,13 @@ void Spell::EffectSummonCritter(SpellEffectIndex eff_idx)
         { ((Creature*)m_caster)->AI()->JustSummoned(critter); }
     if (m_originalCaster && m_originalCaster != m_caster && m_originalCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_originalCaster)->AI())
         { ((Creature*)m_originalCaster)->AI()->JustSummoned(critter); }
+#ifdef ENABLE_ELUNA
     if (Unit* summoner = m_caster->ToUnit())
         sEluna->OnSummoned(critter, summoner);
     if (m_originalCaster)
         if (Unit* summoner = m_originalCaster->ToUnit())
             sEluna->OnSummoned(critter, summoner);
+#endif /* ENABLE_ELUNA */
 }
 
 void Spell::EffectKnockBack(SpellEffectIndex eff_idx)
diff --git a/src/game/Totem.cpp b/src/game/Totem.cpp
index ea0173bf5..e94727210 100644
--- a/src/game/Totem.cpp
+++ b/src/game/Totem.cpp
@@ -32,7 +32,9 @@
 #include "DBCStores.h"
 #include "CreatureAI.h"
 #include "InstanceData.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 Totem::Totem() : Creature(CREATURE_SUBTYPE_TOTEM)
 {
@@ -100,7 +102,9 @@ void Totem::Summon(Unit* owner)
 
     if (owner->GetTypeId() == TYPEID_UNIT && ((Creature*)owner)->AI())
         { ((Creature*)owner)->AI()->JustSummoned((Creature*)this); }
+#ifdef ENABLE_ELUNA
     sEluna->OnSummoned(this, owner);
+#endif /* ENABLE_ELUNA */
 
     // there are some totems, which exist just for their visual appeareance
     if (!GetSpell())
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 0978ca01e..96d40c716 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -57,7 +57,9 @@
 #include "movement/MoveSplineInit.h"
 #include "movement/MoveSpline.h"
 #include "CreatureLinkingMgr.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 #include <math.h>
 #include <stdarg.h>
@@ -279,7 +281,9 @@ Unit::Unit() :
 
 Unit::~Unit()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 
     // set current spells as deletable
     for (uint32 i = 0; i < CURRENT_MAX_SPELL; ++i)
@@ -760,8 +764,10 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
         if (Creature* killer = ToCreature())
         {
             // Used by Eluna
+#ifdef ENABLE_ELUNA
             if (Player* killed = pVictim->ToPlayer())
                 sEluna->OnPlayerKilledByCreature(killer, killed);
+#endif /* ENABLE_ELUNA */
         }
 
         // Call AI OwnerKilledUnit (for any current summoned minipet/guardian/protector)
@@ -820,7 +826,9 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
                 }
 
                 // Used by Eluna
+#ifdef ENABLE_ELUNA
                 sEluna->OnPVPKill(player_tap, playerVictim);
+#endif /* ENABLE_ELUNA */
             }
         }
         else                                                // Killed creature
@@ -1061,7 +1069,9 @@ void Unit::JustKilledCreature(Creature* victim, Player* responsiblePlayer)
             bg->HandleKillUnit(victim, responsiblePlayer);
 
             // Used by Eluna
+#ifdef ENABLE_ELUNA
             sEluna->OnCreatureKill(responsiblePlayer, victim);
+#endif /* ENABLE_ELUNA */
         }
 
     // Notify the outdoor pvp script
@@ -6384,8 +6394,10 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
     }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (GetTypeId() == TYPEID_PLAYER)
         sEluna->OnPlayerEnterCombat(ToPlayer(), enemy);
+#endif /* ENABLE_ELUNA */
 }
 
 void Unit::ClearInCombat()
@@ -6397,8 +6409,10 @@ void Unit::ClearInCombat()
         { RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PET_IN_COMBAT); }
 
     // Used by Eluna
+#ifdef ENABLE_ELUNA
     if (GetTypeId() == TYPEID_PLAYER)
         sEluna->OnPlayerLeaveCombat(ToPlayer());
+#endif /* ENABLE_ELUNA */
 
     // Player's state will be cleared in Player::UpdateContestedPvP
     if (GetTypeId() == TYPEID_UNIT)
diff --git a/src/game/Weather.cpp b/src/game/Weather.cpp
index 09e06faeb..459b1013b 100644
--- a/src/game/Weather.cpp
+++ b/src/game/Weather.cpp
@@ -34,7 +34,9 @@
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Util.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 /// Weather sound defines ( only for 1.12 )
 enum WeatherSounds
@@ -63,7 +65,9 @@ Weather::Weather(uint32 zone, WeatherZoneChances const* weatherChances) : m_zone
 
 Weather::~Weather()
 {
+#ifdef ENABLE_ELUNA
     Eluna::RemoveRef(this);
+#endif /* ENABLE_ELUNA */
 };
 
 /// Launch a weather update
@@ -285,7 +289,9 @@ bool Weather::UpdateWeather()
     }
 
     DETAIL_FILTER_LOG(LOG_FILTER_WEATHER, "Change the weather of zone %u to %s.", m_zone, wthstr);
+#ifdef ENABLE_ELUNA
     sEluna->OnChange(this, (WeatherState)m_type, m_grade);
+#endif /* ENABLE_ELUNA */
 
     return true;
 }
diff --git a/src/game/World.cpp b/src/game/World.cpp
index dde48ff7d..8d0528cca 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -69,7 +69,9 @@
 #include "AuctionHouseBot/AuctionHouseBot.h"
 #include "CharacterDatabaseCleaner.h"
 #include "CreatureLinkingMgr.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 INSTANTIATE_SINGLETON_1(World);
 
@@ -151,7 +153,9 @@ void World::CleanupsBeforeStop()
     KickAll();                                       // save and kick all players
     UpdateSessions(1);                               // real players unload required UpdateSessions call
     sBattleGroundMgr.DeleteAllBattleGrounds();       // unload battleground templates before different singletons destroyed
+#ifdef ENABLE_ELUNA
     Eluna::Uninitialize();
+#endif /* ENABLE_ELUNA */
 }
 
 /// Find a player in a specified zone
@@ -1250,9 +1254,16 @@ void World::SetInitialWorldSettings()
             break;
     }
 
+#ifdef ENABLE_ELUNA
     ///- Initialize Lua Engine
     sLog.outString("Initialize Eluna Lua Engine...");
     Eluna::Initialize();
+#else /* ENABLE_ELUNA */
+    if (sConfig.GetBoolDefault("Eluna.Enabled", false))
+    {
+        sLog.outError("Eluna is enabled but wasn't included during compilation, not activating it.");
+    }
+#endif /* ENABLE_ELUNA */
 
     ///- Initialize game time and timers
     sLog.outString("DEBUG:: Initialize game time and timers");
@@ -1460,7 +1471,9 @@ void World::Update(uint32 diff)
     sOutdoorPvPMgr.Update(diff);
 
     ///- Used by Eluna
+#ifdef ENABLE_ELUNA
     sEluna->OnWorldUpdate(diff);
+#endif /* ENABLE_ELUNA */
 
     ///- Delete all characters which have been deleted X days before
     if (m_timers[WUPDATE_DELETECHARS].Passed())
diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp
index e80d1c629..c4653bec2 100644
--- a/src/game/WorldSession.cpp
+++ b/src/game/WorldSession.cpp
@@ -470,7 +470,9 @@ void WorldSession::LogoutPlayer(bool Save)
         sSocialMgr.RemovePlayerSocial(_player->GetGUIDLow());
 
         ///- Used by Eluna
+#ifdef ENABLE_ELUNA
         sEluna->OnLogout(_player);
+#endif /* ENABLE_ELUNA */
 
         ///- Remove the player from the world
         // the player may not be in the world when logging out
@@ -705,8 +707,10 @@ void WorldSession::SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg)
 
 void WorldSession::ExecuteOpcode(OpcodeHandler const& opHandle, WorldPacket* packet)
 {
+#ifdef ENABLE_ELUNA
     if (!sEluna->OnPacketReceive(this, *packet))
         return;
+#endif /* ENABLE_ELUNA */
 
     // need prevent do internal far teleports in handlers because some handlers do lot steps
     // or call code that can do far teleports in some conditions unexpectedly for generic way work code
diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp
index 04d0a7a16..eb68cd1c5 100644
--- a/src/game/WorldSocket.cpp
+++ b/src/game/WorldSocket.cpp
@@ -50,7 +50,9 @@
 #include "WorldSocketMgr.h"
 #include "Log.h"
 #include "DBCStores.h"
+#ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
+#endif /* ENABLE_ELUNA */
 
 #if defined( __GNUC__ )
 #pragma pack(1)
@@ -149,8 +151,10 @@ int WorldSocket::SendPacket(const WorldPacket& pkt)
     // Dump outgoing packet.
     sLog.outWorldPacketDump(uint32(get_handle()), pct.GetOpcode(), pct.GetOpcodeName(), &pct, false);
 
+#ifdef ENABLE_ELUNA
     if (!sEluna->OnPacketSend(m_Session, pct))
         return 0;
+#endif /* ENABLE_ELUNA */
 
     if (iSendPacket(pct) == -1)
     {
@@ -585,13 +589,17 @@ int WorldSocket::ProcessIncoming(WorldPacket* new_pct)
                     return -1;
                 }
 
+#ifdef ENABLE_ELUNA
                 if (!sEluna->OnPacketReceive(m_Session, *new_pct))
                     return 0;
+#endif /* ENABLE_ELUNA */
                 return HandleAuthSession(*new_pct);
             case CMSG_KEEP_ALIVE:
                 DEBUG_LOG("CMSG_KEEP_ALIVE ,size: " SIZEFMTD " ", new_pct->size());
 
+#ifdef ENABLE_ELUNA
                 sEluna->OnPacketReceive(m_Session, *new_pct);
+#endif /* ENABLE_ELUNA */
                 return 0;
             default:
             {
diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp
index 7a3967334..f458852cd 100644
--- a/src/shared/Log.cpp
+++ b/src/shared/Log.cpp
@@ -72,8 +72,12 @@ enum LogType
 const int LogType_count = int(LogError) + 1;
 
 Log::Log() :
-    raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL),
-    dberLogfile(NULL), elunaErrLogfile(NULL), eventAiErLogfile(NULL), scriptErrLogFile(NULL), worldLogfile(NULL), m_colored(false), m_includeTime(false), m_gmlog_per_account(false), m_scriptLibName(NULL)
+    raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL), dberLogfile(NULL), 
+#ifdef ENABLE_ELUNA
+    elunaErrLogfile(NULL), 
+#endif /* ENABLE_ELUNA */
+    eventAiErLogfile(NULL), scriptErrLogFile(NULL), worldLogfile(NULL), m_colored(false), 
+    m_includeTime(false), m_gmlog_per_account(false), m_scriptLibName(NULL)
 {
     Initialize();
 }
@@ -269,7 +273,9 @@ void Log::Initialize()
 
     charLogfile = openLogFile("CharLogFile", "CharLogTimestamp", "a");
     dberLogfile = openLogFile("DBErrorLogFile", NULL, "a");
+#ifdef ENABLE_ELUNA
     elunaErrLogfile = openLogFile("ElunaErrorLogFile", NULL, "a");
+#endif /* ENABLE_ELUNA */
     eventAiErLogfile = openLogFile("EventAIErrorLogFile", NULL, "a");
     raLogfile = openLogFile("RaLogFile", NULL, "a");
     worldLogfile = openLogFile("WorldLogFile", "WorldLogTimestamp", "a");
@@ -523,6 +529,7 @@ void Log::outErrorDb(const char* err, ...)
     fflush(stderr);
 }
 
+#ifdef ENABLE_ELUNA
 void Log::outErrorEluna()
 {
     if (m_includeTime)
@@ -546,7 +553,12 @@ void Log::outErrorEluna()
 
     fflush(stderr);
 }
+#else
+/* This is made to not fiddle with the eluna code in LuaEngine/ at all */
+void Log::outErrorEluna() {}
+#endif /* ENABLE_ELUNA */
 
+#ifdef ENABLE_ELUNA
 void Log::outErrorEluna(const char* err, ...)
 {
     if (!err)
@@ -597,6 +609,10 @@ void Log::outErrorEluna(const char* err, ...)
 
     fflush(stderr);
 }
+#else
+/* This is made to not fiddle with the eluna code in LuaEngine/ at all */
+void Log::outErrorEluna(const char* err, ...) {}
+#endif /* ENABLE_ELUNA */
 
 void Log::outErrorEventAI()
 {
diff --git a/src/shared/Log.h b/src/shared/Log.h
index 42d3359c6..42b55c032 100644
--- a/src/shared/Log.h
+++ b/src/shared/Log.h
@@ -145,9 +145,11 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
                 { fclose(dberLogfile); }
             dberLogfile = NULL;
 
+#ifdef ENABLE_ELUNA
             if (elunaErrLogfile != NULL)
                 fclose(elunaErrLogfile);
             elunaErrLogfile = NULL;
+#endif /* ENABLE_ELUNA */
 
             if (eventAiErLogfile != NULL)
                 { fclose(eventAiErLogfile); }
@@ -417,7 +419,9 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
         FILE* gmLogfile; /**< TODO */
         FILE* charLogfile; /**< TODO */
         FILE* dberLogfile; /**< TODO */
+#ifdef ENABLE_ELUNA
         FILE* elunaErrLogfile; /**< TODO */
+#endif /* ENABLE_ELUNA */
         FILE* eventAiErLogfile; /**< TODO */
         FILE* scriptErrLogFile; /**< TODO */
         FILE* worldLogfile; /**< TODO */