1 files changed, 13 insertions, 19 deletions
diff --git a/plugins/Folders/src/commonheaders.h b/plugins/Folders/src/commonheaders.h
index 1b5b1be6f2..0734f8db26 100644
--- a/plugins/Folders/src/commonheaders.h
+++ b/plugins/Folders/src/commonheaders.h
@@ -25,38 +25,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define MAX_FOLDER_SIZE 2048
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <windows.h>
 
-#include "newpluginapi.h"
-#include "m_utils.h"
-#include "m_folders.h"
+#include <newpluginapi.h>
+#include <m_database.h>
+#include <m_system_cpp.h>
+#include <m_options.h>
+
+#include <m_variables.h>
+#include <m_folders.h>
 
 #include "version.h"
 #include "utils.h"
 #include "resource.h"
 #include "foldersList.h"
 #include "dlg_handlers.h"
-
-#include "m_database.h"
-#include "m_system.h"
-#include "m_system_cpp.h"
-#include "m_skin.h"
-#include "m_options.h"
-#include "m_clist.h"
-#include "m_langpack.h"
-#include "m_history.h"
-#include "m_contacts.h"
-#include "m_popup.h"
-#include "m_fontservice.h"
-#include "m_variables.h"
+#include "hooked_events.h"
+#include "services.h"
+#include "events.h"
+#include "folderItem.h"
 
 #ifndef MS_DB_GETPROFILEPATH_BASIC //db3xSA
 #define MS_DB_GETPROFILEPATH_BASIC	"DB/GetProfilePathBasic"
 #endif
 
+#define MS_FOLDERS_TEST_PLUGIN "Folders/Test/Plugin"
+
 extern char ModuleName[];
 extern HINSTANCE hInstance;
 extern CFoldersList &lstRegisteredFolders;