diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index 06bb71a82e..a424321ad8 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -27,9 +27,9 @@
 // Standard Includes -----------------------------------------------------------
 
 // System Includes -------------------------------------------------------------
-#include "Menu.h"
-#include "MenuItem.h"
-#include "Window.h"
+#include <Menu.h>
+#include <MenuItem.h>
+#include <Window.h>
 #include <PropertyInfo.h>
 #include <Errors.h>
 #include <File.h>
diff --git a/src/kits/interface/Polygon.cpp b/src/kits/interface/Polygon.cpp
index a4bd035f4a..4e278c0156 100644
--- a/src/kits/interface/Polygon.cpp
+++ b/src/kits/interface/Polygon.cpp
@@ -25,6 +25,7 @@
 //------------------------------------------------------------------------------
 
 // Standard Includes -----------------------------------------------------------
+#include <string.h>
 
 // System Includes -------------------------------------------------------------
 #include <Polygon.h>
diff --git a/src/kits/interface/TextControl.cpp b/src/kits/interface/TextControl.cpp
index 1738611e5d..d82277c204 100644
--- a/src/kits/interface/TextControl.cpp
+++ b/src/kits/interface/TextControl.cpp
@@ -160,7 +160,7 @@ void BTextControl::SetValue(int32 value)
 {
 }
 //------------------------------------------------------------------------------
-status_t BTextControl::Invoke(BMessage* msg = NULL)
+status_t BTextControl::Invoke(BMessage* msg)
 {
 	return BControl::Invoke(msg);
 }
diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index d29a6b2a4e..f47519c3a4 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -28,7 +28,6 @@
 #include <Message.h>
 #include <Bitmap.h>
 #include <Cursor.h>
-#include <Message.h>
 #include <Picture.h>
 #include <Polygon.h>
 #include <Region.h>
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index bb5efb173f..ef4574bb0b 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -123,7 +123,7 @@ BWindow::BWindow(BRect frame,
 				const char* title, 
 				window_type type,
 				uint32 flags,
-				uint32 workspace = B_CURRENT_WORKSPACE)
+				uint32 workspace)
 			: BLooper( title )
 {
 	window_look look;
@@ -141,7 +141,7 @@ BWindow::BWindow(BRect frame,
 				window_look look,
 				window_feel feel,
 				uint32 flags,
-				uint32 workspace = B_CURRENT_WORKSPACE)
+				uint32 workspace)
 			: BLooper( title )
 {
 	InitData( frame, title, look, feel, flags, workspace );
@@ -244,7 +244,7 @@ BArchivable* BWindow::Instantiate(BMessage* data){
 
 //------------------------------------------------------------------------------
 
-status_t BWindow::Archive(BMessage* data, bool deep = true) const{
+status_t BWindow::Archive(BMessage* data, bool deep) const{
 
 	status_t		retval;
 
@@ -332,7 +332,7 @@ void BWindow::Quit(){
 
 //------------------------------------------------------------------------------
 
-void BWindow::AddChild(BView *child, BView *before = NULL){
+void BWindow::AddChild(BView *child, BView *before){
 	top_view->AddChild( child, before );
 }
 
@@ -867,7 +867,7 @@ void BWindow::DispatchMessage(BMessage *msg, BHandler *target)
 		break;}
    }
    Flush();
-} 
+}
 
 //------------------------------------------------------------------------------
 
@@ -1202,7 +1202,7 @@ BView* BWindow::CurrentFocus() const{
 
 //------------------------------------------------------------------------------
 
-void BWindow::Activate(bool active = true){
+void BWindow::Activate(bool active){
 	if (IsHidden())
 		return;
 
@@ -2139,7 +2139,7 @@ void BWindow::task_looper(){
 
 //------------------------------------------------------------------------------
 
-BMessage* BWindow::ReadMessageFromPort(bigtime_t tout = B_INFINITE_TIMEOUT){
+BMessage* BWindow::ReadMessageFromPort(bigtime_t tout){
 	int32			msgcode;
 	BMessage*		msg;
 	uint8*			msgbuffer;
@@ -2157,7 +2157,7 @@ BMessage* BWindow::ReadMessageFromPort(bigtime_t tout = B_INFINITE_TIMEOUT){
 
 //------------------------------------------------------------------------------
 
-uint8* BWindow::ReadRawFromPort(int32* code, bigtime_t tout = B_INFINITE_TIMEOUT){
+uint8* BWindow::ReadRawFromPort(int32* code, bigtime_t tout){
 
 	uint8*			msgbuffer = NULL;
 	ssize_t			buffersize;