diff --git a/cl_dll/Android.mk b/cl_dll/Android.mk
index 94489844..217ff018 100755
--- a/cl_dll/Android.mk
+++ b/cl_dll/Android.mk
@@ -25,25 +25,40 @@ LOCAL_CFLAGS += -DCLIENT_DLL=1
 
 SRCS=
 SRCS_C=
-SRCS+=../dlls/crossbow.cpp
+#SRCS+=../dlls/crossbow.cpp
 SRCS+=../dlls/crowbar.cpp
-SRCS+=../dlls/egon.cpp
+#SRCS+=../dlls/egon.cpp
 SRCS+=./ev_hldm.cpp
-SRCS+=../dlls/gauss.cpp
+#SRCS+=../dlls/gauss.cpp
 SRCS+=../dlls/handgrenade.cpp
 SRCS+=./hl/hl_baseentity.cpp
 SRCS+=./hl/hl_events.cpp
 SRCS+=./hl/hl_objects.cpp
 SRCS+=./hl/hl_weapons.cpp
-SRCS+=../dlls/hornetgun.cpp
+#SRCS+=../dlls/hornetgun.cpp
 SRCS+=../dlls/mp5.cpp
-SRCS+=../dlls/python.cpp
+#SRCS+=../dlls/python.cpp
 SRCS+=../dlls/rpg.cpp
 SRCS+=../dlls/satchel.cpp
 SRCS+=../dlls/shotgun.cpp
 SRCS+=../dlls/squeakgrenade.cpp
 SRCS+=../dlls/tripmine.cpp
 SRCS+=../dlls/glock.cpp
+SRCS+=../dlls/hs/ak47.cpp
+SRCS+=../dlls/hs/beamkatana.cpp
+SRCS+=../dlls/hs/boombox.cpp
+SRCS+=../dlls/hs/bow.cpp
+SRCS+=../dlls/hs/dosh.cpp
+SRCS+=../dlls/hs/fotns.cpp
+SRCS+=../dlls/hs/goldengun.cpp
+SRCS+=../dlls/hs/jackal.cpp
+SRCS+=../dlls/hs/jihad.cpp
+SRCS+=../dlls/hs/modman.cpp
+SRCS+=../dlls/hs/mw2.cpp
+SRCS+=../dlls/hs/nstar.cpp
+SRCS+=../dlls/hs/scipg.cpp
+SRCS+=../dlls/hs/soda_can.cpp
+SRCS+=../dlls/hs/zapper.cpp
 #SRCS+=../game_shared/voice_banmgr.cpp
 #SRCS+=../game_shared/voice_status.cpp
 SRCS+=./ammo.cpp
@@ -90,7 +105,13 @@ SRCS+=./view.cpp
 SRCS+=./input_xash3d.cpp
 SRCS+=./scoreboard.cpp
 SRCS+=./MOTD.cpp
-INCLUDES =  -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls
+SRCS+=hs/cawadooty.cpp
+#SRCS+=hs/halloween.cpp
+#SRCS+=hs/mp3.cpp
+#SRCS+=hs/test.cpp
+#SRCS+=hs/testext.cpp
+SRCS+=hs/timer.cpp
+INCLUDES =  -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls 
 DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -w
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/. \
@@ -98,7 +119,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/. \
 		 $(LOCAL_PATH)/../engine \
 		 $(LOCAL_PATH)/../game_shared \
 		 $(LOCAL_PATH)/../dlls \
-		 $(LOCAL_PATH)/../pm_shared
+		 $(LOCAL_PATH)/../pm_shared \
+		 $(LOCAL_PATH)/hs \
+		 $(LOCAL_PATH)/../dlls/hs
 LOCAL_CFLAGS += $(DEFINES) $(INCLUDES)
 
 LOCAL_SRC_FILES := $(SRCS) $(SRCS_C)
diff --git a/dlls/Android.mk b/dlls/Android.mk
index 7fcdf581..599df68b 100644
--- a/dlls/Android.mk
+++ b/dlls/Android.mk
@@ -19,6 +19,7 @@ LOCAL_CFLAGS += -D_LINUX -DCLIENT_WEAPONS -Dstricmp=strcasecmp -Dstrnicmp=strnca
 LOCAL_CPPFLAGS := $(LOCAL_CFLAGS)
 
 LOCAL_C_INCLUDES := $(SDL_PATH)/include \
+		    $(LOCAL_PATH)/hs \
 		    $(LOCAL_PATH)/. \
 		    $(LOCAL_PATH)/wpn_shared \
 		    $(LOCAL_PATH)/../common \
@@ -44,12 +45,10 @@ LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \
            client.cpp \
            combat.cpp \
            controller.cpp \
-           crossbow.cpp \
            crowbar.cpp \
            defaultai.cpp \
            doors.cpp \
            effects.cpp \
-           egon.cpp \
            explode.cpp \
            flyingmonster.cpp \
            func_break.cpp \
@@ -57,7 +56,6 @@ LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \
            game.cpp \
            gamerules.cpp \
            gargantua.cpp \
-           gauss.cpp \
            genericmonster.cpp \
            ggrenade.cpp \
            globals.cpp \
@@ -74,7 +72,6 @@ LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \
            healthkit.cpp \
            hgrunt.cpp \
            hornet.cpp \
-           hornetgun.cpp \
            houndeye.cpp \
            ichthyosaur.cpp \
            islave.cpp \
@@ -95,7 +92,6 @@ LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \
            plane.cpp \
            plats.cpp \
            player.cpp \
-           python.cpp \
            rat.cpp \
            roach.cpp \
            rpg.cpp \
@@ -124,6 +120,39 @@ LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \
            world.cpp \
            xen.cpp \
            zombie.cpp \
+	   hs/ak47.cpp \
+           hs/beamkatana.cpp \
+           hs/boombox.cpp \
+           hs/bot_combat.cpp \
+           hs/bot.cpp \
+           hs/botcam.cpp \
+           hs/bow.cpp \
+           hs/chrischan.cpp \
+           hs/cod_gamerules.cpp \
+           hs/coop_gamerules.cpp \
+           hs/creeper.cpp \
+           hs/dosh.cpp \
+           hs/fotns.cpp \
+           hs/gayglenn.cpp \
+           hs/goldengun.cpp \
+           hs/grinman.cpp \
+           hs/heavyrain_gamerules.cpp \
+           hs/homestuck.cpp \
+           hs/hs_model.cpp \
+           hs/jackal.cpp \
+           hs/jason.cpp \
+           hs/jihad.cpp \
+           hs/modman.cpp \
+           hs/monhunt_gamerules.cpp \
+           hs/mw2.cpp \
+           hs/nstar.cpp \
+           hs/scipg.cpp \
+           hs/shytplay_gamerules.cpp \
+           hs/sinistar.cpp \
+           hs/soda_can.cpp \
+           hs/test_gamerules.cpp \
+           hs/xmast.cpp \
+           hs/zapper.cpp \
 	   ../pm_shared/pm_debug.c \
 	   ../pm_shared/pm_math.c \
 	   ../pm_shared/pm_shared.c