diff --git a/.gitattributes b/.gitattributes
index 8155c914276e07286091fba590f60971b8190c98..5ab01e4dae6452254c2161fc2009fcde3a445f3c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -147,31 +147,32 @@ examples/dumbledore_cmd.c -text
 examples/overflow1.c -text
 examples/test1.c -text
 libIRDB/Makefile -text
-libIRDB/include/address.hpp -text
-libIRDB/include/baseobj.hpp -text
-libIRDB/include/basetypes.hpp -text
-libIRDB/include/dbinterface.hpp -text
-libIRDB/include/doip.hpp -text
-libIRDB/include/file.hpp -text
-libIRDB/include/function.hpp -text
-libIRDB/include/instruction.hpp -text
-libIRDB/include/libIRDB.hpp -text
-libIRDB/include/pqxxdb.hpp -text
+libIRDB/include/core/address.hpp -text
+libIRDB/include/core/baseobj.hpp -text
+libIRDB/include/core/basetypes.hpp -text
+libIRDB/include/core/dbinterface.hpp -text
+libIRDB/include/core/doip.hpp -text
+libIRDB/include/core/file.hpp -text
+libIRDB/include/core/function.hpp -text
+libIRDB/include/core/instruction.hpp -text
+libIRDB/include/core/pqxxdb.hpp -text
+libIRDB/include/core/variantid.hpp -text
+libIRDB/include/core/variantir.hpp -text
+libIRDB/include/libIRDB-core.hpp -text
 libIRDB/include/utils.hpp -text
-libIRDB/include/variantid.hpp -text
-libIRDB/include/variantir.hpp -text
 libIRDB/src/Makefile -text
-libIRDB/src/address.cpp -text
-libIRDB/src/all.hpp -text
-libIRDB/src/baseobj.cpp -text
-libIRDB/src/dbinterface.cpp -text
-libIRDB/src/file.cpp -text
-libIRDB/src/function.cpp -text
-libIRDB/src/generate_spri.cpp -text
-libIRDB/src/instruction.cpp -text
-libIRDB/src/pqxxdb.cpp -text
-libIRDB/src/variantid.cpp -text
-libIRDB/src/variantir.cpp -text
+libIRDB/src/core/Makefile -text
+libIRDB/src/core/address.cpp -text
+libIRDB/src/core/all.hpp -text
+libIRDB/src/core/baseobj.cpp -text
+libIRDB/src/core/dbinterface.cpp -text
+libIRDB/src/core/file.cpp -text
+libIRDB/src/core/function.cpp -text
+libIRDB/src/core/generate_spri.cpp -text
+libIRDB/src/core/instruction.cpp -text
+libIRDB/src/core/pqxxdb.cpp -text
+libIRDB/src/core/variantid.cpp -text
+libIRDB/src/core/variantir.cpp -text
 libIRDB/test/Makefile -text
 libIRDB/test/clone.cpp -text
 libIRDB/test/create_variant.cpp -text
