diff --git a/Makefile b/Makefile
index 0d952e2..129ea72 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ libcallisto.so: ${OBJS} ${LIBS}
 	${CC} -shared ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 csto.o: csto.c lcallisto.h
 	${CC} ${CFLAGS} ${CPPFLAGS} -c csto.c
-lcallisto.o: lcallisto.c lenvironment.h lfile.h los.h lprocess.h
+lcallisto.o: lcallisto.c lcallisto.h
 	${CC} ${CFLAGS} ${CPPFLAGS} -c lcallisto.c
 lcl.o: lcl.c lcallisto.h
 	${CC} ${CFLAGS} ${CPPFLAGS} -c lcl.c
diff --git a/lcallisto.c b/lcallisto.c
index 2932665..779243a 100644
--- a/lcallisto.c
+++ b/lcallisto.c
@@ -8,16 +8,6 @@
 
 #include "lcallisto.h"
 
-/* Callisto libraries */
-#include "lcl.h"
-#include "lenvironment.h"
-#include "lfile.h"
-#include "ljson.h"
-#include "lmath.h"
-#include "los.h"
-#include "lprocess.h"
-#include "lsocket.h"
-
 
 static const luaL_Reg loadedlibs[] = {
 	{CALLISTO_CLLIBNAME,   callistoopen_cl},
diff --git a/lcl.c b/lcl.c
index c0b9848..cf8b04d 100644
--- a/lcl.c
+++ b/lcl.c
@@ -16,7 +16,6 @@
 #include <lua.h>
 #include <lauxlib.h>
 
-#include "lcl.h"
 #include "lcallisto.h"
 #include "util.h"
 
diff --git a/lcl.h b/lcl.h
deleted file mode 100644
index ae92b00..0000000
--- a/lcl.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _LCL_H_
-
-#define _LCL_H_
-
-#include <lua.h>
-
-int callistoopen_cl(lua_State *);
-
-#endif
diff --git a/lenvironment.c b/lenvironment.c
index 14a3d4e..838335f 100644
--- a/lenvironment.c
+++ b/lenvironment.c
@@ -13,7 +13,6 @@
 #include <lua.h>
 #include <lauxlib.h>
 
-#include "lenvironment.h"
 #include "lcallisto.h"
 #include "util.h"
 
diff --git a/lenvironment.h b/lenvironment.h
deleted file mode 100644
index e175e95..0000000
--- a/lenvironment.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _LENVIRONMENT_H_
-
-#define _LENVIRONMENT_H_
-
-#include <lua.h>
-
-int callistoopen_environment(lua_State *);
-
-#endif
diff --git a/lfile.c b/lfile.c
index 747b8d6..e5bbd4c 100644
--- a/lfile.c
+++ b/lfile.c
@@ -16,7 +16,6 @@
 #include <lua.h>
 #include <lauxlib.h>
 
-#include "lfile.h"
 #include "lcallisto.h"
 #include "util.h"
 
diff --git a/lfile.h b/lfile.h
deleted file mode 100644
index 3c1faa2..0000000
--- a/lfile.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _LFILE_H_
-
-#define _LFILE_H_
-
-#include <lua.h>
-
-int callistoopen_file(lua_State *);
-
-#endif
diff --git a/ljson.c b/ljson.c
index 9459b89..b59dac6 100644
--- a/ljson.c
+++ b/ljson.c
@@ -12,7 +12,6 @@
 #include <lua.h>
 #include <lauxlib.h>
 
-#include "ljson.h"
 #include "lcallisto.h"
 
 
diff --git a/ljson.h b/ljson.h
deleted file mode 100644
index 84cc9ff..0000000
--- a/ljson.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _LJSON_H_
-
-#define _LJSON_H_
-
-#include <lua.h>
-
-int callistoopen_json(lua_State *);
-
-#endif
diff --git a/lmath.c b/lmath.c
index 176d251..b71c0f2 100644
--- a/lmath.c
+++ b/lmath.c
@@ -6,7 +6,6 @@
 #include <lua.h>
 #include <lauxlib.h>
 
-#include "lmath.h"
 #include "lcallisto.h"
 #include "util.h"
 
diff --git a/lmath.h b/lmath.h
deleted file mode 100644
index 168fbff..0000000
--- a/lmath.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _LMATH_H_
-
-#define _LMATH_H_
-
-#include <lua.h>
-
-int callistoopen_math(lua_State *);
-
-#endif
diff --git a/los.c b/los.c
index 4637fda..f2780ff 100644
--- a/los.c
+++ b/los.c
@@ -17,7 +17,6 @@
 #include <lua.h>
 #include <lauxlib.h>
 
-#include "los.h"
 #include "lcallisto.h"
 #include "util.h"
 
diff --git a/los.h b/los.h
deleted file mode 100644
index 667d4e0..0000000
--- a/los.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _LOS_H_
-
-#define _LOS_H_
-
-#include <lua.h>
-
-int callistoopen_os(lua_State *);
-
-#endif
diff --git a/lprocess.c b/lprocess.c
index 7afe04b..38aa534 100644
--- a/lprocess.c
+++ b/lprocess.c
@@ -16,7 +16,6 @@
 #include <lua.h>
 #include <lauxlib.h>
 
-#include "lprocess.h"
 #include "lcallisto.h"
 #include "util.h"
 
diff --git a/lprocess.h b/lprocess.h
deleted file mode 100644
index df48aa2..0000000
--- a/lprocess.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _LPROCESS_H_
-
-#define _LPROCESS_H_
-
-#include <lua.h>
-
-int callistoopen_process(lua_State *);
-
-#endif
diff --git a/lsocket.c b/lsocket.c
index 2bc53bc..6abebe3 100644
--- a/lsocket.c
+++ b/lsocket.c
@@ -11,7 +11,6 @@
 #include <lua.h>
 #include <lauxlib.h>
 
-#include "lsocket.h"
 #include "lcallisto.h"
 
 
diff --git a/lsocket.h b/lsocket.h
deleted file mode 100644
index 01e26e6..0000000
--- a/lsocket.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _LSOCKET_H_
-
-#define _LSOCKET_H_
-
-#include <lua.h>
-
-int callistoopen_socket(lua_State *);
-
-#endif