diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 1cdf4da149..7ff0b35718 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -662,24 +662,9 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons bluetooth ;
 	EnableWerror src add-ons decorators ;
 	EnableWerror src add-ons disk_systems ;
-	EnableWerror src add-ons input_server devices ;
-	EnableWerror src add-ons input_server filters ;
-	EnableWerror src add-ons input_server methods pen ;
-	EnableWerror src add-ons input_server methods t9 ;
+	EnableWerror src add-ons input_server ;
 	EnableWerror src add-ons kernel bluetooth ;
-	EnableWerror src add-ons kernel bus_managers acpi ;
-	EnableWerror src add-ons kernel bus_managers agp_gart ;
-	EnableWerror src add-ons kernel bus_managers ata ;
-	EnableWerror src add-ons kernel bus_managers firewire ;
-	EnableWerror src add-ons kernel bus_managers ide ;
-	EnableWerror src add-ons kernel bus_managers isa ;
-	EnableWerror src add-ons kernel bus_managers pci ;
-	EnableWerror src add-ons kernel bus_managers ps2 ;
-	EnableWerror src add-ons kernel bus_managers random ;
-	EnableWerror src add-ons kernel bus_managers scsi ;
-	EnableWerror src add-ons kernel bus_managers tty ;
-	EnableWerror src add-ons kernel bus_managers usb ;
-	EnableWerror src add-ons kernel bus_managers virtio ;
+	EnableWerror src add-ons kernel bus_managers ;
 	EnableWerror src add-ons kernel busses agp_gart ;
 	EnableWerror src add-ons kernel busses ata ;
 #	EnableWerror src add-ons kernel busses i2c ;
@@ -732,24 +717,7 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons kernel power ;
 	EnableWerror src add-ons locale ;
 	EnableWerror src add-ons mail_daemon ;
-	EnableWerror src add-ons media media-add-ons demultiplexer ;
-	EnableWerror src add-ons media media-add-ons dvb ;
-	EnableWerror src add-ons media media-add-ons esound_sink ;
-	EnableWerror src add-ons media media-add-ons finepix_webcam ;
-	EnableWerror src add-ons media media-add-ons firewire_dv ;
-	EnableWerror src add-ons media media-add-ons legacy ;
-	EnableWerror src add-ons media media-add-ons mixer ;
-	EnableWerror src add-ons media media-add-ons multi_audio ;
-	EnableWerror src add-ons media media-add-ons opensound ;
-	EnableWerror src add-ons media media-add-ons radeon ;
-	EnableWerror src add-ons media media-add-ons reader ;
-	EnableWerror src add-ons media media-add-ons tone_producer_demo ;
-	EnableWerror src add-ons media media-add-ons usb_vision ;
-	EnableWerror src add-ons media media-add-ons usb_webcam ;
-	EnableWerror src add-ons media media-add-ons video_mixer ;
-	EnableWerror src add-ons media media-add-ons video_producer_demo ;
-	EnableWerror src add-ons media media-add-ons videowindow ;
-	EnableWerror src add-ons media media-add-ons writer ;
+	EnableWerror src add-ons media media-add-ons ;
 	EnableWerror src add-ons media plugins ape_reader ;
 	EnableWerror src add-ons media plugins au_reader ;
 #	EnableWerror src add-ons media plugins ffmpeg ;
@@ -777,10 +745,12 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons translators wonderbrush ;
 	EnableWerror src add-ons print ;
 	EnableWerror src bin desklink ;
+	EnableWerror src bin listusb ;
 	EnableWerror src bin multiuser ;
 	EnableWerror src bin package ;
 	EnableWerror src bin package_repo ;
 	EnableWerror src bin pkgman ;
+	EnableWerror src bin writembr ;
 	EnableWerror src libs bsd ;
 	EnableWerror src apps ;
 	EnableWerror src kits ;
diff --git a/headers/os/media/TimedEventQueue.h b/headers/os/media/TimedEventQueue.h
index 732fd1727b..54cb46b695 100644
--- a/headers/os/media/TimedEventQueue.h
+++ b/headers/os/media/TimedEventQueue.h
@@ -21,7 +21,7 @@ struct media_timed_event {
 									bigtime_t inTime, int32 inType,
 									void* inPointer, uint32 inCleanup,
 									int32 inData, int64 inBigdata,
-									char* inUserData, size_t dataSize = 0);
+									const char* inUserData, size_t dataSize = 0);
 
 								media_timed_event(
 									const media_timed_event& other);