diff --git a/libIRDB/include/address.hpp b/libIRDB/include/core/address.hpp
similarity index 100%
rename from libIRDB/include/address.hpp
rename to libIRDB/include/core/address.hpp
diff --git a/libIRDB/include/baseobj.hpp b/libIRDB/include/core/baseobj.hpp
similarity index 100%
rename from libIRDB/include/baseobj.hpp
rename to libIRDB/include/core/baseobj.hpp
diff --git a/libIRDB/include/basetypes.hpp b/libIRDB/include/core/basetypes.hpp
similarity index 100%
rename from libIRDB/include/basetypes.hpp
rename to libIRDB/include/core/basetypes.hpp
diff --git a/libIRDB/include/dbinterface.hpp b/libIRDB/include/core/dbinterface.hpp
similarity index 100%
rename from libIRDB/include/dbinterface.hpp
rename to libIRDB/include/core/dbinterface.hpp
diff --git a/libIRDB/include/doip.hpp b/libIRDB/include/core/doip.hpp
similarity index 100%
rename from libIRDB/include/doip.hpp
rename to libIRDB/include/core/doip.hpp
diff --git a/libIRDB/include/file.hpp b/libIRDB/include/core/file.hpp
similarity index 100%
rename from libIRDB/include/file.hpp
rename to libIRDB/include/core/file.hpp
diff --git a/libIRDB/include/function.hpp b/libIRDB/include/core/function.hpp
similarity index 100%
rename from libIRDB/include/function.hpp
rename to libIRDB/include/core/function.hpp
diff --git a/libIRDB/include/instruction.hpp b/libIRDB/include/core/instruction.hpp
similarity index 100%
rename from libIRDB/include/instruction.hpp
rename to libIRDB/include/core/instruction.hpp
diff --git a/libIRDB/include/pqxxdb.hpp b/libIRDB/include/core/pqxxdb.hpp
similarity index 100%
rename from libIRDB/include/pqxxdb.hpp
rename to libIRDB/include/core/pqxxdb.hpp
diff --git a/libIRDB/include/variantid.hpp b/libIRDB/include/core/variantid.hpp
similarity index 100%
rename from libIRDB/include/variantid.hpp
rename to libIRDB/include/core/variantid.hpp
diff --git a/libIRDB/include/variantir.hpp b/libIRDB/include/core/variantir.hpp
similarity index 100%
rename from libIRDB/include/variantir.hpp
rename to libIRDB/include/core/variantir.hpp
diff --git a/libIRDB/include/libIRDB-core.hpp b/libIRDB/include/libIRDB-core.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..765d84fe38453abaef7413af7311dfc6f6c3298c
--- /dev/null
+++ b/libIRDB/include/libIRDB-core.hpp
@@ -0,0 +1,31 @@
+#ifndef libIRDB_core
+#define libIRDB_core
+
+#include <string>
+#include <set>
+#include <assert.h>
+#include <string.h>
+#include <iostream>
+#include <pqxx/pqxx>
+#include <beaengine/BeaEngine.h>
+
+namespace libIRDB 
+{
+
+class VariantID_t; // forward decl for many classes
+
+#include <core/basetypes.hpp>
+#include <core/dbinterface.hpp>
+#include <core/doip.hpp>
+#include <core/baseobj.hpp>
+#include <core/address.hpp>
+#include <core/instruction.hpp>
+#include <core/file.hpp>
+#include <core/function.hpp>
+#include <core/variantid.hpp>
+#include <core/variantir.hpp>
+#include <core/pqxxdb.hpp>
+
+};
+
+#endif
diff --git a/libIRDB/include/libIRDB.hpp b/libIRDB/include/libIRDB.hpp
deleted file mode 100644
index d85f0b60c0f6edf8be065cf857b14d90e0cabd15..0000000000000000000000000000000000000000
--- a/libIRDB/include/libIRDB.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#include <string>
-#include <set>
-#include <assert.h>
-#include <string.h>
-#include <iostream>
-#include <pqxx/pqxx>
-#include "beaengine/BeaEngine.h"
-
-namespace libIRDB 
-{
-
-class VariantID_t; // forward decl for many classes
-
-#include <basetypes.hpp>
-#include <dbinterface.hpp>
-#include <doip.hpp>
-#include <baseobj.hpp>
-#include <address.hpp>
-#include <instruction.hpp>
-#include <file.hpp>
-#include <function.hpp>
-#include <variantid.hpp>
-#include <variantir.hpp>
-#include <pqxxdb.hpp>
-
-};
-
diff --git a/libIRDB/src/Makefile b/libIRDB/src/Makefile
index bd6f0ee31059ac35602dfe2d0941c43ccf82efb0..e330ffad295ff629b1aea14d1707875b161f2355 100644
--- a/libIRDB/src/Makefile
+++ b/libIRDB/src/Makefile
@@ -1,16 +1,6 @@
 
