4 files changed, 6 insertions, 55 deletions
diff --git a/protocols/FacebookRM/src/common.h b/protocols/FacebookRM/src/common.h
index 2abb3a3cc0..f78c4cb437 100644
--- a/protocols/FacebookRM/src/common.h
+++ b/protocols/FacebookRM/src/common.h
@@ -22,43 +22,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//#pragma warning(push)
-//#pragma warning(disable:4312)
 #pragma warning(disable:4996)
 
-#define MIRANDA_VER    0x0A00
 #define _WIN32_WINNT   0x0500
 #define _WIN32_WINDOWS 0x0500
 
-#include <string>
 #include <sstream>
 #include <fstream>
-#include <list>
 #include <map>
 #include <vector>
 #include <set>
-#include <algorithm>
 
-#include <stdarg.h>
+#include <windows.h>
 #include <time.h>
-#include <assert.h>
-#include <io.h>
 
-#include <windows.h>
 #include <win2k.h>
-#include <commctrl.h>
-
 #include <newpluginapi.h>
-#include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_avatars.h>
-#include <m_button.h>
 #include <m_chat.h>
-#include <m_clist.h>
 #include <m_clistint.h>
-#include <m_clui.h>
 #include <m_database.h>
-#include <m_history.h>
 #include <m_idle.h>
 #include <m_ignore.h>
 #include <m_langpack.h>
@@ -66,22 +49,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_netlib.h>
 #include <m_options.h>
 #include <m_popup.h>
-#include <m_protocols.h>
 #include <m_protosvc.h>
 #include <m_protoint.h>
 #include <m_protomod.h>
 #include <m_skin.h>
-#include <statusmodes.h>
-#include <m_userinfo.h>
 #include <m_icolib.h>
-#include <m_utils.h>
 #include <m_hotkeys.h>
+
 #include <m_folders.h>
 #include <m_smileyadd.h>
 #include <m_toptoolbar.h>
 
-#include "version.h"
-
 class FacebookProto;
 
 #include "definitions.h"
@@ -98,6 +76,7 @@ class FacebookProto;
 #include "dialogs.h"
 #include "theme.h"
 #include "resource.h"
+#include "version.h"
 
 extern HINSTANCE g_hInstance;
 extern std::string g_strUserAgent;
diff --git a/protocols/FacebookRM/src/http.cpp b/protocols/FacebookRM/src/http.cpp
deleted file mode 100644
index 49462fb7eb..0000000000
--- a/protocols/FacebookRM/src/http.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-
-Facebook plugin for Miranda Instant Messenger
-_____________________________________________
-
-Copyright © 2009-11 Michal Zelinka, 2011-13 Robert Pösel
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "common.h"
diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp
index 564bc195ae..f22ce7b0d0 100644
--- a/protocols/FacebookRM/src/main.cpp
+++ b/protocols/FacebookRM/src/main.cpp
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "common.h"
-#include "version.h" 
 
 // TODO: Make following as "globals" structure?
 
@@ -43,7 +42,7 @@ PLUGININFOEX pluginInfo = {
 	__AUTHORWEB,
 	UNICODE_AWARE,
 	// {8432B009-FF32-4727-AAE6-A9035038FD58}
-	{ 0x8432b009, 0xff32, 0x4727, { 0xaa, 0xe6, 0xa9, 0x3, 0x50, 0x38, 0xfd, 0x58 } }
+	{0x8432b009, 0xff32, 0x4727, {0xaa, 0xe6, 0xa9, 0x3, 0x50, 0x38, 0xfd, 0x58}}
 };
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/FacebookRM/src/version.h b/protocols/FacebookRM/src/version.h
index c35c72fd48..223710daa2 100644
--- a/protocols/FacebookRM/src/version.h
+++ b/protocols/FacebookRM/src/version.h
@@ -4,14 +4,10 @@
 #define __BUILD_NUM					0
 
 #define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-
-#define __STRINGIFY_IMPL(x)			#x
-#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)
-#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)
+#define __TOSTRING(x)			#x
+#define __VERSION_STRING		__TOSTRING(__FILEVERSION_STRING)
 
 #define __PLUGIN_NAME				"Facebook RM"
-#define __INTERNAL_NAME				"Facebook RM"
 #define __FILENAME					"Facebook.dll"
 #define __DESCRIPTION 				"Facebook protocol support for Miranda NG."
 #define __AUTHOR					"Michal Zelinka, Robert P\xf6" "sel"