2 files changed, 4 insertions, 12 deletions

diff --git a/include/litmus/fpmath.h b/include/litmus/fpmath.h
index 9a2519523fd5..e1450e22842b 100644
--- a/include/litmus/fpmath.h
+++ b/include/litmus/fpmath.h
@@ -1,15 +1,11 @@
 #ifndef __FP_MATH_H__
 #define __FP_MATH_H__
 
-#ifdef CONFIG_PLUGIN_AEDZL
-#include <litmus/rt_param.h>
-#else
 typedef long fpbuf_t;
 typedef struct
 {
         fpbuf_t val;
 } fp_t;
-#endif
 
 #define FP_SHIFT 10
 #define ROUND_BIT (FP_SHIFT - 1)
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 41ac654dd27e..e746dfc1a185 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -5,6 +5,10 @@
 #ifndef _LINUX_RT_PARAM_H_
 #define _LINUX_RT_PARAM_H_
 
+#ifdef CONFIG_PLUGIN_AEDZL
+#include <litmus/fpmath.h>
+#endif
+
 /* Litmus time type. */
 typedef unsigned long long lt_t;
 
@@ -33,14 +37,6 @@ typedef enum {
         PRECISE_ENFORCEMENT  /* NOT IMPLEMENTED - enforced with hrtimers */
 } budget_policy_t;
 
-#ifdef CONFIG_PLUGIN_AEDZL
-typedef long fpbuf_t;
-typedef struct
-{
-        fpbuf_t val;
-} fp_t;
-#endif
-
 struct rt_task {
         lt_t            exec_cost;
         lt_t            period;