diff --git a/Makefile.tools b/Makefile.tools
index 7a12846..8857c16 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -38,22 +38,20 @@ emulator_btvirt_SOURCES = emulator/main.c monitor/bt.h \
 
 emulator_b1ee_SOURCES = emulator/b1ee.c monitor/mainloop.h monitor/mainloop.c
 
-tools_mgmt_tester_SOURCES = tools/mgmt-tester.c \
-				monitor/bt.h \
+tools_mgmt_tester_SOURCES = tools/mgmt-tester.c monitor/bt.h \
 				emulator/btdev.h emulator/btdev.c \
 				emulator/bthost.h emulator/bthost.c \
-				tools/hciemu.h tools/hciemu.c \
 				src/shared/util.h src/shared/util.c \
 				src/shared/mgmt.h src/shared/mgmt.c \
+				src/shared/hciemu.h src/shared/hciemu.c \
 				src/shared/tester.h src/shared/tester.c
 tools_mgmt_tester_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
 
 tools_gap_tester_SOURCES = $(gdbus_sources) \
-				tools/gap-tester.c \
-				tools/hciemu.h tools/hciemu.c \
-				monitor/bt.h \
+				tools/gap-tester.c monitor/bt.h \
 				emulator/btdev.h emulator/btdev.c \
-				emulator/bthost.h emulator/bthost.c
+				emulator/bthost.h emulator/bthost.c \
+				src/shared/hciemu.h src/shared/hciemu.c
 tools_gap_tester_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
 endif
 
diff --git a/tools/hciemu.c b/src/shared/hciemu.c
similarity index 93%
rename from tools/hciemu.c
rename to src/shared/hciemu.c
index 0befedf..d523743 100644
--- a/tools/hciemu.c
+++ b/src/shared/hciemu.c
@@ -5,18 +5,18 @@
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
  *
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
diff --git a/tools/hciemu.h b/src/shared/hciemu.h
similarity index 71%
rename from tools/hciemu.h
rename to src/shared/hciemu.h
index 2592c3a..7be2004 100644
--- a/tools/hciemu.h
+++ b/src/shared/hciemu.h
@@ -5,18 +5,18 @@
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
  *
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
diff --git a/tools/gap-tester.c b/tools/gap-tester.c
index 0395500..7635ddc 100644
--- a/tools/gap-tester.c
+++ b/tools/gap-tester.c
@@ -35,7 +35,7 @@
 #include <glib.h>
 #include <gdbus.h>
 
-#include "hciemu.h"
+#include "src/shared/hciemu.h"
 
 static GMainLoop *main_loop;
 
diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
index a99402a..f319200 100644
--- a/tools/mgmt-tester.c
+++ b/tools/mgmt-tester.c
@@ -32,7 +32,7 @@
 
 #include "src/shared/tester.h"
 #include "src/shared/mgmt.h"
-#include "tools/hciemu.h"
+#include "src/shared/hciemu.h"
 
 struct test_data {
 	const void *test_data;