diff --git a/src/bin/bemail_utils/spamdbm.cpp b/src/bin/bemail_utils/spamdbm.cpp
index 089bc6ff88..3d9a63a943 100644
--- a/src/bin/bemail_utils/spamdbm.cpp
+++ b/src/bin/bemail_utils/spamdbm.cpp
@@ -494,6 +494,8 @@ static long long atoll (const char *str) {
 #include <string>
 #include <vector>
 
+using namespace std;
+
 /* BeOS (Be Operating System) headers. */
 
 #include <Alert.h>
@@ -1184,6 +1186,11 @@ private:
 };
 
 
+/* Various message codes for various buttons etc. */
+static const uint32 MSG_LINE_DOWN = 'LnDn';
+static const uint32 MSG_LINE_UP = 'LnUp';
+static const uint32 MSG_PAGE_DOWN = 'PgDn';
+static const uint32 MSG_PAGE_UP = 'PgUp';
 
 /******************************************************************************
  * This view contains the list of words.  It displays as many as can fit in the
@@ -1207,12 +1214,6 @@ public:
   virtual void Pulse ();
 
 private:
-  /* Various message codes for various buttons etc. */
-  static const uint32 MSG_LINE_DOWN = 'LnDn';
-  static const uint32 MSG_LINE_UP = 'LnUp';
-  static const uint32 MSG_PAGE_DOWN = 'PgDn';
-  static const uint32 MSG_PAGE_UP = 'PgUp';
-
   /* Our member functions. */
   void MoveTextUpOrDown (uint32 MovementType);
   void RefsDroppedHere (BMessage *MessagePntr);
@@ -1524,7 +1525,7 @@ static void DisplayErrorMessage (
  * result on the given output stream.
  */
 
-static void WrapTextToStream (ostream& OutputStream, char *TextPntr)
+static void WrapTextToStream (ostream& OutputStream, const char *TextPntr)
 {
   const int LineLength = 79;
   char     *StringPntr;
diff --git a/src/bin/chkbfs/chkbfs.cpp b/src/bin/chkbfs/chkbfs.cpp
index 0f383ff761..f68622062c 100644
--- a/src/bin/chkbfs/chkbfs.cpp
+++ b/src/bin/chkbfs/chkbfs.cpp
@@ -1,3 +1,4 @@
+#include <StorageDefs.h>
 #include "bfs_control.h"
 
 #include <fs_info.h>
diff --git a/src/bin/dpms.cpp b/src/bin/dpms.cpp
index 53a49a657c..b8207a4a82 100644
--- a/src/bin/dpms.cpp
+++ b/src/bin/dpms.cpp
@@ -4,6 +4,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <Application.h>
 #include <Accelerant.h>
 #include <Screen.h>
diff --git a/src/bin/modifiers.cpp b/src/bin/modifiers.cpp
index 75ae573a62..d8dcb8f777 100644
--- a/src/bin/modifiers.cpp
+++ b/src/bin/modifiers.cpp
@@ -11,29 +11,33 @@
 #include <strings.h>
 #include <InterfaceDefs.h>
 
+
 int32 modifier_bits[] = {
-B_SHIFT_KEY,
-B_COMMAND_KEY,
-B_CONTROL_KEY,
-B_CAPS_LOCK,
-B_SCROLL_LOCK,
-B_NUM_LOCK,
-B_OPTION_KEY,
-B_MENU_KEY,
-B_LEFT_SHIFT_KEY,
-B_RIGHT_SHIFT_KEY,
-B_LEFT_COMMAND_KEY,
-B_RIGHT_COMMAND_KEY,
-B_LEFT_CONTROL_KEY,
-B_RIGHT_CONTROL_KEY,
-B_LEFT_OPTION_KEY,
-B_RIGHT_OPTION_KEY,
-0
+	B_SHIFT_KEY,
+	B_COMMAND_KEY,
+	B_CONTROL_KEY,
+	B_CAPS_LOCK,
+	B_SCROLL_LOCK,
+	B_NUM_LOCK,
+	B_OPTION_KEY,
+	B_MENU_KEY,
+	B_LEFT_SHIFT_KEY,
+	B_RIGHT_SHIFT_KEY,
+	B_LEFT_COMMAND_KEY,
+	B_RIGHT_COMMAND_KEY,
+	B_LEFT_CONTROL_KEY,
+	B_RIGHT_CONTROL_KEY,
+	B_LEFT_OPTION_KEY,
+	B_RIGHT_OPTION_KEY,
+	0
 };
 
+
 const char *modifier_names[] = { "shift", "command", "control", "capslock", "scrolllock", "numlock", "option", "menu", "lshift", "rshift", "lcommand", "rcommand", "lcontrol", "rcontrol", "loption", "roption", NULL };
 
-int usage(char *progname, int error)
+
+int
+usage(char *progname, int error)
 {
 	FILE *outstr;
 	outstr = error?stderr:stdout;
@@ -43,7 +47,9 @@ int usage(char *progname, int error)
 	return error;
 }
 
-int list_modifiers(int mods)
+
+int
+list_modifiers(int mods)
 {
 	int i;
 	int gotone = 0;
@@ -61,7 +67,9 @@ int list_modifiers(int mods)
 	return 0;
 }
 
-int main(int argc, char **argv)
+
+int
+main(int argc, char **argv)
 {
 	int32 mods;
 	int32 mask_xor = 0x0;
@@ -69,7 +77,6 @@ int main(int argc, char **argv)
 	int i, j;
 
 	mods = modifiers();
-//	printf("mods = 0x%08lx\n", mods);
 	if (argc == 1)
 		return usage(argv[0], 1);
 	for (i=1; i<argc; i++) {