diff --git a/.gitmodules b/.gitmodules
index 70b36fa6..f0581a3c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "external/icu4c"]
 	path = external/icu4c
 	url = git://android.git.kernel.org/platform/external/icu4c.git
+[submodule "notepadbot"]
+  path = dist/SQLCipherForAndroid-SDK/samples/notepadbot
+  url = git://github.com/guardianproject/notepadbot.git
diff --git a/external/Android.mk b/external/Android.mk
index 3cbf5d02..49750f73 100644
--- a/external/Android.mk
+++ b/external/Android.mk
@@ -58,11 +58,11 @@ include $(BUILD_SHARED_LIBRARY)
 
 # these are all files from various external git repos
 libsqlite3_android_local_src_files := \
-	android-sqlite/android/sqlite3_android.cpp
-#	android-sqlite/android/PhonebookIndex.cpp \
-#	android-sqlite/android/PhoneNumberUtils.cpp \
-#	android-sqlite/android/OldPhoneNumberUtils.cpp \
-#	android-sqlite/android/PhoneticStringUtils.cpp \
+	android-sqlite/android/sqlite3_android.cpp \
+	android-sqlite/android/PhonebookIndex.cpp \
+	android-sqlite/android/PhoneNumberUtils.cpp \
+	android-sqlite/android/OldPhoneNumberUtils.cpp \
+	android-sqlite/android/PhoneticStringUtils.cpp \
 #	android-sqlite/android/PhoneNumberUtilsTest.cpp \
 #	android-sqlite/android/PhoneticStringUtilsTest.cpp \
 
@@ -81,8 +81,8 @@ LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/include \
 	$(LOCAL_PATH)/icu4c/i18n \
 	$(LOCAL_PATH)/icu4c/common \
-#	$(LOCAL_PATH)/platform-system-core/include \
-#	$(LOCAL_PATH)/platform-frameworks-base/include
+	$(LOCAL_PATH)/platform-system-core/include \
+	$(LOCAL_PATH)/platform-frameworks-base/include
 #LOCAL_LDFLAGS +=  $(project_ldflags)
 LOCAL_LDFLAGS += -L$(LOCAL_PATH)/android-2.3/ -L$(LOCAL_PATH)/libs/armeabi/
 LOCAL_LDLIBS := -lsqlcipher -llog -licuuc -licui18n -lutils -lcutils
diff --git a/external/android-2.2/libandroid_runtime.so b/external/android-2.2/libandroid_runtime.so
new file mode 100644
index 00000000..fa370f30
Binary files /dev/null and b/external/android-2.2/libandroid_runtime.so differ
diff --git a/external/android-2.2/libbinder.so b/external/android-2.2/libbinder.so
new file mode 100644
index 00000000..5cbc35f2
Binary files /dev/null and b/external/android-2.2/libbinder.so differ
diff --git a/jni/info_guardianproject_database_sqlcipher_SQLiteDatabase.cpp b/jni/info_guardianproject_database_sqlcipher_SQLiteDatabase.cpp
index 0fbd50a9..89a8f049 100644
--- a/jni/info_guardianproject_database_sqlcipher_SQLiteDatabase.cpp
+++ b/jni/info_guardianproject_database_sqlcipher_SQLiteDatabase.cpp
@@ -36,10 +36,7 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <string.h>
-#include <netdb.h>
 #include <sys/ioctl.h>
 
 #include "sqlite3_exception.h"