8 files changed, 3 insertions, 10 deletions
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