diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 829a0066d4..2e49656249 100644
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -11,12 +11,7 @@
 #ifndef __GSOCKET_H
 #define __GSOCKET_H
 
-// FIXME: OS/2 needs to move to modern C++ GSocket
-#if defined(__OS2__)
-#undef wxUSE_GSOCKET_CPLUSPLUS
-#else
 #define wxUSE_GSOCKET_CPLUSPLUS 1
-#endif
 
 #if !defined(__cplusplus) && defined(wxUSE_GSOCKET_CPLUSPLUS)
 #error "You need to compile this file (probably a GUI gsock peice) as C++"