Merge.

core-legacy/CPlugin.cpp

@@ -13,6 +13,7 @@
 #include "sourcemm.h"
 #include "concommands.h"
 #include "vsp_listener.h"
+#include "util.h"
 
 /** 
  * @brief Implements functions from CPlugin.h

core-legacy/CSmmAPI.cpp

@@ -14,6 +14,7 @@
 #include "concommands.h"
 #include "CPlugin.h"
 #include "vsp_listener.h"
+#include "util.h"
 
 /**
  * @brief Implementation of main API interface

core-legacy/concommands.cpp

@@ -16,6 +16,7 @@
 #include "sh_string.h"
 #include "sh_list.h"
 #include "vsp_listener.h"
+#include "util.h"
 
 /**
  * @brief Console Command Implementations

core-legacy/sourcemm.h

@@ -24,7 +24,6 @@
 #include "ISmmAPI.h"
 #include "CPlugin.h"
 #include "oslink.h"
-#include "util.h"
 #include "version.h"
 #include "loader_bridge.h"
 

core-legacy/util.cpp

@@ -11,9 +11,9 @@
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>
+#include "sourcemm.h"
 #include "util.h"
 #include "oslink.h"
-#include "sourcemm.h"
 
 /**
  * @brief Utility functions

core-legacy/vsp_bridge.cpp

@@ -28,6 +28,7 @@
 #include <assert.h>
 #include "sourcemm.h"
 #include "concommands.h"
+#include "util.h"
 #include <loader_bridge.h>
 
 SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false);