diff --git a/libs/libimcomm/imcomm.h b/libs/libimcomm/imcomm.h
index b373135..0c52bab 100644
--- a/libs/libimcomm/imcomm.h
+++ b/libs/libimcomm/imcomm.h
@@ -52,7 +52,7 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <netinet/in.h>
-#ifndef __BEOS__
+#ifndef __HAIKU__
 #include <arpa/inet.h>
 #endif
 #include <netdb.h>
@@ -74,7 +74,7 @@ typedef unsigned __int8 uint8_t;
 #endif
 #endif
 
-#ifdef __BEOS__
+#ifdef __HAIKU__
 #include <inttypes.h>
 #endif
 
diff --git a/libs/librunview/RunView.cpp b/libs/librunview/RunView.cpp
index cd4c900..9a1dbce 100644
--- a/libs/librunview/RunView.cpp
+++ b/libs/librunview/RunView.cpp
@@ -58,11 +58,7 @@
 #include <Roster.h>
 #include <stdlib.h>
 
-#ifdef ZETA
-#include <locale/Locale.h>
-#else
 #define _T(str) (str)
-#endif
 
 // cursor data for hovering over URLs
 
@@ -209,9 +205,6 @@ void
 RunView::AttachedToWindow (void)
 {
 	BView::AttachedToWindow();
-#if B_BEOS_VERSION_DANO
-	SetDoubleBuffering (B_UPDATE_INVALIDATED | B_UPDATE_SCROLLED | B_UPDATE_EXPOSED | B_UPDATE_RESIZED);
-#endif
 	RecalcScrollBar (false);
 	fTheme->WriteLock();
 	fTheme->AddView (this);