diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamInternalAddons.h b/src/add-ons/media/media-add-ons/usb_webcam/CamInternalAddons.h
deleted file mode 100644
index 34c61730cf..0000000000
--- a/src/add-ons/media/media-add-ons/usb_webcam/CamInternalAddons.h
+++ /dev/null
@@ -1,2 +0,0 @@
-B_WEBCAM_MKINTFUNC(quickcam)
-B_WEBCAM_MKINTFUNC(sonix)
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamInternalColorSpaceTransforms.h b/src/add-ons/media/media-add-ons/usb_webcam/CamInternalColorSpaceTransforms.h
deleted file mode 100644
index 20323138dd..0000000000
--- a/src/add-ons/media/media-add-ons/usb_webcam/CamInternalColorSpaceTransforms.h
+++ /dev/null
@@ -1 +0,0 @@
-B_WEBCAM_DECLARE_CSTRANSFORM(BayerTransform, bayer)
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamInternalSensors.h b/src/add-ons/media/media-add-ons/usb_webcam/CamInternalSensors.h
deleted file mode 100644
index 22d326b9f8..0000000000
--- a/src/add-ons/media/media-add-ons/usb_webcam/CamInternalSensors.h
+++ /dev/null
@@ -1,3 +0,0 @@
-B_WEBCAM_DECLARE_SENSOR(HDCS1000Sensor, hdcs1000)
-B_WEBCAM_DECLARE_SENSOR(HV7131E1Sensor, hv7131e1)
-B_WEBCAM_DECLARE_SENSOR(TAS5110C1BSensor, tas5110c1b)
diff --git a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
index eafa450056..2b5d3e9b5e 100644
--- a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
+++ b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
@@ -51,19 +51,20 @@ sensorsSources = hdcs1000.cpp hv7131e1.cpp tas5110c1b.cpp ;
 ## how to build header files from sources to include the list of built-in addons.
 # but it doesn't seem to work for some reason...
 
-rule USBWebcamHeaderGen
+rule USBWebcamHeaderGen header : macro : sources
 {
-	SEARCH on $(3) = $(SEARCH_SOURCE) ;
+	SEARCH on $(sources) = $(SEARCH_SOURCE) ;
 
-	Depends $(1) : $(3) ;
-	MakeLocateArch $(<) ;
-	USBWebcamHeaderGen1 $(2) : $(3) : $(1) ;
-	LocalClean clean : $(<) ;
+	Depends $(header) : $(sources) ;
+	MakeLocateArch $(header) ;
+	GREP_DEFINE on $(header) = $(macro) ;
+	USBWebcamHeaderGen1 $(header) : $(sources) ;
+	LocalClean clean : $(header) ;
 }
 
 actions USBWebcamHeaderGen1
 {
-	alert 'grep -h $(1) $(2) > $(3) ' ;
+	grep -h $(GREP_DEFINE) $(2) > $(1) ;
 }
 
 USBWebcamHeaderGen [ FGristFiles CamInternalAddons.h ] : B_WEBCAM_MKINTFUNC : $(addonSources) ;