diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk
index df1b0df87..cd2f7a66e 100644
--- a/src/libcharon/Android.mk
+++ b/src/libcharon/Android.mk
@@ -48,7 +48,6 @@ network/receiver.c network/receiver.h \
 network/sender.c network/sender.h \
 network/socket_manager.c network/socket_manager.h network/socket.h \
 processing/jobs/acquire_job.c processing/jobs/acquire_job.h \
-processing/jobs/callback_job.c processing/jobs/callback_job.h \
 processing/jobs/delete_child_sa_job.c processing/jobs/delete_child_sa_job.h \
 processing/jobs/delete_ike_sa_job.c processing/jobs/delete_ike_sa_job.h \
 processing/jobs/migrate_job.c processing/jobs/migrate_job.h \
diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 9fafaece8..ba2485c54 100644
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -46,7 +46,6 @@ network/receiver.c network/receiver.h \
 network/sender.c network/sender.h \
 network/socket_manager.c network/socket_manager.h network/socket.h \
 processing/jobs/acquire_job.c processing/jobs/acquire_job.h \
-processing/jobs/callback_job.c processing/jobs/callback_job.h \
 processing/jobs/delete_child_sa_job.c processing/jobs/delete_child_sa_job.h \
 processing/jobs/delete_ike_sa_job.c processing/jobs/delete_ike_sa_job.h \
 processing/jobs/migrate_job.c processing/jobs/migrate_job.h \
diff --git a/src/libhydra/Android.mk b/src/libhydra/Android.mk
index abbec9e49..b94fc7f62 100644
--- a/src/libhydra/Android.mk
+++ b/src/libhydra/Android.mk
@@ -9,6 +9,7 @@ attributes/attribute_provider.h attributes/attribute_handler.h \
 attributes/attribute_manager.c attributes/attribute_manager.h \
 attributes/mem_pool.c attributes/mem_pool.h \
 processing/jobs/job.h \
+processing/jobs/callback_job.c processing/jobs/callback_job.h \
 processing/processor.c processing/processor.h
 
 # adding the plugin source files
diff --git a/src/libhydra/Makefile.am b/src/libhydra/Makefile.am
index 78e12e0a2..1d32a121a 100644
--- a/src/libhydra/Makefile.am
+++ b/src/libhydra/Makefile.am
@@ -7,6 +7,7 @@ attributes/attribute_provider.h attributes/attribute_handler.h \
 attributes/attribute_manager.c attributes/attribute_manager.h \
 attributes/mem_pool.c attributes/mem_pool.h \
 processing/jobs/job.h \
+processing/jobs/callback_job.c processing/jobs/callback_job.h \
 processing/processor.c processing/processor.h
 
 libhydra_la_LIBADD =
diff --git a/src/libcharon/processing/jobs/callback_job.c b/src/libhydra/processing/jobs/callback_job.c
similarity index 100%
rename from src/libcharon/processing/jobs/callback_job.c
rename to src/libhydra/processing/jobs/callback_job.c
diff --git a/src/libcharon/processing/jobs/callback_job.h b/src/libhydra/processing/jobs/callback_job.h
similarity index 99%
rename from src/libcharon/processing/jobs/callback_job.h
rename to src/libhydra/processing/jobs/callback_job.h
index 92bd7642b..722fa52a4 100644
--- a/src/libcharon/processing/jobs/callback_job.h
+++ b/src/libhydra/processing/jobs/callback_job.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup callback_job callback_job
- * @{ @ingroup cjobs
+ * @{ @ingroup hjobs
  */
 
 #ifndef CALLBACK_JOB_H_