@@ -19,35 +19,32 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef OG_GTK
+#if defined(OG_GTK)
 # include <gtk/gtk.h>
-#endif
-#ifdef OG_W32
+#elif defined(OG_WIN32)
 # include <windows.h>
 #endif
 
 #import <ObjFW/ObjFW.h>
 
 @interface OGWidget: OFObject
 {
 @public
-#ifdef OG_GTK
+#if defined(OG_GTK)
 	GtkWidget *widget;
-#endif
-#ifdef OG_W32
+#elif defined(OG_WIN32)
 	HWND widget;
 #endif
 }
 
 - (void)show;
 - (void)hide;
 @end
 
-#ifdef OG_GTK
+#if defined(OG_GTK)
 extern void og_destroy(GtkWidget*, OGWidget*);
-#endif
-#ifdef OG_W32
+#elif defined(OG_WIN32)
 extern void og_destroy(HWND widget, OGWidget *object);
 #endif