diff --git a/src/native/common/checkALerror.h b/src/native/common/checkALerror.h
index 4e5df663..66138f21 100644
--- a/src/native/common/checkALerror.h
+++ b/src/native/common/checkALerror.h
@@ -13,7 +13,7 @@
 #ifdef _DEBUG
 
 #include <jni.h>
-#include <al.h>
+#include <AL/al.h>
 
 #define CHECK_AL_ERROR \
 	{ \
@@ -42,4 +42,4 @@
 
 #endif /* _DEBUG */
 
-#endif /* _CHECKGLERROR_H_INCLUDED_ */
\ No newline at end of file
+#endif /* _CHECKGLERROR_H_INCLUDED_ */
diff --git a/src/native/win32/extal.c b/src/native/common/extal.c
similarity index 100%
rename from src/native/win32/extal.c
rename to src/native/common/extal.c
diff --git a/src/native/linux/checkALerror.h b/src/native/linux/checkALerror.h
deleted file mode 100644
index 66138f21..00000000
--- a/src/native/linux/checkALerror.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-	checkGLerror.h
-
-	Author:		C. Prince
-	Created:	8 November 2001
-
-	Error checking for OpenGL bindings
-*/
-
-#ifndef _CHECKGLERROR_H_INCLUDED_
-#define _CHECKGLERROR_H_INCLUDED_
-
-#ifdef _DEBUG
-
-#include <jni.h>
-#include <AL/al.h>
-
-#define CHECK_AL_ERROR \
-	{ \
-		int err = alGetError(); \
-		if (err != AL_NO_ERROR) { \
-			jclass cls = env->FindClass("org/lwjgl/openal/OpenALException"); \
-			env->ThrowNew(cls, (const char*) alGetString(err)); \
-			env->DeleteLocalRef(cls); \
-		} \
-	}
-/* only available if deviceaddress is specified in method */
-#define CHECK_ALC_ERROR \
-	{ \
-		int err = alcGetError((ALCdevice*) deviceaddress); \
-		if (err != AL_NO_ERROR) { \
-			jclass cls = env->FindClass("org/lwjgl/openal/OpenALException"); \
-			env->ThrowNew(cls, (const char*) alcGetString((ALCdevice*) deviceaddress, err)); \
-			env->DeleteLocalRef(cls); \
-		} \
-	}
-
-#else
-
-#define CHECK_AL_ERROR
-#define CHECK_ALC_ERROR
-
-#endif /* _DEBUG */
-
-#endif /* _CHECKGLERROR_H_INCLUDED_ */
diff --git a/src/native/linux/extal.c b/src/native/linux/extal.c
deleted file mode 100644
index 7e53a91c..00000000
--- a/src/native/linux/extal.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 
- * Copyright (c) 2002 Light Weight Java Game Library Project
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
- * met:
- * 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'Light Weight Java Game Library' nor the names of 
- *   its contributors may be used to endorse or promote products derived 
- *   from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN 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.
- */
-#include "extal.h"
-
-/**
- * $Id$
- *
- * This file contains the AL extension assigning mechanism
- *
- * @author elias_naur <elias_naur@matzon.dk>
- * @version $Revision$
- */