diff --git a/headers/private/drivers/mmc.h b/headers/private/drivers/mmc.h
index e8434c4171..e48937bac0 100644
--- a/headers/private/drivers/mmc.h
+++ b/headers/private/drivers/mmc.h
@@ -110,8 +110,8 @@ typedef struct mmc_device_interface {
 
 
 // Device attribute paths for the MMC device
-static const char* kMmcRcaAttribute = "mmc/rca";
-static const char* kMmcTypeAttribute = "mmc/type";
+const char* const kMmcRcaAttribute = "mmc/rca";
+const char* const kMmcTypeAttribute = "mmc/type";
 
 
 #endif /* _MMC_H */
diff --git a/src/add-ons/media/media-add-ons/mixer/Interpolate.cpp b/src/add-ons/media/media-add-ons/mixer/Interpolate.cpp
index 36cda95ef9..0fb48f995d 100644
--- a/src/add-ons/media/media-add-ons/mixer/Interpolate.cpp
+++ b/src/add-ons/media/media-add-ons/mixer/Interpolate.cpp
@@ -25,10 +25,10 @@ kernel(Resampler* object, const void *_src, int32 srcSampleOffset,
 	int32 srcSampleCount, void *_dest, int32 destSampleOffset,
 	int32 destSampleCount, float _gain)
 {
-	register const char * src = (const char *)_src;
-	register char * dest = (char *)_dest;
-	register int32 count = destSampleCount;
-	register float gain = _gain * gnum / gden;
+	const char * src = (const char *)_src;
+	char * dest = (char *)_dest;
+	int32 count = destSampleCount;
+	float gain = _gain * gnum / gden;
 
 	if (srcSampleCount == destSampleCount) {
 		// optimized case for no resampling
@@ -46,8 +46,8 @@ kernel(Resampler* object, const void *_src, int32 srcSampleOffset,
 		return;
 	}
 
-	register float delta = float(srcSampleCount) / float(destSampleCount);
-	register float current = 0.0f;
+	float delta = float(srcSampleCount) / float(destSampleCount);
+	float current = 0.0f;
 	float oldSample = ((Interpolate*)object)->fOldSample;
 
 	#define SRC *(const inType*)(src)
diff --git a/src/bin/listusb/listusb.cpp b/src/bin/listusb/listusb.cpp
index ec1845278e..29b7840591 100644
--- a/src/bin/listusb/listusb.cpp
+++ b/src/bin/listusb/listusb.cpp
@@ -209,11 +209,11 @@ DumpCDCDescriptor(const usb_generic_descriptor* descriptor, int subclass)
 					= (const usb_cdc_cm_functional_descriptor*)descriptor;
 				printf("                    Capabilities ..... ");
 				bool somethingPrinted = false;
-				if (cmDesc->capabilities & USB_CDC_CM_DOES_CALL_MANAGEMENT != 0) {
+				if ((cmDesc->capabilities & USB_CDC_CM_DOES_CALL_MANAGEMENT) != 0) {
 					printf("Call management");
 					somethingPrinted = true;
 				}
-				if (cmDesc->capabilities & USB_CDC_CM_OVER_DATA_INTERFACE != 0) {
+				if ((cmDesc->capabilities & USB_CDC_CM_OVER_DATA_INTERFACE) != 0) {
 					if (somethingPrinted)
 						printf(", ");
 					printf("Over data interface");
@@ -232,23 +232,23 @@ DumpCDCDescriptor(const usb_generic_descriptor* descriptor, int subclass)
 					= (const usb_cdc_acm_functional_descriptor*)descriptor;
 				printf("                    Capabilities ..... ");
 				bool somethingPrinted = false;
-				if (acmDesc->capabilities & USB_CDC_ACM_HAS_COMM_FEATURES != 0) {
+				if ((acmDesc->capabilities & USB_CDC_ACM_HAS_COMM_FEATURES) != 0) {
 					printf("Communication features");
 					somethingPrinted = true;
 				}
-				if (acmDesc->capabilities & USB_CDC_ACM_HAS_LINE_CONTROL != 0) {
+				if ((acmDesc->capabilities & USB_CDC_ACM_HAS_LINE_CONTROL) != 0) {
 					if (somethingPrinted)
 						printf(", ");
 					printf("Line control");
 					somethingPrinted = true;
 				}
-				if (acmDesc->capabilities & USB_CDC_ACM_HAS_SEND_BREAK != 0) {
+				if ((acmDesc->capabilities & USB_CDC_ACM_HAS_SEND_BREAK) != 0) {
 					if (somethingPrinted)
 						printf(", ");
 					printf("Send break");
 					somethingPrinted = true;
 				}
-				if (acmDesc->capabilities & USB_CDC_ACM_HAS_NETWORK_CONNECTION != 0) {
+				if ((acmDesc->capabilities & USB_CDC_ACM_HAS_NETWORK_CONNECTION) != 0) {
 					if (somethingPrinted)
 						printf(", ");
 					printf("Network connection");
diff --git a/src/bin/writembr/writembr.cpp b/src/bin/writembr/writembr.cpp
index 1661683729..054c091273 100644
--- a/src/bin/writembr/writembr.cpp
+++ b/src/bin/writembr/writembr.cpp
@@ -78,7 +78,7 @@ main(int argc, char** argv)
 
 	unsigned char MBR[kMBRSize];
 	fs.read((char*)MBR, kMBRSize);
-	if (fs.fail() || fs.gcount() < kMBRSize ) {
+	if (fs.fail() || fs.gcount() < (off_t)kMBRSize ) {
 		cerr << "Cannot read " << kMBRSize
 			<< " bytes from " << device.Path() << endl;
 		fs.close();
diff --git a/src/kits/media/TimedEventQueue.cpp b/src/kits/media/TimedEventQueue.cpp
index 0b382fa036..22818aa65b 100644
--- a/src/kits/media/TimedEventQueue.cpp
+++ b/src/kits/media/TimedEventQueue.cpp
@@ -50,7 +50,7 @@ media_timed_event::media_timed_event(bigtime_t inTime,
 									 uint32 inCleanup,
 									 int32 inData,
 									 int64 inBigdata,
-									 char *inUserData,
+									 const char *inUserData,
 									 size_t dataSize)
 {
 	CALLED();