159 files changed, 39 insertions, 60 deletions

diff --git a/configure b/configure
index 2d99c0b19..8342409ed 100755
--- a/configure
+++ b/configure
@@ -598,7 +598,7 @@ PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
-ac_unique_file="src/actions.c"
+ac_unique_file="src/actions.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
diff --git a/configure.in b/configure.in
index 1bda1b300..13ba368fe 100644
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@ if test "${with_instdir+set}" != set; then
   exit 0
 fi
 
-AC_CONFIG_SRCDIR([src/actions.c])
+AC_CONFIG_SRCDIR([src/actions.cpp])
 AC_CONFIG_HEADER(include/sysconf.h)
 AC_PROG_CC
 if test "$ac_cv_c_compiler_gnu" = "yes"; then
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8cf232a77..b9c082c7b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
-# Find all the *.c and *.cpp files within the current source directory, and sort the list
-file(GLOB SRC_SRCS_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c")
+# Find all the *.cpp files within the current source directory, and sort the list
 file(GLOB SRC_SRCS_CPP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp")
 set(SRC_SRCS ${SRC_SRCS_C} ${SRC_SRCS_CPP})
 
diff --git a/src/Makefile b/src/Makefile
index e7c8ba2fb..d4ce6625e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -19,9 +19,6 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 	   'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' \
 	   'MAKEBIN=${MAKEBIN}' 'MYSQLDIR=${MYSQLDIR}'
 
-.c.o:
-	$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
-
 .cpp.o:
 	$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
 
@@ -34,50 +31,50 @@ services:  $(OBJS)
 	$(MAKEBIN) $(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
 
 $(OBJS): Makefile
-actions.o:      actions.c   $(INCLUDES)
-base64.o:       base64.c    $(INCLUDES)
+actions.o:      actions.cpp   $(INCLUDES)
+base64.o:       base64.cpp    $(INCLUDES)
 bots.o:         bots.cpp    $(INCLUDES)
-botserv.o:      botserv.c   $(INCLUDES)
-channels.o:     channels.c  $(INCLUDES)
-chanserv.o:     chanserv.c  $(INCLUDES)
+botserv.o:      botserv.cpp   $(INCLUDES)
+channels.o:     channels.cpp  $(INCLUDES)
+chanserv.o:     chanserv.cpp  $(INCLUDES)
 command.o:      command.cpp  $(INCLUDES)
-commands.o:     commands.c  $(INCLUDES)
-compat.o:       compat.c    $(INCLUDES)
-config.o:       config.c    $(INCLUDES)
+commands.o:     commands.cpp  $(INCLUDES)
+compat.o:       compat.cpp    $(INCLUDES)
+config.o:       config.cpp    $(INCLUDES)
 configreader.o: configreader.cpp $(INCLUDES)
-encrypt.o:      encrypt.c   $(INCLUDES)
-init.o:         init.c      $(INCLUDES)
-ircd.o:         ircd.c      $(INCLUDES)
-hostserv.o:     hostserv.c  $(INCLUDES)
-language.o:     language.c  $(INCLUDES)
-log.o:          log.c       $(INCLUDES)
+encrypt.o:      encrypt.cpp   $(INCLUDES)
+init.o:         init.cpp      $(INCLUDES)
+ircd.o:         ircd.cpp      $(INCLUDES)
+hostserv.o:     hostserv.cpp  $(INCLUDES)
+language.o:     language.cpp  $(INCLUDES)
+log.o:          log.cpp       $(INCLUDES)
 mail.o:         mail.cpp      $(INCLUDES)
-main.o:         main.c      $(INCLUDES)
-memory.o:       memory.c    $(INCLUDES)
-memoserv.o:     memoserv.c  $(INCLUDES)
-messages.o:     messages.c  $(INCLUDES)
+main.o:         main.cpp      $(INCLUDES)
+memory.o:       memory.cpp    $(INCLUDES)
+memoserv.o:     memoserv.cpp  $(INCLUDES)
+messages.o:     messages.cpp  $(INCLUDES)
 modes.o:        modes.cpp $(INCLUDES)
-modules.o:      modules.c   $(INCLUDES)
+modules.o:      modules.cpp   $(INCLUDES)
 module.o:       module.cpp   $(INCLUDES)
 modulemanager.o:      modulemanager.cpp   $(INCLUDES)
-misc.o:         misc.c      $(INCLUDES)
+misc.o:         misc.cpp      $(INCLUDES)
 nickalias.o:    nickalias.cpp $(INCLUDES)
 nickcore.o:     nickcore.cpp $(INCLUDES)
-nickserv.o:     nickserv.c  $(INCLUDES)
-operserv.o:     operserv.c  $(INCLUDES)
+nickserv.o:     nickserv.cpp  $(INCLUDES)
+operserv.o:     operserv.cpp  $(INCLUDES)
 opertype.o:     opertype.cpp  $(INCLUDES)
-process.o:      process.c   $(INCLUDES)
+process.o:      process.cpp   $(INCLUDES)
 protocol.o:     protocol.cpp  $(INCLUDES)
 regchannel.o:	regchannel.cpp $(INCLUDES)
-send.o:         send.c      $(INCLUDES)
+send.o:         send.cpp      $(INCLUDES)
 servers.o:      servers.cpp   $(INCLUDES)
-sessions.o:     sessions.c  $(INCLUDES)
-slist.o:        slist.c     $(INCLUDES)
+sessions.o:     sessions.cpp  $(INCLUDES)
+slist.o:        slist.cpp     $(INCLUDES)
 sockets.o:     sockets.cpp  $(INCLUDES)
 threadengine.o: threadengine.cpp $(INCLUDES)
 threadengine_pthread.o: threadengine_pthread.cpp $(INCLUDES)
 timers.o:       timers.cpp  $(INCLUDES)
-users.o:        users.c     $(INCLUDES)
+users.o:        users.cpp     $(INCLUDES)
 wildcard.o:     wildcard.cpp $(INCLUDES)
 
 modules: DUMMY
diff --git a/src/actions.c b/src/actions.cpp
index 00ed01100..00ed01100 100644
--- a/src/actions.c
+++ b/src/actions.cpp
diff --git a/src/base64.c b/src/base64.cpp
index 3f576e96a..3f576e96a 100644
--- a/src/base64.c
+++ b/src/base64.cpp
diff --git a/src/botserv.c b/src/botserv.cpp
index aefe37b08..aefe37b08 100644
--- a/src/botserv.c
+++ b/src/botserv.cpp
diff --git a/src/channels.c b/src/channels.cpp
index 5a439726f..5a439726f 100644
--- a/src/channels.c
+++ b/src/channels.cpp
diff --git a/src/chanserv.c b/src/chanserv.cpp
index 36e82f6b9..36e82f6b9 100644
--- a/src/chanserv.c
+++ b/src/chanserv.cpp
diff --git a/src/commands.c b/src/commands.cpp
index 71c4c986a..71c4c986a 100644
--- a/src/commands.c
+++ b/src/commands.cpp
diff --git a/src/compat.c b/src/compat.cpp
index eb3088fe9..eb3088fe9 100644
--- a/src/compat.c
+++ b/src/compat.cpp
diff --git a/src/config.c b/src/config.cpp
index a1264abce..a1264abce 100644
--- a/src/config.c
+++ b/src/config.cpp
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index f8547872b..2af2b3ea9 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,5 +1,4 @@
-# Find all the *.c and *.cpp files within the current source directory, and sort the list
-file(GLOB CORE_SRCS_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c")
+# Find all the *.cpp files within the current source directory, and sort the list
 file(GLOB CORE_SRCS_CPP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp")
 set(CORE_SRCS ${CORE_SRCS_C} ${CORE_SRCS_CPP})
 sort_list(CORE_SRCS)
diff --git a/src/core/Makefile b/src/core/Makefile
index 122522d69..e1dec257c 100644
--- a/src/core/Makefile
+++ b/src/core/Makefile
@@ -8,8 +8,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' \
 	   'MODULEFLAGS=${MODULEFLAGS}' 'MAKEBIN=${MAKEBIN}'
 
-OBJECTS= $(SRCS:.c=.so)
-OBJECTS+= $(SRCS:.cpp=.so)
+OBJECTS= $(SRCS:.cpp=.so)
 CDEFS= -rdynamic -Wall
 
 all: modules subs
@@ -21,10 +20,7 @@ install:
 
 distclean: spotless
 
-.SUFFIXES: .c .cpp .so
-
-.c.so:
-	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $@ $<
+.SUFFIXES: .cpp .so
 
 .cpp.so:
 	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $@ $<
diff --git a/src/core/bs_act.c b/src/core/bs_act.cpp
index 1bf11e078..1bf11e078 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.cpp
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.cpp
index dc847eb66..dc847eb66 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.cpp
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.cpp
index ce026e9c4..ce026e9c4 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.cpp
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.cpp
index 2c5888554..2c5888554 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.cpp
diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.cpp
index 935e6d18a..935e6d18a 100644
--- a/src/core/bs_botlist.c
+++ b/src/core/bs_botlist.cpp
diff --git a/src/core/bs_help.c b/src/core/bs_help.cpp
index a3e53df5c..a3e53df5c 100644
--- a/src/core/bs_help.c
+++ b/src/core/bs_help.cpp
diff --git a/src/core/bs_info.c b/src/core/bs_info.cpp
index f7d6fb46d..f7d6fb46d 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.cpp
diff --git a/src/core/bs_kick.c b/src/core/bs_kick.cpp
index ab2782c8d..ab2782c8d 100644
--- a/src/core/bs_kick.c
+++ b/src/core/bs_kick.cpp
diff --git a/src/core/bs_say.c b/src/core/bs_say.cpp
index 8dfc55115..8dfc55115 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.cpp
diff --git a/src/core/bs_set.c b/src/core/bs_set.cpp
index 3468198a2..3468198a2 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.cpp
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.cpp
index 067e4cc14..067e4cc14 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.cpp
diff --git a/src/core/cs_access.c b/src/core/cs_access.cpp
index 6ef238b71..6ef238b71 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.cpp
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.cpp
index 3d56e4846..3d56e4846 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.cpp
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.cpp
index 39f290d98..39f290d98 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.cpp
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.cpp
index 5e7ef2674..5e7ef2674 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.cpp
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.cpp
index afeb522a9..afeb522a9 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.cpp
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.cpp
index 141865bf7..141865bf7 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.cpp
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.cpp
index 935a2bdbe..935a2bdbe 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.cpp
diff --git a/src/core/cs_help.c b/src/core/cs_help.cpp
index 941634483..941634483 100644
--- a/src/core/cs_help.c
+++ b/src/core/cs_help.cpp
diff --git a/src/core/cs_info.c b/src/core/cs_info.cpp
index c0c99c856..c0c99c856 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.cpp
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.cpp
index 2abcf82bb..2abcf82bb 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.cpp
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.cpp
index 1c05ea77e..1c05ea77e 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.cpp
diff --git a/src/core/cs_list.c b/src/core/cs_list.cpp
index 4b6f1d242..4b6f1d242 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.cpp
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.cpp
index 312bc55dc..312bc55dc 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.cpp
diff --git a/src/core/cs_register.c b/src/core/cs_register.cpp
index 882e0e17c..882e0e17c 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.cpp
diff --git a/src/core/cs_set.c b/src/core/cs_set.cpp
index 07171bdc1..07171bdc1 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.cpp
diff --git a/src/core/cs_status.c b/src/core/cs_status.cpp
index 9db2b2d00..9db2b2d00 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.cpp
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.cpp
index 654dd9711..654dd9711 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.cpp
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.cpp
index b8642666c..b8642666c 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.cpp
diff --git a/src/core/cs_unban.c b/src/core/cs_unban.cpp
index 0ae2077ed..0ae2077ed 100644
--- a/src/core/cs_unban.c
+++ b/src/core/cs_unban.cpp
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.cpp
index c25bf02e2..c25bf02e2 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.cpp
diff --git a/src/core/enc_md5.c b/src/core/enc_md5.cpp
index 1c46ca72b..1c46ca72b 100644
--- a/src/core/enc_md5.c
+++ b/src/core/enc_md5.cpp
diff --git a/src/core/enc_none.c b/src/core/enc_none.cpp
index 280c86bd2..280c86bd2 100644
--- a/src/core/enc_none.c
+++ b/src/core/enc_none.cpp
diff --git a/src/core/enc_old.c b/src/core/enc_old.cpp
index 68eece13c..68eece13c 100644
--- a/src/core/enc_old.c
+++ b/src/core/enc_old.cpp
diff --git a/src/core/enc_sha1.c b/src/core/enc_sha1.cpp
index b4ac2a4e2..b4ac2a4e2 100644
--- a/src/core/enc_sha1.c
+++ b/src/core/enc_sha1.cpp
diff --git a/src/core/enc_sha256.c b/src/core/enc_sha256.cpp
index ef1ed7a00..ef1ed7a00 100644
--- a/src/core/enc_sha256.c
+++ b/src/core/enc_sha256.cpp
diff --git a/src/core/hs_del.c b/src/core/hs_del.cpp
index 12610d31f..12610d31f 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.cpp
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.cpp
index aaab9b6e1..aaab9b6e1 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.cpp
diff --git a/src/core/hs_group.c b/src/core/hs_group.cpp
index 3c744ef90..3c744ef90 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.cpp
diff --git a/src/core/hs_help.c b/src/core/hs_help.cpp
index 7e8d1e69a..7e8d1e69a 100644
--- a/src/core/hs_help.c
+++ b/src/core/hs_help.cpp
diff --git a/src/core/hs_list.c b/src/core/hs_list.cpp
index 427864e54..427864e54 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.cpp
diff --git a/src/core/hs_off.c b/src/core/hs_off.cpp
index ac6416cea..ac6416cea 100644
--- a/src/core/hs_off.c
+++ b/src/core/hs_off.cpp
diff --git a/src/core/hs_on.c b/src/core/hs_on.cpp
index d04040de1..d04040de1 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.cpp
diff --git a/src/core/hs_set.c b/src/core/hs_set.cpp
index a570986ac..a570986ac 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.cpp
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.cpp
index dd90d4153..dd90d4153 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.cpp
diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.cpp
index 33d8006db..33d8006db 100644
--- a/src/core/ms_cancel.c
+++ b/src/core/ms_cancel.cpp
diff --git a/src/core/ms_check.c b/src/core/ms_check.cpp
index 51281574e..51281574e 100644
--- a/src/core/ms_check.c
+++ b/src/core/ms_check.cpp
diff --git a/src/core/ms_del.c b/src/core/ms_del.cpp
index 68c093f86..68c093f86 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.cpp
diff --git a/src/core/ms_help.c b/src/core/ms_help.cpp
index 09570eca2..09570eca2 100644
--- a/src/core/ms_help.c
+++ b/src/core/ms_help.cpp
diff --git a/src/core/ms_info.c b/src/core/ms_info.cpp
index 0519fd5b8..0519fd5b8 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.cpp
diff --git a/src/core/ms_list.c b/src/core/ms_list.cpp
index c653f7708..c653f7708 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.cpp
diff --git a/src/core/ms_read.c b/src/core/ms_read.cpp
index 600e92cae..600e92cae 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.cpp
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.cpp
index 7759edb2c..7759edb2c 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.cpp
diff --git a/src/core/ms_send.c b/src/core/ms_send.cpp
index ffd3a911c..ffd3a911c 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.cpp
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.cpp
index 2e3abe640..2e3abe640 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.cpp
diff --git a/src/core/ms_set.c b/src/core/ms_set.cpp
index bac493ade..bac493ade 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.cpp
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.cpp
index d3ff161c9..d3ff161c9 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.cpp
diff --git a/src/core/ns_access.c b/src/core/ns_access.cpp
index e64bc1b16..e64bc1b16 100644
--- a/src/core/ns_access.c
+++ b/src/core/ns_access.cpp
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.cpp
index 0fd7b47af..0fd7b47af 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.cpp
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.cpp
index 16c73f04a..16c73f04a 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.cpp
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.cpp
index 70943ceeb..70943ceeb 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.cpp
diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.cpp
index 2c15a0042..2c15a0042 100644
--- a/src/core/ns_getemail.c
+++ b/src/core/ns_getemail.cpp
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.cpp
index f1acaf6ca..f1acaf6ca 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.cpp
diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.cpp
index 674fb3d08..674fb3d08 100644
--- a/src/core/ns_ghost.c
+++ b/src/core/ns_ghost.cpp
diff --git a/src/core/ns_group.c b/src/core/ns_group.cpp
index dd6f9b3be..dd6f9b3be 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.cpp
diff --git a/src/core/ns_help.c b/src/core/ns_help.cpp
index 233c7252f..233c7252f 100644
--- a/src/core/ns_help.c
+++ b/src/core/ns_help.cpp
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.cpp
index bf8a4548f..bf8a4548f 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.cpp
diff --git a/src/core/ns_info.c b/src/core/ns_info.cpp
index a73766c06..a73766c06 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.cpp
diff --git a/src/core/ns_list.c b/src/core/ns_list.cpp
index bc27e9619..bc27e9619 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.cpp
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.cpp
index 463916082..463916082 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.cpp
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.cpp
index b44998d86..b44998d86 100644
--- a/src/core/ns_recover.c
+++ b/src/core/ns_recover.cpp
diff --git a/src/core/ns_register.c b/src/core/ns_register.cpp
index beb2e26ac..beb2e26ac 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.cpp
diff --git a/src/core/ns_release.c b/src/core/ns_release.cpp
index 7201f3493..7201f3493 100644
--- a/src/core/ns_release.c
+++ b/src/core/ns_release.cpp
diff --git a/src/core/ns_resetpass.c b/src/core/ns_resetpass.cpp
index 42e38b108..42e38b108 100644
--- a/src/core/ns_resetpass.c
+++ b/src/core/ns_resetpass.cpp
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.cpp
index 7117ffab7..7117ffab7 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.cpp
diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.cpp
index 70ec1ab9d..70ec1ab9d 100644
--- a/src/core/ns_sendpass.c
+++ b/src/core/ns_sendpass.cpp
diff --git a/src/core/ns_set.c b/src/core/ns_set.cpp
index 1325f6b32..1325f6b32 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.cpp
diff --git a/src/core/ns_status.c b/src/core/ns_status.cpp
index f6bc6ca34..f6bc6ca34 100644
--- a/src/core/ns_status.c
+++ b/src/core/ns_status.cpp
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.cpp
index 94408adac..94408adac 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.cpp
diff --git a/src/core/ns_update.c b/src/core/ns_update.cpp
index 755df4dc0..755df4dc0 100644
--- a/src/core/ns_update.c
+++ b/src/core/ns_update.cpp
diff --git a/src/core/os_akill.c b/src/core/os_akill.cpp
index 47a2b9dd1..47a2b9dd1 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.cpp
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.cpp
index aa6ffa142..aa6ffa142 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.cpp
diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.cpp
index 5d1ab1873..5d1ab1873 100644
--- a/src/core/os_chanlist.c
+++ b/src/core/os_chanlist.cpp
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.cpp
index 89b10a4a1..89b10a4a1 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.cpp
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.cpp
index 6f9197a2b..6f9197a2b 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.cpp
diff --git a/src/core/os_global.c b/src/core/os_global.cpp
index 791bdcbc0..791bdcbc0 100644
--- a/src/core/os_global.c
+++ b/src/core/os_global.cpp
diff --git a/src/core/os_help.c b/src/core/os_help.cpp
index 8e9893407..8e9893407 100644
--- a/src/core/os_help.c
+++ b/src/core/os_help.cpp
diff --git a/src/core/os_ignore.c b/src/core/os_ignore.cpp
index f71a1cd2c..f71a1cd2c 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.cpp
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.cpp
index 11d9fafee..11d9fafee 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.cpp
diff --git a/src/core/os_kick.c b/src/core/os_kick.cpp
index 72a47b9c4..72a47b9c4 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.cpp
diff --git a/src/core/os_mode.c b/src/core/os_mode.cpp
index c72ab9e26..c72ab9e26 100644
--- a/src/core/os_mode.c
+++ b/src/core/os_mode.cpp
diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.cpp
index 0a000bc00..0a000bc00 100644
--- a/src/core/os_modinfo.c
+++ b/src/core/os_modinfo.cpp
diff --git a/src/core/os_modlist.c b/src/core/os_modlist.cpp
index b51be2067..b51be2067 100644
--- a/src/core/os_modlist.c
+++ b/src/core/os_modlist.cpp
diff --git a/src/core/os_modload.c b/src/core/os_modload.cpp
index ddda212d5..ddda212d5 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.cpp
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.cpp
index 8c5fee850..8c5fee850 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.cpp
diff --git a/src/core/os_news.c b/src/core/os_news.cpp
index 68cb827f9..68cb827f9 100644
--- a/src/core/os_news.c
+++ b/src/core/os_news.cpp
diff --git a/src/core/os_noop.c b/src/core/os_noop.cpp
index bfa1fcbeb..bfa1fcbeb 100644
--- a/src/core/os_noop.c
+++ b/src/core/os_noop.cpp
diff --git a/src/core/os_oline.c b/src/core/os_oline.cpp
index f02484352..f02484352 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.cpp
diff --git a/src/core/os_quit.c b/src/core/os_quit.cpp
index 5d3630a2d..5d3630a2d 100644
--- a/src/core/os_quit.c
+++ b/src/core/os_quit.cpp
diff --git a/src/core/os_reload.c b/src/core/os_reload.cpp
index 67c1c679f..67c1c679f 100644
--- a/src/core/os_reload.c
+++ b/src/core/os_reload.cpp
diff --git a/src/core/os_restart.c b/src/core/os_restart.cpp
index 8904381f5..8904381f5 100644
--- a/src/core/os_restart.c
+++ b/src/core/os_restart.cpp
diff --git a/src/core/os_session.c b/src/core/os_session.cpp
index 06331eb79..06331eb79 100644
--- a/src/core/os_session.c
+++ b/src/core/os_session.cpp
diff --git a/src/core/os_set.c b/src/core/os_set.cpp
index 419802871..419802871 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.cpp
diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.cpp
index 99801b8d0..99801b8d0 100644
--- a/src/core/os_shutdown.c
+++ b/src/core/os_shutdown.cpp
diff --git a/src/core/os_sqline.c b/src/core/os_sqline.cpp
index 89864c69e..89864c69e 100644
--- a/src/core/os_sqline.c
+++ b/src/core/os_sqline.cpp
diff --git a/src/core/os_staff.c b/src/core/os_staff.cpp
index 80d1f95a1..80d1f95a1 100644
--- a/src/core/os_staff.c
+++ b/src/core/os_staff.cpp
diff --git a/src/core/os_stats.c b/src/core/os_stats.cpp
index fb9623771..fb9623771 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.cpp
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.cpp
index 83906794f..83906794f 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.cpp
diff --git a/src/core/os_szline.c b/src/core/os_szline.cpp
index 674b8d7d5..674b8d7d5 100644
--- a/src/core/os_szline.c
+++ b/src/core/os_szline.cpp
diff --git a/src/core/os_umode.c b/src/core/os_umode.cpp
index 2532d531d..2532d531d 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.cpp
diff --git a/src/core/os_update.c b/src/core/os_update.cpp
index 750bb0e14..750bb0e14 100644
--- a/src/core/os_update.c
+++ b/src/core/os_update.cpp
diff --git a/src/core/os_userlist.c b/src/core/os_userlist.cpp
index fbc57f406..fbc57f406 100644
--- a/src/core/os_userlist.c
+++ b/src/core/os_userlist.cpp
diff --git a/src/core/ss_main.c b/src/core/ss_main.cpp
index d0578b16d..d0578b16d 100644
--- a/src/core/ss_main.c
+++ b/src/core/ss_main.cpp
diff --git a/src/encrypt.c b/src/encrypt.cpp
index 4f76ee895..4f76ee895 100644
--- a/src/encrypt.c
+++ b/src/encrypt.cpp
diff --git a/src/hostserv.c b/src/hostserv.cpp
index 9d7362903..9d7362903 100644
--- a/src/hostserv.c
+++ b/src/hostserv.cpp
diff --git a/src/init.c b/src/init.cpp
index 2c2a64ed4..2c2a64ed4 100644
--- a/src/init.c
+++ b/src/init.cpp
diff --git a/src/ircd.c b/src/ircd.cpp
index 70d961d81..70d961d81 100644
--- a/src/ircd.c
+++ b/src/ircd.cpp
diff --git a/src/language.c b/src/language.cpp
index 3f5c900e9..3f5c900e9 100644
--- a/src/language.c
+++ b/src/language.cpp
diff --git a/src/log.c b/src/log.cpp
index bf5fd10fb..bf5fd10fb 100644
--- a/src/log.c
+++ b/src/log.cpp
diff --git a/src/main.c b/src/main.cpp
index d4746cf93..d4746cf93 100644
--- a/src/main.c
+++ b/src/main.cpp
diff --git a/src/memory.c b/src/memory.cpp
index 4343bf5e6..4343bf5e6 100644
--- a/src/memory.c
+++ b/src/memory.cpp
diff --git a/src/memoserv.c b/src/memoserv.cpp
index 4d33bde3e..4d33bde3e 100644
--- a/src/memoserv.c
+++ b/src/memoserv.cpp
diff --git a/src/messages.c b/src/messages.cpp
index 56351ea8f..56351ea8f 100644
--- a/src/messages.c
+++ b/src/messages.cpp
diff --git a/src/misc.c b/src/misc.cpp
index 22ea81432..22ea81432 100644
--- a/src/misc.c
+++ b/src/misc.cpp
diff --git a/src/modules.c b/src/modules.cpp
index 0044bcc56..0044bcc56 100644
--- a/src/modules.c
+++ b/src/modules.cpp
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 6cb5b5612..a7feab5d0 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -1,5 +1,4 @@
-# Find all the *.c and *.cpp files within the current source directory, and sort the list
-file(GLOB MODULES_SRCS_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c")
+# Find all the *.cpp files within the current source directory, and sort the list
 file(GLOB MODULES_SRCS_CPP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp")
 set(MODULES_SRCS ${MODULES_SRCS_C} ${MODULES_SRCS_CPP})
 sort_list(MODULES_SRCS)
diff --git a/src/modules/Makefile b/src/modules/Makefile
index 64b9373c7..c69128ea3 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -8,8 +8,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\
 	   'MAKEBIN=${MAKEBIN}' 'MYSQLDIR=${MYSQLDIR}'
 
-OBJECTS= $(SRCS:.c=.so)
-OBJECTS+= $(SRCS:.cpp=.so)
+OBJECTS= $(SRCS:.cpp=.so)
 CDEFS= -rdynamic -Wall
 MYSQL_ARGS = -I$(MYSQLDIR)/include/ -L$(MYSQLDIR)/lib/ -Wl,-rpath -Wl,$(MYSQLDIR)/lib/ -lmysqlpp
 
@@ -25,12 +24,7 @@ install:
 
 distclean: spotless
 
-.SUFFIXES: .c .cpp .so
-
-.c.so:
-	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} \
-	$(if $(shell grep RequiredLibraries $< | grep mysqlpp), $(MYSQL_ARGS)) $(if $(shell grep RequiredLibraries $< | grep ssl), -lssl) $(if $(shell grep RequiredLibraries $< | grep crypt), -lcrypt) \
-	-I../${INCLUDEDIR} -o $@ $<
+.SUFFIXES: .cpp .so
 
 .cpp.so:
 	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} \
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.cpp
index 311ac0717..311ac0717 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.cpp
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.cpp
index 906e42ea6..906e42ea6 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.cpp
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.cpp
index 710840d52..710840d52 100644
--- a/src/modules/cs_tban.c
+++ b/src/modules/cs_tban.cpp
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.cpp
index 385dfc8c5..385dfc8c5 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.cpp
diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.cpp
index 2399dba68..2399dba68 100644
--- a/src/modules/ns_maxemail.c
+++ b/src/modules/ns_maxemail.cpp
diff --git a/src/modules/os_info.c b/src/modules/os_info.cpp
index a49fa8a88..a49fa8a88 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.cpp
diff --git a/src/nickserv.c b/src/nickserv.cpp
index c3b3d31c6..c3b3d31c6 100644
--- a/src/nickserv.c
+++ b/src/nickserv.cpp
diff --git a/src/operserv.c b/src/operserv.cpp
index c8432b9f9..c8432b9f9 100644
--- a/src/operserv.c
+++ b/src/operserv.cpp
diff --git a/src/process.c b/src/process.cpp
index 7a015c64b..7a015c64b 100644
--- a/src/process.c
+++ b/src/process.cpp
diff --git a/src/protocol/CMakeLists.txt b/src/protocol/CMakeLists.txt
index a74b49a89..abca56caf 100644
--- a/src/protocol/CMakeLists.txt
+++ b/src/protocol/CMakeLists.txt
@@ -1,5 +1,4 @@
-# Find all the *.c and *.cpp files within the current source directory, and sort the list
-file(GLOB PROTOCOL_SRCS_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c")
+# Find all the *.cpp files within the current source directory, and sort the list
 file(GLOB PROTOCOL_SRCS_CPP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp")
 set(PROTOCOL_SRCS ${PROTOCOL_SRCS_C} ${PROTOCOL_SRCS_CPP})
 sort_list(PROTOCOL_SRCS)
diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index a40d009c2..7221ab2e2 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@@ -8,8 +8,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\
 	   'MAKEBIN=${MAKEBIN}'
 
-OBJECTS= $(SRCS:.c=.so)
-OBJECTS+= $(SRCS:.cpp=.so)
+OBJECTS= $(SRCS:.cpp=.so)
 CDEFS= -rdynamic -Wall
 
 all: modules subs
@@ -21,10 +20,7 @@ install:
 
 distclean: clean spotless
 
-.SUFFIXES: .c .cpp .so
-
-.c.so:
-	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $@ $<
+.SUFFIXES: .cpp .so
 
 .cpp.so:
 	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $@ $<
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.cpp
index 040144737..040144737 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.cpp
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.cpp
index 8fe766824..8fe766824 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.cpp
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.cpp
index 95ccf6392..95ccf6392 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.cpp
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.cpp
index 4d90e6bcf..4d90e6bcf 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.cpp
diff --git a/src/send.c b/src/send.cpp
index 4209e2a1b..4209e2a1b 100644
--- a/src/send.c
+++ b/src/send.cpp
diff --git a/src/sessions.c b/src/sessions.cpp
index e0c20e185..e0c20e185 100644
--- a/src/sessions.c
+++ b/src/sessions.cpp
diff --git a/src/users.c b/src/users.cpp
index 946f70f6a..946f70f6a 100644
--- a/src/users.c
+++ b/src/users.cpp