diff --git a/src/add-ons/input_server/filters/shortcut_catcher/BitFieldTesters.h b/src/add-ons/input_server/filters/shortcut_catcher/BitFieldTesters.h
index e72cd15827..e4681ae62e 100644
--- a/src/add-ons/input_server/filters/shortcut_catcher/BitFieldTesters.h
+++ b/src/add-ons/input_server/filters/shortcut_catcher/BitFieldTesters.h
@@ -19,9 +19,11 @@
 // This file contains various BitTester classes, each of which defines a 
 // sequence of bit testing logics to do on a uint32.
 
+#ifndef __HAIKU__
 #ifndef __INTEL__
 #pragma export on 
 #endif
+#endif
 
 // The abstract base class. Defines the interface.
 _EXPORT class BitFieldTester;
@@ -114,8 +116,10 @@ private:
 			bool			fDeleteSlaves;
 };
 
+#ifndef __HAIKU__
 #ifndef __INTEL__
 #pragma export reset 
 #endif
+#endif
 
 #endif
diff --git a/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.h b/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.h
index 8f3e136b36..82baf3775f 100644
--- a/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.h
+++ b/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.h
@@ -16,9 +16,11 @@
 #include <List.h>
 #include <InputServerFilter.h>
 
+#ifndef __HAIKU__
 #ifndef __INTEL__
 #pragma export on 
 #endif
+#endif
 
 struct key_map; // declaration
 
@@ -362,8 +364,10 @@ private:
 			BMessage				fSendMsg;
 };
 
+#ifndef __HAIKU__
 #ifndef __INTEL__
 #pragma export reset
 #endif
+#endif
 
 #endif