7 files changed, 7 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4872e46f2..8b072a55d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,7 +39,7 @@ endif(WIN32)
 
 # Generate the Anope executable and set it's linker flags, also set it to export it's symbols even though it's not a module
 add_executable(${PROGRAM_NAME} ${SRC_SRCS})
-set_target_properties(${PROGRAM_NAME} PROPERTIES LINK_FLAGS "${LDFLAGS}" ENABLE_EXPORTS ON)
+set_target_properties(${PROGRAM_NAME} PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}" ENABLE_EXPORTS ON)
 # On Windows, also link Anope to the wsock32 library, as well as set the version
 if(WIN32)
   target_link_libraries(${PROGRAM_NAME} wsock32)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 266b420d5..623f36f3e 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -19,7 +19,7 @@ foreach(SRC ${CORE_SRCS})
   endif(MSVC)
   # Generate the module and set it's linker flags, also set it to depend on the main Anope executable to be built beforehand
   add_library(${SO} MODULE ${SRC})
-  set_target_properties(${SO} PROPERTIES PREFIX "" SUFFIX "" LINK_FLAGS "${LDFLAGS}")
+  set_target_properties(${SO} PROPERTIES LINKER_LANGUAGE CXX PREFIX "" SUFFIX "" LINK_FLAGS "${LDFLAGS}")
   add_dependencies(${SO} ${PROGRAM_NAME})
   # For Windows only, have the module link to the export library of Anope as well as the wsock32 library (most of the modules probably don't need this, but this is to be on the safe side), also set it's version
   if(WIN32)
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 300d87050..f8acaab58 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -19,7 +19,7 @@ foreach(SRC ${MODULES_SRCS})
   endif(MSVC)
   # Generate the module and set it's linker flags, also set it to depend on the main Anope executable to be built beforehand
   add_library(${SO} MODULE ${SRC})
-  set_target_properties(${SO} PROPERTIES PREFIX "" SUFFIX "" LINK_FLAGS "${LDFLAGS}")
+  set_target_properties(${SO} PROPERTIES LINKER_LANGUAGE CXX PREFIX "" SUFFIX "" LINK_FLAGS "${LDFLAGS}")
   add_dependencies(${SO} ${PROGRAM_NAME})
   # For Windows only, have the module link to the export library of Anope as well as the wsock32 library (most of the modules probably don't need this, but this is to be on the safe side), also set it's version
   if(WIN32)
diff --git a/src/protocol/CMakeLists.txt b/src/protocol/CMakeLists.txt
index c384f7a31..71352d576 100644
--- a/src/protocol/CMakeLists.txt
+++ b/src/protocol/CMakeLists.txt
@@ -19,7 +19,7 @@ foreach(SRC ${PROTOCOL_SRCS})
   endif(MSVC)
   # Generate the module and set it's linker flags, also set it to depend on the main Anope executable to be built beforehand
   add_library(${SO} MODULE ${SRC})
-  set_target_properties(${SO} PROPERTIES PREFIX "" SUFFIX "" LINK_FLAGS "${LDFLAGS}")
+  set_target_properties(${SO} PROPERTIES LINKER_LANGUAGE CXX PREFIX "" SUFFIX "" LINK_FLAGS "${LDFLAGS}")
   add_dependencies(${SO} ${PROGRAM_NAME})
   # For Windows only, have the module link to the export library of Anope as well as the wsock32 library (most of the modules probably don't need this, but this is to be on the safe side), also set it's version
   if(WIN32)
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 1b38286d5..d1df8220f 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -61,7 +61,7 @@
 #endif
 
 #ifdef _WIN32
-#include "winsock.h"
+#include <winsock.h>
 int inet_aton(const char *name, struct in_addr *addr)
 {
 	uint32 a = inet_addr(name);
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index c7edecd82..bef8d113c 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -61,7 +61,7 @@
 #endif
 
 #ifdef _WIN32
-#include "winsock.h"
+#include <winsock.h>
 int inet_aton(const char *name, struct in_addr *addr)
 {
 	uint32 a = inet_addr(name);
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 17d9b9282..96fa1c39c 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -15,7 +15,7 @@ foreach(SRC ${TOOLS_SRCS})
   calculate_depends(${SRC})
   # Generate the executable and set it's linker flags, also set it to depend on the main Anope executable to be built beforehand
   add_executable(${EXE} ${SRC})
-  set_target_properties(${EXE} PROPERTIES LINK_FLAGS "${LDFLAGS}")
+  set_target_properties(${EXE} PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}")
   add_dependencies(${EXE} ${PROGRAM_NAME})
   # Set the executable to be installed to the tools directory under the bin directory
   install(TARGETS ${EXE}