diff --git a/lib/detect.asm b/lib/detect.asm
index 7d87ead..b25aae4 100644
--- a/lib/detect.asm
+++ b/lib/detect.asm
@@ -13,28 +13,18 @@ org 0h
 
 header exe <"CE",1,0,0,offset exports,,,>
 
-exports:
-        db "cpuinfo",0			
-        dw cpuinfo
-        db "setinfo",0
-        dw setinfo
-        db "pciinfo",0
-        dw pciinfo
-        db "getpciclass",0
-        dw getpciclass
-        db "getpcisubclass",0
-        dw getpcisubclass
-        db "getcardinfo",0
-        dw getcardinfo
-        db "pcireadbyte",0
-        dw pcireadbyte
-        db "pcireadword",0
-        dw pcireadword
-        db "pcireaddword",0
-        dw pcireaddword
-        db "detectvmware",0
-        dw detectvmware
-        dd 0
+exporting
+declare cpuinfo
+declare setinfo
+declare pciinfo
+declare getpciclass
+declare getpcisubclass
+declare getcardinfo
+declare pcireadbyte
+declare pcireadword
+declare pcireaddword
+declare detectvmware
+ende
         
 PROC detectvmware FAR
 	USES	eax,ebx,ecx,edx
diff --git a/lib/video.asm b/lib/video.asm
index c90b916..6a0e872 100644
--- a/lib/video.asm
+++ b/lib/video.asm
@@ -11,40 +11,24 @@ org 0h
 
 header exe <"CE",1,0,0,offset exports,offset imports,,>
 
-exports:
-         db "print",0
-         dw print
-         db "showdate",0
-         dw showdate
-         db "showtime",0
-         dw showtime
-         db "showname",0
-         dw showname
-         db "showattr",0
-         dw showattr
-         db "showsize",0
-         dw showsize
-         db "showspace",0
-         dw showspace
-         db "showint",0
-         dw showint
-         db "showsigned",0
-         dw showsigned
-         db "showhex",0
-         dw showhex
-         db "showbin",0
-         dw showbin
-         db "showbcd",0
-         dw showbcd
-         db "showstring",0
-         dw showstring
-         db "showstring0",0
-         dw showstring0
-         db "showintr",0
-         dw showintr
-         db "showintl",0
-         dw showintl
-         dw 0
+exporting
+declare print
+declare showdate
+declare showtime
+declare showname
+declare showattr
+declare showsize
+declare showspace
+declare showint
+declare showsigned
+declare showhex
+declare showbin
+declare showbcd
+declare showstring
+declare showstring0
+declare showintr
+declare showintl
+ende
          
 imports:
          db "VIDEO::addline",0