fixed:

- (weird) linker error on windows caused by using different include.
- IpcTests using private field which had a public accessor.
- some includes using wrong lib.

src/test/integtests/platform/MSWindowsClipboardTests.cpp

@@ -19,8 +19,8 @@
 #include "platform/MSWindowsClipboard.h"
 #include "platform/IMSWindowsClipboardFacade.h"
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/global/gmock.h"
+#include "test/global/gtest.h"
 
 class CMSWindowsClipboardTests : public ::testing::Test
 {

src/test/integtests/platform/MSWindowsKeyStateTests.cpp

@@ -18,17 +18,16 @@
 
 #define TEST_ENV
 
-#include "test/global/access.h"
+#include "test/mock/synergy/MockEventQueue.h"
+#include "test/mock/synergy/MockKeyMap.h"
 #include "platform/MSWindowsKeyState.h"
 #include "platform/MSWindowsDesks.h"
 #include "platform/MSWindowsScreen.h"
 #include "platform/MSWindowsScreenSaver.h"
-#include "synergy/CMockEventQueue.h"
-#include "synergy/CMockKeyMap.h"
 #include "base/TMethodJob.h"
 
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
+#include "test/global/gtest.h"
+#include "test/global/gmock.h"
 
 // wParam = flags, HIBYTE(lParam) = virtual key, LOBYTE(lParam) = scan code
 #define SYNERGY_MSG_FAKE_KEY		SYNERGY_HOOK_LAST_MSG + 4

src/test/integtests/platform/OSXScreenTests.cpp

@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test/global/access.h"
 #include "platform/OSXScreen.h"
 #include "arch/Arch.h"
 #include "base/EventQueue.h"

src/test/integtests/platform/XWindowsClipboardTests.cpp

@@ -18,7 +18,7 @@
 
 #include "platform/XWindowsClipboard.h"
 
-#include <gtest/gtest.h>
+#include "test/global/gtest.h"
 #include <iostream>
 
 class CXWindowsClipboardTests : public ::testing::Test

src/test/integtests/platform/XWindowsKeyStateTests.cpp

@@ -32,8 +32,8 @@
 #	include <X11/XKBlib.h>
 #endif
 
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
+#include "test/global/gtest.h"
+#include "test/global/gmock.h"
 #include <errno.h>
 
 class CXWindowsKeyStateTests : public ::testing::Test

src/test/integtests/platform/XWindowsScreenSaverTests.cpp

@@ -22,7 +22,7 @@
 #include "test/mock/synergy/MockEventQueue.h"
 #include "platform/XWindowsScreenSaver.h"
 
-#include <gtest/gtest.h>
+#include "test/global/gtest.h"
 #include <X11/Xlib.h>
 
 using ::testing::_;

src/test/integtests/platform/XWindowsScreenTests.cpp

@@ -19,7 +19,7 @@
 #include "platform/XWindowsScreen.h"
 #include "synergy/CMockEventQueue.h"
 
-#include <gtest/gtest.h>
+#include "test/global/gtest.h"
 
 using ::testing::_;