diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index bce14a6ff..928466e41 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -159,5 +159,6 @@ function(build_subdir)
   endif(HAS_FUNCTION)
 endfunction(build_subdir)
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 build_modules(${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/modules/commands/cs_fantasy_stats.cpp b/modules/commands/cs_fantasy_stats.cpp
index b1b878c63..df24710a0 100644
--- a/modules/commands/cs_fantasy_stats.cpp
+++ b/modules/commands/cs_fantasy_stats.cpp
@@ -12,7 +12,7 @@
 /*************************************************************************/
 
 #include "module.h"
-#include "../extra/sql.h"
+#include "sql.h"
 
 class MySQLInterface : public SQL::Interface
 {
diff --git a/modules/commands/cs_fantasy_top.cpp b/modules/commands/cs_fantasy_top.cpp
index 2f445028b..9baceeda3 100644
--- a/modules/commands/cs_fantasy_top.cpp
+++ b/modules/commands/cs_fantasy_top.cpp
@@ -12,7 +12,7 @@
 /*************************************************************************/
 
 #include "module.h"
-#include "../extra/sql.h"
+#include "sql.h"
 
 class MySQLInterface : public SQL::Interface
 {
diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp
index 4025fec69..894037026 100644
--- a/modules/database/db_sql.cpp
+++ b/modules/database/db_sql.cpp
@@ -9,7 +9,7 @@
  */
 
 #include "module.h"
-#include "../extra/sql.h"
+#include "sql.h"
 
 using namespace SQL;
 
diff --git a/modules/database/db_sql_live.cpp b/modules/database/db_sql_live.cpp
index a26b08cf7..239c543c2 100644
--- a/modules/database/db_sql_live.cpp
+++ b/modules/database/db_sql_live.cpp
@@ -1,5 +1,5 @@
 #include "module.h"
-#include "../extra/sql.h"
+#include "sql.h"
 #include "../commands/os_session.h"
 
 using namespace SQL;
diff --git a/modules/extra/httpd.h b/modules/httpd.h
similarity index 100%
rename from modules/extra/httpd.h
rename to modules/httpd.h
diff --git a/modules/extra/ldap.h b/modules/ldap.h
similarity index 100%
rename from modules/extra/ldap.h
rename to modules/ldap.h
diff --git a/modules/extra/sql.h b/modules/sql.h
similarity index 100%
rename from modules/extra/sql.h
rename to modules/sql.h
diff --git a/modules/extra/ssl.h b/modules/ssl.h
similarity index 100%
rename from modules/extra/ssl.h
rename to modules/ssl.h
diff --git a/modules/extra/xmlrpc.h b/modules/xmlrpc.h
similarity index 100%
rename from modules/extra/xmlrpc.h
rename to modules/xmlrpc.h