diff --git a/GNUmakefile b/GNUmakefile
index cb9828f..b3a8d71 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -92,7 +92,6 @@ libobjc_CCFLAGS += -std=c++98 -g -fexceptions #-fvisibility=hidden
 #libobjc_CFLAGS += -fno-inline
 libobjc_OBJCFLAGS += $(libobjc_CFLAGS) $(libobjc_CFLAGS)
 libobjc_LDFLAGS += -g
-libobjc_LIB_DIRS += -L toydispatch/obj
 
 libobjc_CFLAGS +=  -O3
 
diff --git a/Makefile b/Makefile
index 01c159b..5ca0c31 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,8 @@ OBJECTS = \
 	selector_table.o\
 	sendmsg2.o\
 	statics_loader.o\
-	sync.o
+	sync.o\
+	toydispatch.o
 
 all: libobjc.so.$(VERSION) libobjc.a
 
diff --git a/objc/toydispatch.h b/objc/toydispatch.h
index e89b9ad..3737714 100644
--- a/objc/toydispatch.h
+++ b/objc/toydispatch.h
@@ -29,15 +29,15 @@ typedef struct dispatch_queue * dispatch_queue_t;
 /**
  * Create a new queue.  Both parameters are ignored by toydispatch.
  */
-dispatch_queue_t dispatch_queue_create(const char *label,
-		void *attr);
+dispatch_queue_t dispatch_queue_create(const char *label, void *attr);
 
 #define dispatch_async_f toy_dispatch_async_f
 /**
  * Add a function to the queue.  
  */
-void dispatch_async_f(dispatch_queue_t queue, void *context,
-		dispatch_function_t work);
+void dispatch_async_f(dispatch_queue_t queue,
+                      void *context,
+                      dispatch_function_t work);
 
 #define dispatch_release toy_dispatch_release
 void dispatch_release(dispatch_queue_t queue);
diff --git a/toydispatch/COPYING b/toydispatch/COPYING
deleted file mode 100644
index 8647a56..0000000
--- a/toydispatch/COPYING
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2009 David Chisnall
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
diff --git a/toydispatch/GNUmakefile b/toydispatch/GNUmakefile
deleted file mode 100644
index 21d7a7f..0000000
--- a/toydispatch/GNUmakefile
+++ /dev/null
@@ -1,30 +0,0 @@
-include $(GNUSTEP_MAKEFILES)/common.make
-
-LIBRARY_NAME = toydispatch
-
-toydispatch_VERSION = 1
-
-toydispatch_C_FILES = \
-	toydispatch.c
-
-toydispatch_HEADER_FILES_INSTALL_DIR = toydispatch
-toydispatch_HEADER_FILES = \
-	toydispatch.h
-
-toydispatch_LIBRARIES_DEPEND_UPON += -lpthread
-
-toydispatch_CFLAGS += -Werror -std=c99
-
-ifneq ($(findstring gcc, $(CC)),)
-  # Hack to get the __sync_* GCC builtins to work with GCC
-  ifeq ($(GNUSTEP_TARGET_CPU), ix86)
-    toydispatch_CFLAGS += -march=i586
-  endif
-endif
-
-ifeq ($(GNUSTEP_TARGET_OS), mingw32)
-  # Hack to get mingw to provide declaration for strdup (since it is non-standard)
-  toydispatch_CPPFLAGS += -U__STRICT_ANSI__
-endif
-
-include $(GNUSTEP_MAKEFILES)/library.make