diff --git a/net/CNetwork.h b/net/CNetwork.h
index 8d6e9842..696973da 100644
--- a/net/CNetwork.h
+++ b/net/CNetwork.h
@@ -38,7 +38,8 @@ public:
 	typedef struct sockaddr Address;
 	typedef int AddressLength;
 	typedef BOOL TCPNoDelayType;
-	struct PollEntry {
+	class PollEntry {
+	public:
 		Socket			fd;
 		short			events;
 		short			revents;
diff --git a/synergy/CXWindowsScreen.h b/synergy/CXWindowsScreen.h
index 0f81414a..b02fd264 100644
--- a/synergy/CXWindowsScreen.h
+++ b/synergy/CXWindowsScreen.h
@@ -105,12 +105,12 @@ protected:
 	virtual long		getEventMask(Window) const = 0;
 
 private:
-	struct CPropertyNotifyInfo {
+	class CPropertyNotifyInfo {
 	public:
 		Window			m_window;
 		Atom			m_property;
 	};
-	struct CClipboardRequest {
+	class CClipboardRequest {
 	public:
 		CString			m_data;
 		UInt32			m_sent;