-#include "message.h"
-#include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_privmsg.h"
-
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
-
-void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
+#include "commands/cmd_privmsg.h"
+
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+ return new cmd_privmsg(Instance);
+}
+
+CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)