-LIB=../lib/libIRDB.a
-
-
-OBJS=baseobj.o  variantid.o pqxxdb.o dbinterface.o function.o variantir.o file.o instruction.o address.o generate_spri.o
-
-all: $(OBJS)
-
-$(OBJS): ../include/*.hpp *.hpp
+all:
+	cd core; make
 
 clean:
-	rm -f $(OBJS)
-
-.cpp.o:
-	g++ -g -c -I../include -I../../beaengine/include $<
-	ar rc $(LIB) $@
+	cd core; make clean
diff --git a/libIRDB/src/all.hpp b/libIRDB/src/all.hpp
deleted file mode 100644
index 75ed139b4ac047800a7105080d8dadb71a71917b..0000000000000000000000000000000000000000
--- a/libIRDB/src/all.hpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <libIRDB.hpp> 
-using namespace libIRDB;
diff --git a/libIRDB/src/core/Makefile b/libIRDB/src/core/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..850e596b295660320f2eb2f8d6171a67a02a5cf0
--- /dev/null
+++ b/libIRDB/src/core/Makefile
@@ -0,0 +1,16 @@
+
+LIB=../../lib/libIRDB-core.a
+
+
+OBJS=baseobj.o  variantid.o pqxxdb.o dbinterface.o function.o variantir.o file.o instruction.o address.o generate_spri.o
+
+all: $(OBJS)
+
+$(OBJS): ../../include/core/*.hpp *.hpp ../../include/*.hpp 
+
+clean:
+	rm -f $(OBJS)
+
+.cpp.o:
+	g++ -g -c -I. -I../../include -I../../../beaengine/include $<
+	ar rc $(LIB) $@
diff --git a/libIRDB/src/address.cpp b/libIRDB/src/core/address.cpp
similarity index 96%
rename from libIRDB/src/address.cpp
rename to libIRDB/src/core/address.cpp
index 18bb13eda8e672a056ee0ee87bbc01bc96ed13e2..796b8194d7a112ab5000cf3e15bf0eb25e11683b 100644
--- a/libIRDB/src/address.cpp
+++ b/libIRDB/src/core/address.cpp
@@ -1,5 +1,5 @@
 
-#include <libIRDB.hpp>
+#include <all.hpp>
 #include <utils.hpp>
 #include <stdlib.h>
 using namespace libIRDB;
diff --git a/libIRDB/src/core/all.hpp b/libIRDB/src/core/all.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..214b973a6c9659a473ac48b812e90ed2cc072755
--- /dev/null
+++ b/libIRDB/src/core/all.hpp
@@ -0,0 +1,2 @@
+#include <libIRDB-core.hpp> 
+using namespace libIRDB;
diff --git a/libIRDB/src/baseobj.cpp b/libIRDB/src/core/baseobj.cpp
similarity index 89%
rename from libIRDB/src/baseobj.cpp
rename to libIRDB/src/core/baseobj.cpp
index 2f81dcd0d6cba9a6acd13dc40cc4dfd43c627249..e39eb13afa313913e9edac5b9971a6e40fe3405b 100644
--- a/libIRDB/src/baseobj.cpp
+++ b/libIRDB/src/core/baseobj.cpp
@@ -1,6 +1,5 @@
 
-#include <libIRDB.hpp>
-using namespace libIRDB;
+#include <all.hpp>
 
 
 /*
diff --git a/libIRDB/src/dbinterface.cpp b/libIRDB/src/core/dbinterface.cpp
similarity index 95%
rename from libIRDB/src/dbinterface.cpp
rename to libIRDB/src/core/dbinterface.cpp
index fdfce9ad809606544732345744df32b63180fef4..3334d5e36ce795bfd988e4c38c9951d37e8ca49d 100644
--- a/libIRDB/src/dbinterface.cpp
+++ b/libIRDB/src/core/dbinterface.cpp
@@ -1,5 +1,5 @@
 
-#include <libIRDB.hpp>
+#include <all.hpp>
 #include <iostream>
 #include <stdlib.h>
 
diff --git a/libIRDB/src/file.cpp b/libIRDB/src/core/file.cpp
similarity index 92%
rename from libIRDB/src/file.cpp
rename to libIRDB/src/core/file.cpp
index 4b1da9d6b42529a64a9654b77621bd2cf492e06c..f54e1f397b5d5e411a8e7c5d5e3b45f122e6bcaa 100644
--- a/libIRDB/src/file.cpp
+++ b/libIRDB/src/core/file.cpp
@@ -1,5 +1,5 @@
 
-#include <libIRDB.hpp>
+#include <all.hpp>
 #include <utils.hpp>
 #include <stdlib.h>
 using namespace libIRDB;
diff --git a/libIRDB/src/function.cpp b/libIRDB/src/core/function.cpp
similarity index 98%
rename from libIRDB/src/function.cpp
rename to libIRDB/src/core/function.cpp
index bc27e40f03406beba2dc86342888db5be527ff67..828538f954ec5c5f16f9dbc852f93e51f15a048e 100644
--- a/libIRDB/src/function.cpp
+++ b/libIRDB/src/core/function.cpp
@@ -1,4 +1,4 @@
-#include <libIRDB.hpp>
+#include <all.hpp>
 #include <utils.hpp>
 #include <stdlib.h>
 using namespace libIRDB;
diff --git a/libIRDB/src/generate_spri.cpp b/libIRDB/src/core/generate_spri.cpp
similarity index 99%
rename from libIRDB/src/generate_spri.cpp
rename to libIRDB/src/core/generate_spri.cpp
index db72834efc02440135eb5eb373b8a85513fbfafc..a032066c91588bf94bdf9727bb666c1c15654a21 100644
--- a/libIRDB/src/generate_spri.cpp
+++ b/libIRDB/src/core/generate_spri.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <all.hpp>
 #include <utils.hpp> // to_string function from libIRDB
 #include <iostream>
 #include <fstream>
diff --git a/libIRDB/src/instruction.cpp b/libIRDB/src/core/instruction.cpp
similarity index 99%
rename from libIRDB/src/instruction.cpp
rename to libIRDB/src/core/instruction.cpp
index 2a94646cbc68f5f27588524ef0b12a57d58ff9c1..568d762df27e8d04f3935182bbdd4e91b0f9c2a7 100644
--- a/libIRDB/src/instruction.cpp
+++ b/libIRDB/src/core/instruction.cpp
@@ -1,8 +1,9 @@
-#include <libIRDB.hpp>
+#include <all.hpp>
 #include <utils.hpp>
 #include <stdlib.h>
 #include <fstream>
 
+
 using namespace libIRDB;
 using namespace std;
 
diff --git a/libIRDB/src/pqxxdb.cpp b/libIRDB/src/core/pqxxdb.cpp
similarity index 96%
rename from libIRDB/src/pqxxdb.cpp
rename to libIRDB/src/core/pqxxdb.cpp
index 64ed9448e7b5cb106d0fb067943530dd26fa40f9..54473a6050875a031408fd198b35be4d64c3a0ef 100644
--- a/libIRDB/src/pqxxdb.cpp
+++ b/libIRDB/src/core/pqxxdb.cpp
@@ -1,5 +1,5 @@
 
-#include <libIRDB.hpp>
+#include <all.hpp>
 #include <pqxx/pqxx>
 #include <string>
 
diff --git a/libIRDB/src/variantid.cpp b/libIRDB/src/core/variantid.cpp
similarity index 99%
rename from libIRDB/src/variantid.cpp
rename to libIRDB/src/core/variantid.cpp
index 6019ffa10259f1284cf35d78ebe9dff6e67c0760..2016511e569bf642ec9ab47516bcc1722d888e38 100644
--- a/libIRDB/src/variantid.cpp
+++ b/libIRDB/src/core/variantid.cpp
@@ -1,9 +1,8 @@
 
 
-#include <libIRDB.hpp>
+#include <all.hpp>
 #include <utils.hpp>
 #include <stdlib.h>
-using namespace libIRDB;
 using namespace std;
 
 
diff --git a/libIRDB/src/variantir.cpp b/libIRDB/src/core/variantir.cpp
similarity index 99%
rename from libIRDB/src/variantir.cpp
rename to libIRDB/src/core/variantir.cpp
index 1eb8050cbb7046f920ba651847eea5f342f9f495..1ce0f0726bd2fa1c95834804ba6450d7f9b07433 100644
--- a/libIRDB/src/variantir.cpp
+++ b/libIRDB/src/core/variantir.cpp
@@ -1,5 +1,5 @@
 
-#include <libIRDB.hpp>
+#include <all.hpp>
 #include <utils.hpp>
 #include <stdlib.h>
 #include <map>
diff --git a/libIRDB/test/Makefile b/libIRDB/test/Makefile
index edee863122605f6ff76aa49298b727f3069860c5..d9d53a86eccb3dfeb60fb76d4151083f3625bed3 100644
--- a/libIRDB/test/Makefile
+++ b/libIRDB/test/Makefile
@@ -5,10 +5,10 @@ PROGS=print_variant.exe list_programs.exe create_variant.exe create_variantir.ex
 
 all: $(PROGS)
 
-$(PROGS): ../lib/libIRDB.a
+$(PROGS): ../lib/libIRDB-core.a
 
-.cpp.exe:  $< ../lib/libIRDB.a
-	g++ -g $< -I../include/ -I../../beaengine/include -L ../lib/ -lIRDB -lpqxx -L ../../beaengine/lib/Linux.gnu.Debug -lBeaEngine_s_d -o $@
+.cpp.exe:  $< ../lib/libIRDB-core.a
+	g++ -g $< -I../include/ -I../../beaengine/include -L ../lib/ -lIRDB-core -lpqxx -L ../../beaengine/lib/Linux.gnu.Debug -lBeaEngine_s_d -o $@
 
 clean:
 	rm -f $(PROGS)
diff --git a/libIRDB/test/clone.cpp b/libIRDB/test/clone.cpp
index 4bcc31b63f33260ef9420bfa59a98b6df05c116b..9cfafd0a7d5a7b3338da27b77b18de66ff59724d 100644
--- a/libIRDB/test/clone.cpp
+++ b/libIRDB/test/clone.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 
diff --git a/libIRDB/test/create_variant.cpp b/libIRDB/test/create_variant.cpp
index addd0792a7243e28fdf53373cc6aef74909d821d..155f3162d4cb23191e3c23b4dd12c7e6f2feec28 100644
--- a/libIRDB/test/create_variant.cpp
+++ b/libIRDB/test/create_variant.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 
diff --git a/libIRDB/test/create_variantir.cpp b/libIRDB/test/create_variantir.cpp
index 2d2a3f980c0a207ac8e57de8d566aca3ddb3c5cc..aca1b71b99c1c3d624471b76ff017ed9fb412f6e 100644
--- a/libIRDB/test/create_variantir.cpp
+++ b/libIRDB/test/create_variantir.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 
diff --git a/libIRDB/test/drop_variant.cpp b/libIRDB/test/drop_variant.cpp
index b8e6712cd5ca188694f31fb2f6f6b395aa5a414e..682a6ec5326724e55d9adfd57d7b83a118ec2bd2 100644
--- a/libIRDB/test/drop_variant.cpp
+++ b/libIRDB/test/drop_variant.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 
diff --git a/libIRDB/test/fill_in_cfg.cpp b/libIRDB/test/fill_in_cfg.cpp
index 534723572f84b90a79595a9525500f2b6d46fd98..af3d576d2190d4640b64a1178112bcc25770bc67 100644
--- a/libIRDB/test/fill_in_cfg.cpp
+++ b/libIRDB/test/fill_in_cfg.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libIRDB/test/fill_in_indtargs.cpp b/libIRDB/test/fill_in_indtargs.cpp
index 2254eb05032b7330c18a0f72b43be81bbf655cf3..0c4e5f1afffd84d7782fc0eb217034d1bd426bbf 100644
--- a/libIRDB/test/fill_in_indtargs.cpp
+++ b/libIRDB/test/fill_in_indtargs.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libIRDB/test/fix_calls.cpp b/libIRDB/test/fix_calls.cpp
index 522ff1dbcd3b46ac6ea309d2915066d2e75cd27c..2228da5300d18d57bcad8c7d3a1266679cdf0063 100644
--- a/libIRDB/test/fix_calls.cpp
+++ b/libIRDB/test/fix_calls.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 #include "beaengine/BeaEngine.h"
diff --git a/libIRDB/test/generate_spri.cpp b/libIRDB/test/generate_spri.cpp
index 29a14068ba652dc6b950428ebcf9d379d6c64678..3d4b57769aba7601a204408becff864bf863b6bb 100644
--- a/libIRDB/test/generate_spri.cpp
+++ b/libIRDB/test/generate_spri.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <utils.hpp> // to_string function from libIRDB
 #include <iostream>
 #include <fstream>
diff --git a/libIRDB/test/ilr.cpp b/libIRDB/test/ilr.cpp
index 7b7c9d53892e12bf18d500e9e10eb2efe0639533..5a9bf3bcf6cc8998bf07ee45033b895164acc75c 100644
--- a/libIRDB/test/ilr.cpp
+++ b/libIRDB/test/ilr.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 
diff --git a/libIRDB/test/list_programs.cpp b/libIRDB/test/list_programs.cpp
index 934c4709be797b1da8a61f6da9332be7e2f74c84..01738628a66d0edb266e33885d3c956571dabef3 100644
--- a/libIRDB/test/list_programs.cpp
+++ b/libIRDB/test/list_programs.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 
diff --git a/libIRDB/test/print_variant.cpp b/libIRDB/test/print_variant.cpp
index f97666c0252da2ac47a5e86c394336cb36e8a937..49118f5fd54d86ae0c42e3faa3e01c8f8222e707 100644
--- a/libIRDB/test/print_variant.cpp
+++ b/libIRDB/test/print_variant.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 
diff --git a/libIRDB/test/read_variantir.cpp b/libIRDB/test/read_variantir.cpp
index 8960624815f6654329c64c617c7a2e0d49bbd920..a57c0a4cf9187be9d328c8cd386d9ef8de301fc9 100644
--- a/libIRDB/test/read_variantir.cpp
+++ b/libIRDB/test/read_variantir.cpp
@@ -1,6 +1,6 @@
 
 
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 
diff --git a/tools/transforms/Makefile b/tools/transforms/Makefile
index f65683bff52e8478f390f4978860df8c5d762b26..fc64a903342960accd7e36e50c9c4c82263c7f2a 100644
--- a/tools/transforms/Makefile
+++ b/tools/transforms/Makefile
@@ -19,7 +19,7 @@ PROGS=p1transform.exe integerbugtransform.exe nulltransform.exe
 CC=g++
 CFLAGS= -g
 INCLUDE=-I. -I../../include -I../../xform -I../../beaengine/include -I../../libIRDB/include/ 
-LIBS=-L../../lib -L../../xform -lxform -lELFIO -L../../libIRDB/lib/ -lIRDB -L../../beaengine/lib/Linux.gnu.Debug -lBeaEngine_s_d -lpqxx 
+LIBS=-L../../lib -L../../xform -lxform -lELFIO -L../../libIRDB/lib/ -lIRDB-core -L../../beaengine/lib/Linux.gnu.Debug -lBeaEngine_s_d -lpqxx 
 OBJS=transformutils.o
 
 .SUFFIXES: .o .c .exe .cpp
diff --git a/tools/transforms/integerbugtransform.cpp b/tools/transforms/integerbugtransform.cpp
index 4be6de021661e502405da9f48c9a08ca7c40bb8b..907f6b15fe4bda4b0e3827d31949038bbf330933 100644
--- a/tools/transforms/integerbugtransform.cpp
+++ b/tools/transforms/integerbugtransform.cpp
@@ -1,4 +1,4 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tools/transforms/p1transform.h b/tools/transforms/p1transform.h
index 7e4b87d40fcc720f190f8e1516f9d793b7e8f99e..bab8e3383dc075a70c62b0a5379fbbe7487ee651 100755
--- a/tools/transforms/p1transform.h
+++ b/tools/transforms/p1transform.h
@@ -1,4 +1,4 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
 #include <iostream>
 #include <stdlib.h>
 #include <regex.h>