Buildsystem/Core: Adjust header locations in CMake for collisions and shared + clean up includes from re26dbe6981

This sorts out issues with non-PCH compiles on supported platforms.

--HG--
branch : trunk

src/server/shared/Database/MySQLConnection.cpp

@@ -16,10 +16,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <mysql.h>
+#include "Common.h"
+#include "QueryResult.h"
+#include "SQLOperation.h"
 #include "MySQLConnection.h"
 #include "DatabaseWorker.h"
-#include "Utilities/Util.h"
-#include "Utilities/Timer.h"
+#include "Log.h"
+#include "Util.h"
+#include "Timer.h"
 
 MySQLConnection::MySQLConnection() :
 m_Mysql(NULL)
@@ -241,4 +246,4 @@ void MySQLConnection::RollbackTransaction()
 void MySQLConnection::CommitTransaction()
 {
     Execute("COMMIT");
-}
+}